930 files changed, 61497 insertions, 93063 deletions

diff --git a/ANNOUNCE.1.5 b/ANNOUNCE.1.5
deleted file mode 100644
index 36c78e1..0000000
--- a/ANNOUNCE.1.5
+++ /dev/null
@@ -1,54 +0,0 @@
-- broadband (dsl/wireless) tracking, etc etc
-- Extended description on invoice for time/data charges
-- Multiple, named taxes
-- */*FIX
-- extended reported and graphing
-- integrated RT ticketing system
-- one-time payments (in signup server too).  DCRD and DCHK on-demand payment types
-- credit report
-- reseller interface
-
-1.5.0pre6:
-- RADIUS session viewing
-- Major updates for reseller interface
-- Credit card and ACH refunds (w/supported processor module)
-- Proper email payment receipts (not invoice copies)
-- modular price plans, rewrote package add/edit page
-- fixed up tax report - should be correct for edge cases with named taxes,
-  tax classes, etc.
-- Documentation updates
-
-1.5.7:
-- version numbering change, now even/odd like Perl or Linux
-- fix bug that could cause mis-billing on upgrades! (new installs ok)
-- updated install documentation
-- historical late notice viewing in web interface
-- VoIP billing for CDRs from RADIUS
-- promotional codes for signup
-- lots of RT integration, integrated RT upgraded to 3.2.2, preliminary RT 
-  add-on docs
-- one-time referral credits
-- invoices now use history records (don't lose details)
-- option to credit for remaining service upon package cancel/change
-  (peter bowen)
-- one-time registration codes
-- "selfservice_server-session_module" config value can be set to
-  "Cache::FileCache" on FreeBSD or elsewhere IPC::ShareLite has trouble.
-- package changes don't re-charge setup fee
-- per-agent payment and credit reports
-- CSV and Excel export of most reports, others to be migrated to new report template
-- prepaid card support updated: now includes a web generator, agent-specific
-  prepaid cards, and creates *payments*, not credits
-- preliminary setup for Slony-1 PostgreSQL replication
-- reformatted latex invoice templates w/Text::Template (khoff) and removed
-  some useless fields (quantity/unit price)
-- simplified upgrade instructions
-- add export to vpopmail SQL
-- html invoices
-- big self-service updates (recharge w/prepaid card, change info, more)
-- significant freeside-daily speedup
-
-notyet (1.5.8?):
-- account merging UI in exports (for example, to consolidate passwd files from
-  multiple servers)
-
diff --git a/ANNOUNCE.1.5.0 b/ANNOUNCE.1.5.0
new file mode 100644
index 0000000..9d2b97e
--- /dev/null
+++ b/ANNOUNCE.1.5.0
@@ -0,0 +1,27 @@
+- broadband (dsl/wireless) tracking, etc etc
+- Extended description on invoice for time/data charges
+- Multiple, named taxes
+- */*FIX
+- extended reported and graphing
+- integrated RT ticketing system
+- one-time payments (in signup server too).  DCRD and DCHK on-demand payment types
+- credit report
+- reseller interface
+
+1.5.0pre6:
+- RADIUS session viewing
+- Major updates for reseller interface
+- Credit card and ACH refunds (w/supported processor module)
+- Proper email payment receipts (not invoice copies)
+- modular price plans, rewrote package add/edit page
+- fixed up tax report - should be correct for edge cases with named taxes,
+  tax classes, etc.
+- Documentation updates
+
+1.5.0pre7:
+- fix bug that could cause mis-billing on upgrades! (new installs ok)
+- update install documentation for 1.5 HTML::Mason or Apache::ASP install
+# - historical late notice viewing in web interface
+- VoIP billing for CDRs from RADIUS
+- promotional codes for signup
+- lots of RT integration, integrated RT upgraded to 3.2.2
diff --git a/CREDITS b/CREDITS
index 930b4f3..39b53a7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -12,7 +12,7 @@ Jerry St. Pierre <jstpi@city.timmins.on.ca> did the "SISD" graphic used in
 1.0.x and most of 1.1.x.
 
 Mark Norris of Urban Design, Inc. <http://www.urban.com/> did the red "S"
-logo for later 1.1.x versions until 1.4.1
+logo for later 1.1.x versions and 1.2.x
 
 Brian McCane? <bmccane@maxbaud.net> contributed PostgreSQL support, HTML
 style enhancements and many, many bugfixes.
@@ -110,11 +110,10 @@ other fixes.
 Charles A Beasley <cbeasley@noment.net> contributed quota editing for the
 Infostreet export.
 
-Richard Siddall <richard.siddall@elirion.net> sent in Mason fixes, fixed lots
-of typos, mod_perl 2.0 work, RPM packaging and other things I'm probably
-forgetting.
+Richard Siddall <richard.siddall@elirion.net> sent in Mason fixes and other
+things I'm probably forgetting.
 
-Contains "JS Calendar" <http://dynarch.com/mishoo/calendar.epl>
+Contains "JS Calendar" v0.9.3 <http://dynarch.com/mishoo/calendar.epl>
 by Mihai Bazon <mishoo@infoiasi.ro> licensed under the terms of the GNU LGPL.
 
 Latex invoice template based on a template from eBills
@@ -124,38 +123,8 @@ licensed under the terms fo the GNU GPL.
 Contains "Request Tracker" <http://www.bestpractical.com/rt/> by Jesse
 Vincent <jesse@bestpractical.com> licensed under the terms of the GNU GPL.
 
-#not yet used...
-# Contains "SQL Ledger" <http://www.sql-ledger.com/> by DWS Systems Inc. and
-# contributors licensed under the terms of the GNU GPL.
-
-Peter Bowen <pbowen@aboutws.com> started the difficult modular price plans
-changes, added credit card encryption features, and other things I've
-probably overlooked.
-
-Rebecca Cardennis <http://www.shinza.org/> created the great new logo first
-released with 1.4.2beta1 and 1.5.0pre6.
-
-Troy Hammonds <troyh@netsignia.net> sent in RADIUS session history viewing,
-many bugfixes and other things I'm probably forgetting.
-
-Contains the QLIB JavaScript library <http://qlib.quazzle.com/> by 
-Quazzle.com, Serge Dolgov, licensed under the terms of the GNU GPL.
-
-Contains the overlibmws DHTML Popup Library <http://www.macridesweb.com/oltest/>
-by Foteos Macrides (derived from overLIB <http://www.bosrup.com/web/overlib/>
-by Erik Bosrup), licensed under the terms of the Artistic license
-<http://www.macridesweb.com/oltest/license.html>.
-
-Ricardo SIGNES <rjbs+freeside-devel@icgroup.com> has contributed a bunch of
-patches to clean up and refactor various stuff in the module layer.  Thanks!
-
-XMLHttpRequest implementation based on the SAJAX toolkit, licensed under the
-terms of the BSD license.
-(c) copyright 2005 modernmethod, inc
-Perl backend version (c) copyright 2005 Nathan Schmidt
-
-Scott Edwards <supadupa@gmail.com> contributed magic for XMLHTTP error
-handling, and other patches.
+Contains "SQL Ledger" <http://www.sql-ledger.com/> by DWS Systems Inc. and
+contributors licensed under the terms of the GNU GPL.
 
 Everything else is my (Ivan Kohler <ivan@420.am>) fault.
 
diff --git a/Changelog b/Changelog
deleted file mode 100644
index 36c78e1..0000000
--- a/Changelog
+++ /dev/null
@@ -1,54 +0,0 @@
-- broadband (dsl/wireless) tracking, etc etc
-- Extended description on invoice for time/data charges
-- Multiple, named taxes
-- */*FIX
-- extended reported and graphing
-- integrated RT ticketing system
-- one-time payments (in signup server too).  DCRD and DCHK on-demand payment types
-- credit report
-- reseller interface
-
-1.5.0pre6:
-- RADIUS session viewing
-- Major updates for reseller interface
-- Credit card and ACH refunds (w/supported processor module)
-- Proper email payment receipts (not invoice copies)
-- modular price plans, rewrote package add/edit page
-- fixed up tax report - should be correct for edge cases with named taxes,
-  tax classes, etc.
-- Documentation updates
-
-1.5.7:
-- version numbering change, now even/odd like Perl or Linux
-- fix bug that could cause mis-billing on upgrades! (new installs ok)
-- updated install documentation
-- historical late notice viewing in web interface
-- VoIP billing for CDRs from RADIUS
-- promotional codes for signup
-- lots of RT integration, integrated RT upgraded to 3.2.2, preliminary RT 
-  add-on docs
-- one-time referral credits
-- invoices now use history records (don't lose details)
-- option to credit for remaining service upon package cancel/change
-  (peter bowen)
-- one-time registration codes
-- "selfservice_server-session_module" config value can be set to
-  "Cache::FileCache" on FreeBSD or elsewhere IPC::ShareLite has trouble.
-- package changes don't re-charge setup fee
-- per-agent payment and credit reports
-- CSV and Excel export of most reports, others to be migrated to new report template
-- prepaid card support updated: now includes a web generator, agent-specific
-  prepaid cards, and creates *payments*, not credits
-- preliminary setup for Slony-1 PostgreSQL replication
-- reformatted latex invoice templates w/Text::Template (khoff) and removed
-  some useless fields (quantity/unit price)
-- simplified upgrade instructions
-- add export to vpopmail SQL
-- html invoices
-- big self-service updates (recharge w/prepaid card, change info, more)
-- significant freeside-daily speedup
-
-notyet (1.5.8?):
-- account merging UI in exports (for example, to consolidate passwd files from
-  multiple servers)
-
diff --git a/Changes.1.5.7 b/Changes.1.5.7
deleted file mode 100644
index 1407af6..0000000
--- a/Changes.1.5.7
+++ /dev/null
@@ -1,45 +0,0 @@
-Major new features and updates:
-- Version numbering has been simplified.  1.5.7 is the version after
-  1.5.0pre6.  It is still a development version - releases with odd numbered 
-  middle parts (NN in x.NN.x) are development versions, like Perl or Linux.
-- VoIP rating and billing for CDRs from RADIUS
-- Lots of additions to the RT integration, integrated RT upgraded to 3.2.2,
-  preliminary RT installation docs
-- Self-service updates (recharge w/prepaid card, change info, UI updates)
-
-Signup additions:
-- Prepaid card support updated: now includes a web generator and agent-specific
-  prepaid cards
-- Promotional codes and one-time registration codes for signup, with
-  agent-specific option
-
-Invoicing:
-- HTML formatting option for email invoices
-- Retypeset and reformatted latex invoice templates w/Text::Template
-  (thanks to Kristian Hoffman)
-- Option to credit a package for the prorated remaining service upon cancel
-  or change (thanks to Peter Bowen)
-- Web interface now includes ability to view all late notices as the customer
-  sees them
-
-Reporting:
-- Per-agent payment and credit reports
-- New report template used for most reports includs CSV and Excel export.
-  Remaining reports will shortly be migrated to the new template.
-
-Documentation updates:
-- Updated the install documentation
-- Simplified upgrade instructions
-
-Miscellaneous:
-- Added direct export to vpopmail SQL databases
-- Preliminary setup for Slony-1 PostgreSQL replication
-- "selfservice_server-session_module" config value can be set to
-  "Cache::FileCache" on FreeBSD or elsewhere IPC::ShareLite has trouble.
-
-Bugfixes and optimizations:
-- Significant freeside-daily speedup
-- Fix bug that could cause mis-billing on upgrades! (new installs ok)
-- Invoices now use history records to retain account details
-- Package changes don't re-charge setup fee
-
diff --git a/Changes.1.5.8 b/Changes.1.5.8
deleted file mode 100644
index ab35721..0000000
--- a/Changes.1.5.8
+++ /dev/null
@@ -1,28 +0,0 @@
-- move account search (httemplate/search/svc_acct.cgi) to new template
-- cust-fields configuration value to control which customer fields are shown on reports
-- add unlinked mail forward (svc_forward) report
-- move cust_pkg search (httemplate/search/cust_pkg.cgi) to new template
-- add active/suspended/cancelled customer packages to agent browse
-- add export to everyone.net outsource mail service
-- add native Radiator export
-- added agent/taxclass/card type-specific gateway overrides for people with
-  multiple payment gateways for different resellers, taxclasses and/or card
-  types
-- re-did billing section of customer edit and added maestro/switch/solo support
-- add cpanel export
-- added prepaid packages that set the RADIUS "Expiration" attribute and
-  auto-suspend on their next bill date
-- added banned card table and option to send customer cards there on cancel
-- moved to XMLHttpRequest instead of hidden iframe transport for progress bar,
-  should be more efficient and improve compatibility with Konq and maybe other
-  browsers?
-- also use XMLHttpRequest for retreiving states rather than send a huge page
-  for customer add/edit, much faster
-- redo account view and edit pages, add ability to edit uid/gid if conf options
-  for it are turned on
-- redo quick payment entry page with ajax magic
-- explicit payment types for cash and (optionally) western union
-- bulk svcpart change
-- tax report updated, per-agent option and most items now clickable
-- direct radiator export
-- added maximum "cap" options to RADIUS usage charges
diff --git a/FS/FS.pm b/FS/FS.pm
index f41245e..3bbd66f 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -88,10 +88,6 @@ L<FS::part_pkg_option> - Package definition option class
 L<FS::pkg_svc> - Class linking package definitions (see L<FS::part_pkg>) with
 service definitions (see L<FS::part_svc>)
 
-L<FS::reg_code> - One-time registration codes
-
-L<FS::reg_code_pkg> - Class linking registration codes (see L<FS::reg_code>) with package definitions (see L<FS::part_pkg>)
-
 L<FS::rate> - Rate plans for call billing
 
 L<FS::rate_region> - Rate regions for call billing
@@ -160,24 +156,6 @@ L<FS::queue_depend> - Job dependencies
 
 L<FS::msgcat> - Message catalogs
 
-L<FS::clientapi_session>
-
-L<FS::clientapi_session_field>
-
-=head1 Client API
-
-L<FS::ClientAPI>
-
-L<FS::ClientAPI_SessionCache>
-
-L<FS::ClientAPI::Signup>
-
-L<FS::ClientAPI::passwd>
-
-L<FS::ClientAPI::MyAccount>
-
-L<FS::ClientAPI::Agent>
-
 =head1 Remote API modules
 
 L<FS::SelfService>
@@ -212,9 +190,15 @@ L<freeside-bill>
 
 L<freeside-overdue>
 
-=head2 User Interface classes
+=head2 User Interface classes (under (stalled) development; not yet usable)
+
+L<FS::UI::Base> - User-interface base class
+
+L<FS::UI::Gtk> - Gtk user-interface class
+
+L<FS::UI::CGI> - CGI (HTML) user-interface class
 
-L<FS::UI::Web> - Web user-interface class
+L<FS::UI::agent> - agent table user-interface class
 
 =head2 Notes
 
@@ -237,11 +221,11 @@ The main documentation is in httemplate/docs.
 =head1 SUPPORT
 
 A mailing list for users is available.  Send a blank message to
-<freeside-users-subscribe@sisd.com> to subscribe.
+<ivan-freeside-subscribe@sisd.com> to subscribe.
 
 A mailing list for developers is available.  It is intended to be lower volume
 and higher SNR than the users list.  Send a blank message to
-<freeside-devel-subscribe@sisd.com> to subscribe.
+<ivan-freeside-devel-subscribe@sisd.com> to subscribe.
 
 Commercial support is available; see
 <http://www.sisd.com/freeside/commercial.html>.
diff --git a/FS/FS/ClientAPI.pm b/FS/FS/ClientAPI.pm
index 902f58b..7cbbdbf 100644
--- a/FS/FS/ClientAPI.pm
+++ b/FS/FS/ClientAPI.pm
@@ -1,35 +1,42 @@
 package FS::ClientAPI;
 
 use strict;
-use vars qw(%handler $domain $DEBUG);
-
-$DEBUG = 0;
+use vars qw(%handler $domain);
 
 %handler = ();
 
 #find modules
 foreach my $INC ( @INC ) {
-  my $glob = "$INC/FS/ClientAPI/*.pm";
-  warn "FS::ClientAPI: searching $glob" if $DEBUG;
-  foreach my $file ( glob($glob) ) {
+  foreach my $file ( glob("$INC/FS/ClientAPI/*.pm") ) {
     $file =~ /\/(\w+)\.pm$/ or do {
       warn "unrecognized ClientAPI file: $file";
       next
     };
     my $mod = $1;
-    warn "using FS::ClientAPI::$mod" if $DEBUG;
+    #warn "using FS::ClientAPI::$mod";
     eval "use FS::ClientAPI::$mod;";
     die "error using FS::ClientAPI::$mod: $@" if $@;
   }
 }
 
+#(sub for modules)
+sub register_handlers {
+  my $self = shift;
+  my %new_handlers = @_;
+  foreach my $key ( keys %new_handlers ) {
+    warn "WARNING: redefining sub $key" if exists $handler{$key};
+    #warn "registering $key";
+    $handler{$key} = $new_handlers{$key};
+  }
+}
+
 #---
 
 sub dispatch {
   my ( $self, $name ) = ( shift, shift );
-  $name =~ s(/)(::)g;
-  my $sub = "FS::ClientAPI::$name";
-  no strict 'refs';
+  my $sub = $handler{$name}
+    or die "unknown FS::ClientAPI sub $name (known: ". join(" ", keys %handler );
+    #or die "unknown FS::ClientAPI sub $name";
   &{$sub}(@_);
 }
 
diff --git a/FS/FS/ClientAPI/Agent.pm b/FS/FS/ClientAPI/Agent.pm
index daede59..f534a86 100644
--- a/FS/FS/ClientAPI/Agent.pm
+++ b/FS/FS/ClientAPI/Agent.pm
@@ -4,18 +4,24 @@ package FS::ClientAPI::Agent;
 
 use strict;
 use vars qw($cache);
-use subs qw(_cache);
 use Digest::MD5 qw(md5_hex);
+use Cache::SharedMemoryCache; #store in db?
 use FS::Record qw(qsearchs); # qsearch dbdef dbh);
-use FS::ClientAPI_SessionCache;
 use FS::agent;
 use FS::cust_main qw(smart_search);
 
-sub _cache {
-  $cache ||= new FS::ClientAPI_SessionCache( {
-               'namespace' => 'FS::ClientAPI::Agent',
-             } );
-}
+use FS::ClientAPI;
+FS::ClientAPI->register_handlers(
+  'Agent/agent_login'          => \&agent_login,
+  'Agent/agent_logout'         => \&agent_logout,
+  'Agent/agent_info'           => \&agent_info,
+  'Agent/agent_list_customers' => \&agent_list_customers,
+);
+
+#store in db?
+my $cache = new Cache::SharedMemoryCache( {
+   'namespace' => 'FS::ClientAPI::Agent',
+} );
 
 sub agent_login {
   my $p = shift;
@@ -39,9 +45,9 @@ sub agent_login {
   my $session_id;
   do {
     $session_id = md5_hex(md5_hex(time(). {}. rand(). $$))
-  } until ( ! defined _cache->get($session_id) ); #just in case
+  } until ( ! defined $cache->get($session_id) ); #just in case
 
-  _cache->set( $session_id, $session, '1 hour' );
+  $cache->set( $session_id, $session, '1 hour' );
 
   { 'error'      => '',
     'session_id' => $session_id,
@@ -51,7 +57,7 @@ sub agent_login {
 sub agent_logout {
   my $p = shift;
   if ( $p->{'session_id'} ) {
-    _cache->remove($p->{'session_id'});
+    $cache->remove($p->{'session_id'});
     return { 'error' => '' };
   } else {
     return { 'error' => "Can't resume session" }; #better error message
@@ -61,7 +67,7 @@ sub agent_logout {
 sub agent_info {
   my $p = shift;
 
-  my $session = _cache->get($p->{'session_id'})
+  my $session = $cache->get($p->{'session_id'})
     or return { 'error' => "Can't resume session" }; #better error message
 
   #my %return;
@@ -86,7 +92,7 @@ sub agent_info {
 sub agent_list_customers {
   my $p = shift;
 
-  my $session = _cache->get($p->{'session_id'})
+  my $session = $cache->get($p->{'session_id'})
     or return { 'error' => "Can't resume session" }; #better error message
 
   #my %return;
@@ -122,4 +128,3 @@ sub agent_list_customers {
 
 }
 
-1;
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 4b67f53..fe2e1c2 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -2,16 +2,14 @@ package FS::ClientAPI::MyAccount;
 
 use strict;
 use vars qw($cache);
-use subs qw(_cache);
 use Digest::MD5 qw(md5_hex);
 use Date::Format;
 use Business::CreditCard;
-use Time::Duration;
+use Cache::SharedMemoryCache; #store in db?
 use FS::CGI qw(small_custview); #doh
 use FS::Conf;
 use FS::Record qw(qsearch qsearchs);
 use FS::Msgcat qw(gettext);
-use FS::ClientAPI_SessionCache;
 use FS::svc_acct;
 use FS::svc_domain;
 use FS::svc_external;
@@ -21,22 +19,42 @@ use FS::cust_bill;
 use FS::cust_main_county;
 use FS::cust_pkg;
 
+use FS::ClientAPI; #hmm
+FS::ClientAPI->register_handlers(
+  'MyAccount/login'              => \&login,
+  'MyAccount/logout'             => \&logout,
+  'MyAccount/customer_info'      => \&customer_info,
+  'MyAccount/edit_info'          => \&edit_info,
+  'MyAccount/invoice'            => \&invoice,
+  'MyAccount/list_invoices'      => \&list_invoices,
+  'MyAccount/cancel'             => \&cancel,
+  'MyAccount/payment_info'       => \&payment_info,
+  'MyAccount/process_payment'    => \&process_payment,
+  'MyAccount/list_pkgs'          => \&list_pkgs,
+  'MyAccount/order_pkg'          => \&order_pkg,
+  'MyAccount/cancel_pkg'         => \&cancel_pkg,
+  'MyAccount/charge'             => \&charge,
+  'MyAccount/part_svc_info'      => \&part_svc_info,
+  'MyAccount/provision_acct'     => \&provision_acct,
+  'MyAccount/provision_external' => \&provision_external,
+  'MyAccount/unprovision_svc'    => \&unprovision_svc,
+);
+
 use vars qw( @cust_main_editable_fields );
 @cust_main_editable_fields = qw(
   first last company address1 address2 city
     county state zip country daytime night fax
   ship_first ship_last ship_company ship_address1 ship_address2 ship_city
     ship_state ship_zip ship_country ship_daytime ship_night ship_fax
-  payby payinfo payname paystart_month paystart_year payissue payip
+  payby payinfo payname
 );
 
 use subs qw(_provision);
 
-sub _cache {
-  $cache ||= new FS::ClientAPI_SessionCache( {
-               'namespace' => 'FS::ClientAPI::MyAccount',
-             } );
-}
+#store in db?
+my $cache = new Cache::SharedMemoryCache( {
+   'namespace' => 'FS::ClientAPI::MyAccount',
+} );
 
 #false laziness w/FS::ClientAPI::passwd::passwd
 sub login {
@@ -72,9 +90,9 @@ sub login {
   my $session_id;
   do {
     $session_id = md5_hex(md5_hex(time(). {}. rand(). $$))
-  } until ( ! defined _cache->get($session_id) ); #just in case
+  } until ( ! defined $cache->get($session_id) ); #just in case
 
-  _cache->set( $session_id, $session, '1 hour' );
+  $cache->set( $session_id, $session, '1 hour' );
 
   return { 'error'      => '',
            'session_id' => $session_id,
@@ -84,7 +102,7 @@ sub login {
 sub logout {
   my $p = shift;
   if ( $p->{'session_id'} ) {
-    _cache->remove($p->{'session_id'});
+    $cache->remove($p->{'session_id'});
     return { 'error' => '' };
   } else {
     return { 'error' => "Can't resume session" }; #better error message
@@ -118,7 +136,7 @@ sub customer_info {
 
     my $conf = new FS::Conf;
     $return{small_custview} =
-      small_custview( $cust_main, $conf->config('countrydefault') );
+      small_custview( $cust_main, $conf->config('defaultcountry') );
 
     $return{name} = $cust_main->first. ' '. $cust_main->get('last');
 
@@ -132,20 +150,16 @@ sub customer_info {
     }
 
     $return{'invoicing_list'} =
-      join(', ', grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list );
+      join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list );
     $return{'postal_invoicing'} =
       0 < ( grep { $_ eq 'POST' } $cust_main->invoicing_list );
 
-  } elsif ( $session->{'svcnum'} ) { #no customer record
+  } else { #no customer record
 
     my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $session->{'svcnum'} } )
       or die "unknown svcnum";
     $return{name} = $svc_acct->email;
 
-  } else {
-
-    return { 'error' => 'Expired session' }; #XXX redirect to login w/this err!
-
   }
 
   return { 'error'          => '',
@@ -157,7 +171,7 @@ sub customer_info {
 
 sub edit_info {
   my $p = shift;
-  my $session = _cache->get($p->{'session_id'})
+  my $session = $cache->get($p->{'session_id'})
     or return { 'error' => "Can't resume session" }; #better error message
 
   my $custnum = $session->{'custnum'}
@@ -197,7 +211,7 @@ sub edit_info {
 
 sub payment_info {
   my $p = shift;
-  my $session = _cache->get($p->{'session_id'})
+  my $session = $cache->get($p->{'session_id'})
     or return { 'error' => "Can't resume session" }; #better error message
 
   ##
@@ -207,7 +221,7 @@ sub payment_info {
   my $conf = new FS::Conf;
   my %states = map { $_->state => 1 }
                  qsearch('cust_main_county', {
-                   'country' => $conf->config('countrydefault') || 'US'
+                   'country' => $conf->config('defaultcountry') || 'US'
                  } );
 
   use vars qw($payment_info); #cache for performance
@@ -226,8 +240,6 @@ sub payment_info {
       'MasterCard' => 'MasterCard',
       'Discover' => 'Discover card',
       'American Express' => 'American Express card',
-      'Switch' => 'Switch',
-      'Solo' => 'Solo',
     },
 
   };
@@ -276,7 +288,7 @@ sub process_payment {
 
   my $p = shift;
 
-  my $session = _cache->get($p->{'session_id'})
+  my $session = $cache->get($p->{'session_id'})
     or return { 'error' => "Can't resume session" }; #better error message
 
   my %return;
@@ -343,8 +355,7 @@ sub process_payment {
     'payname'  => $payname,
     'paybatch' => $paybatch,
     'paycvv'   => $paycvv,
-    map { $_ => $p->{$_} } qw( paystart_month paystart_year payissue payip
-                               address1 address2 city state zip )
+    map { $_ => $p->{$_} } qw( address1 address2 city state zip )
   );
   return { 'error' => $error } if $error;
 
@@ -353,8 +364,7 @@ sub process_payment {
   if ( $p->{'save'} ) {
     my $new = new FS::cust_main { $cust_main->hash };
     $new->set( $_ => $p->{$_} )
-      foreach qw( payname paystart_month paystart_year payissue payip
-                  address1 address2 city state zip payinfo );
+      foreach qw( payname address1 address2 city state zip payinfo );
     $new->set( 'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01' );
     $new->set( 'payby' => $p->{'auto'} ? 'CARD' : 'DCRD' );
     my $error = $new->replace($cust_main);
@@ -366,39 +376,9 @@ sub process_payment {
 
 }
 
-sub process_prepay {
-
-  my $p = shift;
-
-  my $session = _cache->get($p->{'session_id'})
-    or return { 'error' => "Can't resume session" }; #better error message
-
-  my %return;
-
-  my $custnum = $session->{'custnum'};
-
-  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-    or return { 'error' => "unknown custnum $custnum" };
-
-  my( $amount, $seconds ) = ( 0, 0 );
-  my $error = $cust_main->recharge_prepay( $p->{'prepaid_cardnum'},
-                                           \$amount,
-                                           \$seconds
-                                         );
-
-  return { 'error' => $error } if $error;
-
-  return { 'error'    => '',
-           'amount'   => $amount,
-           'seconds'  => $seconds,
-           'duration' => duration_exact($seconds),
-         };
-
-}
-
 sub invoice {
   my $p = shift;
-  my $session = _cache->get($p->{'session_id'})
+  my $session = $cache->get($p->{'session_id'})
     or return { 'error' => "Can't resume session" }; #better error message
 
   my $custnum = $session->{'custnum'};
@@ -420,7 +400,7 @@ sub invoice {
 
 sub list_invoices {
   my $p = shift;
-  my $session = _cache->get($p->{'session_id'})
+  my $session = $cache->get($p->{'session_id'})
     or return { 'error' => "Can't resume session" }; #better error message
 
   my $custnum = $session->{'custnum'};
@@ -441,7 +421,7 @@ sub list_invoices {
 
 sub cancel {
   my $p = shift;
-  my $session = _cache->get($p->{'session_id'})
+  my $session = $cache->get($p->{'session_id'})
     or return { 'error' => "Can't resume session" }; #better error message
 
   my $custnum = $session->{'custnum'};
@@ -494,7 +474,7 @@ sub list_pkgs {
                         } $cust_main->ncancelled_pkgs
                   ],
     'small_custview' =>
-      small_custview( $cust_main, $conf->config('countrydefault') ),
+      small_custview( $cust_main, $conf->config('defaultcountry') ),
   };
 
 }
@@ -612,7 +592,7 @@ sub order_pkg {
 
 sub cancel_pkg {
   my $p = shift;
-  my $session = _cache->get($p->{'session_id'})
+  my $session = $cache->get($p->{'session_id'})
     or return { 'error' => "Can't resume session" }; #better error message
 
   my $custnum = $session->{'custnum'};
@@ -737,7 +717,7 @@ sub part_svc_info {
     'acstate'         => '',
 
     'small_custview' =>
-      small_custview( $cust_main, $conf->config('countrydefault') ),
+      small_custview( $cust_main, $conf->config('defaultcountry') ),
 
   };
 
@@ -767,7 +747,7 @@ sub unprovision_svc {
   return { 'svc'   => $cust_svc->part_svc->svc,
            'error' => $cust_svc->cancel,
            'small_custview' =>
-             small_custview( $cust_main, $conf->config('countrydefault') ),
+             small_custview( $cust_main, $conf->config('defaultcountry') ),
          };
 
 }
@@ -781,27 +761,28 @@ sub _custoragent_session_custnum {
   if ( $p->{'session_id'} ) {
 
     $context = 'customer';
-    $session = _cache->get($p->{'session_id'})
-      or return ( 'error' => "Can't resume session" ); #better error message
+    $session = $cache->get($p->{'session_id'})
+      or return { 'error' => "Can't resume session" }; #better error message
     $custnum = $session->{'custnum'};
 
   } elsif ( $p->{'agent_session_id'} ) {
 
     $context = 'agent';
-    my $agent_cache = new FS::ClientAPI_SessionCache( {
+    my $agent_cache = new Cache::SharedMemoryCache( {
       'namespace' => 'FS::ClientAPI::Agent',
     } );
     $session = $agent_cache->get($p->{'agent_session_id'})
-      or return ( 'error' => "Can't resume session" ); #better error message
+      or return { 'error' => "Can't resume session" }; #better error message
     $custnum = $p->{'custnum'};
 
   } else {
-    return ( 'error' => "Can't resume session" ); #better error message
+    return { 'error' => "Can't resume session" }; #better error message
   }
 
   ($context, $session, $custnum);
 
 }
 
+
 1;
 
diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index ed71651..dc627e9 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -5,7 +5,6 @@ use Tie::RefHash;
 use FS::Conf;
 use FS::Record qw(qsearch qsearchs dbdef);
 use FS::Msgcat qw(gettext);
-use FS::ClientAPI_SessionCache;
 use FS::agent;
 use FS::cust_main_county;
 use FS::part_pkg;
@@ -15,7 +14,12 @@ use FS::cust_pkg;
 use FS::svc_acct;
 use FS::acct_snarf;
 use FS::queue;
-use FS::reg_code;
+
+use FS::ClientAPI; #hmm
+FS::ClientAPI->register_handlers(
+  'Signup/signup_info'  => \&signup_info,
+  'Signup/new_customer' => \&new_customer,
+);
 
 sub signup_info {
   my $packet = shift;
@@ -89,7 +93,7 @@ sub signup_info {
 
   my $session = '';
   if ( exists $packet->{'session_id'} ) {
-    my $cache = new FS::ClientAPI_SessionCache( {
+    my $cache = new Cache::SharedMemoryCache( {
       'namespace' => 'FS::ClientAPI::Agent',
     } );
     $session = $cache->get($packet->{'session_id'});
@@ -101,22 +105,7 @@ sub signup_info {
   }
 
   $signup_info->{'part_pkg'} = [];
-
-  if ( $packet->{'reg_code'} ) {
-    $signup_info->{'part_pkg'} = 
-      [ map { { 'payby'   => [ $_->payby ], %{$_->hashref} } }
-          grep { $_->svcpart('svc_acct') }
-          map { $_->part_pkg }
-            qsearchs( 'reg_code', { 'code'     => $packet->{'reg_code'},
-                                    'agentnum' => $agentnum,              } )
-
-      ];
-
-    $signup_info->{'error'} = 'Unknown registration code'
-      unless @{ $signup_info->{'part_pkg'} };
-
-  } elsif ( $packet->{'promo_code'} ) {
-
+  if ( $packet->{'promo_code'} ) {
     $signup_info->{'part_pkg'} =
       [ map { { 'payby'   => [ $_->payby ], %{$_->hashref} } }
           grep { $_->svcpart('svc_acct') }
@@ -165,7 +154,7 @@ sub new_customer {
 
   my $agentnum;
   if ( exists $packet->{'session_id'} ) {
-    my $cache = new FS::ClientAPI_SessionCache( {
+    my $cache = new Cache::SharedMemoryCache( {
       'namespace' => 'FS::ClientAPI::Agent',
     } );
     my $session = $cache->get($packet->{'session_id'});
@@ -197,12 +186,7 @@ sub new_customer {
       ship_city ship_county ship_state ship_zip ship_country
       ship_daytime ship_night ship_fax
 
-      payby
-      payinfo paycvv paydate payname
-      paystart_month paystart_year payissue
-      payip
-
-      referral_custnum comments
+      payby payinfo paycvv paydate payname referral_custnum comments
     )
 
   } );
@@ -225,18 +209,10 @@ sub new_customer {
       or return { 'error' => "WARNING: unknown pkgpart: $pkgpart" };
   my $svcpart = $part_pkg->svcpart('svc_acct');
 
-  my $reg_code = '';
-  if ( $packet->{'reg_code'} ) {
-    $reg_code = qsearchs( 'reg_code', { 'code'     => $packet->{'reg_code'},
-                                        'agentnum' => $agentnum,             } )
-      or return { 'error' => 'Unknown registration code' };
-  }
-
   my $cust_pkg = new FS::cust_pkg ( {
     #later#'custnum' => $custnum,
     'pkgpart'    => $packet->{'pkgpart'},
     'promo_code' => $packet->{'promo_code'},
-    'reg_code'   => $packet->{'reg_code'},
   } );
   #my $error = $cust_pkg->check;
   #return { 'error' => $error } if $error;
@@ -329,11 +305,6 @@ sub new_customer {
 
   }
 
-  if ( $reg_code ) {
-    $error = $reg_code->delete;
-    return { 'error' => $error } if $error;
-  }
-
   $error = $placeholder->delete;
   return { 'error' => $error } if $error;
 
diff --git a/FS/FS/ClientAPI/passwd.pm b/FS/FS/ClientAPI/passwd.pm
index b22d761..cb839ec 100644
--- a/FS/FS/ClientAPI/passwd.pm
+++ b/FS/FS/ClientAPI/passwd.pm
@@ -5,6 +5,13 @@ use FS::Record qw(qsearchs);
 use FS::svc_acct;
 use FS::svc_domain;
 
+use FS::ClientAPI; #hmm
+FS::ClientAPI->register_handlers(
+  'passwd/passwd' => \&passwd,
+  'passwd/chfn' => \&chfn,
+  'passwd/chsh' => \&chsh,
+);
+
 sub passwd {
   my $packet = shift;
 
diff --git a/FS/FS/ClientAPI_SessionCache.pm b/FS/FS/ClientAPI_SessionCache.pm
deleted file mode 100644
index b722484..0000000
--- a/FS/FS/ClientAPI_SessionCache.pm
+++ /dev/null
@@ -1,78 +0,0 @@
-package FS::ClientAPI_SessionCache;
-
-use strict;
-use vars qw($module);
-use FS::UID qw(datasrc);
-
-#ask FS::UID to run this stuff for us later
-install_callback FS::UID sub { 
-  my $conf = new FS::Conf;
-  $module = $conf->config('selfservice_server-cache_module')
-            || 'Cache::SharedMemoryCache';
-};
-
-=head1 NAME
-
-FS::ClientAPI_SessionCache;
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-Minimal Cache::Cache-alike interface for storing session cache information.
-Backends to Cache::SharedMemoryCache, Cache::FileCache, or an internal
-implementation which stores information in the clientapi_session and
-clientapi_session_field database tables.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-=cut
-
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  unless ( $module =~ /^_Database$/ ) {
-    eval "use $module;";
-    die $@ if $@;
-    my $self = $module->new(@_);
-    $self->set_cache_root('/usr/local/etc/freeside/clientapi_session.'.datasrc)
-      if $module =~ /^Cache::FileCache$/;
-    $self;
-  } else {
-    my $self = shift;
-    bless ($self, $class);
-  }
-}
-
-sub get {
-  my($self, $session_id) = @_;
-  die '_Database self-service session cache not yet implemented';
-}
-
-sub set {
-  my($self, $session_id, $session, $expiration) = @_;
-  die '_Database self-service session cache not yet implemented';
-}
-
-sub remove {
-  my($self, $session_id) = @_;
-  die '_Database self-service session cache not yet implemented';
-}
-
-=back
-
-=head1 BUGS
-
-Minimal documentation.
-
-=head1 SEE ALSO
-
-L<Cache::Cache>, L<FS::clientapi_session>, L<FS::clientapi_session_field>
-
-=cut
-
-1;
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 88dbdf0..b6c115d 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -95,21 +95,6 @@ sub config {
   }
 }
 
-=item config_binary KEY
-
-Returns the exact scalar value for key.
-
-=cut
-
-sub config_binary {
-  my($self,$file)=@_;
-  my($dir)=$self->dir;
-  my $fh = new IO::File "<$dir/$file" or return;
-  local $/;
-  my $content = <$fh>;
-  $content;
-}
-
 =item exists KEY
 
 Returns true if the specified key exists, even if the corresponding value
@@ -224,31 +209,6 @@ sub config_items {
         new FS::ConfItem {
                            'key'         => $basename,
                            'section'     => 'billing',
-                           'description' => 'Alternate HTML template for invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
-                           'type'        => 'textarea',
-                         }
-      } glob($self->dir. '/invoice_html_*')
-  ),
-  ( map { 
-        my $basename = basename($_);
-        $basename =~ /^(.*)$/;
-        $basename = $1;
-        ($latexname = $basename ) =~ s/latex/html/;
-        new FS::ConfItem {
-                           'key'         => $basename,
-                           'section'     => 'billing',
-                           'description' => "Alternate Notes section for HTML invoices.  Defaults to the same data in $latexname if not specified.",
-                           'type'        => 'textarea',
-                         }
-      } glob($self->dir. '/invoice_htmlnotes_*')
-  ),
-  ( map { 
-        my $basename = basename($_);
-        $basename =~ /^(.*)$/;
-        $basename = $1;
-        new FS::ConfItem {
-                           'key'         => $basename,
-                           'section'     => 'billing',
                            'description' => 'Alternate LaTeX template for invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
                            'type'        => 'textarea',
                          }
@@ -342,34 +302,6 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'encryption',
-    'section'     => 'billing',
-    'description' => 'Enable encryption of credit cards.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'encryptionmodule',
-    'section'     => 'billing',
-    'description' => 'Use which module for encryption?',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'encryptionpublickey',
-    'section'     => 'billing',
-    'description' => 'Your RSA Public Key - Required if Encryption is turned on.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'encryptionprivatekey',
-    'section'     => 'billing',
-    'description' => 'Your RSA Private Key - Including this will enable the "Bill Now" feature.  However if the system is compromised, a hacker can use this key to decode the stored credit card information.  This is generally not a good idea.',
-    'type'        => 'textarea',
-  },
-
-  {
     'key'         => 'business-onlinepayment',
     'section'     => 'billing',
     'description' => '<a href="http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password.  An optional fourth line specifies the action or actions (multiple actions are separated with `,\': for example: `Authorization Only, Post Authorization\').    Optional additional lines are passed to Business::OnlinePayment as %processor_options.',
@@ -391,13 +323,6 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'business-onlinepayment-email-override',
-    'section'     => 'billing',
-    'description' => 'Email address used instead of customer email address when submitting a BOP transaction.',
-    'type'        => 'text',
-  },
-
-  {
     'key'         => 'bsdshellmachines',
     'section'     => 'deprecated',
     'description' => '<b>DEPRECATED</b>, add a <i>bsdshell</i> <a href="../browse/part_export.cgi">export</a> instead.  Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd\' and `/etc/master.passwd\'.',
@@ -512,7 +437,7 @@ httemplate/docs/config.html
   {
     'key'         => 'erpcdmachines',
     'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, ERPCD is no longer supported.  Used to be ERPCD authentication machines, one per line.  This enables export of `/usr/annex/acp_passwd\' and `/usr/annex/acp_dialup\'',
+    'description' => '<b>DEPRECATED</b>, ERPCD is no longer supported.  Used to be ERPCD authenticaion machines, one per line.  This enables export of `/usr/annex/acp_passwd\' and `/usr/annex/acp_dialup\'',
     'type'        => 'textarea',
   },
 
@@ -580,38 +505,9 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'invoice_html',
-    'section'     => 'billing',
-    'description' => 'Optional HTML template for invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
-
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'invoice_htmlnotes',
-    'section'     => 'billing',
-    'description' => 'Notes section for HTML invoices.  Defaults to the same data in invoice_latexnotes if not specified.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'invoice_htmlfooter',
-    'section'     => 'billing',
-    'description' => 'Footer for HTML invoices.  Defaults to the same data in invoice_latexfooter if not specified.',
-    'type'        => 'textarea',
-  },
-
-  {
-    'key'         => 'invoice_htmlreturnaddress',
-    'section'     => 'billing',
-    'description' => 'Return address for HTML invoices.  Defaults to the same data in invoice_latexreturnaddress if not specified.',
-    'type'        => 'textarea',
-  },
-
-  {
     'key'         => 'invoice_latex',
     'section'     => 'billing',
-    'description' => 'Optional LaTeX template for typeset PostScript invoices.  See the <a href="../docs/billing.html">billing documentation</a> for details.',
+    'description' => 'Optional LaTeX template for typeset PostScript invoices.',
     'type'        => 'textarea',
   },
 
@@ -630,34 +526,12 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'invoice_latexreturnaddress',
-    'section'     => 'billing',
-    'description' => 'Return address for LaTeX typeset PostScript invoices.',
-    'type'        => 'textarea',
-  },
-
-  {
     'key'         => 'invoice_latexsmallfooter',
     'section'     => 'billing',
     'description' => 'Optional small footer for multi-page LaTeX typeset PostScript invoices.',
     'type'        => 'textarea',
   },
 
-  {
-    'key'         => 'invoice_email_pdf',
-    'section'     => 'billing',
-    'description' => 'Send PDF invoice as an attachment to emailed invoices.  By default, includes the plain text invoice as the email body, unless invoice_email_pdf_note is set.',
-    'type'        => 'checkbox'
-  },
-
-  {
-    'key'         => 'invoice_email_pdf_note',
-    'section'     => 'billing',
-    'description' => 'If defined, this text will replace the default plain text invoice as the body of emailed PDF invoices.',
-    'type'        => 'textarea'
-  },
-
-
   { 
     'key'         => 'invoice_default_terms',
     'section'     => 'billing',
@@ -668,7 +542,7 @@ httemplate/docs/config.html
 
   {
     'key'         => 'invoice_send_receipts',
-    'section'     => 'deprecated',
+    'section'     => 'deprecated',q
     'description' => '<b>DEPRECATED</b>, this used to send an invoice copy on payments and credits.  See the payment_receipt_email and XXXX instead.',
     'type'        => 'checkbox',
   },
@@ -676,7 +550,7 @@ httemplate/docs/config.html
   {
     'key'         => 'payment_receipt_email',
     'section'     => 'billing',
-    'description' => 'Template file for payment receipts.  Payment receipts are sent to the customer email invoice destination(s) when a payment is received.  See the <a href="http://search.cpan.org/~mjd/Text-Template/lib/Text/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available: <ul><li><code>$date</code> <li><code>$name</code> <li><code>$paynum</code> - Freeside payment number <li><code>$paid</code> - Amount of payment <li><code>$payby</code> - Payment type (Card, Check, Electronic check, etc.) <li><code>$payinfo</code> - Masked credit card number or check number <li><code>$balance</code> - New balance</ul>',
+    'description' => 'Template file for payment receipts.',
     'type'        => 'textarea',
   },
 
@@ -723,7 +597,7 @@ httemplate/docs/config.html
     'editlist_parts' => [ { type=>'text' },
                           { type=>'immutable', value=>'IN' },
                           { type=>'select',
-                            select_enum=>{ map { $_=>$_ } qw(A CNAME MX NS TXT)} },
+                            select_enum=>{ map { $_=>$_ } qw(A CNAME MX NS)} },
                           { type=> 'text' }, ],
   },
 
@@ -1050,13 +924,6 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
-  { 
-    'key'         => 'username-percent',
-    'section'     => 'username',
-    'description' => 'Allow the percent character (%) in usernames.',
-    'type'        => 'checkbox',
-  },
-
   {
     'key'         => 'username_policy',
     'section'     => 'deprecated',
@@ -1202,13 +1069,6 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'backend-realtime',
-    'section'     => '',
-    'description' => 'Run billing for backend signups immediately.',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'declinetemplate',
     'section'     => 'billing',
     'description' => 'Template file for credit card decline emails.',
@@ -1265,16 +1125,9 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'require_taxclasses',
-    'section'     => 'billing',
-    'description' => 'Require a taxclass to be entered for every package',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'welcome_email',
     'section'     => '',
-    'description' => 'Template file for welcome email.  Welcome emails are sent to the customer email invoice destination(s) each time a svc_acct record is created.  See the <a href="http://search.cpan.org/~mjd/Text-Template/lib/Text/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available<ul><li><code>$username</code> <li><code>$password</code> <li><code>$first</code> <li><code>$last</code> <li><code>$pkg</code></ul>',
+    'description' => 'Template file for welcome email.  Welcome emails are sent to the customer email invoice destination(s) each time a svc_acct record is created.  See the <a href="http://search.cpan.org/doc/MJD/Text-Template-1.42/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available: <code>$username</code>, <code>$password</code>, <code>$first</code>, <code>$last</code> and <code>$pkg</code>.',
     'type'        => 'textarea',
   },
 
@@ -1301,19 +1154,11 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'payby',
-    'section'     => 'billing',
-    'description' => 'Available payment types.',
-    'type'        => 'selectmultiple',
-    'select_enum' => [ qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST MCRD COMP) ],
-  },
-
-  {
     'key'         => 'payby-default',
     'section'     => 'UI',
     'description' => 'Default payment type.  HIDE disables display of billing information and sets customers to BILL.',
     'type'        => 'select',
-    'select_enum' => [ '', qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST MCRD COMP HIDE) ],
+    'select_enum' => [ '', qw(CARD DCRD CHEK DCHK LECB BILL COMP HIDE) ],
   },
 
   {
@@ -1478,37 +1323,16 @@ httemplate/docs/config.html
   {
     'key'         => 'ticket_system',
     'section'     => '',
-    'description' => 'Ticketing system integration.  <b>RT_Internal</b> uses the built-in RT ticketing system (see the <a href="../docs/install-rt">integrated ticketing installation instructions</a>).   <b>RT_External</b> accesses an external RT installation in a separate database (local or remote).',
+    'description' => 'Ticketing system integraiton.  <b>RT_Internal</b> uses the built-in RT ticketing system (use <code>make create-rt</code> to create the necessary tables).  <b>RT_Libs</b> uses the built-in RT libraries to access an RT installation in a separate database (local or remote).  <b>RT_External</b> uses RT\'s XML interface and RTx::Atom to access an RT installation in a separate database (local or remote).',
     'type'        => 'select',
-    #'select_enum' => [ '', qw(RT_Internal RT_Libs RT_External) ],
-    'select_enum' => [ '', qw(RT_Internal RT_External) ],
+    'select_enum' => [ '', qw(RT_Internal RT_Libs RT_External) ],
   },
 
   {
     'key'         => 'ticket_system-default_queueid',
     'section'     => '',
-    'description' => 'Default queue used when creating new customer tickets.',
-    'type'        => 'select-sub',
-    'options_sub' => sub {
-                           my $conf = new FS::Conf;
-                           if ( $conf->config('ticket_system') ) {
-                             eval "use FS::TicketSystem;";
-                             die $@ if $@;
-                             FS::TicketSystem->queues();
-                           } else {
-                             ();
-                           }
-                         },
-    'option_sub'  => sub { 
-                           my $conf = new FS::Conf;
-                           if ( $conf->config('ticket_system') ) {
-                             eval "use FS::TicketSystem;";
-                             die $@ if $@;
-                             FS::TicketSystem->queue(shift);
-                           } else {
-                             '';
-                           }
-                         },
+    'description' => 'Default queue number used when creating new customer tickets.',
+    'type'        => 'text',
   },
 
   {
@@ -1533,21 +1357,6 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'ticket_system-rt_external_datasrc',
-    'section'     => '',
-    'description' => 'With external RT integration, the DBI data source for the external RT installation, for example, <code>DBI:Pg:user=rt_user;password=rt_word;host=rt.example.com;dbname=rt</code>',
-    'type'        => 'text',
-
-  },
-
-  {
-    'key'         => 'ticket_system-rt_external_url',
-    'section'     => '',
-    'description' => 'With external RT integration, the URL for the external RT installation, for example, <code>https://rt.example.com/rt</code>',
-    'type'        => 'text',
-  },
-
-  {
     'key'         => 'company_name',
     'section'     => 'required',
     'description' => 'Your company name',
@@ -1562,105 +1371,12 @@ httemplate/docs/config.html
   },
 
   {
-    'key'         => 'cc-void',
-    'section'     => 'billing',
-    'description' => 'Enable local-only voiding of credit card payments in addition to refunds against the payment gateway',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'unvoid',
-    'section'     => 'billing',
-    'description' => 'Enable unvoiding of voided payments',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'address2-search',
     'section'     => 'UI',
     'description' => 'Enable a "Unit" search box which searches the second address field',
     'type'        => 'checkbox',
   },
 
-  { 'key'         => 'referral_credit',
-    'section'     => 'billing',
-    'description' => "Enables one-time referral credits in the amount of one month <i>referred</i> customer's recurring fee (irregardless of frequency).",
-    'type'        => 'checkbox',
-  },
-
-  { 'key'         => 'selfservice_server-cache_module',
-    'section'     => '',
-    'description' => 'Module used to store self-service session information.  All modules handle any number of self-service servers.  Cache::SharedMemoryCache is appropriate for a single database / single Freeside server.  Cache::FileCache is useful for multiple databases on a single server, or when IPC::ShareLite is not available (i.e. FreeBSD).', #  _Database stores session information in the database and is appropriate for multiple Freeside servers, but may be slower.',
-    'type'        => 'select',
-    'select_enum' => [ 'Cache::SharedMemoryCache', 'Cache::FileCache', ], # '_Database' ],
-  },
-
-  {
-    'key'         => 'hylafax',
-    'section'     => '',
-    'description' => 'Options for a HylaFAX server to enable the FAX invoice destination.  They should be in the form of a space separated list of arguments to the Fax::Hylafax::Client::sendfax subroutine.  You probably shouldn\'t override things like \'docfile\'.  *Note* Only supported when using typeset invoices (see the invoice_latex configuration option).',
-    'type'        => [qw( checkbox textarea )],
-  },
-
-  {
-    'key'         => 'svc_acct-usage_suspend',
-    'section'     => 'billing',
-    'description' => 'Suspends the package an account belongs to when svc_acct.seconds is decremented to 0 or below (accounts with an empty seconds value are ignored).  Typically used in conjunction with prepaid packages and freeside-sqlradius-radacctd.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'svc_acct-usage_unsuspend',
-    'section'     => 'billing',
-    'description' => 'Unuspends the package an account belongs to when svc_acct.seconds is incremented from 0 or below to a positive value (accounts with an empty seconds value are ignored).  Typically used in conjunction with prepaid packages and freeside-sqlradius-radacctd.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'cust-fields',
-    'section'     => 'UI',
-    'description' => 'Which customer fields to display on reports',
-    'type'        => 'select',
-    'select_enum' => [
-      'Customer: Last, First</b> or</i> Company (Last, First)</b>',
-      'Cust# | Customer: custnum | Last, First or Company (Last, First)',
-      'Name | Company: Last, First | Company',
-      'Cust# | Name | Company: custnum | Last, First | Company',
-      '(bill) Customer | (service) Customer: Last, First or Company (Last, First) | (same for service address if present)',
-      'Cust# | (bill) Customer | (service) Customer:  custnum | Last, First or Company (Last, First) | (same for service address if present)',
-      '(bill) Name | (bill) Company | (service) Name | (service) Company: Last, First | Company | (same for service address if present)',
-      'Cust# | (bill) Name | (bill) Company | (service) Name | (service) Company: custnum | Last, First | Company | (same for service address if present)',
-    ],
-  },
-
-  {
-    'key'         => 'cust_pkg-display_times',
-    'section'     => 'UI',
-    'description' => 'Display full timestamps (not just dates) for customer packages.  Useful if you are doing real-time things like hourly prepaid.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'svc_acct-edit_uid',
-    'section'     => 'shell',
-    'description' => 'Allow UID editing.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'svc_acct-edit_gid',
-    'section'     => 'shell',
-    'description' => 'Allow GID editing.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'zone-underscore',
-    'section'     => 'BIND',
-    'description' => 'Allow underscores in zone names.  As underscores are illegal characters in zone names, this option is not recommended.',
-    'type'        => 'checkbox',
-  },
-
 );
 
 1;
diff --git a/FS/FS/ConfItem.pm b/FS/FS/ConfItem.pm
index a0e997a..83295b4 100644
--- a/FS/FS/ConfItem.pm
+++ b/FS/FS/ConfItem.pm
@@ -2,7 +2,7 @@ package FS::ConfItem;
 
 =head1 NAME
 
-FS::ConfItem - Configuration option meta-data.
+FS::ConfItem - Configutaion option meta-data.
 
 =head1 SYNOPSIS
 
diff --git a/FS/FS/Daemon.pm b/FS/FS/Daemon.pm
deleted file mode 100644
index 3e64f79..0000000
--- a/FS/FS/Daemon.pm
+++ /dev/null
@@ -1,91 +0,0 @@
-package FS::Daemon;
-
-use vars qw( @ISA @EXPORT_OK );
-use vars qw( $pid_dir $me $pid_file $sigint $sigterm $logfile );
-use Exporter;
-use Fcntl qw(:flock);
-use POSIX qw(setsid);
-use Date::Format;
-
-#this is a simple refactoring of the stuff from freeside-queued, just to
-#avoid duplicate code.  eventually this should use something from CPAN.
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw( daemonize1 drop_root daemonize2 sigint sigterm logfile );
-
-$pid_dir = '/var/run';
-
-sub daemonize1 {
-  $me = shift;
-
-  $pid_file = "$pid_dir/$me";
-  $pid_file .= '.'.shift if scalar(@_);
-  $pid_file .= '.pid';
-
-  chdir "/" or die "Can't chdir to /: $!";
-  open STDIN, '/dev/null' or die "Can't read /dev/null: $!";
-  defined(my $pid = fork) or die "Can't fork: $!";
-  if ( $pid ) {
-    print "$me started with pid $pid\n"; #logging to $log_file\n";
-    exit unless $pid_file;
-    my $pidfh = new IO::File ">$pid_file" or exit;
-    print $pidfh "$pid\n";
-    exit;
-  }
-
-  #sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
-  #$SIG{CHLD} =  \&REAPER;
-  $sigterm = 0;
-  $sigint = 0;
-  $SIG{INT}  = sub { warn "SIGINT received; shutting down\n"; $sigint++;  };
-  $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
-}
-
-sub drop_root {
-  my $freeside_gid = scalar(getgrnam('freeside'))
-    or die "can't find freeside group\n";
-  $) = $freeside_gid;
-  $( = $freeside_gid;
-  #if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
-  ($(,$)) = ($),$();
-  $) = $freeside_gid;
-  
-  $> = $FS::UID::freeside_uid;
-  $< = $FS::UID::freeside_uid;
-  #freebsd is sofa king broken, won't setuid()
-  ($<,$>) = ($>,$<);
-  $> = $FS::UID::freeside_uid;
-}
-
-sub daemonize2 {
-  open STDOUT, '>/dev/null' or die "Can't write to /dev/null: $!";
-  setsid                    or die "Can't start a new session: $!";
-  open STDERR, '>&STDOUT'   or die "Can't dup stdout: $!";
-
-  $SIG{__DIE__} = \&_die;
-  $SIG{__WARN__} = \&_logmsg;
-
-  warn "$me starting\n";
-}
-
-sub sigint  { $sigint; }
-sub sigterm { $sigterm; }
-
-sub logfile { $logfile = shift; } #_logmsg('test'); }
-
-sub _die {
-  my $msg = shift;
-  unlink $pid_file if -e $pid_file;
-  _logmsg($msg);
-}
-
-sub _logmsg {
-  chomp( my $msg = shift );
-  my $log = new IO::File ">>$logfile";
-  flock($log, LOCK_EX);
-  seek($log, 0, 2);
-  print $log "[". time2str("%a %b %e %T %Y",time). "] [$$] $msg\n";
-  flock($log, LOCK_UN);
-  close $log;
-}
-
diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index 2e383d5..df97170 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -1,15 +1,11 @@
 package FS::Misc;
 
 use strict;
-use vars qw ( @ISA @EXPORT_OK $DEBUG );
+use vars qw ( @ISA @EXPORT_OK );
 use Exporter;
-use Carp;
-use Data::Dumper;
 
 @ISA = qw( Exporter );
-@EXPORT_OK = qw( send_email send_fax );
-
-$DEBUG = 0;
+@EXPORT_OK = qw( send_email );
 
 =head1 NAME
 
@@ -41,19 +37,9 @@ I<to> - (required) comma-separated scalar or arrayref of recipients
 
 I<subject> - (required)
 
-I<content-type> - (optional) MIME type for the body
-
-I<body> - (required unless I<nobody> is true) arrayref of body text lines
-
-I<mimeparts> - (optional, but required if I<nobody> is true) arrayref of MIME::Entity->build PARAMHASH refs or MIME::Entity objects.  These will be passed as arguments to MIME::Entity->attach().
-
-I<nobody> - (optional) when set true, send_email will ignore the I<body> option and simply construct a message with the given I<mimeparts>.  In this case,
-I<content-type>, if specified, overrides the default "multipart/mixed" for the outermost MIME container.
+I<content-type> - (optional) MIME type
 
-I<content-encoding> - (optional) when using nobody, optional top-level MIME
-encoding which, if specified, overrides the default "7bit".
-
-I<type> - (optional) type parameter for multipart/related messages
+I<body> - (required) arrayref of body text lines
 
 =cut
 
@@ -61,7 +47,6 @@ use vars qw( $conf );
 use Date::Format;
 use Mail::Header;
 use Mail::Internet 1.44;
-use MIME::Entity;
 use FS::UID;
 
 FS::UID->install_callback( sub {
@@ -70,111 +55,25 @@ FS::UID->install_callback( sub {
 
 sub send_email {
   my(%options) = @_;
-  if ( $DEBUG ) {
-    my %doptions = %options;
-    $doptions{'body'} = '(full body not shown in debug)';
-    warn "FS::Misc::send_email called with options:\n  ". Dumper(\%doptions);
-#         join("\n", map { "  $_: ". $options{$_} } keys %options ). "\n"
-  }
 
   $ENV{MAILADDRESS} = $options{'from'};
   my $to = ref($options{to}) ? join(', ', @{ $options{to} } ) : $options{to};
-
-  my @mimeargs = ();
-  my @mimeparts = ();
-  if ( $options{'nobody'} ) {
-
-    croak "'mimeparts' option required when 'nobody' option given\n"
-      unless $options{'mimeparts'};
-
-    @mimeparts = @{$options{'mimeparts'}};
-
-    @mimeargs = (
-      'Type'         => ( $options{'content-type'} || 'multipart/mixed' ),
-      'Encoding'     => ( $options{'content-encoding'} || '7bit' ),
-    );
-
-  } else {
-
-    @mimeparts = @{$options{'mimeparts'}}
-      if ref($options{'mimeparts'}) eq 'ARRAY';
-
-    if (scalar(@mimeparts)) {
-
-      @mimeargs = (
-        'Type'     => 'multipart/mixed',
-        'Encoding' => '7bit',
-      );
-  
-      unshift @mimeparts, { 
-        'Type'        => ( $options{'content-type'} || 'text/plain' ),
-        'Data'        => $options{'body'},
-        'Encoding'    => ( $options{'content-type'} ? '-SUGGEST' : '7bit' ),
-        'Disposition' => 'inline',
-      };
-
-    } else {
-    
-      @mimeargs = (
-        'Type'     => ( $options{'content-type'} || 'text/plain' ),
-        'Data'     => $options{'body'},
-        'Encoding' => ( $options{'content-type'} ? '-SUGGEST' : '7bit' ),
-      );
-
-    }
-
-  }
-
-  my $domain;
-  if ( $options{'from'} =~ /\@([\w\.\-]+)/ ) {
-    $domain = $1;
-  } else {
-    warn 'no domain found in invoice from address '. $options{'from'}.
-         '; constructing Message-ID @example.com'; 
-    $domain = 'example.com';
-  }
-  my $message_id = join('.', rand()*(2**32), $$, time). "\@$domain";
-
-  my $message = MIME::Entity->build(
-    'From'       => $options{'from'},
-    'To'         => $to,
-    'Sender'     => $options{'from'},
-    'Reply-To'   => $options{'from'},
-    'Date'       => time2str("%a, %d %b %Y %X %z", time),
-    'Subject'    => $options{'subject'},
-    'Message-ID' => "<$message_id>",
-    @mimeargs,
+  my @header = (
+    'From: '.     $options{'from'},
+    'To: '.       $to,
+    'Sender: '.   $options{'from'},
+    'Reply-To: '. $options{'from'},
+    'Date: '.     time2str("%a, %d %b %Y %X %z", time),
+    'Subject: '.  $options{'subject'},
   );
+  push @header, 'Content-Type: '. $options{'content-type'}
+    if exists($options{'content-type'});
+  my $header = new Mail::Header ( \@header );
 
-  if ( $options{'type'} ) {
-    #false laziness w/cust_bill::generate_email
-    $message->head->replace('Content-type',
-      $message->mime_type.
-      '; boundary="'. $message->head->multipart_boundary. '"'.
-      '; type='. $options{'type'}
-    );
-  }
-
-  foreach my $part (@mimeparts) {
-
-    if ( UNIVERSAL::isa($part, 'MIME::Entity') ) {
-
-      warn "attaching MIME part from MIME::Entity object\n"
-        if $DEBUG;
-      $message->add_part($part);
-
-    } elsif ( ref($part) eq 'HASH' ) {
-
-      warn "attaching MIME part from hashref:\n".
-           join("\n", map "  $_: ".$part->{$_}, keys %$part ). "\n"
-        if $DEBUG;
-      $message->attach(%$part);
-
-    } else {
-      croak "mimepart $part isn't a hashref or MIME::Entity object!";
-    }
-
-  }
+  my $message = new Mail::Internet (
+    'Header' => $header,
+    'Body'   => $options{'body'},
+  );
 
   my $smtpmachine = $conf->config('smtpmachine');
   $!=0;
@@ -185,89 +84,6 @@ sub send_email {
 
 }
 
-=item send_fax OPTION => VALUE ...
-
-Options:
-
-I<dialstring> - (required) 10-digit phone number w/ area code
-
-I<docdata> - (required) Array ref containing PostScript or TIFF Class F document
-
--or-
-
-I<docfile> - (required) Filename of PostScript TIFF Class F document
-
-...any other options will be passed to L<Fax::Hylafax::Client::sendfax>
-
-
-=cut
-
-sub send_fax {
-
-  my %options = @_;
-
-  die 'HylaFAX support has not been configured.'
-    unless $conf->exists('hylafax');
-
-  eval {
-    require Fax::Hylafax::Client;
-  };
-
-  if ($@) {
-    if ($@ =~ /^Can't locate Fax.*/) {
-      die "You must have Fax::Hylafax::Client installed to use invoice faxing."
-    } else {
-      die $@;
-    }
-  }
-
-  my %hylafax_opts = map { split /\s+/ } $conf->config('hylafax');
-
-  die 'Called send_fax without a \'dialstring\'.'
-    unless exists($options{'dialstring'});
-
-  if (exists($options{'docdata'}) and ref($options{'docdata'}) eq 'ARRAY') {
-      my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
-      my $fh = new File::Temp(
-        TEMPLATE => 'faxdoc.'. $options{'dialstring'} . '.XXXXXXXX',
-        DIR      => $dir,
-        UNLINK   => 0,
-      ) or die "can't open temp file: $!\n";
-
-      $options{docfile} = $fh->filename;
-
-      print $fh @{$options{'docdata'}};
-      close $fh;
-
-      delete $options{'docdata'};
-  }
-
-  die 'Called send_fax without a \'docfile\' or \'docdata\'.'
-    unless exists($options{'docfile'});
-
-  #FIXME: Need to send canonical dialstring to HylaFAX, but this only
-  #       works in the US.
-
-  $options{'dialstring'} =~ s/[^\d\+]//g;
-  if ($options{'dialstring'} =~ /^\d{10}$/) {
-    $options{dialstring} = '+1' . $options{'dialstring'};
-  } else {
-    return 'Invalid dialstring ' . $options{'dialstring'} . '.';
-  }
-
-  my $faxjob = &Fax::Hylafax::Client::sendfax(%options, %hylafax_opts);
-
-  if ($faxjob->success) {
-    warn "Successfully queued fax to '$options{dialstring}' with jobid " .
-           $faxjob->jobid
-      if $DEBUG;
-    return '';
-  } else {
-    return 'Error while sending FAX: ' . $faxjob->trace;
-  }
-
-}
-
 package Mail::Internet;
 
 use Mail::Address;
@@ -322,9 +138,6 @@ sub Mail::Internet::mysmtpsend {
 
     # Send it
 
-    #warn "Headers: \n" . join('',@{$hdr->header});
-    #warn "Body: \n" . join('',@{$src->body});
-
     my $ok = $smtp->mail( $envelope ) &&
 		$smtp->to(@addr) &&
 		$smtp->data(join("", @{$hdr->header},"\n",@{$src->body}));
@@ -340,8 +153,6 @@ sub Mail::Internet::mysmtpsend {
 }
 package FS::Misc;
 
-=back
-
 =head1 BUGS
 
 This package exists.
@@ -350,8 +161,6 @@ This package exists.
 
 L<FS::UID>, L<FS::CGI>, L<FS::Record>, the base documentation.
 
-L<Fax::Hylafax::Client>
-
 =cut
 
 1;
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 887c8dc..5a6bb57 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1,44 +1,35 @@
 package FS::Record;
 
 use strict;
-use vars qw( $AUTOLOAD @ISA @EXPORT_OK $DEBUG
-             $me %virtual_fields_cache $nowarn_identical );
+use vars qw( $dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK $DEBUG
+             $me %dbdef_cache %virtual_fields_cache );
+use subs qw(reload_dbdef);
 use Exporter;
 use Carp qw(carp cluck croak confess);
 use File::CounterFile;
 use Locale::Country;
 use DBI qw(:sql_types);
-use DBIx::DBSchema 0.25;
+use DBIx::DBSchema 0.23;
 use FS::UID qw(dbh getotaker datasrc driver_name);
-use FS::Schema qw(dbdef);
 use FS::SearchCache;
 use FS::Msgcat qw(gettext);
-use FS::Conf;
 
 use FS::part_virtual_field;
 
 use Tie::IxHash;
 
 @ISA = qw(Exporter);
-
-#export dbdef for now... everything else expects to find it here
 @EXPORT_OK = qw(dbh fields hfields qsearch qsearchs dbdef jsearch);
 
 $DEBUG = 0;
 $me = '[FS::Record]';
 
-$nowarn_identical = 0;
-
-my $conf;
-my $rsa_module;
-my $rsa_loaded;
-my $rsa_encrypt;
-my $rsa_decrypt;
-
-FS::UID->install_callback( sub {
-  $conf = new FS::Conf; 
+#ask FS::UID to run this stuff for us later
+$FS::UID::callback{'FS::Record'} = sub { 
   $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters.". datasrc;
-} );
+  $dbdef_file = "/usr/local/etc/freeside/dbdef.". datasrc;
+  &reload_dbdef unless $setup_hack; #$setup_hack needed now?
+};
 
 =head1 NAME
 
@@ -47,7 +38,7 @@ FS::Record - Database record objects
 =head1 SYNOPSIS
 
     use FS::Record;
-    use FS::Record qw(dbh fields qsearch qsearchs);
+    use FS::Record qw(dbh fields qsearch qsearchs dbdef);
 
     $record = new FS::Record 'table', \%hash;
     $record = new FS::Record 'table', { 'column' => 'value', ... };
@@ -93,6 +84,10 @@ FS::Record - Database record objects
     $error = $record->ut_anything('column');
     $error = $record->ut_name('column');
 
+    $dbdef = reload_dbdef;
+    $dbdef = reload_dbdef "/non/standard/filename";
+    $dbdef = dbdef;
+
     $quoted_value = _quote($value,'table','field');
 
     #deprecated
@@ -185,36 +180,13 @@ sub create {
   }
 }
 
-=item qsearch PARAMS_HASHREF | TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ, ADDL_FROM
+=item qsearch TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ
 
 Searches the database for all records matching (at least) the key/value pairs
 in HASHREF.  Returns all the records found as `FS::TABLE' objects if that
 module is loaded (i.e. via `use FS::cust_main;'), otherwise returns FS::Record
 objects.
 
-The preferred usage is to pass a hash reference of named parameters:
-
-  my @records = qsearch( {
-                           'table'     => 'table_name',
-                           'hashref'   => { 'field' => 'value'
-                                            'field' => { 'op'    => '<',
-                                                         'value' => '420',
-                                                       },
-                                          },
-
-                           #these are optional...
-                           'select'    => '*',
-                           'extra_sql' => 'AND field ',
-                           #'cache_obj' => '', #optional
-                           'addl_from' => 'LEFT JOIN othtable USING ( field )',
-                         }
-                       );
-
-Much code still uses old-style positional parameters, this is also probably
-fine in the common case where there are only two parameters:
-
-  my @records = qsearch( 'table', { 'field' => 'value' } );
-
 ###oops, argh, FS::Record::new only lets us create database fields.
 #Normal behaviour if SELECT is not specified is `*', as in
 #C<SELECT * FROM table WHERE ...>.  However, there is an experimental new
@@ -227,28 +199,16 @@ fine in the common case where there are only two parameters:
 =cut
 
 sub qsearch {
-  my($stable, $record, $select, $extra_sql, $cache, $addl_from );
-  if ( ref($_[0]) ) { #hashref for now, eventually maybe accept a list too
-    my $opt = shift;
-    $stable    = $opt->{'table'}     or die "table name is required";
-    $record    = $opt->{'hashref'}   || {};
-    $select    = $opt->{'select'}    || '*';
-    $extra_sql = $opt->{'extra_sql'} || '';
-    $cache     = $opt->{'cache_obj'} || '';
-    $addl_from = $opt->{'addl_from'} || '';
-  } else {
-    ($stable, $record, $select, $extra_sql, $cache, $addl_from ) = @_;
-    $select ||= '*';
-  }
-
+  my($stable, $record, $select, $extra_sql, $cache ) = @_;
   #$stable =~ /^([\w\_]+)$/ or die "Illegal table: $table";
   #for jsearch
   $stable =~ /^([\w\s\(\)\.\,\=]+)$/ or die "Illegal table: $stable";
   $stable = $1;
+  $select ||= '*';
   my $dbh = dbh;
 
   my $table = $cache ? $cache->table : $stable;
-  my $dbdef_table = dbdef->table($table)
+  my $dbdef_table = $dbdef->table($table)
     or die "No schema for table $table found - ".
            "do you need to create it or run dbdef-create?";
   my $pkey = $dbdef_table->primary_key;
@@ -263,7 +223,6 @@ sub qsearch {
   }
 
   my $statement = "SELECT $select FROM $stable";
-  $statement .= " $addl_from" if $addl_from;
   if ( @real_fields or @virtual_fields ) {
     $statement .= ' WHERE '. join(' AND ',
       ( map {
@@ -284,7 +243,7 @@ sub qsearch {
       if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) {
         if ( $op eq '=' ) {
           if ( driver_name eq 'Pg' ) {
-            my $type = dbdef->table($table)->column($column)->type;
+            my $type = $dbdef->table($table)->column($column)->type;
             if ( $type =~ /(int|serial)/i ) {
               qq-( $column IS NULL )-;
             } else {
@@ -295,7 +254,7 @@ sub qsearch {
           }
         } elsif ( $op eq '!=' ) {
           if ( driver_name eq 'Pg' ) {
-            my $type = dbdef->table($table)->column($column)->type;
+            my $type = $dbdef->table($table)->column($column)->type;
             if ( $type =~ /(int|serial)/i ) {
               qq-( $column IS NOT NULL )-;
             } else {
@@ -365,7 +324,7 @@ sub qsearch {
     grep defined( $record->{$_} ) && $record->{$_} ne '', @real_fields
   ) {
     if ( $record->{$field} =~ /^\d+(\.\d+)?$/
-         && dbdef->table($table)->column($field)->type =~ /(int|serial)/i
+         && $dbdef->table($table)->column($field)->type =~ /(int|serial)/i
     ) {
       $sth->bind_param($bind++, $record->{$field}, { TYPE => SQL_INTEGER } );
     } else {
@@ -419,71 +378,32 @@ sub qsearch {
       }
     }
   }
-  my @return;
+  
   if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
     if ( eval 'FS::'. $table. '->can(\'new\')' eq \&new ) {
       #derivied class didn't override new method, so this optimization is safe
       if ( $cache ) {
-        @return = map {
+        map {
           new_or_cached( "FS::$table", { %{$_} }, $cache )
         } values(%result);
       } else {
-        @return = map {
+        map {
           new( "FS::$table", { %{$_} } )
         } values(%result);
       }
     } else {
-      #okay, its been tested
-      # warn "untested code (class FS::$table uses custom new method)";
-      @return = map {
+      warn "untested code (class FS::$table uses custom new method)";
+      map {
         eval 'FS::'. $table. '->new( { %{$_} } )';
       } values(%result);
     }
-
-    # Check for encrypted fields and decrypt them.
-    if ($conf->exists('encryption') && eval 'defined(@FS::'. $table . '::encrypted_fields)') {
-      foreach my $record (@return) {
-        foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
-          # Set it directly... This may cause a problem in the future...
-          $record->setfield($field, $record->decrypt($record->getfield($field)));
-        }
-      }
-    }
   } else {
     cluck "warning: FS::$table not loaded; returning FS::Record objects";
-    @return = map {
+    map {
       FS::Record->new( $table, { %{$_} } );
     } values(%result);
   }
-  return @return;
-}
-
-=item by_key PRIMARY_KEY_VALUE
-
-This is a class method that returns the record with the given primary key
-value.  This method is only useful in FS::Record subclasses.  For example:
-
-  my $cust_main = FS::cust_main->by_key(1); # retrieve customer with custnum 1
-
-is equivalent to:
-
-  my $cust_main = qsearchs('cust_main', { 'custnum' => 1 } );
-
-=cut
-
-sub by_key {
-  my ($class, $pkey_value) = @_;
 
-  my $table = $class->table
-    or croak "No table for $class found";
-
-  my $dbdef_table = dbdef->table($table)
-    or die "No schema for table $table found - ".
-           "do you need to create it or run dbdef-create?";
-  my $pkey = $dbdef_table->primary_key
-    or die "No primary key for table $table";
-
-  return qsearchs($table, { $pkey => $pkey_value });
 }
 
 =item jsearch TABLE, HASHREF, SELECT, EXTRA_SQL, PRIMARY_TABLE, PRIMARY_KEY
@@ -507,7 +427,7 @@ sub jsearch {
   );
 }
 
-=item qsearchs PARAMS_HASHREF | TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ, ADDL_FROM
+=item qsearchs TABLE, HASHREF
 
 Same as qsearch, except that if more than one record matches, it B<carp>s but
 returns the first.  If this happens, you either made a logic error in asking
@@ -518,7 +438,7 @@ for a single item, or your data is corrupted.
 sub qsearchs { # $result_record = &FS::Record:qsearchs('table',\%hash);
   my $table = $_[0];
   my(@result) = qsearch(@_);
-  cluck "warning: Multiple records in scalar search ($table)"
+  carp "warning: Multiple records in scalar search ($table)"
     if scalar(@result) > 1;
   #should warn more vehemently if the search was on a primary key?
   scalar(@result) ? ($result[0]) : ();
@@ -551,7 +471,7 @@ Returns the DBIx::DBSchema::Table object for the table.
 sub dbdef_table {
   my($self)=@_;
   my($table)=$self->table;
-  dbdef->table($table);
+  $dbdef->table($table);
 }
 
 =item get, getfield COLUMN
@@ -677,7 +597,6 @@ otherwise returns false.
 
 sub insert {
   my $self = shift;
-  my $saved = {};
 
   my $error = $self->check;
   return $error if $error;
@@ -708,17 +627,6 @@ sub insert {
   }
 
   my $table = $self->table;
-
-  
-  # Encrypt before the database
-  if ($conf->exists('encryption') && defined(eval '@FS::'. $table . 'encrypted_fields')) {
-    foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
-      $self->{'saved'} = $self->getfield($field);
-      $self->setfield($field, $self->enrypt($self->getfield($field)));
-    }
-  }
-
-
   #false laziness w/delete
   my @real_fields =
     grep defined($self->getfield($_)) && $self->getfield($_) ne "",
@@ -745,32 +653,18 @@ sub insert {
 
   $sth->execute or return $sth->errstr;
 
-  # get inserted id from the database, if applicable & needed
-  if ( $db_seq && ! $self->getfield($primary_key) ) {
+  my $insertid = '';
+  if ( $db_seq ) { # get inserted id from the database, if applicable
     warn "[debug]$me retreiving sequence from database\n" if $DEBUG;
-  
-    my $insertid = '';
-
     if ( driver_name eq 'Pg' ) {
 
-      #my $oid = $sth->{'pg_oid_status'};
-      #my $i_sql = "SELECT $primary_key FROM $table WHERE oid = ?";
-
-      my $default = $self->dbdef_table->column($primary_key)->default;
-      unless ( $default =~ /^nextval\('"?([\w\.]+)"?'/i ) {
-        dbh->rollback if $FS::UID::AutoCommit;
-        return "can't parse $table.$primary_key default value".
-               " for sequence name: $default";
-      }
-      my $sequence = $1;
-
-      my $i_sql = "SELECT currval('$sequence')";
+      my $oid = $sth->{'pg_oid_status'};
+      my $i_sql = "SELECT $primary_key FROM $table WHERE oid = ?";
       my $i_sth = dbh->prepare($i_sql) or do {
         dbh->rollback if $FS::UID::AutoCommit;
         return dbh->errstr;
       };
-      #$i_sth->execute($oid) or do {
-      $i_sth->execute() or do {
+      $i_sth->execute($oid) or do {
         dbh->rollback if $FS::UID::AutoCommit;
         return $i_sth->errstr;
       };
@@ -796,15 +690,11 @@ sub insert {
       }
 
     } else {
-
       dbh->rollback if $FS::UID::AutoCommit;
       return "don't know how to retreive inserted ids from ". driver_name. 
              ", try using counterfiles (maybe run dbdef-create?)";
-
     }
-
     $self->setfield($primary_key, $insertid);
-
   }
 
   my @virtual_fields = 
@@ -836,7 +726,7 @@ sub insert {
 
 
   my $h_sth;
-  if ( defined dbdef->table('h_'. $table) ) {
+  if ( defined $dbdef->table('h_'. $table) ) {
     my $h_statement = $self->_h_statement('insert');
     warn "[debug]$me $h_statement\n" if $DEBUG > 2;
     $h_sth = dbh->prepare($h_statement) or do {
@@ -850,12 +740,6 @@ sub insert {
 
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
-  # Now that it has been saved, reset the encrypted fields so that $new 
-  # can still be used.
-  foreach my $field (keys %{$saved}) {
-    $self->setfield($field, $saved->{$field});
-  }
-
   '';
 }
 
@@ -897,7 +781,7 @@ sub delete {
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   my $h_sth;
-  if ( defined dbdef->table('h_'. $self->table) ) {
+  if ( defined $dbdef->table('h_'. $self->table) ) {
     my $h_statement = $self->_h_statement('delete');
     warn "[debug]$me $h_statement\n" if $DEBUG > 2;
     $h_sth = dbh->prepare($h_statement) or return dbh->errstr;
@@ -960,9 +844,11 @@ returns the error, otherwise returns false.
 
 sub replace {
   my $new = shift;
-  my $old = shift;  
 
-  if (!defined($old)) { 
+  my $old;
+  if ( @_ ) { 
+    $old = shift;
+  } else {
     warn "[debug]$me replace called with no arguments; autoloading old record\n"
      if $DEBUG;
     my $primary_key = $new->dbdef_table->primary_key;
@@ -980,31 +866,19 @@ sub replace {
   return "Records not in same table!" unless $new->table eq $old->table;
 
   my $primary_key = $old->dbdef_table->primary_key;
-  return "Can't change primary key $primary_key ".
-         'from '. $old->getfield($primary_key).
-         ' to ' . $new->getfield($primary_key)
+  return "Can't change $primary_key"
     if $primary_key
        && ( $old->getfield($primary_key) ne $new->getfield($primary_key) );
 
   my $error = $new->check;
   return $error if $error;
-  
-  # Encrypt for replace
-  my $saved = {};
-  if ($conf->exists('encryption') && defined(eval '@FS::'. $new->table . 'encrypted_fields')) {
-    foreach my $field (eval '@FS::'. $new->table . '::encrypted_fields') {
-      $saved->{$field} = $new->getfield($field);
-      $new->setfield($field, $new->encrypt($new->getfield($field)));
-    }
-  }
 
   #my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields;
   my %diff = map { ($new->getfield($_) ne $old->getfield($_))
                    ? ($_, $new->getfield($_)) : () } $old->fields;
                    
   unless ( keys(%diff) ) {
-    carp "[warning]$me $new -> replace $old: records identical"
-      unless $nowarn_identical;
+    carp "[warning]$me $new -> replace $old: records identical";
     return '';
   }
 
@@ -1015,25 +889,13 @@ sub replace {
   ). ' WHERE '.
     join(' AND ',
       map {
-
-        if ( $old->getfield($_) eq '' ) {
-
-         #false laziness w/qsearch
-         if ( driver_name eq 'Pg' ) {
-            my $type = $old->dbdef_table->column($_)->type;
-            if ( $type =~ /(int|serial)/i ) {
-              qq-( $_ IS NULL )-;
-            } else {
-              qq-( $_ IS NULL OR $_ = '' )-;
-            }
-          } else {
-            qq-( $_ IS NULL OR $_ = "" )-;
-          }
-
-        } else {
-          "$_ = ". _quote($old->getfield($_),$old->table,$_);
-        }
-
+        $old->getfield($_) eq ''
+          #? "( $_ IS NULL OR $_ = \"\" )"
+          ? ( driver_name eq 'Pg'
+                ? "( $_ IS NULL OR $_ = '' )"
+                : "( $_ IS NULL OR $_ = \"\" )"
+            )
+          : "$_ = ". _quote($old->getfield($_),$old->table,$_)
       } ( $primary_key ? ( $primary_key ) : real_fields($old->table) )
     )
   ;
@@ -1041,7 +903,7 @@ sub replace {
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
   my $h_old_sth;
-  if ( defined dbdef->table('h_'. $old->table) ) {
+  if ( defined $dbdef->table('h_'. $old->table) ) {
     my $h_old_statement = $old->_h_statement('replace_old');
     warn "[debug]$me $h_old_statement\n" if $DEBUG > 2;
     $h_old_sth = dbh->prepare($h_old_statement) or return dbh->errstr;
@@ -1050,7 +912,7 @@ sub replace {
   }
 
   my $h_new_sth;
-  if ( defined dbdef->table('h_'. $new->table) ) {
+  if ( defined $dbdef->table('h_'. $new->table) ) {
     my $h_new_statement = $new->_h_statement('replace_new');
     warn "[debug]$me $h_new_statement\n" if $DEBUG > 2;
     $h_new_sth = dbh->prepare($h_new_statement) or return dbh->errstr;
@@ -1127,12 +989,6 @@ sub replace {
 
   dbh->commit or croak dbh->errstr if $FS::UID::AutoCommit;
 
-  # Now that it has been saved, reset the encrypted fields so that $new 
-  # can still be used.
-  foreach my $field (keys %{$saved}) {
-    $new->setfield($field, $saved->{$field});
-  }
-
   '';
 
 }
@@ -1182,9 +1038,7 @@ sub check {
 }
 
 sub _h_statement {
-  my( $self, $action, $time ) = @_;
-
-  $time ||= time;
+  my( $self, $action ) = @_;
 
   my @fields =
     grep defined($self->getfield($_)) && $self->getfield($_) ne "",
@@ -1195,7 +1049,7 @@ sub _h_statement {
   "INSERT INTO h_". $self->table. " ( ".
       join(', ', qw(history_date history_user history_action), @fields ).
     ") VALUES (".
-      join(', ', $time, dbh->quote(getotaker()), dbh->quote($action), @values).
+      join(', ', time, dbh->quote(getotaker()), dbh->quote($action), @values).
     ")"
   ;
 }
@@ -1489,8 +1343,6 @@ Check/untaint zip codes.
 
 =cut
 
-my @zip_reqd_countries = qw( CA ); #US implicit...
-
 sub ut_zip {
   my( $self, $field, $country ) = @_;
   if ( $country eq 'US' ) {
@@ -1499,10 +1351,7 @@ sub ut_zip {
                 $self->getfield($field);
     $self->setfield($field,$1);
   } else {
-    if ( $self->getfield($field) =~ /^\s*$/
-         && ( !$country || ! grep { $_ eq $country } @zip_reqd_countries )
-       )
-    {
+    if ( $self->getfield($field) =~ /^\s*$/ ) {
       $self->setfield($field,'');
     } else {
       $self->getfield($field) =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/
@@ -1606,9 +1455,9 @@ sub virtual_fields {
   my $table;
   $table = $self->table or confess "virtual_fields called on non-table";
 
-  confess "Unknown table $table" unless dbdef->table($table);
+  confess "Unknown table $table" unless $dbdef->table($table);
 
-  return () unless dbdef->table('part_virtual_field');
+  return () unless $self->dbdef->table('part_virtual_field');
 
   unless ( $virtual_fields_cache{$table} ) {
     my $query = 'SELECT name from part_virtual_field ' .
@@ -1676,11 +1525,40 @@ fields() and other subroutines elsewhere in FS::Record.
 sub real_fields {
   my $table = shift;
 
-  my($table_obj) = dbdef->table($table);
+  my($table_obj) = $dbdef->table($table);
   confess "Unknown table $table" unless $table_obj;
   $table_obj->columns;
 }
 
+=item reload_dbdef([FILENAME])
+
+Load a database definition (see L<DBIx::DBSchema>), optionally from a
+non-default filename.  This command is executed at startup unless
+I<$FS::Record::setup_hack> is true.  Returns a DBIx::DBSchema object.
+
+=cut
+
+sub reload_dbdef {
+  my $file = shift || $dbdef_file;
+
+  unless ( exists $dbdef_cache{$file} ) {
+    warn "[debug]$me loading dbdef for $file\n" if $DEBUG;
+    $dbdef_cache{$file} = DBIx::DBSchema->load( $file )
+                            or die "can't load database schema from $file";
+  } else {
+    warn "[debug]$me re-using cached dbdef for $file\n" if $DEBUG;
+  }
+  $dbdef = $dbdef_cache{$file};
+}
+
+=item dbdef
+
+Returns the current database definition.  See L<DBIx::DBSchema>.
+
+=cut
+
+sub dbdef { $dbdef; }
+
 =item _quote VALUE, TABLE, COLUMN
 
 This is an internal function used to construct SQL statements.  It returns
@@ -1691,16 +1569,11 @@ type (see L<DBIx::DBSchema::Column>) does not end in `char' or `binary'.
 
 sub _quote {
   my($value, $table, $column) = @_;
-  my $column_obj = dbdef->table($table)->column($column);
+  my $column_obj = $dbdef->table($table)->column($column);
   my $column_type = $column_obj->type;
-  my $nullable = $column_obj->null;
-
-  warn "  $table.$column: $value ($column_type".
-       ( $nullable ? ' NULL' : ' NOT NULL' ).
-       ")\n" if $DEBUG > 2;
 
   if ( $value eq '' && $column_type =~ /^int/ ) {
-    if ( $nullable ) {
+    if ( $column_obj->null ) {
       'NULL';
     } else {
       cluck "WARNING: Attempting to set non-null integer $table.$column null; ".
@@ -1726,7 +1599,7 @@ sub vfieldpart_hashref {
   my $self = shift;
   my $table = $self->table;
 
-  return {} unless dbdef->table('part_virtual_field');
+  return {} unless $self->dbdef->table('part_virtual_field');
 
   my $dbh = dbh;
   my $statement = "SELECT vfieldpart, name FROM part_virtual_field WHERE ".
@@ -1764,79 +1637,6 @@ sub _dump {
   } (fields($self->table)) );
 }
 
-sub encrypt {
-  my ($self, $value) = @_;
-  my $encrypted;
-
-  if ($conf->exists('encryption')) {
-    if ($self->is_encrypted($value)) {
-      # Return the original value if it isn't plaintext.
-      $encrypted = $value;
-    } else {
-      $self->loadRSA;
-      if (ref($rsa_encrypt) =~ /::RSA/) { # We Can Encrypt
-        # RSA doesn't like the empty string so let's pack it up
-        # The database doesn't like the RSA data so uuencode it
-        my $length = length($value)+1;
-        $encrypted = pack("u*",$rsa_encrypt->encrypt(pack("Z$length",$value)));
-      } else {
-        die ("You can't encrypt w/o a valid RSA engine - Check your installation or disable encryption");
-      }
-    }
-  }
-  return $encrypted;
-}
-
-sub is_encrypted {
-  my ($self, $value) = @_;
-  # Possible Bug - Some work may be required here....
-
-  if (length($value) > 80) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-sub decrypt {
-  my ($self,$value) = @_;
-  my $decrypted = $value; # Will return the original value if it isn't encrypted or can't be decrypted.
-  if ($conf->exists('encryption') && $self->is_encrypted($value)) {
-    $self->loadRSA;
-    if (ref($rsa_decrypt) =~ /::RSA/) {
-      my $encrypted = unpack ("u*", $value);
-      $decrypted =  unpack("Z*", $rsa_decrypt->decrypt($encrypted));
-    }
-  }
-  return $decrypted;
-}
-
-sub loadRSA {
-    my $self = shift;
-    #Initialize the Module
-    $rsa_module = 'Crypt::OpenSSL::RSA'; # The Default
-
-    if ($conf->exists('encryptionmodule') && $conf->config('encryptionmodule') ne '') {
-      $rsa_module = $conf->config('encryptionmodule');
-    }
-
-    if (!$rsa_loaded) {
-	eval ("require $rsa_module"); # No need to import the namespace
-	$rsa_loaded++;
-    }
-    # Initialize Encryption
-    if ($conf->exists('encryptionpublickey') && $conf->config('encryptionpublickey') ne '') {
-      my $public_key = join("\n",$conf->config('encryptionpublickey'));
-      $rsa_encrypt = $rsa_module->new_public_key($public_key);
-    }
-    
-    # Intitalize Decryption
-    if ($conf->exists('encryptionprivatekey') && $conf->config('encryptionprivatekey') ne '') {
-      my $private_key = join("\n",$conf->config('encryptionprivatekey'));
-      $rsa_decrypt = $rsa_module->new_private_key($private_key);
-    }
-}
-
 sub DESTROY { return; }
 
 #sub DESTROY {
diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index 89d44f9..d3ff5d1 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -144,44 +144,6 @@ sub credits {
   );
 }
 
-sub canceled { #active
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
-  $self->scalar_sql("
-    SELECT COUNT(*) FROM cust_pkg
-    WHERE cust_pkg.custnum = cust_main.custnum
-    AND 0 = ( SELECT COUNT(*) FROM cust_pkg
-              WHERE cust_pkg.custnum = cust_main.custnum
-              AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-            )
-    AND cust_pkg.cancel > $speriod AND cust_pkg.cancel < $eperiod
-  ");
-}
- 
-sub newaccount { #newaccount
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
-  $self->scalar_sql("
-     SELECT COUNT(*) FROM cust_pkg
-     WHERE cust_pkg.custnum = cust_main.custnum
-     AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-     AND ( cust_pkg.susp IS NULL OR cust_pkg.susp = 0 )
-     AND cust_pkg.setup > $speriod AND cust_pkg.setup < $eperiod
-  ");
-}
- 
-sub suspended { #suspended
-  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
-  $self->scalar_sql("
-     SELECT COUNT(*) FROM cust_pkg
-     WHERE cust_pkg.custnum = cust_main.custnum
-     AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-     AND 0 = ( SELECT COUNT(*) FROM cust_pkg
-               WHERE cust_pkg.custnum = cust_main.custnum
-               AND ( cust_pkg.susp IS NULL OR cust_pkg.susp = 0 )
-             )
-     AND cust_pkg.susp > $speriod AND cust_pkg.susp < $eperiod
-  ");
-}
-
 sub in_time_period {
   my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
   my $table = @_ ? shift().'.' : '';
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
deleted file mode 100644
index 451ef2d..0000000
--- a/FS/FS/Schema.pm
+++ /dev/null
@@ -1,1277 +0,0 @@
-package FS::Schema;
-
-use vars qw(@ISA @EXPORT_OK $DEBUG $setup_hack %dbdef_cache);
-use subs qw(reload_dbdef);
-use Exporter;
-use DBIx::DBSchema 0.25;
-use DBIx::DBSchema::Table;
-use DBIx::DBSchema::Column;
-use DBIx::DBSchema::ColGroup::Unique;
-use DBIx::DBSchema::ColGroup::Index;
-use FS::UID qw(datasrc);
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw( dbdef dbdef_dist reload_dbdef );
-
-$DEBUG = 0;
-$me = '[FS::Schema]';
-
-#ask FS::UID to run this stuff for us later
-FS::UID->install_callback( sub {
-  #$conf = new FS::Conf; 
-  &reload_dbdef("/usr/local/etc/freeside/dbdef.". datasrc)
-    unless $setup_hack; #$setup_hack needed now?
-} );
-
-=head1 NAME
-
-FS::Schema - Freeside database schema
-
-=head1 SYNOPSYS
-
-    use FS::Schema qw(dbdef dbdef_dist reload_dbdef);
-
-    $dbdef = reload_dbdef;
-    $dbdef = reload_dbdef "/non/standard/filename";
-    $dbdef = dbdef;
-    $dbdef_dist = dbdef_dist;
-
-=head1 DESCRIPTION
-
-This class represents the database schema.
-
-=head1 METHODS
-
-=over 4
-
-=item reload_dbdef([FILENAME])
-
-Load a database definition (see L<DBIx::DBSchema>), optionally from a
-non-default filename.  This command is executed at startup unless
-I<$FS::Schema::setup_hack> is true.  Returns a DBIx::DBSchema object.
-
-=cut
-
-sub reload_dbdef {
-  my $file = shift;
-
-  unless ( exists $dbdef_cache{$file} ) {
-    warn "[debug]$me loading dbdef for $file\n" if $DEBUG;
-    $dbdef_cache{$file} = DBIx::DBSchema->load( $file )
-                            or die "can't load database schema from $file";
-  } else {
-    warn "[debug]$me re-using cached dbdef for $file\n" if $DEBUG;
-  }
-  $dbdef = $dbdef_cache{$file};
-}
-
-=item dbdef
-
-Returns the current database definition (represents the current database,
-assuming it is up-to-date).  See L<DBIx::DBSchema>.
-
-=cut
-
-sub dbdef { $dbdef; }
-
-=item dbdef_dist [ OPTION => VALUE ... ]
-
-Returns the current canoical database definition as defined in this file.
-
-=cut
-
-sub dbdef_dist {
-
-  ###
-  # create a dbdef object from the old data structure
-  ###
-
-  my $tables_hashref = tables_hashref();
-
-  #turn it into objects
-  my $dbdef = new DBIx::DBSchema map {  
-    my @columns;
-    while (@{$tables_hashref->{$_}{'columns'}}) {
-      my($name, $type, $null, $length) =
-        splice @{$tables_hashref->{$_}{'columns'}}, 0, 4;
-      push @columns, new DBIx::DBSchema::Column ( $name,$type,$null,$length );
-    }
-    DBIx::DBSchema::Table->new(
-      $_,
-      $tables_hashref->{$_}{'primary_key'},
-      DBIx::DBSchema::ColGroup::Unique->new($tables_hashref->{$_}{'unique'}),
-      DBIx::DBSchema::ColGroup::Index->new($tables_hashref->{$_}{'index'}),
-      @columns,
-    );
-  } keys %$tables_hashref;
-
-  if ( $DEBUG ) {
-    warn "[debug]$me initial dbdef_dist created ($dbdef) with tables:\n";
-    warn "[debug]$me   $_\n" foreach $dbdef->tables;
-  }
-  
-  my $cust_main = $dbdef->table('cust_main');
-  #unless ($ship) { #remove ship_ from cust_main
-  #  $cust_main->delcolumn($_) foreach ( grep /^ship_/, $cust_main->columns );
-  #} else { #add indices
-    push @{$cust_main->index->lol_ref},
-      map { [ "ship_$_" ] } qw( last company daytime night fax );
-  #}
-  
-  #add radius attributes to svc_acct
-  #
-  #my($svc_acct)=$dbdef->table('svc_acct');
-  # 
-  #my($attribute);
-  #foreach $attribute (@attributes) {
-  #  $svc_acct->addcolumn ( new DBIx::DBSchema::Column (
-  #    'radius_'. $attribute,
-  #    'varchar',
-  #    'NULL',
-  #    $char_d,
-  #  ));
-  #}
-  # 
-  #foreach $attribute (@check_attributes) {
-  #  $svc_acct->addcolumn( new DBIx::DBSchema::Column (
-  #    'rc_'. $attribute,
-  #    'varchar',
-  #    'NULL',
-  #    $char_d,
-  #  ));
-  #}
-
-  #create history tables (false laziness w/create-history-tables)
-  foreach my $table (
-    grep { ! /^clientapi_session/ }
-    grep { ! /^h_/ }
-    $dbdef->tables
-  ) {
-    my $tableobj = $dbdef->table($table)
-      or die "unknown table $table";
-  
-    die "unique->lol_ref undefined for $table"
-      unless defined $tableobj->unique->lol_ref;
-    die "index->lol_ref undefined for $table"
-      unless defined $tableobj->index->lol_ref;
-  
-    my $h_tableobj = DBIx::DBSchema::Table->new( {
-      name        => "h_$table",
-      primary_key => 'historynum',
-      unique      => DBIx::DBSchema::ColGroup::Unique->new( [] ),
-      'index'     => DBIx::DBSchema::ColGroup::Index->new( [
-                       @{$tableobj->unique->lol_ref},
-                       @{$tableobj->index->lol_ref}
-                     ] ),
-      columns     => [
-                       DBIx::DBSchema::Column->new( {
-                         'name'    => 'historynum',
-                         'type'    => 'serial',
-                         'null'    => 'NOT NULL',
-                         'length'  => '',
-                         'default' => '',
-                         'local'   => '',
-                       } ),
-                       DBIx::DBSchema::Column->new( {
-                         'name'    => 'history_date',
-                         'type'    => 'int',
-                         'null'    => 'NULL',
-                         'length'  => '',
-                         'default' => '',
-                         'local'   => '',
-                       } ),
-                       DBIx::DBSchema::Column->new( {
-                         'name'    => 'history_user',
-                         'type'    => 'varchar',
-                         'null'    => 'NOT NULL',
-                         'length'  => '80',
-                         'default' => '',
-                         'local'   => '',
-                       } ),
-                       DBIx::DBSchema::Column->new( {
-                         'name'    => 'history_action',
-                         'type'    => 'varchar',
-                         'null'    => 'NOT NULL',
-                         'length'  => '80',
-                         'default' => '',
-                         'local'   => '',
-                       } ),
-                       map {
-                         my $column = $tableobj->column($_);
-  
-                         #clone so as to not disturb the original
-                         $column = DBIx::DBSchema::Column->new( {
-                           map { $_ => $column->$_() }
-                             qw( name type null length default local )
-                         } );
-  
-                         if ( $column->type eq 'serial' ) {
-                           $column->type('int');
-                           $column->null('NULL');
-                         }
-                         #$column->default('')
-                         #  if $column->default =~ /^nextval\(/i;
-                         #( my $local = $column->local ) =~ s/AUTO_INCREMENT//i;
-                         #$column->local($local);
-                         $column;
-                       } $tableobj->columns
-                     ],
-    } );
-    $dbdef->addtable($h_tableobj);
-  }
-
-  $dbdef;
-
-}
-
-sub tables_hashref {
-
-  my $char_d = 80; #default maxlength for text fields
-
-  #my(@date_type)  = ( 'timestamp', '', ''     );
-  my @date_type  = ( 'int', 'NULL', ''     );
-  my @perl_type = ( 'text', 'NULL', ''  ); 
-  my @money_type = ( 'decimal',   '', '10,2' );
-
-  my $username_len = 32; #usernamemax config file
-
-  return {
-
-    'agent' => {
-      'columns' => [
-        'agentnum', 'serial',            '',     '',
-        'agent',    'varchar',           '',     $char_d,
-        'typenum',  'int',            '',     '',
-        'freq',     'int',       'NULL', '',
-        'prog',     @perl_type,
-        'disabled',     'char', 'NULL', 1,
-        'username', 'varchar',       'NULL',     $char_d,
-        '_password','varchar',       'NULL',     $char_d,
-        'ticketing_queueid', 'int', 'NULL', '',
-      ],
-      'primary_key' => 'agentnum',
-      'unique' => [],
-      'index' => [ ['typenum'], ['disabled'] ],
-    },
-
-    'agent_type' => {
-      'columns' => [
-        'typenum',   'serial',  '', '',
-        'atype',     'varchar', '', $char_d,
-      ],
-      'primary_key' => 'typenum',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'type_pkgs' => {
-      'columns' => [
-        'typepkgnum', 'serial', '', '',
-        'typenum',   'int',  '', '',
-        'pkgpart',   'int',  '', '',
-      ],
-      'primary_key' => 'typepkgnum',
-      'unique' => [ ['typenum', 'pkgpart'] ],
-      'index' => [ ['typenum'] ],
-    },
-
-    'cust_bill' => {
-      'columns' => [
-        'invnum',    'serial',  '', '',
-        'custnum',   'int',  '', '',
-        '_date',     @date_type,
-        'charged',   @money_type,
-        'printed',   'int',  '', '',
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'invnum',
-      'unique' => [],
-      'index' => [ ['custnum'], ['_date'] ],
-    },
-
-    'cust_bill_event' => {
-      'columns' => [
-        'eventnum',    'serial',  '', '',
-        'invnum',   'int',  '', '',
-        'eventpart',   'int',  '', '',
-        '_date',     @date_type,
-        'status', 'varchar', '', $char_d,
-        'statustext', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'eventnum',
-      #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
-      'unique' => [],
-      'index' => [ ['invnum'], ['status'] ],
-    },
-
-    'part_bill_event' => {
-      'columns' => [
-        'eventpart',    'serial',  '', '',
-        'payby',       'char',  '', 4,
-        'event',       'varchar',           '',     $char_d,
-        'eventcode',    @perl_type,
-        'seconds',     'int', 'NULL', '',
-        'weight',      'int', '', '',
-        'plan',       'varchar', 'NULL', $char_d,
-        'plandata',   'text', 'NULL', '',
-        'disabled',     'char', 'NULL', 1,
-      ],
-      'primary_key' => 'eventpart',
-      'unique' => [],
-      'index' => [ ['payby'], ['disabled'], ],
-    },
-
-    'cust_bill_pkg' => {
-      'columns' => [
-        'billpkgnum', 'serial', '', '',
-        'pkgnum',  'int', '', '',
-        'invnum',  'int', '', '',
-        'setup',   @money_type,
-        'recur',   @money_type,
-        'sdate',   @date_type,
-        'edate',   @date_type,
-        'itemdesc', 'varchar', 'NULL', $char_d,
-      ],
-      'primary_key' => 'billpkgnum',
-      'unique' => [],
-      'index' => [ ['invnum'], [ 'pkgnum' ] ],
-    },
-
-    'cust_bill_pkg_detail' => {
-      'columns' => [
-        'detailnum', 'serial', '', '',
-        'pkgnum',  'int', '', '',
-        'invnum',  'int', '', '',
-        'detail',  'varchar', '', $char_d,
-      ],
-      'primary_key' => 'detailnum',
-      'unique' => [],
-      'index' => [ [ 'pkgnum', 'invnum' ] ],
-    },
-
-    'cust_credit' => {
-      'columns' => [
-        'crednum',  'serial', '', '',
-        'custnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
-        'otaker',   'varchar', '', 32,
-        'reason',   'text', 'NULL', '',
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'crednum',
-      'unique' => [],
-      'index' => [ ['custnum'] ],
-    },
-
-    'cust_credit_bill' => {
-      'columns' => [
-        'creditbillnum', 'serial', '', '',
-        'crednum',  'int', '', '',
-        'invnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
-      ],
-      'primary_key' => 'creditbillnum',
-      'unique' => [],
-      'index' => [ ['crednum'], ['invnum'] ],
-    },
-
-    'cust_main' => {
-      'columns' => [
-        'custnum',  'serial',  '',     '',
-        'agentnum', 'int',  '',     '',
-#        'titlenum', 'int',  'NULL',   '',
-        'last',     'varchar', '',     $char_d,
-#        'middle',   'varchar', 'NULL', $char_d,
-        'first',    'varchar', '',     $char_d,
-        'ss',       'varchar', 'NULL', 11,
-        'company',  'varchar', 'NULL', $char_d,
-        'address1', 'varchar', '',     $char_d,
-        'address2', 'varchar', 'NULL', $char_d,
-        'city',     'varchar', '',     $char_d,
-        'county',   'varchar', 'NULL', $char_d,
-        'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', 'NULL', 10,
-        'country',  'char', '',     2,
-        'daytime',  'varchar', 'NULL', 20,
-        'night',    'varchar', 'NULL', 20,
-        'fax',      'varchar', 'NULL', 12,
-        'ship_last',     'varchar', 'NULL', $char_d,
-#        'ship_middle',   'varchar', 'NULL', $char_d,
-        'ship_first',    'varchar', 'NULL', $char_d,
-        'ship_company',  'varchar', 'NULL', $char_d,
-        'ship_address1', 'varchar', 'NULL', $char_d,
-        'ship_address2', 'varchar', 'NULL', $char_d,
-        'ship_city',     'varchar', 'NULL', $char_d,
-        'ship_county',   'varchar', 'NULL', $char_d,
-        'ship_state',    'varchar', 'NULL', $char_d,
-        'ship_zip',      'varchar', 'NULL', 10,
-        'ship_country',  'char', 'NULL', 2,
-        'ship_daytime',  'varchar', 'NULL', 20,
-        'ship_night',    'varchar', 'NULL', 20,
-        'ship_fax',      'varchar', 'NULL', 12,
-        'payby',    'char', '',     4,
-        'payinfo',  'varchar', 'NULL', 512,
-        'paycvv',   'varchar', 'NULL', 512,
-	'paymask', 'varchar', 'NULL', $char_d,
-        #'paydate',  @date_type,
-        'paydate',  'varchar', 'NULL', 10,
-        'paystart_month', 'int', 'NULL', '',
-        'paystart_year',  'int', 'NULL', '',
-        'payissue', 'varchar', 'NULL', 2,
-        'payname',  'varchar', 'NULL', $char_d,
-        'payip',    'varchar', 'NULL', 15,
-        'tax',      'char', 'NULL', 1,
-        'otaker',   'varchar', '',    32,
-        'refnum',   'int',  '',     '',
-        'referral_custnum', 'int',  'NULL', '',
-        'comments', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'custnum',
-      'unique' => [],
-      #'index' => [ ['last'], ['company'] ],
-      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ],
-                   [ 'daytime' ], [ 'night' ], [ 'fax' ], [ 'refnum' ],
-                   [ 'county' ], [ 'state' ], [ 'country' ]
-                 ],
-    },
-
-    'cust_main_invoice' => {
-      'columns' => [
-        'destnum',  'serial',  '',     '',
-        'custnum',  'int',  '',     '',
-        'dest',     'varchar', '',  $char_d,
-      ],
-      'primary_key' => 'destnum',
-      'unique' => [],
-      'index' => [ ['custnum'], ],
-    },
-
-    'cust_main_county' => { #county+state+country are checked off the
-                            #cust_main_county for validation and to provide
-                            # a tax rate.
-      'columns' => [
-        'taxnum',   'serial',   '',    '',
-        'state',    'varchar',  'NULL',    $char_d,
-        'county',   'varchar',  'NULL',    $char_d,
-        'country',  'char',  '', 2, 
-        'taxclass',   'varchar', 'NULL', $char_d,
-        'exempt_amount', @money_type,
-        'tax',      'real',  '',    '', #tax %
-        'taxname',  'varchar',  'NULL',    $char_d,
-        'setuptax',  'char', 'NULL', 1, # Y = setup tax exempt
-        'recurtax',  'char', 'NULL', 1, # Y = recur tax exempt
-      ],
-      'primary_key' => 'taxnum',
-      'unique' => [],
-  #    'unique' => [ ['taxnum'], ['state', 'county'] ],
-      'index' => [ [ 'county' ], [ 'state' ], [ 'country' ] ],
-    },
-
-    'cust_pay' => {
-      'columns' => [
-        'paynum',   'serial',    '',   '',
-        #now cust_bill_pay #'invnum',   'int',    '',   '',
-        'custnum',  'int',    '',   '',
-        'paid',     @money_type,
-        '_date',    @date_type,
-        'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
-                                         # payment type table.
-        'payinfo',  'varchar',   'NULL', $char_d,  #see cust_main above
-        'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'paynum',
-      'unique' => [],
-      'index' => [ [ 'custnum' ], [ 'paybatch' ], [ 'payby' ], [ '_date' ] ],
-    },
-
-    'cust_pay_void' => {
-      'columns' => [
-        'paynum',    'int',    '',   '',
-        'custnum',   'int',    '',   '',
-        'paid',      @money_type,
-        '_date',     @date_type,
-        'payby',     'char',   '',     4, # CARD/BILL/COMP, should be index into
-                                          # payment type table.
-        'payinfo',   'varchar',   'NULL', $char_d,  #see cust_main above
-        'paybatch',  'varchar',   'NULL', $char_d, #for auditing purposes.
-        'closed',    'char', 'NULL', 1,
-        'void_date', @date_type,
-        'reason',    'varchar',   'NULL', $char_d,
-        'otaker',   'varchar', '', 32,
-      ],
-      'primary_key' => 'paynum',
-      'unique' => [],
-      'index' => [ [ 'custnum' ] ],
-    },
-
-    'cust_bill_pay' => {
-      'columns' => [
-        'billpaynum', 'serial',     '',   '',
-        'invnum',  'int',     '',   '',
-        'paynum',  'int',     '',   '',
-        'amount',  @money_type,
-        '_date',   @date_type
-      ],
-      'primary_key' => 'billpaynum',
-      'unique' => [],
-      'index' => [ [ 'paynum' ], [ 'invnum' ] ],
-    },
-
-    'cust_pay_batch' => { #what's this used for again?  list of customers
-                          #in current CARD batch? (necessarily CARD?)
-      'columns' => [
-        'paybatchnum',   'serial',    '',   '',
-        'invnum',   'int',    '',   '',
-        'custnum',   'int',    '',   '',
-        'last',     'varchar', '',     $char_d,
-        'first',    'varchar', '',     $char_d,
-        'address1', 'varchar', '',     $char_d,
-        'address2', 'varchar', 'NULL', $char_d,
-        'city',     'varchar', '',     $char_d,
-        'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', 'NULL', 10,
-        'country',  'char', '',     2,
-#        'trancode', 'int', '', '',
-        'cardnum',  'varchar', '',     16,
-        #'exp',      @date_type,
-        'exp',      'varchar', '',     11,
-        'payname',  'varchar', 'NULL', $char_d,
-        'amount',   @money_type,
-      ],
-      'primary_key' => 'paybatchnum',
-      'unique' => [],
-      'index' => [ ['invnum'], ['custnum'] ],
-    },
-
-    'cust_pkg' => {
-      'columns' => [
-        'pkgnum',    'serial',    '',   '',
-        'custnum',   'int',    '',   '',
-        'pkgpart',   'int',    '',   '',
-        'otaker',    'varchar', '', 32,
-        'setup',     @date_type,
-        'bill',      @date_type,
-        'last_bill', @date_type,
-        'susp',      @date_type,
-        'cancel',    @date_type,
-        'expire',    @date_type,
-        'manual_flag', 'char', 'NULL', 1,
-      ],
-      'primary_key' => 'pkgnum',
-      'unique' => [],
-      'index' => [ ['custnum'], ['pkgpart'] ],
-    },
-
-    'cust_refund' => {
-      'columns' => [
-        'refundnum',    'serial',    '',   '',
-        #now cust_credit_refund #'crednum',      'int',    '',   '',
-        'custnum',  'int',    '',   '',
-        '_date',        @date_type,
-        'refund',       @money_type,
-        'otaker',       'varchar',   '',   32,
-        'reason',       'varchar',   '',   $char_d,
-        'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
-                                             # into payment type table.
-        'payinfo',      'varchar',   'NULL', $char_d,  #see cust_main above
-        'paybatch',     'varchar',   'NULL', $char_d,
-        'closed',    'char', 'NULL', 1,
-      ],
-      'primary_key' => 'refundnum',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'cust_credit_refund' => {
-      'columns' => [
-        'creditrefundnum', 'serial',     '',   '',
-        'crednum',  'int',     '',   '',
-        'refundnum',  'int',     '',   '',
-        'amount',  @money_type,
-        '_date',   @date_type
-      ],
-      'primary_key' => 'creditrefundnum',
-      'unique' => [],
-      'index' => [ [ 'crednum', 'refundnum' ] ],
-    },
-
-
-    'cust_svc' => {
-      'columns' => [
-        'svcnum',    'serial',    '',   '',
-        'pkgnum',    'int',    'NULL',   '',
-        'svcpart',   'int',    '',   '',
-      ],
-      'primary_key' => 'svcnum',
-      'unique' => [],
-      'index' => [ ['svcnum'], ['pkgnum'], ['svcpart'] ],
-    },
-
-    'part_pkg' => {
-      'columns' => [
-        'pkgpart',    'serial',    '',   '',
-        'pkg',        'varchar',   '',   $char_d,
-        'comment',    'varchar',   '',   $char_d,
-        'promo_code', 'varchar', 'NULL', $char_d,
-        'setup',      @perl_type,
-        'freq',       'varchar',   '',   $char_d,  #billing frequency
-        'recur',      @perl_type,
-        'setuptax',  'char', 'NULL', 1,
-        'recurtax',  'char', 'NULL', 1,
-        'plan',       'varchar', 'NULL', $char_d,
-        'plandata',   'text', 'NULL', '',
-        'disabled',   'char', 'NULL', 1,
-        'taxclass',   'varchar', 'NULL', $char_d,
-      ],
-      'primary_key' => 'pkgpart',
-      'unique' => [],
-      'index' => [ [ 'promo_code' ], [ 'disabled' ] ],
-    },
-
-#    'part_title' => {
-#      'columns' => [
-#        'titlenum',   'int',    '',   '',
-#        'title',      'varchar',   '',   $char_d,
-#      ],
-#      'primary_key' => 'titlenum',
-#      'unique' => [ [] ],
-#      'index' => [ [] ],
-#    },
-
-    'pkg_svc' => {
-      'columns' => [
-        'pkgsvcnum',  'serial', '',  '',
-        'pkgpart',    'int',    '',   '',
-        'svcpart',    'int',    '',   '',
-        'quantity',   'int',    '',   '',
-        'primary_svc','char', 'NULL',  1,
-      ],
-      'primary_key' => 'pkgsvcnum',
-      'unique' => [ ['pkgpart', 'svcpart'] ],
-      'index' => [ ['pkgpart'] ],
-    },
-
-    'part_referral' => {
-      'columns' => [
-        'refnum',   'serial',    '',   '',
-        'referral', 'varchar',   '',   $char_d,
-        'disabled',     'char', 'NULL', 1,
-      ],
-      'primary_key' => 'refnum',
-      'unique' => [],
-      'index' => [ ['disabled'] ],
-    },
-
-    'part_svc' => {
-      'columns' => [
-        'svcpart',    'serial',    '',   '',
-        'svc',        'varchar',   '',   $char_d,
-        'svcdb',      'varchar',   '',   $char_d,
-        'disabled',   'char',  'NULL',   1,
-      ],
-      'primary_key' => 'svcpart',
-      'unique' => [],
-      'index' => [ [ 'disabled' ] ],
-    },
-
-    'part_svc_column' => {
-      'columns' => [
-        'columnnum',   'serial',         '', '',
-        'svcpart',     'int',         '', '',
-        'columnname',  'varchar',     '', 64,
-        'columnvalue', 'varchar', 'NULL', $char_d,
-        'columnflag',  'char',    'NULL', 1, 
-      ],
-      'primary_key' => 'columnnum',
-      'unique' => [ [ 'svcpart', 'columnname' ] ],
-      'index' => [ [ 'svcpart' ] ],
-    },
-
-    #(this should be renamed to part_pop)
-    'svc_acct_pop' => {
-      'columns' => [
-        'popnum',    'serial',    '',   '',
-        'city',      'varchar',   '',   $char_d,
-        'state',     'varchar',   '',   $char_d,
-        'ac',        'char',   '',   3,
-        'exch',      'char',   '',   3,
-        'loc',       'char',   'NULL',   4, #NULL for legacy purposes
-      ],
-      'primary_key' => 'popnum',
-      'unique' => [],
-      'index' => [ [ 'state' ] ],
-    },
-
-    'part_pop_local' => {
-      'columns' => [
-        'localnum',  'serial',     '',     '',
-        'popnum',    'int',     '',     '',
-        'city',      'varchar', 'NULL', $char_d,
-        'state',     'char',    'NULL', 2,
-        'npa',       'char',    '',     3,
-        'nxx',       'char',    '',     3,
-      ],
-      'primary_key' => 'localnum',
-      'unique' => [],
-      'index' => [ [ 'npa', 'nxx' ], [ 'popnum' ] ],
-    },
-
-    'svc_acct' => {
-      'columns' => [
-        'svcnum',    'int',    '',   '',
-        'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
-        '_password', 'varchar',   '',   72, #13 for encryped pw's plus ' *SUSPENDED* (md5 passwords can be 34, blowfish 60)
-        'sec_phrase', 'varchar',  'NULL',   $char_d,
-        'popnum',    'int',    'NULL',   '',
-        'uid',       'int', 'NULL',   '',
-        'gid',       'int', 'NULL',   '',
-        'finger',    'varchar',   'NULL',   $char_d,
-        'dir',       'varchar',   'NULL',   $char_d,
-        'shell',     'varchar',   'NULL',   $char_d,
-        'quota',     'varchar',   'NULL',   $char_d,
-        'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
-        'seconds',   'int', 'NULL',   '', #uhhhh
-        'domsvc',    'int', '',   '',
-      ],
-      'primary_key' => 'svcnum',
-      #'unique' => [ [ 'username', 'domsvc' ] ],
-      'unique' => [],
-      'index' => [ ['username'], ['domsvc'] ],
-    },
-
-    #'svc_charge' => {
-    #  'columns' => [
-    #    'svcnum',    'int',    '',   '',
-    #    'amount',    @money_type,
-    #  ],
-    #  'primary_key' => 'svcnum',
-    #  'unique' => [ [] ],
-    #  'index' => [ [] ],
-    #},
-
-    'svc_domain' => {
-      'columns' => [
-        'svcnum',    'int',    '',   '',
-        'domain',    'varchar',    '',   $char_d,
-        'catchall',  'int', 'NULL',    '',
-      ],
-      'primary_key' => 'svcnum',
-      'unique' => [ ['domain'] ],
-      'index' => [],
-    },
-
-    'domain_record' => {
-      'columns' => [
-        'recnum',    'serial',     '',  '',
-        'svcnum',    'int',     '',  '',
-        #'reczone',   'varchar', '',  $char_d,
-        'reczone',   'varchar', '',  255,
-        'recaf',     'char',    '',  2,
-        'rectype',   'varchar',    '',  5,
-        #'recdata',   'varchar', '',  $char_d,
-        'recdata',   'varchar', '',  255,
-      ],
-      'primary_key' => 'recnum',
-      'unique'      => [],
-      'index'       => [ ['svcnum'] ],
-    },
-
-    'svc_forward' => {
-      'columns' => [
-        'svcnum',   'int',            '',   '',
-        'srcsvc',   'int',        'NULL',   '',
-        'src',      'varchar',    'NULL',  255,
-        'dstsvc',   'int',        'NULL',   '',
-        'dst',      'varchar',    'NULL',  255,
-      ],
-      'primary_key' => 'svcnum',
-      'unique'      => [],
-      'index'       => [ ['srcsvc'], ['dstsvc'] ],
-    },
-
-    'svc_www' => {
-      'columns' => [
-        'svcnum',   'int',    '',  '',
-        'recnum',   'int',    '',  '',
-        'usersvc',  'int',    '',  '',
-      ],
-      'primary_key' => 'svcnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    #'svc_wo' => {
-    #  'columns' => [
-    #    'svcnum',    'int',    '',   '',
-    #    'svcnum',    'int',    '',   '',
-    #    'svcnum',    'int',    '',   '',
-    #    'worker',    'varchar',   '',   $char_d,
-    #    '_date',     @date_type,
-    #  ],
-    #  'primary_key' => 'svcnum',
-    #  'unique' => [ [] ],
-    #  'index' => [ [] ],
-    #},
-
-    'prepay_credit' => {
-      'columns' => [
-        'prepaynum',   'serial',     '',   '',
-        'identifier',  'varchar', '', $char_d,
-        'amount',      @money_type,
-        'seconds',     'int',     'NULL', '',
-        'agentnum',    'int',     'NULL', '',
-      ],
-      'primary_key' => 'prepaynum',
-      'unique'      => [ ['identifier'] ],
-      'index'       => [],
-    },
-
-    'port' => {
-      'columns' => [
-        'portnum',  'serial',     '',   '',
-        'ip',       'varchar', 'NULL', 15,
-        'nasport',  'int',     'NULL', '',
-        'nasnum',   'int',     '',   '',
-      ],
-      'primary_key' => 'portnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'nas' => {
-      'columns' => [
-        'nasnum',   'serial',     '',    '',
-        'nas',      'varchar', '',    $char_d,
-        'nasip',    'varchar', '',    15,
-        'nasfqdn',  'varchar', '',    $char_d,
-        'last',     'int',     '',    '',
-      ],
-      'primary_key' => 'nasnum',
-      'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
-      'index'       => [ [ 'last' ] ],
-    },
-
-    'session' => {
-      'columns' => [
-        'sessionnum', 'serial',       '',   '',
-        'portnum',    'int',       '',   '',
-        'svcnum',     'int',       '',   '',
-        'login',      @date_type,
-        'logout',     @date_type,
-      ],
-      'primary_key' => 'sessionnum',
-      'unique'      => [],
-      'index'       => [ [ 'portnum' ] ],
-    },
-
-    'queue' => {
-      'columns' => [
-        'jobnum', 'serial', '', '',
-        'job', 'text', '', '',
-        '_date', 'int', '', '',
-        'status', 'varchar', '', $char_d,
-        'statustext', 'text', 'NULL', '',
-        'svcnum', 'int', 'NULL', '',
-      ],
-      'primary_key' => 'jobnum',
-      'unique'      => [],
-      'index'       => [ [ 'svcnum' ], [ 'status' ] ],
-    },
-
-    'queue_arg' => {
-      'columns' => [
-        'argnum', 'serial', '', '',
-        'jobnum', 'int', '', '',
-        'arg', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'argnum',
-      'unique'      => [],
-      'index'       => [ [ 'jobnum' ] ],
-    },
-
-    'queue_depend' => {
-      'columns' => [
-        'dependnum', 'serial', '', '',
-        'jobnum', 'int', '', '',
-        'depend_jobnum', 'int', '', '',
-      ],
-      'primary_key' => 'dependnum',
-      'unique'      => [],
-      'index'       => [ [ 'jobnum' ], [ 'depend_jobnum' ] ],
-    },
-
-    'export_svc' => {
-      'columns' => [
-        'exportsvcnum' => 'serial', '', '',
-        'exportnum'    => 'int', '', '',
-        'svcpart'      => 'int', '', '',
-      ],
-      'primary_key' => 'exportsvcnum',
-      'unique'      => [ [ 'exportnum', 'svcpart' ] ],
-      'index'       => [ [ 'exportnum' ], [ 'svcpart' ] ],
-    },
-
-    'part_export' => {
-      'columns' => [
-        'exportnum', 'serial', '', '',
-        #'svcpart',   'int', '', '',
-        'machine', 'varchar', '', $char_d,
-        'exporttype', 'varchar', '', $char_d,
-        'nodomain',     'char', 'NULL', 1,
-      ],
-      'primary_key' => 'exportnum',
-      'unique'      => [],
-      'index'       => [ [ 'machine' ], [ 'exporttype' ] ],
-    },
-
-    'part_export_option' => {
-      'columns' => [
-        'optionnum', 'serial', '', '',
-        'exportnum', 'int', '', '',
-        'optionname', 'varchar', '', $char_d,
-        'optionvalue', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'optionnum',
-      'unique'      => [],
-      'index'       => [ [ 'exportnum' ], [ 'optionname' ] ],
-    },
-
-    'radius_usergroup' => {
-      'columns' => [
-        'usergroupnum', 'serial', '', '',
-        'svcnum',       'int', '', '',
-        'groupname',    'varchar', '', $char_d,
-      ],
-      'primary_key' => 'usergroupnum',
-      'unique'      => [],
-      'index'       => [ [ 'svcnum' ], [ 'groupname' ] ],
-    },
-
-    'msgcat' => {
-      'columns' => [
-        'msgnum', 'serial', '', '',
-        'msgcode', 'varchar', '', $char_d,
-        'locale', 'varchar', '', 16,
-        'msg', 'text', '', '',
-      ],
-      'primary_key' => 'msgnum',
-      'unique'      => [ [ 'msgcode', 'locale' ] ],
-      'index'       => [],
-    },
-
-    'cust_tax_exempt' => {
-      'columns' => [
-        'exemptnum', 'serial', '', '',
-        'custnum',   'int', '', '',
-        'taxnum',    'int', '', '',
-        'year',      'int', '', '',
-        'month',     'int', '', '',
-        'amount',   @money_type,
-      ],
-      'primary_key' => 'exemptnum',
-      'unique'      => [ [ 'custnum', 'taxnum', 'year', 'month' ] ],
-      'index'       => [],
-    },
-
-    'router' => {
-      'columns' => [
-        'routernum', 'serial', '', '',
-        'routername', 'varchar', '', $char_d,
-        'svcnum', 'int', 'NULL', '',
-      ],
-      'primary_key' => 'routernum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'part_svc_router' => {
-      'columns' => [
-        'svcrouternum', 'serial', '', '',
-        'svcpart', 'int', '', '',
-	'routernum', 'int', '', '',
-      ],
-      'primary_key' => 'svcrouternum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'addr_block' => {
-      'columns' => [
-        'blocknum', 'serial', '', '',
-	'routernum', 'int', '', '',
-        'ip_gateway', 'varchar', '', 15,
-        'ip_netmask', 'int', '', '',
-      ],
-      'primary_key' => 'blocknum',
-      'unique'      => [ [ 'blocknum', 'routernum' ] ],
-      'index'       => [],
-    },
-
-    'svc_broadband' => {
-      'columns' => [
-        'svcnum', 'int', '', '',
-        'blocknum', 'int', '', '',
-        'speed_up', 'int', '', '',
-        'speed_down', 'int', '', '',
-        'ip_addr', 'varchar', '', 15,
-      ],
-      'primary_key' => 'svcnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'part_virtual_field' => {
-      'columns' => [
-        'vfieldpart', 'int', '', '',
-        'dbtable', 'varchar', '', 32,
-        'name', 'varchar', '', 32,
-        'check_block', 'text', 'NULL', '',
-        'length', 'int', 'NULL', '',
-        'list_source', 'text', 'NULL', '',
-        'label', 'varchar', 'NULL', 80,
-      ],
-      'primary_key' => 'vfieldpart',
-      'unique' => [],
-      'index' => [],
-    },
-
-    'virtual_field' => {
-      'columns' => [
-        'vfieldnum', 'serial', '', '',
-        'recnum', 'int', '', '',
-        'vfieldpart', 'int', '', '',
-        'value', 'varchar', '', 128,
-      ],
-      'primary_key' => 'vfieldnum',
-      'unique' => [ [ 'vfieldpart', 'recnum' ] ],
-      'index' => [],
-    },
-
-    'acct_snarf' => {
-      'columns' => [
-        'snarfnum',  'int', '', '',
-        'svcnum',    'int', '', '',
-        'machine',   'varchar', '', 255,
-        'protocol',  'varchar', '', $char_d,
-        'username',  'varchar', '', $char_d,
-        '_password', 'varchar', '', $char_d,
-      ],
-      'primary_key' => 'snarfnum',
-      'unique' => [],
-      'index'  => [ [ 'svcnum' ] ],
-    },
-
-    'svc_external' => {
-      'columns' => [
-        'svcnum', 'int', '', '',
-        'id',     'int', 'NULL', '',
-        'title',  'varchar', 'NULL', $char_d,
-      ],
-      'primary_key' => 'svcnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'cust_pay_refund' => {
-      'columns' => [
-        'payrefundnum', 'serial', '', '',
-        'paynum',  'int', '', '',
-        'refundnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
-      ],
-      'primary_key' => 'payrefundnum',
-      'unique' => [],
-      'index' => [ ['paynum'], ['refundnum'] ],
-    },
-
-    'part_pkg_option' => {
-      'columns' => [
-        'optionnum', 'serial', '', '',
-        'pkgpart', 'int', '', '',
-        'optionname', 'varchar', '', $char_d,
-        'optionvalue', 'text', 'NULL', '',
-      ],
-      'primary_key' => 'optionnum',
-      'unique'      => [],
-      'index'       => [ [ 'pkgpart' ], [ 'optionname' ] ],
-    },
-
-    'rate' => {
-      'columns' => [
-        'ratenum',  'serial', '', '',
-        'ratename', 'varchar', '', $char_d,
-      ],
-      'primary_key' => 'ratenum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'rate_detail' => {
-      'columns' => [
-        'ratedetailnum',   'serial', '', '',
-        'ratenum',         'int',     '', '',
-        'orig_regionnum',  'int', 'NULL', '',
-        'dest_regionnum',  'int',     '', '',
-        'min_included',    'int',     '', '',
-        'min_charge',      @money_type,
-        'sec_granularity', 'int',     '', '',
-        #time period (link to table of periods)?
-      ],
-      'primary_key' => 'ratedetailnum',
-      'unique'      => [ [ 'ratenum', 'orig_regionnum', 'dest_regionnum' ] ],
-      'index'       => [ [ 'ratenum', 'dest_regionnum' ] ],
-    },
-
-    'rate_region' => {
-      'columns' => [
-        'regionnum',   'serial',      '', '',
-        'regionname',  'varchar',     '', $char_d,
-      ],
-      'primary_key' => 'regionnum',
-      'unique'      => [],
-      'index'       => [],
-    },
-
-    'rate_prefix' => {
-      'columns' => [
-        'prefixnum',   'serial',    '', '',
-        'regionnum',   'int',       '', '',,
-        'countrycode', 'varchar',     '', 3,
-        'npa',         'varchar', 'NULL', 6,
-        'nxx',         'varchar', 'NULL', 3,
-      ],
-      'primary_key' => 'prefixnum',
-      'unique'      => [],
-      'index'       => [ [ 'countrycode' ], [ 'regionnum' ] ],
-    },
-
-    'reg_code' => {
-      'columns' => [
-        'codenum',   'serial',    '', '',
-        'code',      'varchar',   '', $char_d,
-        'agentnum',  'int',       '', '',
-      ],
-      'primary_key' => 'codenum',
-      'unique'      => [ [ 'agentnum', 'code' ] ],
-      'index'       => [ [ 'agentnum' ] ],
-    },
-
-    'reg_code_pkg' => {
-      'columns' => [
-        'codepkgnum', 'serial', '', '',
-        'codenum',   'int',    '', '',
-        'pkgpart',   'int',    '', '',
-      ],
-      'primary_key' => 'codepkgnum',
-      'unique'      => [ [ 'codenum', 'pkgpart' ] ],
-      'index'       => [ [ 'codenum' ] ],
-    },
-
-    'clientapi_session' => {
-      'columns' => [
-        'sessionnum',  'serial',  '', '',
-        'sessionid',  'varchar',  '', $char_d,
-        'namespace',  'varchar',  '', $char_d,
-      ],
-      'primary_key' => 'sessionnum',
-      'unique'      => [ [ 'sessionid', 'namespace' ] ],
-      'index'       => [],
-    },
-
-    'clientapi_session_field' => {
-      'columns' => [
-        'fieldnum',    'serial',     '', '',
-        'sessionnum',     'int',     '', '',
-        'fieldname',  'varchar',     '', $char_d,
-        'fieldvalue',    'text', 'NULL', '',
-      ],
-      'primary_key' => 'fieldnum',
-      'unique'      => [ [ 'sessionnum', 'fieldname' ] ],
-      'index'       => [],
-    },
-
-    'payment_gateway' => {
-      'columns' => [
-        'gatewaynum',       'serial',   '',     '',
-        'gateway_module',   'varchar',  '',     $char_d,
-        'gateway_username', 'varchar',  'NULL', $char_d,
-        'gateway_password', 'varchar',  'NULL', $char_d,
-        'gateway_action',   'varchar',  'NULL', $char_d,
-        'disabled',   'char',  'NULL',   1,
-      ],
-      'primary_key' => 'gatewaynum',
-      'unique' => [],
-      'index'  => [ [ 'disabled' ] ],
-    },
-
-    'payment_gateway_option' => {
-      'columns' => [
-        'optionnum',   'serial',  '',     '',
-        'gatewaynum',  'int',     '',     '',
-        'optionname',  'varchar', '',     $char_d,
-        'optionvalue', 'text',    'NULL', '',
-      ],
-      'primary_key' => 'optionnum',
-      'unique'      => [],
-      'index'       => [ [ 'gatewaynum' ], [ 'optionname' ] ],
-    },
-
-    'agent_payment_gateway' => {
-      'columns' => [
-        'agentgatewaynum', 'serial', '', '',
-        'agentnum',        'int', '', '',
-        'gatewaynum',      'int', '', '',
-        'cardtype',        'varchar', 'NULL', $char_d,
-        'taxclass',        'varchar', 'NULL', $char_d,
-      ],
-      'primary_key' => 'agentgatewaynum',
-      'unique'      => [],
-      'index'       => [ [ 'agentnum', 'cardtype' ], ],
-    },
-
-    'banned_pay' => {
-      'columns' => [
-        'bannum',  'serial',   '',     '',
-        'payby',   'char',     '',       4,
-        'payinfo', 'varchar',  '',     128, #say, a 512-big digest _hex encoded
-	#'paymask', 'varchar',  'NULL', $char_d,
-        '_date',   @date_type,
-        'otaker',  'varchar',  '',     32,
-        'reason',  'varchar',  'NULL', $char_d,
-      ],
-      'primary_key' => 'bannum',
-      'unique'      => [ [ 'payby', 'payinfo' ] ],
-      'index'       => [],
-    },
-
-    'cancel_reason' => {
-      'columns' => [
-        'reasonnum', 'serial',  '',     '',
-        'reason',    'varchar', '',     $char_d,
-        'disabled',  'char',    'NULL', 1,
-      ],
-      'primary_key' => 'reasonnum',
-      'unique' => [],
-      'index'  => [ [ 'disabled' ] ],
-    },
-
-  };
-
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<DBIx::DBSchema>
-
-=cut
-
-1;
-
diff --git a/FS/FS/TicketSystem.pm b/FS/FS/TicketSystem.pm
index a80a827..9d961fc 100644
--- a/FS/FS/TicketSystem.pm
+++ b/FS/FS/TicketSystem.pm
@@ -5,10 +5,10 @@ use vars qw( $conf $system $AUTOLOAD );
 use FS::Conf;
 use FS::UID;
 
-FS::UID->install_callback( sub { 
+install_callback FS::UID sub { 
   $conf = new FS::Conf;
   $system = $conf->config('ticket_system');
-} );
+};
 
 sub AUTOLOAD {
   my $self = shift;
diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm
index d951cc0..be08238 100644
--- a/FS/FS/TicketSystem/RT_External.pm
+++ b/FS/FS/TicketSystem/RT_External.pm
@@ -2,14 +2,11 @@ package FS::TicketSystem::RT_External;
 
 use strict;
 use vars qw( $conf $default_queueid
-             $priority_field $priority_field_queue $field
-	     $dbh $external_url );
+             $priority_field $priority_field_queue $field );
 use URI::Escape;
-use FS::UID qw(dbh);
-use FS::Record qw(qsearchs);
-use FS::cust_main;
+use FS::UID;
 
-FS::UID->install_callback( sub { 
+install_callback FS::UID sub { 
   my $conf = new FS::Conf;
   $default_queueid = $conf->config('ticket_system-default_queueid');
   $priority_field =
@@ -24,25 +21,16 @@ FS::UID->install_callback( sub {
     $priority_field_queue = '';
     $field = '';
   }
-
-  $external_url = '';
-  $dbh = dbh;
-  if ($conf->config('ticket_system') eq 'RT_External') {
-    my ($datasrc, $user, $pass) = $conf->config('ticket_system-rt_external_datasrc');
-    $dbh = DBI->connect($datasrc, $user, $pass, { 'ChopBlanks' => 1 })
-      or die "RT_External DBI->connect error: $DBI::errstr\n";
-
-    $external_url = $conf->config('ticket_system-rt_external_url');
-  }
-
-} );
+};
 
 sub num_customer_tickets {
-  my( $self, $custnum, $priority ) = @_;
+  my( $self, $custnum, $priority, $dbh ) = @_;
+
+  #$dbh ||= create one from some config options
 
   my( $from_sql, @param) = $self->_from_customer( $custnum, $priority );
 
-  my $sql = "SELECT COUNT(*) $from_sql";
+  my $sql = "select count(*) $from_sql";
   my $sth = $dbh->prepare($sql) or die $dbh->errstr. " preparing $sql";
   $sth->execute(@param)         or die $sth->errstr. " executing $sql";
 
@@ -51,13 +39,15 @@ sub num_customer_tickets {
 }
 
 sub customer_tickets {
-  my( $self, $custnum, $limit, $priority ) = @_;
+  my( $self, $custnum, $limit, $priority, $dbh ) = @_;
   $limit ||= 0;
 
+  #$dbh ||= create one from some config options
+
   my( $from_sql, @param) = $self->_from_customer( $custnum, $priority );
-  my $sql = "SELECT tickets.*, queues.name".
-            ( length($priority) ? ", objectcustomfieldvalues.content" : '' ).
-            " $from_sql ORDER BY priority DESC LIMIT $limit";
+  my $sql = "select tickets.*, queues.name".
+            ( length($priority) ? ", ticketcustomfieldvalues.content" : '' ).
+            " $from_sql order by priority desc limit $limit";
   my $sth = $dbh->prepare($sql) or die $dbh->errstr. "preparing $sql";
   $sth->execute(@param)         or die $sth->errstr. "executing $sql";
 
@@ -75,23 +65,9 @@ sub _from_customer {
   my $where = '';
   if ( defined($priority) ) {
 
-    my $queue_sql = " ObjectCustomFields.ObjectId = ( SELECT id FROM queues
-                                                       WHERE queues.name = ? )
-                      OR ( ? = '' AND ObjectCustomFields.ObjectId = 0 )";
-
-    my $customfield_sql =
-      "customfield = ( 
-        SELECT CustomFields.Id FROM CustomFields
-                  JOIN ObjectCustomFields
-                    ON ( CustomFields.id = ObjectCustomFields.CustomField )
-         WHERE LookupType = 'RT::Queue-RT::Ticket'
-           AND name = ?
-           AND ( $queue_sql )
-       )";
-
-    push @param, $priority_field,
-                 $priority_field_queue,
-                 $priority_field_queue;
+    my $queue_sql = " customfields.queue = ( select id from queues
+                                              where queues.name = ? )
+                      or ( ? = '' and customfields.queue = 0 )";
 
     if ( length($priority) ) {
       #$where = "    
@@ -103,35 +79,40 @@ sub _from_customer {
       #                                 )
       #          )
       #";
-      unshift @param, $priority;
+      push @param, $priority;
 
-      $join = "JOIN ObjectCustomFieldValues
-                 ON ( tickets.id = ObjectCustomFieldValues.ObjectId )";
+      $join = "join TicketCustomFieldValues
+                 on ( tickets.id = TicketCustomFieldValues.ticket )";
       
-      $where = " AND content = ?
-                 AND ObjectType = 'RT::Ticket'
-                 AND $customfield_sql";
-
+      $where = "and content = ?
+                and customfield = ( select id from customfields
+                                     where name = ?
+                                       and ( $queue_sql )
+                                  )
+               ";
     } else {
-
       $where =
-               "AND 0 = ( SELECT count(*) FROM ObjectCustomFieldValues
-                           WHERE ObjectId    = tickets.id
-                             AND ObjectType  = 'RT::Ticket'
-                             AND $customfield_sql
+               "and 0 = ( select count(*) from TicketCustomFieldValues
+                           where ticket = tickets.id
+                             and customfield = ( select id from customfields
+                                                  where name = ?
+                                                    and ( $queue_sql )
+                                               )
                         )
                ";
     }
-
+    push @param, $priority_field,
+                 $priority_field_queue,
+                 $priority_field_queue;
   }
 
   my $sql = "
-                    FROM tickets
-                    JOIN queues ON ( tickets.queue = queues.id )
-                    JOIN links ON ( tickets.id = links.localbase )
+                    from tickets
+                    join queues on ( tickets.queue = queues.id )
+                    join links on ( tickets.id = links.localbase )
                     $join 
-       WHERE ( status = 'new' OR status = 'open' OR status = 'stalled' )
-         AND target = 'freeside://freeside/cust_main/$custnum'
+       where ( status = 'new' or status = 'open' or status = 'stalled' )
+         and target = 'freeside://freeside/cust_main/$custnum'
          $where
   ";
 
@@ -142,11 +123,9 @@ sub _from_customer {
 sub href_customer_tickets {
   my( $self, $custnum, $priority ) = @_;
 
-  my $href = $self->baseurl;
-
   #i snarfed this from an RT bookmarked search, it could be unescaped in the
   #source for readability and run through uri_escape
-  $href .= 
+  my $href = 
     'Search/Results.html?Order=ASC&Query=%20MemberOf%20%3D%20%27freeside%3A%2F%2Ffreeside%2Fcust_main%2F'.
     $custnum.
     '%27%20%20AND%20%28%20Status%20%3D%20%27open%27%20%20OR%20Status%20%3D%20%27new%27%20%20OR%20Status%20%3D%20%27stalled%27%20%29%20'
@@ -166,11 +145,7 @@ sub href_customer_tickets {
 
   $href .= '&Rows=100'.
            '&OrderBy=id&Page=1'.
-           '&Format=%27%20%20%20%3Cb%3E%3Ca%20href%3D%22'.
-	   $self->baseurl.
-	   'Ticket%2FDisplay.html%3Fid%3D__id__%22%3E__id__%3C%2Fa%3E%3C%2Fb%3E%2FTITLE%3A%23%27%2C%20%0A%27%3Cb%3E%3Ca%20href%3D%22'.
-	   $self->baseurl.
-	   'Ticket%2FDisplay.html%3Fid%3D__id__%22%3E__Subject__%3C%2Fa%3E%3C%2Fb%3E%2FTITLE%3ASubject%27%2C%20%0A%27__Status__%27%2C%20';
+           '&Format=%27%20%20%20%3Cb%3E%3Ca%20href%3D%22%2Ffreeside%2Frt%2FTicket%2FDisplay.html%3Fid%3D__id__%22%3E__id__%3C%2Fa%3E%3C%2Fb%3E%2FTITLE%3A%23%27%2C%20%0A%27%3Cb%3E%3Ca%20href%3D%22%2Ffreeside%2Frt%2FTicket%2FDisplay.html%3Fid%3D__id__%22%3E__Subject__%3C%2Fa%3E%3C%2Fb%3E%2FTITLE%3ASubject%27%2C%20%0A%27__Status__%27%2C%20';
 
   if ( defined($priority) && $field ) {
     $href .= '%0A%27__CustomField.'. $field. '__%2FTITLE%3ASeverity%27%2C%20';
@@ -185,25 +160,13 @@ sub href_customer_tickets {
   $href .= '%20%0A%27%3Csmall%3E__ToldRelative__%3C%2Fsmall%3E%27%2C%20%0A%27%3Csmall%3E__LastUpdatedRelative__%3C%2Fsmall%3E%27%2C%20%0A%27%3Csmall%3E__TimeLeft__%3C%2Fsmall%3E%27';
 
   $href;
-
 }
 
-sub href_new_ticket {
-  my( $self, $custnum_or_cust_main, $requestors ) = @_;
-
-  my( $custnum, $cust_main );
-  if ( ref($custnum_or_cust_main) ) {
-    $cust_main = $custnum_or_cust_main;
-    $custnum = $cust_main->custnum;
-  } else {
-    $custnum = $custnum_or_cust_main;
-    $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-  }
-  my $queueid = $cust_main->agent->ticketing_queueid || $default_queueid;
 
-  $self->baseurl.
+sub href_new_ticket {
+  my( $self, $custnum, $requestors ) = @_;
   'Ticket/Create.html?'.
-    "Queue=$queueid".
+    "Queue=$default_queueid".
     "&new-MemberOf=freeside://freeside/cust_main/$custnum".
     ( $requestors ? '&Requestors='. uri_escape($requestors) : '' )
     ;
@@ -211,36 +174,7 @@ sub href_new_ticket {
 
 sub href_ticket {
   my($self, $ticketnum) = @_;
-  $self->baseurl. 'Ticket/Display.html?id='.$ticketnum;
-}
-
-sub queues {
-  my($self) = @_;
-
-  my $sql = "SELECT id, name FROM queues WHERE disabled = 0";
-  my $sth = $dbh->prepare($sql) or die $dbh->errstr. " preparing $sql";
-  $sth->execute()               or die $sth->errstr. " executing $sql";
-
-  map { $_->[0] => $_->[1] } @{ $sth->fetchall_arrayref([]) };
-
-}
-
-sub queue {
-  my($self, $queueid) = @_;
-
-  return '' unless $queueid;
-
-  my $sql = "SELECT name FROM queues WHERE id = ?";
-  my $sth = $dbh->prepare($sql) or die $dbh->errstr. " preparing $sql";
-  $sth->execute($queueid)       or die $sth->errstr. " executing $sql";
-
-  $sth->fetchrow_arrayref->[0];
-
-}
-
-sub baseurl {
-  #my $self = shift;
-  $external_url;
+  'Ticket/Display.html?id='.$ticketnum;
 }
 
 1;
diff --git a/FS/FS/TicketSystem/RT_Internal.pm b/FS/FS/TicketSystem/RT_Internal.pm
index 8fce918..0039823 100644
--- a/FS/FS/TicketSystem/RT_Internal.pm
+++ b/FS/FS/TicketSystem/RT_Internal.pm
@@ -16,13 +16,32 @@ sub sql_num_customer_tickets {
    )";
 }
 
-sub baseurl {
-  #my $self = shift;
-  if ( $RT::URI::freeside::URL ) {
-    $RT::URI::freeside::URL. 'rt/';
-  } else {
-    'http://you_need_to_set_RT_URI_freeside_URL_in_SiteConfig.pm/';
-  }
+sub num_customer_tickets {
+  my( $self, $custnum, $priority ) = ( shift, shift, shift );
+  $self->SUPER::num_customer_tickets( $custnum, $priority, dbh );
+}
+
+sub customer_tickets {
+  my( $self, $custnum, $limit, $priority ) = ( shift, shift, shift, shift );
+  $self->SUPER::customer_tickets( $custnum, $limit, $priority, dbh );
+}
+
+sub href_customer_tickets {
+  my $self = shift;
+  # well, 2 is wrong here but will have to do for now
+  popurl(2).'rt/'. $self->SUPER::href_customer_tickets(@_);
+}
+
+sub href_new_ticket {
+  my $self = shift;
+  # well, 2 is wrong here but will have to do for now
+  popurl(2).'rt/'. $self->SUPER::href_new_ticket(@_);
+}
+
+sub href_ticket {
+  my $self = shift;
+  # well, 2 is wrong here but will have to do for now
+  popurl(2).'rt/'. $self->SUPER::href_ticket(@_);
 }
 
 1;
diff --git a/FS/FS/UI/Base.pm b/FS/FS/UI/Base.pm
new file mode 100644
index 0000000..bbeb9e1
--- /dev/null
+++ b/FS/FS/UI/Base.pm
@@ -0,0 +1,194 @@
+package FS::UI::Base;
+
+use strict;
+use vars qw ( @ISA );
+use FS::Record qw( fields qsearch );
+
+@ISA = ( $FS::UI::Base::_lock );
+
+=head1 NAME
+
+FS::UI::Base - Base class for all user-interface objects
+
+=head1 SYNOPSIS
+
+  use FS::UI::SomeInterface;
+  use FS::UI::some_table;
+
+  $interface = new FS::UI::some_table;
+
+  $error = $interface->browse;
+  $error = $interface->search;
+  $error = $interface->view;
+  $error = $interface->edit;
+  $error = $interface->process;
+
+=head1 DESCRIPTION
+
+An FS::UI::Base object represents a user interface object.  FS::UI::Base
+is intended as a base class for table-specfic classes to inherit from, i.e.
+FS::UI::cust_main.  The simplest case, which will provide a default UI for your
+new table, is as follows:
+
+  package FS::UI::table_name;
+  use vars qw ( @ISA );
+  use FS::UI::Base;
+  @ISA = qw( FS::UI::Base );
+  sub db_table { 'table_name'; }
+
+Currently available interfaces are:
+  FS::UI::Gtk, an X-Windows UI implemented using the Gtk+ toolkit
+  FS::UI::CGI, a web interface implemented using CGI.pm, etc.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+=item browse
+
+=cut
+
+sub browse {
+  my $self = shift;
+
+  my @fields = $self->list_fields;
+
+  #begin browse-specific stuff
+
+  $self->title( "Browse ". $self->db_names ) unless $self->title;
+  my @records = qsearch ( $self->db_table, {} );
+
+  #end browse-specific stuff
+
+  $self->addwidget ( new FS::UI::_Text ( $self->db_description ) );
+
+  my @header = $self->list_header;
+  my @headerspan = $self->list_headerspan;
+  my %callback = $self->db_callback;
+
+  my $columns;
+
+  my $table = new FS::UI::_Tableborder (
+    'rows' => 1 + scalar(@records),
+    'columns' => $columns || scalar(@fields),
+  );
+
+  my $c = 0;
+  foreach my $header ( @header ) {
+    my $headerspan = shift(@headerspan) || 1;
+    $table->attach(
+      0, $c, new FS::UI::_Text ( $header ), 1, $headerspan
+    );
+    $c += $headerspan;
+  }
+
+  my $r = 1;
+  
+  foreach my $record ( @records ) {
+    $c = 0;
+    foreach my $field ( @fields ) {
+      my $value = $record->getfield($field);
+      my $widget;
+      if ( $callback{$field} ) {
+        $widget = &{ $callback{$field} }( $value, $record );
+      } else {
+        $widget = new FS::UI::_Text ( $value );
+      }
+      $table->attach( $r, $c++, $widget, 1, 1 );
+    }
+    $r++;
+  }
+
+  $self->addwidget( $table );
+
+  $self->activate;
+
+}
+
+=item title
+
+=cut
+
+sub title {
+  my $self = shift;
+  my $value = shift;
+  if ( defined($value) ) {
+    $self->{'title'} = $value;
+  } else {
+    $self->{'title'};
+  }
+}
+
+=item addwidget
+
+=cut
+
+sub addwidget {
+  my $self = shift;
+  my $widget = shift;
+  push @{ $self->{'Widgets'} }, $widget;
+}
+
+#fallback methods
+
+sub db_description {}
+
+sub db_name {}
+
+sub db_names {
+  my $self = shift;
+  $self->db_name. 's';
+}
+
+sub list_fields {
+  my $self = shift;
+  fields( $self->db_table );
+}
+
+sub list_header {
+  my $self = shift;
+  $self->list_fields
+}
+
+sub list_headerspan {
+  my $self = shift;
+  map 1, $self->list_header;
+}
+
+sub db_callback {}
+
+=back
+
+=head1 VERSION
+
+$Id: Base.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+This documentation is incomplete.
+
+There should be some sort of per-(freeside)-user preferences and the ability
+for specific FS::UI:: modules to put their own values there as well.
+
+=head1 SEE ALSO
+
+L<FS::UI::Gtk>, L<FS::UI::CGI>
+
+=head1 HISTORY
+
+$Log: Base.pm,v $
+Revision 1.1  1999-08-04 09:03:53  ivan
+initial checkin of module files for proper perl installation
+
+Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.
+
+
+=cut
+
+1;
+
diff --git a/FS/FS/UI/CGI.pm b/FS/FS/UI/CGI.pm
new file mode 100644
index 0000000..ae87d13
--- /dev/null
+++ b/FS/FS/UI/CGI.pm
@@ -0,0 +1,239 @@
+package FS::UI::CGI;
+
+use strict;
+use CGI;
+#use CGI::Switch;  #when FS::UID user and preference callback stuff is fixed
+use CGI::Carp qw(fatalsToBrowser);
+use HTML::Table;
+use FS::UID qw(adminsuidsetup);
+#use FS::Record qw( qsearch fields );
+
+die "Can't initialize CGI interface; $FS::UI::Base::_lock used"
+  if $FS::UI::Base::_lock;
+$FS::UI::Base::_lock = "FS::UI::CGI";
+
+=head1 NAME
+
+FS::UI::CGI - Base class for CGI user-interface objects
+
+=head1 SYNOPSIS
+
+  use FS::UI::CGI;
+  use FS::UI::some_table;
+
+  $interface = new FS::UI::some_table;
+
+  $error = $interface->browse;
+  $error = $interface->search;
+  $error = $interface->view;
+  $error = $interface->edit;
+  $error = $interface->process;
+
+=head1 DESCRIPTION
+
+An FS::UI::CGI object represents a CGI interface object.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+
+  $self->{'_cgi'} = new CGI;
+  $self->{'_user'} = $self->{'_cgi'}->remote_user;
+  $self->{'_dbh'} = FS::UID::adminsuidsetup $self->{'_user'};
+
+  bless ( $self, $class);
+}
+
+sub activate {
+  my $self = shift;
+  print $self->_header,
+        join ( "<BR>", map $_->sprint, @{ $self->{'Widgets'} } ),
+        $self->_footer,
+  ;
+}
+
+=item _header
+
+=cut
+
+sub _header {
+  my $self = shift;
+  my $cgi = $self->{'_cgi'};
+
+  $cgi->header( '-expires' => 'now' ), '<HTML>', 
+    '<HEAD><TITLE>', $self->title, '</TITLE></HEAD>',
+    '<BODY BGCOLOR="#ffffff">',
+    '<FONT COLOR="#ff0000" SIZE=7>', $self->title, '</FONT><BR><BR>',
+  ;
+}
+
+=item _footer
+
+=cut
+
+sub _footer {
+  "</BODY></HTML>";
+}
+
+=item interface
+
+Returns the string `CGI'.  Useful for the author of a table-specific UI class
+to conditionally specify certain behaviour.
+
+=cut
+
+sub interface { 'CGI'; }
+
+=back
+
+=cut
+
+package FS::UI::_Widget;
+
+use vars qw( $AUTOLOAD );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  bless ( $self, $class );
+}
+
+sub AUTOLOAD {
+  my $self = shift;
+  my $value = shift;
+  my($field)=$AUTOLOAD;
+  $field =~ s/.*://;
+  if ( defined($value) ) {
+    $self->{$field} = $value;
+  } else {
+    $self->{$field};
+  }    
+}
+
+package FS::UI::_Text;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget);
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  $self->{'_text'} = shift;
+  bless ( $self, $class );
+}
+
+sub sprint {
+  my $self = shift;
+  $self->{'_text'};
+}
+
+package FS::UI::_Link;
+
+use vars qw ( @ISA $BASE_URL );
+
+@ISA = qw ( FS::UI::_Widget);
+$BASE_URL = "http://rootwood.sisd.com/freeside";
+
+sub sprint {
+  my $self = shift;
+  my $table = $self->{'table'};
+  my $method = $self->{'method'};
+
+  # i will be cleaned up when we're done moving from the old webinterface!
+  my @arg = @{$self->{'arg'}};
+  my $yuck = join( "&", @arg);
+  qq(<A HREF="$BASE_URL/$method/$table.cgi?$yuck">). $self->{'text'}. "<\A>";
+}
+
+package FS::UI::_Table;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget);
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = $class eq $proto ? { @_ } : $proto;
+  bless ( $self, $class );
+  $self->{'_table'} = new HTML::Table ( $self->rows, $self->columns );
+  $self;
+}
+
+sub attach {
+  my $self = shift;
+  my ( $row, $column, $widget, $rowspan, $colspan ) = @_;
+  $self->{"_table"}->setCell( $row+1, $column+1, $widget->sprint );
+  $self->{"_table"}->setCellRowSpan( $row+1, $column+1, $rowspan ) if $rowspan;
+  $self->{"_table"}->setCellColSpan( $row+1, $column+1, $colspan ) if $colspan;
+}
+
+sub sprint {
+  my $self = shift;
+  $self->{'_table'}->getTable;
+}
+
+package FS::UI::_Tableborder;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Table );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = $class eq $proto ? { @_ } : $proto;
+  bless ( $self, $class );
+  $self->SUPER::new(@_);
+  $self->{'_table'}->setBorder;
+  $self;
+}
+
+=head1 VERSION
+
+$Id: CGI.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+This documentation is incomplete.
+
+In _Tableborder, headers should be links that sort on their fields.
+
+_Link uses a constant $BASE_URL
+
+_Link passes the arguments as a manually-constructed GET string instead
+of POSTing, for compatability while the web interface is upgraded.  Once
+this is done it should pass arguements properly (i.e. as a POST, 8-bit clean)
+
+Still some small bits of widget code same as FS::UI::Gtk.
+
+=head1 SEE ALSO
+
+L<FS::UI::Base>
+
+=head1 HISTORY
+
+$Log: CGI.pm,v $
+Revision 1.1  1999-08-04 09:03:53  ivan
+initial checkin of module files for proper perl installation
+
+Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.
+
+
+=cut
+
+1;
+
diff --git a/FS/FS/UI/Gtk.pm b/FS/FS/UI/Gtk.pm
new file mode 100644
index 0000000..507a293
--- /dev/null
+++ b/FS/FS/UI/Gtk.pm
@@ -0,0 +1,224 @@
+package FS::UI::Gtk;
+
+use strict;
+use Gtk;
+use FS::UID qw(adminsuidsetup);
+
+die "Can't initialize Gtk interface; $FS::UI::Base::_lock used"
+  if $FS::UI::Base::_lock;
+$FS::UI::Base::_lock = "FS::UI::Gtk";
+
+=head1 NAME
+
+FS::UI::Gtk - Base class for Gtk user-interface objects
+
+=head1 SYNOPSIS
+
+  use FS::UI::Gtk;
+  use FS::UI::some_table;
+
+  $interface = new FS::UI::some_table;
+
+  $error = $interface->browse;
+  $error = $interface->search;
+  $error = $interface->view;
+  $error = $interface->edit;
+  $error = $interface->process;
+
+=head1 DESCRIPTION
+
+An FS::UI::Gtk object represents a Gtk user interface object.
+
+=head1 METHODS
+
+=over 4
+
+=item new
+
+=cut
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+
+  bless ( $self, $class );
+
+  $self->{'_user'} = 'ivan'; #Pop up login window?
+  $self->{'_dbh'} = FS::UID::adminsuidsetup $self->{'_user'};
+
+
+
+  $self;
+}
+
+sub activate {
+  my $self = shift;
+
+  my $vbox = new Gtk::VBox ( 0, 4 );
+
+  foreach my $widget ( @{ $self->{'Widgets'} } ) {
+    $widget->_gtk->show;
+    $vbox->pack_start ( $widget->_gtk, 1, 1, 4 );
+  }
+  $vbox->show;
+
+  my $window = new Gtk::Window "toplevel";
+  $self->{'_gtk'} = $window;
+  $window->set_title( $self->title );
+  $window->add ( $vbox );
+  $window->show;
+  main Gtk;
+}
+
+=item interface
+
+Returns the string `Gtk'.  Useful for the author of a table-specific UI class
+to conditionally specify certain behaviour.
+
+=cut 
+
+sub interface { 'Gtk'; }
+
+=back
+
+=cut
+
+package FS::UI::_Widget;
+
+use vars qw( $AUTOLOAD );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  bless ( $self, $class );
+}
+
+sub _gtk {
+  my $self = shift;
+  $self->{'_gtk'};
+}
+
+sub AUTOLOAD {
+  my $self = shift;
+  my $value = shift;
+  my($field)=$AUTOLOAD;
+  $field =~ s/.*://;
+  if ( defined($value) ) {
+    $self->{$field} = $value;
+  } else {
+    $self->{$field};
+  }    
+}
+
+package FS::UI::_Text;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = {};
+  $self->{'_gtk'} = new Gtk::Label ( shift );
+  bless ( $self, $class );
+}
+
+package FS::UI::_Link;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  $self->{'_gtk'} = new_with_label Gtk::Button ( $self->{'text'} );
+  $self->{'_gtk'}->signal_connect( 'clicked', sub {
+      print "STUB: (Gtk) FS::UI::_Link";
+    }, "hi", "there" );
+  bless ( $self, $class );
+}
+
+
+package FS::UI::_Table;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Widget );
+
+sub new {
+  my $proto = shift;
+  my $class = ref($proto) || $proto;
+  my $self = { @_ };
+  bless ( $self, $class );
+
+  $self->{'_gtk'} = new Gtk::Table (
+    $self->rows,
+    $self->columns,
+    0, #homogeneous
+  );
+
+  $self;
+}
+
+sub attach {
+  my $self = shift;
+  my ( $row, $column, $widget, $rowspan, $colspan ) = @_;
+  $rowspan ||= 1;
+  $colspan ||= 1;
+  $self->_gtk->attach_defaults(
+    $widget->_gtk,
+    $column,
+    $column + $colspan,
+    $row,
+    $row + $rowspan,
+  );
+  $widget->_gtk->show;
+}
+
+package FS::UI::_Tableborder;
+
+use vars qw ( @ISA );
+
+@ISA = qw ( FS::UI::_Table );
+
+=head1 VERSION
+
+$Id: Gtk.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+
+=head1 BUGS
+
+This documentation is incomplete.
+
+_Tableborder is just a _Table now.  _Tableborders should scroll (but not the
+headers) and need and need more decoration. (data in white section ala gtksql
+and sliding field widths) headers should be buttons that callback to sort on
+their fields.
+
+There should be a persistant, per-(freeside)-user store for window positions
+and sizes and sort fields etc (see L<FS::UI::CGI/BUGS>.
+
+Still some small bits of widget code same as FS::UI::CGI.
+
+=head1 SEE ALSO
+
+L<FS::UI::Base>
+
+=head1 HISTORY
+
+$Log: Gtk.pm,v $
+Revision 1.1  1999-08-04 09:03:53  ivan
+initial checkin of module files for proper perl installation
+
+Revision 1.1  1999/01/20 09:30:36  ivan
+skeletal cross-UI UI code.
+
+
+=cut
+
+1;
+
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
deleted file mode 100644
index 49e3fbf..0000000
--- a/FS/FS/UI/Web.pm
+++ /dev/null
@@ -1,267 +0,0 @@
-package FS::UI::Web;
-
-use vars qw($DEBUG);
-use FS::Conf;
-use FS::Record qw(dbdef);
-
-#use vars qw(@ISA);
-#use FS::UI
-#@ISA = qw( FS::UI );
-
-use Date::Parse;
-sub parse_beginning_ending {
-  my($cgi) = @_;
-
-  my $beginning = 0;
-  if ( $cgi->param('begin') =~ /^(\d+)$/ ) {
-    $beginning = $1;
-  } elsif ( $cgi->param('beginning') =~ /^([ 0-9\-\/]{1,64})$/ ) {
-    $beginning = str2time($1) || 0;
-  }
-
-  my $ending = 4294967295; #2^32-1
-  if ( $cgi->param('end') =~ /^(\d+)$/ ) {
-    $ending = $1 - 1;
-  } elsif ( $cgi->param('ending') =~ /^([ 0-9\-\/]{1,64})$/ ) {
-    #probably need an option to turn off the + 86399
-    $ending = str2time($1) + 86399;
-  }
-
-  ( $beginning, $ending );
-}
-
-###
-# cust_main report methods
-###
-
-=item cust_header
-
-Returns an array of customer information headers according to the
-B<cust-fields> configuration setting.
-
-=cut
-
-use vars qw( @cust_fields );
-
-sub cust_sql_fields {
-  my @fields = qw( last first company );
-  push @fields, map "ship_$_", @fields
-    if dbdef->table('cust_main')->column('ship_last');
-  map "cust_main.$_", @fields;
-}
-
-sub cust_header {
-
-  warn "FS::svc_Common::cust_header called"
-    if $DEBUG;
-
-  my $conf = new FS::Conf;
-
-  my %header2method = (
-    'Customer'           => 'name',
-    'Cust#'              => 'custnum',
-    'Name'               => 'contact',
-    'Company'            => 'company',
-    '(bill) Customer'    => 'name',
-    '(service) Customer' => 'ship_name',
-    '(bill) Name'        => 'contact',
-    '(service) Name'     => 'ship_contact',
-    '(bill) Company'     => 'company',
-    '(service) Company'  => 'ship_company',
-  );
-
-  my @cust_header;
-  if (    $conf->exists('cust-fields')
-       && $conf->config('cust-fields') =~ /^([\w \|\#\(\)]+):/
-     )
-  {
-    warn "  found cust-fields configuration value"
-      if $DEBUG;
-
-    my $cust_fields = $1;
-     @cust_header = split(/ \| /, $cust_fields);
-     @cust_fields = map { $header2method{$_} } @cust_header;
-  } else { 
-    warn "  no cust-fields configuration value found; using default 'Customer'"
-      if $DEBUG;
-    @cust_header = ( 'Customer' );
-    @cust_fields = ( 'name' );
-  }
-
-  #my $svc_x = shift;
-  @cust_header;
-}
-
-=item cust_fields
-
-Given a svc_ object that contains fields from cust_main (say, from a
-JOINed search.  See httemplate/search/svc_* for examples), returns an array
-of customer information according to the <B>cust-fields</B> configuration
-setting, or "(unlinked)" if this service is not linked to a customer.
-
-=cut
-
-sub cust_fields {
-  my $svc_x = shift;
-  warn "FS::svc_Common::cust_fields called for $svc_x ".
-       "(cust_fields: @cust_fields)"
-    if $DEBUG > 1;
-
-  cust_header() unless @cust_fields;
-
-  my $seen_unlinked = 0;
-  map { 
-    if ( $svc_x->custnum ) {
-      warn "  $svc_x -> $_"
-        if $DEBUG > 1;
-      $svc_x->$_(@_);
-    } else {
-      warn "  ($svc_x unlinked)"
-        if $DEBUG > 1;
-      $seen_unlinked++ ? '' : '(unlinked)';
-    }
-  } @cust_fields;
-}
-
-###
-# begin JSRPC code...
-###
-
-package FS::UI::Web::JSRPC;
-
-use strict;
-use vars qw($DEBUG);
-use Storable qw(nfreeze);
-use MIME::Base64;
-use JSON;
-use FS::UID;
-use FS::Record qw(qsearchs);
-use FS::queue;
-
-$DEBUG = 0;
-
-sub new {
-        my $class = shift;
-        my $self  = {
-                env => {},
-                job => shift,
-                cgi => shift,
-        };
-
-        bless $self, $class;
-
-        die "CGI object required as second argument" unless $self->{'cgi'};
-
-        return $self;
-}
-
-sub process {
-
-  my $self = shift;
-
-  my $cgi = $self->{'cgi'};
-
-  # XXX this should parse JSON foo and build a proper data structure
-  my @args = $cgi->param('arg');
-
-  #work around konqueror bug!
-  @args = map { s/\x00$//; $_; } @args;
-
-  my $sub = $cgi->param('sub'); #????
-
-  warn "FS::UI::Web::JSRPC::process:\n".
-       "  cgi=$cgi\n".
-       "  sub=$sub\n".
-       "  args=".join(', ',@args)."\n"
-    if $DEBUG;
-
-  if ( $sub eq 'start_job' ) {
-
-    $self->start_job(@args);
-
-  } elsif ( $sub eq 'job_status' ) {
-
-    $self->job_status(@args);
-
-  }
-
-}
-
-sub start_job {
-  my $self = shift;
-
-  warn "FS::UI::Web::start_job: ". join(', ', @_) if $DEBUG;
-#  my %param = @_;
-  my %param = ();
-  while ( @_ ) {
-    my( $field, $value ) = splice(@_, 0, 2);
-    unless ( exists( $param{$field} ) ) {
-      $param{$field} = $value;
-    } elsif ( ! ref($param{$field}) ) {
-      $param{$field} = [ $param{$field}, $value ];
-    } else {
-      push @{$param{$field}}, $value;
-    }
-  }
-  warn "FS::UI::Web::start_job\n".
-       join('', map {
-                      if ( ref($param{$_}) ) {
-                        "  $_ => [ ". join(', ', @{$param{$_}}). " ]\n";
-                      } else {
-                        "  $_ => $param{$_}\n";
-                      }
-                    } keys %param )
-    if $DEBUG;
-
-  #first get the CGI params shipped off to a job ASAP so an id can be returned
-  #to the caller
-  
-  my $job = new FS::queue { 'job' => $self->{'job'} };
-  
-  #too slow to insert all the cgi params as individual args..,?
-  #my $error = $queue->insert('_JOB', $cgi->Vars);
-  
-  #warn 'froze string of size '. length(nfreeze(\%param)). " for job args\n"
-  #  if $DEBUG;
-
-  my $error = $job->insert( '_JOB', encode_base64(nfreeze(\%param)) );
-
-  if ( $error ) {
-    $error;  #this doesn't seem to be handled well,
-             # will trigger "illegal jobnum" below?
-             # (should never be an error inserting the job, though, only thing
-             #  would be Pg f%*kage)
-  } else {
-    $job->jobnum;
-  }
-  
-}
-
-sub job_status {
-  my( $self, $jobnum ) = @_; #$url ???
-
-  sleep 1; # XXX could use something better...
-
-  my $job;
-  if ( $jobnum =~ /^(\d+)$/ ) {
-    $job = qsearchs('queue', { 'jobnum' => $jobnum } );
-  } else {
-    die "FS::UI::Web::job_status: illegal jobnum $jobnum\n";
-  }
-
-  my @return;
-  if ( $job && $job->status ne 'failed' ) {
-    @return = ( 'progress', $job->statustext );
-  } elsif ( !$job ) { #handle job gone case : job sucessful
-                      # so close popup, redirect parent window...
-    @return = ( 'complete' );
-  } else {
-    @return = ( 'error', $job ? $job->statustext : $jobnum );
-  }
-
-  objToJson(\@return);
-
-}
-
-1;
-
diff --git a/FS/FS/UI/agent.pm b/FS/FS/UI/agent.pm
new file mode 100644
index 0000000..ce9744a
--- /dev/null
+++ b/FS/FS/UI/agent.pm
@@ -0,0 +1,62 @@
+package FS::UI::agent;
+
+use strict;
+use vars qw ( @ISA );
+use FS::UI::Base;
+use FS::Record qw( qsearchs );
+use FS::agent;
+use FS::agent_type;
+
+@ISA = qw ( FS::UI::Base );
+
+sub db_table { 'agent' };
+
+sub db_name { 'Agent' };
+
+sub db_description { <<END;
+Agents are resellers of your service. Agents may be limited to a subset of your
+full offerings (via their type).
+END
+}
+
+sub list_fields {
+  'agentnum',
+  'typenum',
+#  'freq',
+#  'prog',
+; }
+
+sub list_header {
+  'Agent',
+  'Type',
+#  'Freq (n/a)',
+#  'Prog (n/a)',
+; }
+
+sub db_callback { 
+  'agentnum' =>
+    sub {
+      my ( $agentnum, $record ) = @_;
+      my $agent = $record->agent;
+      new FS::UI::_Link (
+        'table'  => 'agent',
+        'method' => 'edit',
+        'arg'    => [ $agentnum ],
+        'text'   => "$agentnum: $agent",
+      );
+    },
+  'typenum' =>
+    sub {
+      my $typenum = shift;
+      my $agent_type = qsearchs( 'agent_type', { 'typenum' => $typenum } );
+      my $atype = $agent_type->atype;
+      new FS::UI::_Link (
+        'table'  => 'agent_type',
+        'method' => 'edit',
+        'arg'    => [ $typenum ],
+        'text'   => "$typenum: $atype"
+      );
+    },
+}
+
+1;
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index c0c9f7a..3d893ee 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -98,7 +98,7 @@ sub forksuidsetup {
 }
 
 sub myconnect {
-  DBI->connect( getsecrets, {'AutoCommit' => 0, 'ChopBlanks' => 1, } )
+  $dbh = DBI->connect( getsecrets, {'AutoCommit' => 0, 'ChopBlanks' => 1, } )
     or die "DBI->connect error: $DBI::errstr\n";
 }
 
diff --git a/FS/FS/XMLRPC.pm b/FS/FS/XMLRPC.pm
deleted file mode 100644
index 84f3e41..0000000
--- a/FS/FS/XMLRPC.pm
+++ /dev/null
@@ -1,165 +0,0 @@
-package FS::XMLRPC;
-
-use strict;
-use vars qw( @ISA $DEBUG );
-use Frontier::RPC2;
-
-# Instead of 'use'ing freeside modules on the fly below, just preload them now.
-use FS;
-use FS::CGI;
-use FS::Conf;
-use FS::Record;
-use FS::cust_main;
-
-@ISA = qw( );
-
-$DEBUG = 1;
-
-=head1 NAME
-
-FS::XMLRPC - Object methods for handling XMLRPC requests
-
-=head1 SYNOPSIS
-
-  use FS::XMLRPC;
-
-  $xmlrpc = new FS::XMLRPC;
-
-  ($error, $response_xml) = $xmlrpc->serve($request_xml);
-
-=head1 DESCRIPTION
-
-The FS::XMLRPC object is a mechanisim to access read-only data from freeside's subroutines.  It does not, at least not at this point, give you the ability to access methods of freeside objects remotely.  It can, however, be used to call subroutines such as FS::cust_main::smart_search and FS::Record::qsearch.
-
-See the serve method below for calling syntax.
-
-=head1 METHODS
-
-=over 4
-
-=item new
-
-Provides a FS::XMLRPC object used to handle incoming XMLRPC requests.
-
-=cut
-
-sub new {
-
-  my $class = shift;
-  my $self = {};
-  bless($self, $class);
-
-  $self->{_coder} = new Frontier::RPC2;
-
-  return $self;
-
-}
-
-=item serve REQUEST_XML_SCALAR
-
-The serve method takes a scalar containg an XMLRPC request for one of freeside's subroutines (not object methods).  Parameters passed in the 'methodCall' will be passed as a list to the subroutine untouched.  The return value of the called subroutine _must_ be a freeside object reference (eg. qsearchs) or a list of freeside object references (eg. qsearch, smart_search), _and_, the object(s) returned must support the hashref method.  This will be checked first by calling UNIVERSAL::can('FS::class::subroutine', 'hashref').
-
-Return value is an XMLRPC methodResponse containing the results of the call.  The result of the subroutine call itself will be coded in the methodResponse as an array of structs, regardless of whether there was many or a single object returned.  In other words, after you decode the response, you'll always have an array.
-
-=cut
-
-sub serve {
-
-  my ($self, $request_xml) = (shift, shift);
-  my $response_xml;
-
-  my $coder = $self->{_coder};
-  my $call = $coder->decode($request_xml);
-  
-  warn "Got methodCall with method_name='" . $call->{method_name} . "'"
-    if $DEBUG;
-
-  $response_xml = $coder->encode_response(&_serve($call->{method_name}, $call->{value}));
-
-  return ('', $response_xml);
-
-}
-
-sub _serve { #Subroutine, not method
-
-  my ($method_name, $params) = (shift, shift);
-
-  use Data::Dumper;
-
-  #die 'Called _serve without parameters' unless ref($params) eq 'ARRAY';
-  $params = [] unless (ref($params) eq 'ARRAY');
-
-  if ($method_name =~ /^(\w+)\.(\w+)/) {
-
-    #my ($class, $sub) = split(/\./, $method_name);
-    my ($class, $sub) = ($1, $2);
-    my $fssub = "FS::${class}::${sub}";
-    warn "fssub: ${fssub}" if $DEBUG;
-    warn "params: " . Dumper($params) if $DEBUG;
-
-    my @result;
-
-    if ($class eq 'Conf') { #Special case for FS::Conf because we need an obj.
-
-      if ($sub eq 'config') {
-        my $conf = new FS::Conf;
-        @result = ($conf->config(@$params));
-      } else {
-	warn "FS::XMLRPC: Can't call undefined subroutine '${fssub}'";
-      }
-
-    } else {
-
-      unless (UNIVERSAL::can("FS::${class}", $sub)) {
-        warn "FS::XMLRPC: Can't call undefined subroutine '${fssub}'";
-        # Should we encode an error in the response,
-        # or just break silently to the remote caller and complain locally?
-        return [];
-      }
-
-      eval { 
-        no strict 'refs';
-        my $fssub = "FS::${class}::${sub}";
-        @result = (&$fssub(@$params));
-      };
-
-      if ($@) {
-        warn "FS::XMLRPC: Error while calling '${fssub}': $@";
-        return [];
-      }
-
-    }
-
-    warn Dumper(@result);
-
-    if (grep { UNIVERSAL::can($_, 'hashref') ? 0 : 1 } @result) {
-      #warn "FS::XMLRPC: One or more objects returned from '${fssub}' doesn't " .
-      #     "support the 'hashref' method.";
-      
-      # If they're not FS::Record decendants, just return the results unmap'd?
-      # This is more flexible, but possibly more error-prone.
-      return [ @result ];
-    } else {
-      return [ map { $_->hashref } @result ];
-    }
-  } elsif ($method_name eq 'version') {
-    return [ $FS::VERSION ];
-  } # else...
-
-  warn "Unhandle XMLRPC request '${method_name}'";
-  return [];
-
-}
-
-=head1 BUGS
-
-Probably lots.
-
-=head1 SEE ALSO
-
-L<Frontier::RPC2>.
-
-=cut
-
-1;
-
diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index 83f0ce5..a9e41a6 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -2,13 +2,9 @@ package FS::agent;
 
 use strict;
 use vars qw( @ISA );
-#use Crypt::YAPassGen;
 use FS::Record qw( dbh qsearch qsearchs );
 use FS::cust_main;
-use FS::cust_pkg;
 use FS::agent_type;
-use FS::reg_code;
-use FS::TicketSystem;
 
 @ISA = qw( FS::Record );
 
@@ -168,18 +164,6 @@ sub pkgpart_hashref {
   $self->agent_type->pkgpart_hashref;
 }
 
-=item ticketing_queue
-
-Returns the queue name corresponding with the id from the I<ticketing_queueid>
-field, or the empty string.
-
-=cut
-
-sub ticketing_queue {
-  my $self = shift;
-  FS::TicketSystem->queue($self->ticketing_queueid);
-};
-
 =item num_prospect_cust_main
 
 Returns the number of prospects (customers with no packages ever ordered) for
@@ -193,9 +177,10 @@ sub num_prospect_cust_main {
 
 sub num_sql {
   my( $self, $sql ) = @_;
-  my $statement = "SELECT COUNT(*) FROM cust_main WHERE agentnum = ? AND $sql";
-  my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
-  $sth->execute($self->agentnum) or die $sth->errstr. "executing $statement";
+  my $sth = dbh->prepare(
+    "SELECT COUNT(*) FROM cust_main WHERE agentnum = ? AND $sql"
+  ) or die dbh->errstr;
+  $sth->execute($self->agentnum) or die $sth->errstr;
   $sth->fetchrow_arrayref->[0];
 }
 
@@ -279,122 +264,6 @@ sub cancel_cust_main {
   shift->cust_main_sql(FS::cust_main->cancel_sql);
 }
 
-=item num_active_cust_pkg
-
-Returns the number of active customer packages for this agent.
-
-=cut
-
-sub num_active_cust_pkg {
-  shift->num_pkg_sql(FS::cust_pkg->active_sql);
-}
-
-sub num_pkg_sql {
-  my( $self, $sql ) = @_;
-  my $statement = 
-    "SELECT COUNT(*) FROM cust_pkg LEFT JOIN cust_main USING ( custnum )".
-    " WHERE agentnum = ? AND $sql";
-  my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
-  $sth->execute($self->agentnum) or die $sth->errstr. "executing $statement";
-  $sth->fetchrow_arrayref->[0];
-}
-
-=item num_susp_cust_pkg
-
-Returns the number of suspended customer packages for this agent.
-
-=cut
-
-sub num_susp_cust_pkg {
-  shift->num_pkg_sql(FS::cust_pkg->susp_sql);
-}
-
-=item num_cancel_cust_pkg
-
-Returns the number of cancelled customer packages for this agent.
-
-=cut
-
-sub num_cancel_cust_pkg {
-  shift->num_pkg_sql(FS::cust_pkg->cancel_sql);
-}
-
-=item generate_reg_codes NUM PKGPART_ARRAYREF
-
-Generates the specified number of registration codes, allowing purchase of the
-specified package definitions.  Returns an array reference of the newly
-generated codes, or a scalar error message.
-
-=cut
-
-#false laziness w/prepay_credit::generate
-sub generate_reg_codes {
-  my( $self, $num, $pkgparts ) = @_;
-
-  my @codeset = ( 'A'..'Z' );
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my @codes = ();
-  for ( 1 ... $num ) {
-    my $reg_code = new FS::reg_code {
-      'agentnum' => $self->agentnum,
-      'code'     => join('', map($codeset[int(rand $#codeset)], (0..7) ) ),
-    };
-    my $error = $reg_code->insert($pkgparts);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-    push @codes, $reg_code->code;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  \@codes;
-
-}
-
-=item num_reg_code
-
-Returns the number of unused registration codes for this agent.
-
-=cut
-
-sub num_reg_code {
-  my $self = shift;
-  my $sth = dbh->prepare(
-    "SELECT COUNT(*) FROM reg_code WHERE agentnum = ?"
-  ) or die dbh->errstr;
-  $sth->execute($self->agentnum) or die $sth->errstr;
-  $sth->fetchrow_arrayref->[0];
-}
-
-=item num_prepay_credit
-
-Returns the number of unused prepaid cards for this agent.
-
-=cut
-
-sub num_prepay_credit {
-  my $self = shift;
-  my $sth = dbh->prepare(
-    "SELECT COUNT(*) FROM prepay_credit WHERE agentnum = ?"
-  ) or die dbh->errstr;
-  $sth->execute($self->agentnum) or die $sth->errstr;
-  $sth->fetchrow_arrayref->[0];
-}
-
-
 =back
 
 =head1 BUGS
diff --git a/FS/FS/agent_payment_gateway.pm b/FS/FS/agent_payment_gateway.pm
deleted file mode 100644
index bd99d0c..0000000
--- a/FS/FS/agent_payment_gateway.pm
+++ /dev/null
@@ -1,139 +0,0 @@
-package FS::agent_payment_gateway;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::payment_gateway;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::agent_payment_gateway - Object methods for agent_payment_gateway records
-
-=head1 SYNOPSIS
-
-  use FS::agent_payment_gateway;
-
-  $record = new FS::agent_payment_gateway \%hash;
-  $record = new FS::agent_payment_gateway { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::agent_payment_gateway object represents a payment gateway override for
-a specific agent.  FS::agent_payment_gateway inherits from FS::Record.  The
-following fields are currently supported:
-
-=over 4
-
-=item agentgatewaynum - primary key
-
-=item agentnum - 
-
-=item gatewaynum - 
-
-=item cardtype - 
-
-=item taxclass - 
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new override.  To add the override to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'agent_payment_gateway'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid override.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('agentgatewaynum')
-    || $self->ut_foreign_key('agentnum', 'agent', 'agentnum')
-    || $self->ut_foreign_key('gatewaynum', 'payment_gateway', 'gatewaynum' )
-    || $self->ut_textn('cardtype')
-    || $self->ut_textn('taxclass')
-  ;
-  return $error if $error;
-
-  $self->SUPER::check;
-}
-
-=item payment_gateway
-
-=cut
-
-sub payment_gateway {
-  my $self = shift;
-  qsearchs('payment_gateway', { 'gatewaynum' => $self->gatewaynum } );
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::payment_gateway>, L<FS::agent>, L<FS::Record>, schema.html from the
-base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/banned_pay.pm b/FS/FS/banned_pay.pm
deleted file mode 100644
index 1ad87f5..0000000
--- a/FS/FS/banned_pay.pm
+++ /dev/null
@@ -1,136 +0,0 @@
-package FS::banned_pay;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::UID qw( getotaker );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::banned_pay - Object methods for banned_pay records
-
-=head1 SYNOPSIS
-
-  use FS::banned_pay;
-
-  $record = new FS::banned_pay \%hash;
-  $record = new FS::banned_pay { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::banned_pay object represents an banned credit card or ACH account.
-FS::banned_pay inherits from FS::Record.  The following fields are currently
-supported:
-
-=over 4
-
-=item bannum - primary key
-
-=item payby - I<CARD> or I<CHEK>
-
-=item payinfo - fingerprint of banned card (base64-encoded MD5 digest)
-
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-=item otaker - order taker (assigned automatically, see L<FS::UID>)
-
-=item reason - reason (text)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new ban.  To add the ban to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'banned_pay'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid ban.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('bannum')
-    || $self->ut_enum('payby', [ 'CARD', 'CHEK' ] )
-    || $self->ut_text('payinfo')
-    || $self->ut_numbern('_date')
-    || $self->ut_textn('reason')
-  ;
-  return $error if $error;
-
-  $self->_date(time) unless $self->_date;
-
-  $self->otaker(getotaker);
-
-  $self->SUPER::check;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cancel_reason.pm b/FS/FS/cancel_reason.pm
deleted file mode 100644
index 19cc721..0000000
--- a/FS/FS/cancel_reason.pm
+++ /dev/null
@@ -1,123 +0,0 @@
-package FS::cancel_reason;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::cancel_reason - Object methods for cancel_reason records
-
-=head1 SYNOPSIS
-
-  use FS::cancel_reason;
-
-  $record = new FS::cancel_reason \%hash;
-  $record = new FS::cancel_reason { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cancel_reason object represents an cancellation reason.
-FS::cancel_reason inherits from FS::Record.  The following fields are
-currently supported:
-
-=over 4
-
-=item reasonnum - primary key
-
-=item reason - 
-
-=item disabled - empty or "Y"
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new cancellation reason.  To add the reason to the database, see
-L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'cancel_reason'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid reason.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('reasonnum')
-    || $self->ut_text('reason')
-    || $self->ut_enum('disabled', [ '', 'Y' ] )
-  ;
-  return $error if $error;
-
-  $self->SUPER::check;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/clientapi_session.pm b/FS/FS/clientapi_session.pm
deleted file mode 100644
index f71a126..0000000
--- a/FS/FS/clientapi_session.pm
+++ /dev/null
@@ -1,121 +0,0 @@
-package FS::clientapi_session;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::clientapi_session - Object methods for clientapi_session records
-
-=head1 SYNOPSIS
-
-  use FS::clientapi_session;
-
-  $record = new FS::clientapi_session \%hash;
-  $record = new FS::clientapi_session { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::clientapi_session object represents an FS::ClientAPI session.
-FS::clientapi_session inherits from FS::Record.  The following fields are
-currently supported:
-
-=over 4
-
-=item sessionnum - primary key
-
-=item sessionid - session ID
-
-=item namespace - session namespace
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new record.  To add the record to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'clientapi_session'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('primary_key')
-    || $self->ut_number('validate_other_fields')
-  ;
-  return $error if $error;
-
-  $self->SUPER::check;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::ClientAPI>, <FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/clientapi_session_field.pm b/FS/FS/clientapi_session_field.pm
deleted file mode 100644
index bfa487d..0000000
--- a/FS/FS/clientapi_session_field.pm
+++ /dev/null
@@ -1,126 +0,0 @@
-package FS::clientapi_session_field;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::clientapi_session_field - Object methods for clientapi_session_field records
-
-=head1 SYNOPSIS
-
-  use FS::clientapi_session_field;
-
-  $record = new FS::clientapi_session_field \%hash;
-  $record = new FS::clientapi_session_field { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::clientapi_session_field object represents a FS::ClientAPI session data
-field.  FS::clientapi_session_field inherits from FS::Record.  The following
-fields are currently supported:
-
-=over 4
-
-=item fieldnum - primary key
-
-=item sessionnum - Base ClientAPI sesison (see L<FS::clientapi_session>)
-
-=item fieldname
-
-=item fieldvalie
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new record.  To add the record to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'clientapi_session_field'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('primary_key')
-    || $self->ut_number('validate_other_fields')
-  ;
-  return $error if $error;
-
-  $self->SUPER::check;
-}
-
-=back
-
-=head1 BUGS
-
-The author forgot to customize this manpage.
-
-=head1 SEE ALSO
-
-L<FS::clientapi_session>, L<FS::ClientAPI>, L<FS::Record>, schema.html from the
-base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 6e3b2b2..0306c01 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1,20 +1,15 @@
 package FS::cust_bill;
 
 use strict;
-use vars qw( @ISA $DEBUG $conf $money_char );
+use vars qw( @ISA $conf $money_char );
 use vars qw( $invoice_lines @buf ); #yuck
-use Fcntl qw(:flock); #for spool_csv
-use IPC::Run3;
 use Date::Format;
-use Text::Template 1.20;
+use Text::Template;
 use File::Temp 0.14;
 use String::ShellQuote;
-use HTML::Entities;
-use Locale::Country;
 use FS::UID qw( datasrc );
-use FS::Misc qw( send_email send_fax );
 use FS::Record qw( qsearch qsearchs );
-use FS::cust_main_Mixin;
+use FS::Misc qw( send_email );
 use FS::cust_main;
 use FS::cust_bill_pkg;
 use FS::cust_credit;
@@ -23,13 +18,8 @@ use FS::cust_pkg;
 use FS::cust_credit_bill;
 use FS::cust_pay_batch;
 use FS::cust_bill_event;
-use FS::part_pkg;
-use FS::cust_bill_pay;
-use FS::part_bill_event;
 
-@ISA = qw( FS::cust_main_Mixin FS::Record );
-
-$DEBUG = 0;
+@ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
 FS::UID->install_callback( sub { 
@@ -107,13 +97,6 @@ Invoices are normally created by calling the bill method of a customer object
 
 sub table { 'cust_bill'; }
 
-sub cust_linked { $_[0]->cust_main_custnum; } 
-sub cust_unlinked_msg {
-  my $self = shift;
-  "WARNING: can't find cust_main.custnum ". $self->custnum.
-  ' (cust_bill.invnum '. $self->invnum. ')';
-}
-
 =item insert
 
 Adds this invoice to the database ("Posts" the invoice).  If there is an error,
@@ -236,25 +219,6 @@ sub cust_main {
   qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 }
 
-=item cust_suspend_if_balance_over AMOUNT
-
-Suspends the customer associated with this invoice if the total amount owed on
-this invoice and all older invoices is greater than the specified amount.
-
-Returns a list: an empty list on success or a list of errors.
-
-=cut
-
-sub cust_suspend_if_balance_over {
-  my( $self, $amount ) = ( shift, shift );
-  my $cust_main = $self->cust_main;
-  if ( $cust_main->total_owed_date($self->_date) < $amount ) {
-    return ();
-  } else {
-    $cust_main->suspend;
-  }
-}
-
 =item cust_credit
 
 Depreciated.  See the cust_credited method.
@@ -354,244 +318,15 @@ sub owed {
   $balance;
 }
 
-
-=item generate_email PARAMHASH
-
-PARAMHASH can contain the following:
-
-=over 4
-
-=item from       => sender address, required
-
-=item tempate    => alternate template name, optional
-
-=item print_text => text attachment arrayref, optional
-
-=item subject    => email subject, optional
-
-=back
-
-Returns an argument list to be passed to L<FS::Misc::send_email>.
-
-=cut
-
-use MIME::Entity;
-
-sub generate_email {
-
-  my $self = shift;
-  my %args = @_;
-
-  my $me = '[FS::cust_bill::generate_email]';
-
-  my %return = (
-    'from'      => $args{'from'},
-    'subject'   => (($args{'subject'}) ? $args{'subject'} : 'Invoice'),
-  );
-
-  if (ref($args{'to'} eq 'ARRAY')) {
-    $return{'to'} = $args{'to'};
-  } else {
-    $return{'to'} = [ grep { $_ !~ /^(POST|FAX)$/ }
-                           $self->cust_main->invoicing_list
-                    ];
-  }
-
-  if ( $conf->exists('invoice_html') ) {
-
-    warn "$me creating HTML/text multipart message"
-      if $DEBUG;
-
-    $return{'nobody'} = 1;
-
-    my $alternative = build MIME::Entity
-      'Type'        => 'multipart/alternative',
-      'Encoding'    => '7bit',
-      'Disposition' => 'inline'
-    ;
-
-    my $data;
-    if ( $conf->exists('invoice_email_pdf')
-         and scalar($conf->config('invoice_email_pdf_note')) ) {
-
-      warn "$me using 'invoice_email_pdf_note' in multipart message"
-        if $DEBUG;
-      $data = [ map { $_ . "\n" }
-                    $conf->config('invoice_email_pdf_note')
-              ];
-
-    } else {
-
-      warn "$me not using 'invoice_email_pdf_note' in multipart message"
-        if $DEBUG;
-      if ( ref($args{'print_text'}) eq 'ARRAY' ) {
-        $data = $args{'print_text'};
-      } else {
-        $data = [ $self->print_text('', $args{'template'}) ];
-      }
-
-    }
-
-    $alternative->attach(
-      'Type'        => 'text/plain',
-      #'Encoding'    => 'quoted-printable',
-      'Encoding'    => '7bit',
-      'Data'        => $data,
-      'Disposition' => 'inline',
-    );
-
-    $args{'from'} =~ /\@([\w\.\-]+)/ or $1 = 'example.com';
-    my $content_id = join('.', rand()*(2**32), $$, time). "\@$1";
-
-    my $path = "$FS::UID::conf_dir/conf.$FS::UID::datasrc";
-    my $file;
-    if ( defined($args{'_template'}) && length($args{'_template'})
-         && -e "$path/logo_". $args{'_template'}. ".png"
-       )
-    {
-      $file = "$path/logo_". $args{'_template'}. ".png";
-    } else {
-      $file = "$path/logo.png";
-    }
-
-    my $image = build MIME::Entity
-      'Type'       => 'image/png',
-      'Encoding'   => 'base64',
-      'Path'       => $file,
-      'Filename'   => 'logo.png',
-      'Content-ID' => "<$content_id>",
-    ;
-
-    $alternative->attach(
-      'Type'        => 'text/html',
-      'Encoding'    => 'quoted-printable',
-      'Data'        => [ '<html>',
-                         '  <head>',
-                         '    <title>',
-                         '      '. encode_entities($return{'subject'}), 
-                         '    </title>',
-                         '  </head>',
-                         '  <body bgcolor="#e8e8e8">',
-                         $self->print_html('', $args{'template'}, $content_id),
-                         '  </body>',
-                         '</html>',
-                       ],
-      'Disposition' => 'inline',
-      #'Filename'    => 'invoice.pdf',
-    );
-
-    if ( $conf->exists('invoice_email_pdf') ) {
-
-      #attaching pdf too:
-      # multipart/mixed
-      #   multipart/related
-      #     multipart/alternative
-      #       text/plain
-      #       text/html
-      #     image/png
-      #   application/pdf
-
-      my $related = build MIME::Entity 'Type'     => 'multipart/related',
-                                       'Encoding' => '7bit';
-
-      #false laziness w/Misc::send_email
-      $related->head->replace('Content-type',
-        $related->mime_type.
-        '; boundary="'. $related->head->multipart_boundary. '"'.
-        '; type=multipart/alternative'
-      );
-
-      $related->add_part($alternative);
-
-      $related->add_part($image);
-
-      my $pdf = build MIME::Entity $self->mimebuild_pdf('', $args{'template'});
-
-      $return{'mimeparts'} = [ $related, $pdf ];
-
-    } else {
-
-      #no other attachment:
-      # multipart/related
-      #   multipart/alternative
-      #     text/plain
-      #     text/html
-      #   image/png
-
-      $return{'content-type'} = 'multipart/related';
-      $return{'mimeparts'} = [ $alternative, $image ];
-      $return{'type'} = 'multipart/alternative'; #Content-Type of first part...
-      #$return{'disposition'} = 'inline';
-
-    }
-  
-  } else {
-
-    if ( $conf->exists('invoice_email_pdf') ) {
-      warn "$me creating PDF attachment"
-        if $DEBUG;
-
-      #mime parts arguments a la MIME::Entity->build().
-      $return{'mimeparts'} = [
-        { $self->mimebuild_pdf('', $args{'template'}) }
-      ];
-    }
-  
-    if ( $conf->exists('invoice_email_pdf')
-         and scalar($conf->config('invoice_email_pdf_note')) ) {
-
-      warn "$me using 'invoice_email_pdf_note'"
-        if $DEBUG;
-      $return{'body'} = [ map { $_ . "\n" }
-                              $conf->config('invoice_email_pdf_note')
-                        ];
-
-    } else {
-
-      warn "$me not using 'invoice_email_pdf_note'"
-        if $DEBUG;
-      if ( ref($args{'print_text'}) eq 'ARRAY' ) {
-        $return{'body'} = $args{'print_text'};
-      } else {
-        $return{'body'} = [ $self->print_text('', $args{'template'}) ];
-      }
-
-    }
-
-  }
-
-  %return;
-
-}
-
-=item mimebuild_pdf
-
-Returns a list suitable for passing to MIME::Entity->build(), representing
-this invoice as PDF attachment.
-
-=cut
-
-sub mimebuild_pdf {
-  my $self = shift;
-  (
-    'Type'        => 'application/pdf',
-    'Encoding'    => 'base64',
-    'Data'        => [ $self->print_pdf(@_) ],
-    'Disposition' => 'attachment',
-    'Filename'    => 'invoice.pdf',
-  );
-}
-
 =item send [ TEMPLATENAME [ , AGENTNUM [ , INVOICE_FROM ] ] ]
 
-Sends this invoice to the destinations configured for this customer: sends
-email, prints and/or faxes.  See L<FS::cust_main_invoice>.
+Sends this invoice to the destinations configured for this customer: send
+emails or print.  See L<FS::cust_main_invoice>.
 
 TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
 
 AGENTNUM, if specified, means that this invoice will only be sent for customers
-of the specified agent or agent(s).  AGENTNUM can be a scalar agentnum (for a
-single agent) or an arrayref of agentnums.
+of the specified agent.
 
 INVOICE_FROM, if specified, overrides the default email invoice From: address.
 
@@ -600,127 +335,45 @@ INVOICE_FROM, if specified, overrides the default email invoice From: address.
 sub send {
   my $self = shift;
   my $template = scalar(@_) ? shift : '';
-  if ( scalar(@_) && $_[0]  ) {
-    my $agentnums = ref($_[0]) ? shift : [ shift ];
-    return 'N/A' unless grep { $_ == $self->cust_main->agentnum } @$agentnums;
-  }
-
+  return 'N/A' if scalar(@_) && $_[0] && $self->cust_main->agentnum != shift;
   my $invoice_from =
     scalar(@_)
       ? shift
       : ( $self->_agent_invoice_from || $conf->config('invoice_from') );
 
+  my @print_text = $self->print_text('', $template);
   my @invoicing_list = $self->cust_main->invoicing_list;
 
-  $self->email($template, $invoice_from)
-    if grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list or !@invoicing_list;
-
-  $self->print($template)
-    if grep { $_ eq 'POST' } @invoicing_list; #postal
-
-  $self->fax($template)
-    if grep { $_ eq 'FAX' } @invoicing_list; #fax
-
-  '';
-
-}
+  if ( grep { $_ ne 'POST' } @invoicing_list or !@invoicing_list  ) { #email
 
-=item email [ TEMPLATENAME  [ , INVOICE_FROM ] ] 
-
-Emails this invoice.
-
-TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
-
-INVOICE_FROM, if specified, overrides the default email invoice From: address.
-
-=cut
-
-sub email {
-  my $self = shift;
-  my $template = scalar(@_) ? shift : '';
-  my $invoice_from =
-    scalar(@_)
-      ? shift
-      : ( $self->_agent_invoice_from || $conf->config('invoice_from') );
+    #better to notify this person than silence
+    @invoicing_list = ($invoice_from) unless @invoicing_list;
 
-  my @invoicing_list = grep { $_ !~ /^(POST|FAX)$/ } 
-                            $self->cust_main->invoicing_list;
-
-  #better to notify this person than silence
-  @invoicing_list = ($invoice_from) unless @invoicing_list;
-
-  my $error = send_email(
-    $self->generate_email(
-      'from'       => $invoice_from,
-      'to'         => [ grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ],
-      'template'   => $template,
-    )
-  );
-  die "can't email invoice: $error\n" if $error;
-  #die "$error\n" if $error;
-
-}
-
-=item lpr_data [ TEMPLATENAME ]
-
-Returns the postscript or plaintext for this invoice as an arrayref.
-
-TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
-
-=cut
-
-sub lpr_data {
-  my( $self, $template) = @_;
-  $conf->exists('invoice_latex')
-    ? [ $self->print_ps('', $template) ]
-    : [ $self->print_text('', $template) ];
-}
-
-=item print [ TEMPLATENAME ]
-
-Prints this invoice.
-
-TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
-
-=cut
-
-sub print {
-  my $self = shift;
-  my $template = scalar(@_) ? shift : '';
-
-  my $lpr = $conf->config('lpr');
+    my $error = send_email(
+      'from'    => $invoice_from,
+      'to'      => [ grep { $_ ne 'POST' } @invoicing_list ],
+      'subject' => 'Invoice',
+      'body'    => \@print_text,
+    );
+    die "can't email invoice: $error\n" if $error;
 
-  my $outerr = '';
-  run3 $lpr, $self->lpr_data($template), \$outerr, \$outerr;
-  if ( $? ) {
-    $outerr = ": $outerr" if length($outerr);
-    die "Error from $lpr (exit status ". ($?>>8). ")$outerr\n";
   }
 
-}
-
-=item fax [ TEMPLATENAME ] 
-
-Faxes this invoice.
-
-TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
-
-=cut
-
-sub fax {
-  my $self = shift;
-  my $template = scalar(@_) ? shift : '';
-
-  die 'FAX invoice destination not (yet?) supported with plain text invoices.'
-    unless $conf->exists('invoice_latex');
+  if ( $conf->config('invoice_latex') ) {
+    @print_text = $self->print_ps('', $template);
+  }
 
-  my $dialstring = $self->cust_main->getfield('fax');
-  #Check $dialstring?
+  if ( grep { $_ eq 'POST' } @invoicing_list ) { #postal
+    my $lpr = $conf->config('lpr');
+    open(LPR, "|$lpr")
+      or die "Can't open pipe to $lpr: $!\n";
+    print LPR @print_text;
+    close LPR
+      or die $! ? "Error closing $lpr: $!\n"
+                : "Exit status $? from $lpr\n";
+  }
 
-  my $error = send_fax( 'docdata'    => $self->lpr_data($template),
-                        'dialstring' => $dialstring,
-                      );
-  die $error if $error;
+  '';
 
 }
 
@@ -747,7 +400,7 @@ sub send_if_newest {
   $self->send(@_);
 }
 
-=item send_csv OPTION => VALUE, ...
+=item send_csv OPTIONS
 
 Sends invoice as a CSV data-file to a remote host with the specified protocol.
 
@@ -762,141 +415,7 @@ dir
 The file will be named "N-YYYYMMDDHHMMSS.csv" where N is the invoice number
 and YYMMDDHHMMSS is a timestamp.
 
-See L</print_csv> for a description of the output format.
-
-=cut
-
-sub send_csv {
-  my($self, %opt) = @_;
-
-  #create file(s)
-
-  my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/cust_bill";
-  mkdir $spooldir, 0700 unless -d $spooldir;
-
-  my $tracctnum = $self->invnum. time2str('-%Y%m%d%H%M%S', time);
-  my $file = "$spooldir/$tracctnum.csv";
-  
-  my ( $header, $detail ) = $self->print_csv(%opt, 'tracctnum' => $tracctnum );
-
-  open(CSV, ">$file") or die "can't open $file: $!";
-  print CSV $header;
-
-  print CSV $detail;
-
-  close CSV;
-
-  my $net;
-  if ( $opt{protocol} eq 'ftp' ) {
-    eval "use Net::FTP;";
-    die $@ if $@;
-    $net = Net::FTP->new($opt{server}) or die @$;
-  } else {
-    die "unknown protocol: $opt{protocol}";
-  }
-
-  $net->login( $opt{username}, $opt{password} )
-    or die "can't FTP to $opt{username}\@$opt{server}: login error: $@";
-
-  $net->binary or die "can't set binary mode";
-
-  $net->cwd($opt{dir}) or die "can't cwd to $opt{dir}";
-
-  $net->put($file) or die "can't put $file: $!";
-
-  $net->quit;
-
-  unlink $file;
-
-}
-
-=item spool_csv
-
-Spools CSV invoice data.
-
-Options are:
-
-=over 4
-
-=item format - 'default' or 'billco'
-
-=item dest - if set (to POST, EMAIL or FAX), only sends spools invoices if the customer has the corresponding invoice destinations set (see L<FS::cust_main_invoice>).
-
-=item agent_spools - if set to a true value, will spool to per-agent files rather than a single global file
-
-=back
-
-=cut
-
-sub spool_csv {
-  my($self, %opt) = @_;
-
-  my $cust_main = $self->cust_main;
-
-  if ( $opt{'dest'} ) {
-    my %invoicing_list = map { /^(POST|FAX)$/ or 'EMAIL' =~ /^(.*)$/; $1 => 1 }
-                             $cust_main->invoicing_list;
-    return 'N/A' unless $invoicing_list{$opt{'dest'}}
-                     || ! keys %invoicing_list;
-  }
-
-  my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/cust_bill";
-  mkdir $spooldir, 0700 unless -d $spooldir;
-
-  my $tracctnum = $self->invnum. time2str('-%Y%m%d%H%M%S', time);
-
-  my $file =
-    "$spooldir/".
-    ( $opt{'agent_spools'} ? 'agentnum'.$cust_main->agentnum : 'spool' ).
-    ( lc($opt{'format'}) eq 'billco' ? '-header' : '' ) .
-    '.csv';
-  
-  my ( $header, $detail ) = $self->print_csv(%opt, 'tracctnum' => $tracctnum );
-
-  open(CSV, ">>$file") or die "can't open $file: $!";
-  flock(CSV, LOCK_EX);
-  seek(CSV, 0, 2);
-
-  print CSV $header;
-
-  if ( lc($opt{'format'}) eq 'billco' ) {
-
-    flock(CSV, LOCK_UN);
-    close CSV;
-
-    $file =
-      "$spooldir/".
-      ( $opt{'agent_spools'} ? 'agentnum'.$cust_main->agentnum : 'spool' ).
-      '-detail.csv';
-
-    open(CSV,">>$file") or die "can't open $file: $!";
-    flock(CSV, LOCK_EX);
-    seek(CSV, 0, 2);
-  }
-
-  print CSV $detail;
-
-  flock(CSV, LOCK_UN);
-  close CSV;
-
-  return '';
-
-}
-
-=item print_csv OPTION => VALUE, ...
-
-Returns CSV data for this invoice.
-
-Options are:
-
-format - 'default' or 'billco'
-
-Returns a list consisting of two scalars.  The first is a single line of CSV
-header information for this invoice.  The second is one or more lines of CSV
-detail information for this invoice.
-
-If I<format> is not specified or "default", the fields of the CSV file are as
-follows:
+The fields of the CSV file is as follows:
 
 record_type, invnum, custnum, _date, charged, first, last, company, address1, address2, city, state, zip, country, pkg, setup, recur, sdate, edate
 
@@ -904,13 +423,13 @@ record_type, invnum, custnum, _date, charged, first, last, company, address1, ad
 
 =item record type - B<record_type> is either C<cust_bill> or C<cust_bill_pkg>
 
-B<record_type> is C<cust_bill> for the initial header line only.  The
+If B<record_type> is C<cust_bill>, this is a primary invoice record.  The
 last five fields (B<pkg> through B<edate>) are irrelevant, and all other
 fields are filled in.
 
-B<record_type> is C<cust_bill_pkg> for detail lines.  Only the first two fields
-(B<record_type> and B<invnum>) and the last five fields (B<pkg> through B<edate>)
-are filled in.
+If B<record_type> is C<cust_bill_pkg>, this is a line item record.  Only the
+first two fields (B<record_type> and B<invnum>) and the last five fields
+(B<pkg> through B<edate>) are filled in.
 
 =item invnum - invoice number
 
@@ -950,213 +469,101 @@ are filled in.
 
 =back
 
-If I<format> is "billco", the fields of the header CSV file are as follows:
-
-  +-------------------------------------------------------------------+
-  |                        FORMAT HEADER FILE                         |
-  |-------------------------------------------------------------------|
-  | Field | Description                   | Name       | Type | Width |
-  | 1     | N/A-Leave Empty               | RC         | CHAR |     2 |
-  | 2     | N/A-Leave Empty               | CUSTID     | CHAR |    15 |
-  | 3     | Transaction Account No        | TRACCTNUM  | CHAR |    15 |
-  | 4     | Transaction Invoice No        | TRINVOICE  | CHAR |    15 |
-  | 5     | Transaction Zip Code          | TRZIP      | CHAR |     5 |
-  | 6     | Transaction Company Bill To   | TRCOMPANY  | CHAR |    30 |
-  | 7     | Transaction Contact Bill To   | TRNAME     | CHAR |    30 |
-  | 8     | Additional Address Unit Info  | TRADDR1    | CHAR |    30 |
-  | 9     | Bill To Street Address        | TRADDR2    | CHAR |    30 |
-  | 10    | Ancillary Billing Information | TRADDR3    | CHAR |    30 |
-  | 11    | Transaction City Bill To      | TRCITY     | CHAR |    20 |
-  | 12    | Transaction State Bill To     | TRSTATE    | CHAR |     2 |
-  | 13    | Bill Cycle Close Date         | CLOSEDATE  | CHAR |    10 |
-  | 14    | Bill Due Date                 | DUEDATE    | CHAR |    10 |
-  | 15    | Previous Balance              | BALFWD     | NUM* |     9 |
-  | 16    | Pmt/CR Applied                | CREDAPPLY  | NUM* |     9 |
-  | 17    | Total Current Charges         | CURRENTCHG | NUM* |     9 |
-  | 18    | Total Amt Due                 | TOTALDUE   | NUM* |     9 |
-  | 19    | Total Amt Due                 | AMTDUE     | NUM* |     9 |
-  | 20    | 30 Day Aging                  | AMT30      | NUM* |     9 |
-  | 21    | 60 Day Aging                  | AMT60      | NUM* |     9 |
-  | 22    | 90 Day Aging                  | AMT90      | NUM* |     9 |
-  | 23    | Y/N                           | AGESWITCH  | CHAR |     1 |
-  | 24    | Remittance automation         | SCANLINE   | CHAR |   100 |
-  | 25    | Total Taxes & Fees            | TAXTOT     | NUM* |     9 |
-  | 26    | Customer Reference Number     | CUSTREF    | CHAR |    15 |
-  | 27    | Federal Tax***                | FEDTAX     | NUM* |     9 |
-  | 28    | State Tax***                  | STATETAX   | NUM* |     9 |
-  | 29    | Other Taxes & Fees***         | OTHERTAX   | NUM* |     9 |
-  +-------+-------------------------------+------------+------+-------+
-
-If I<format> is "billco", the fields of the detail CSV file are as follows:
-
-                                  FORMAT FOR DETAIL FILE
-        |                            |           |      |
-  Field | Description                | Name      | Type | Width
-  1     | N/A-Leave Empty            | RC        | CHAR |     2
-  2     | N/A-Leave Empty            | CUSTID    | CHAR |    15
-  3     | Account Number             | TRACCTNUM | CHAR |    15
-  4     | Invoice Number             | TRINVOICE | CHAR |    15
-  5     | Line Sequence (sort order) | LINESEQ   | NUM  |     6
-  6     | Transaction Detail         | DETAILS   | CHAR |   100
-  7     | Amount                     | AMT       | NUM* |     9
-  8     | Line Format Control**      | LNCTRL    | CHAR |     2
-  9     | Grouping Code              | GROUP     | CHAR |     2
-  10    | User Defined               | ACCT CODE | CHAR |    15
-
 =cut
 
-sub print_csv {
+sub send_csv {
   my($self, %opt) = @_;
-  
-  eval "use Text::CSV_XS";
-  die $@ if $@;
 
-  my $cust_main = $self->cust_main;
+  #part one: create file
 
-  my $csv = Text::CSV_XS->new({'always_quote'=>1});
+  my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/cust_bill";
+  mkdir $spooldir, 0700 unless -d $spooldir;
 
-  if ( lc($opt{'format'}) eq 'billco' ) {
+  my $file = $spooldir. '/'. $self->invnum. time2str('-%Y%m%d%H%M%S.csv', time);
 
-    my $taxtotal = 0;
-    $taxtotal += $_->{'amount'} foreach $self->_items_tax;
+  open(CSV, ">$file") or die "can't open $file: $!";
 
-    my $duedate = '';
-    if (    $conf->exists('invoice_default_terms') 
-         && $conf->config('invoice_default_terms')=~ /^\s*Net\s*(\d+)\s*$/ ) {
-      $duedate = time2str("%m/%d/%Y", $self->_date + ($1*86400) );
-    }
+  eval "use Text::CSV_XS";
+  die $@ if $@;
 
-    my( $previous_balance, @unused ) = $self->previous; #previous balance
+  my $csv = Text::CSV_XS->new({'always_quote'=>1});
 
-    my $pmt_cr_applied = 0;
-    $pmt_cr_applied += $_->{'amount'}
-      foreach ( $self->_items_payments, $self->_items_credits ) ;
+  my $cust_main = $self->cust_main;
 
-    my $totaldue = sprintf('%.2f', $self->owed + $previous_balance);
+  $csv->combine(
+    'cust_bill',
+    $self->invnum,
+    $self->custnum,
+    time2str("%x", $self->_date),
+    sprintf("%.2f", $self->charged),
+    ( map { $cust_main->getfield($_) }
+        qw( first last company address1 address2 city state zip country ) ),
+    map { '' } (1..5),
+  ) or die "can't create csv";
+  print CSV $csv->string. "\n";
+
+  #new charges (false laziness w/print_text)
+  foreach my $cust_bill_pkg ( $self->cust_bill_pkg ) {
+
+    my($pkg, $setup, $recur, $sdate, $edate);
+    if ( $cust_bill_pkg->pkgnum ) {
+    
+      ($pkg, $setup, $recur, $sdate, $edate) = (
+        $cust_bill_pkg->cust_pkg->part_pkg->pkg,
+        ( $cust_bill_pkg->setup != 0
+          ? sprintf("%.2f", $cust_bill_pkg->setup )
+          : '' ),
+        ( $cust_bill_pkg->recur != 0
+          ? sprintf("%.2f", $cust_bill_pkg->recur )
+          : '' ),
+        time2str("%x", $cust_bill_pkg->sdate),
+        time2str("%x", $cust_bill_pkg->edate),
+      );
 
-    $csv->combine(
-      '',                         #  1 | N/A-Leave Empty               CHAR   2
-      '',                         #  2 | N/A-Leave Empty               CHAR  15
-      $opt{'tracctnum'},          #  3 | Transaction Account No        CHAR  15
-      $self->invnum,              #  4 | Transaction Invoice No        CHAR  15
-      $cust_main->zip,            #  5 | Transaction Zip Code          CHAR   5
-      $cust_main->company,        #  6 | Transaction Company Bill To   CHAR  30
-      #$cust_main->payname,        #  7 | Transaction Contact Bill To   CHAR  30
-      $cust_main->contact,        #  7 | Transaction Contact Bill To   CHAR  30
-      $cust_main->address2,       #  8 | Additional Address Unit Info  CHAR  30
-      $cust_main->address1,       #  9 | Bill To Street Address        CHAR  30
-      '',                         # 10 | Ancillary Billing Information CHAR  30
-      $cust_main->city,           # 11 | Transaction City Bill To      CHAR  20
-      $cust_main->state,          # 12 | Transaction State Bill To     CHAR   2
-
-      # XXX ?
-      time2str("%m/%d/%Y", $self->_date), # 13 | Bill Cycle Close Date CHAR  10
-
-      # XXX ?
-      $duedate,                   # 14 | Bill Due Date                 CHAR  10
-
-      $previous_balance,          # 15 | Previous Balance              NUM*   9
-      $pmt_cr_applied,            # 16 | Pmt/CR Applied                NUM*   9
-      sprintf("%.2f", $self->charged), # 17 | Total Current Charges    NUM*   9
-      $totaldue,                  # 18 | Total Amt Due                 NUM*   9
-      $totaldue,                  # 19 | Total Amt Due                 NUM*   9
-      '',                         # 20 | 30 Day Aging                  NUM*   9
-      '',                         # 21 | 60 Day Aging                  NUM*   9
-      '',                         # 22 | 90 Day Aging                  NUM*   9
-      'N',                        # 23 | Y/N                           CHAR   1
-      '',                         # 24 | Remittance automation         CHAR 100
-      $taxtotal,                  # 25 | Total Taxes & Fees            NUM*   9
-      $self->custnum,             # 26 | Customer Reference Number     CHAR  15
-      '0',                        # 27 | Federal Tax***                NUM*   9
-      sprintf("%.2f", $taxtotal), # 28 | State Tax***                  NUM*   9
-      '0',                        # 29 | Other Taxes & Fees***         NUM*   9
-    );
+    } else { #pkgnum tax
+      next unless $cust_bill_pkg->setup != 0;
+      my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
+                       ? ( $cust_bill_pkg->itemdesc || 'Tax' )
+                       : 'Tax';
+      ($pkg, $setup, $recur, $sdate, $edate) =
+        ( $itemdesc, sprintf("%10.2f",$cust_bill_pkg->setup), '', '', '' );
+    }
 
-  } else {
-  
     $csv->combine(
-      'cust_bill',
+      'cust_bill_pkg',
       $self->invnum,
-      $self->custnum,
-      time2str("%x", $self->_date),
-      sprintf("%.2f", $self->charged),
-      ( map { $cust_main->getfield($_) }
-          qw( first last company address1 address2 city state zip country ) ),
-      map { '' } (1..5),
+      ( map { '' } (1..11) ),
+      ($pkg, $setup, $recur, $sdate, $edate)
     ) or die "can't create csv";
+    print CSV $csv->string. "\n";
+
   }
 
-  my $header = $csv->string. "\n";
-
-  my $detail = '';
-  if ( lc($opt{'format'}) eq 'billco' ) {
-
-    my $lineseq = 0;
-    foreach my $item ( $self->_items_pkg ) {
-
-      $csv->combine(
-        '',                     #  1 | N/A-Leave Empty            CHAR   2
-        '',                     #  2 | N/A-Leave Empty            CHAR  15
-        $opt{'tracctnum'},      #  3 | Account Number             CHAR  15
-        $self->invnum,          #  4 | Invoice Number             CHAR  15
-        $lineseq++,             #  5 | Line Sequence (sort order) NUM    6
-        $item->{'description'}, #  6 | Transaction Detail         CHAR 100
-        $item->{'amount'},      #  7 | Amount                     NUM*   9
-        '',                     #  8 | Line Format Control**      CHAR   2
-        '',                     #  9 | Grouping Code              CHAR   2
-        '',                     # 10 | User Defined               CHAR  15
-      );
+  close CSV or die "can't close CSV: $!";
 
-      $detail .= $csv->string. "\n";
-
-    }
+  #part two: upload it
 
+  my $net;
+  if ( $opt{protocol} eq 'ftp' ) {
+    eval "use Net::FTP;";
+    die $@ if $@;
+    $net = Net::FTP->new($opt{server}) or die @$;
   } else {
+    die "unknown protocol: $opt{protocol}";
+  }
 
-    foreach my $cust_bill_pkg ( $self->cust_bill_pkg ) {
-
-      my($pkg, $setup, $recur, $sdate, $edate);
-      if ( $cust_bill_pkg->pkgnum ) {
-      
-        ($pkg, $setup, $recur, $sdate, $edate) = (
-          $cust_bill_pkg->cust_pkg->part_pkg->pkg,
-          ( $cust_bill_pkg->setup != 0
-            ? sprintf("%.2f", $cust_bill_pkg->setup )
-            : '' ),
-          ( $cust_bill_pkg->recur != 0
-            ? sprintf("%.2f", $cust_bill_pkg->recur )
-            : '' ),
-          ( $cust_bill_pkg->sdate 
-            ? time2str("%x", $cust_bill_pkg->sdate)
-            : '' ),
-          ($cust_bill_pkg->edate 
-            ?time2str("%x", $cust_bill_pkg->edate)
-            : '' ),
-        );
-  
-      } else { #pkgnum tax
-        next unless $cust_bill_pkg->setup != 0;
-        my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
-                         ? ( $cust_bill_pkg->itemdesc || 'Tax' )
-                         : 'Tax';
-        ($pkg, $setup, $recur, $sdate, $edate) =
-          ( $itemdesc, sprintf("%10.2f",$cust_bill_pkg->setup), '', '', '' );
-      }
-  
-      $csv->combine(
-        'cust_bill_pkg',
-        $self->invnum,
-        ( map { '' } (1..11) ),
-        ($pkg, $setup, $recur, $sdate, $edate)
-      ) or die "can't create csv";
+  $net->login( $opt{username}, $opt{password} )
+    or die "can't FTP to $opt{username}\@$opt{server}: login error: $@";
 
-      $detail .= $csv->string. "\n";
+  $net->binary or die "can't set binary mode";
 
-    }
+  $net->cwd($opt{dir}) or die "can't cwd to $opt{dir}";
 
-  }
+  $net->put($file) or die "can't put $file: $!";
 
-  ( $header, $detail );
+  $net->quit;
+
+  unlink $file;
 
 }
 
@@ -1275,7 +682,7 @@ sub batch_card {
     'state'    => $cust_main->getfield('state'),
     'zip'      => $cust_main->getfield('zip'),
     'country'  => $cust_main->getfield('country'),
-    'cardnum'  => $cust_main->payinfo,
+    'cardnum'  => $cust_main->getfield('payinfo'),
     'exp'      => $cust_main->getfield('paydate'),
     'payname'  => $cust_main->getfield('payname'),
     'amount'   => $self->owed,
@@ -1305,9 +712,7 @@ sub _agent_plandata {
       'plan'      => 'send_agent',
       'plandata'  => { 'op'    => '~',
                        'value' => "(^|\n)agentnum ".
-                                   '([0-9]*, )*'.
                                   $self->cust_main->agentnum.
-                                   '(, [0-9]*)*'.
                                   "(\n|\$)",
                      },
     },
@@ -1338,7 +743,7 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =cut
 
-#still some false laziness w/_items stuff (and send_csv)
+#still some false laziness w/print_text
 sub print_text {
 
   my( $self, $today, $template ) = @_;
@@ -1379,49 +784,48 @@ sub print_text {
     ( grep { ! $_->pkgnum } $self->cust_bill_pkg ),  #then taxes
   ) {
 
-    my $desc = $cust_bill_pkg->desc;
+    if ( $cust_bill_pkg->pkgnum ) {
 
-    if ( $cust_bill_pkg->pkgnum > 0 ) {
+      my $cust_pkg = qsearchs('cust_pkg', { pkgnum =>$cust_bill_pkg->pkgnum } );
+      my $part_pkg = qsearchs('part_pkg', { pkgpart=>$cust_pkg->pkgpart } );
+      my $pkg = $part_pkg->pkg;
 
       if ( $cust_bill_pkg->setup != 0 ) {
-        my $description = $desc;
+        my $description = $pkg;
         $description .= ' Setup' if $cust_bill_pkg->recur != 0;
         push @buf, [ $description,
                      $money_char. sprintf("%10.2f", $cust_bill_pkg->setup) ];
         push @buf,
-          map { [ "  ". $_->[0]. ": ". $_->[1], '' ] }
-              $cust_bill_pkg->cust_pkg->h_labels($self->_date);
+          map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
       }
 
       if ( $cust_bill_pkg->recur != 0 ) {
         push @buf, [
-          "$desc (" . time2str("%x", $cust_bill_pkg->sdate) . " - " .
-                      time2str("%x", $cust_bill_pkg->edate) . ")",
+          "$pkg (" . time2str("%x", $cust_bill_pkg->sdate) . " - " .
+                                time2str("%x", $cust_bill_pkg->edate) . ")",
           $money_char. sprintf("%10.2f", $cust_bill_pkg->recur)
         ];
         push @buf,
-          map { [ "  ". $_->[0]. ": ". $_->[1], '' ] }
-              $cust_bill_pkg->cust_pkg->h_labels( $cust_bill_pkg->edate,
-                                                  $cust_bill_pkg->sdate );
+          map { [ "  ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
       }
 
       push @buf, map { [ "  $_", '' ] } $cust_bill_pkg->details;
 
     } else { #pkgnum tax or one-shot line item
-
+      my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
+                     ? ( $cust_bill_pkg->itemdesc || 'Tax' )
+                     : 'Tax';
       if ( $cust_bill_pkg->setup != 0 ) {
-        push @buf, [ $desc,
+        push @buf, [ $itemdesc,
                      $money_char. sprintf("%10.2f", $cust_bill_pkg->setup) ];
       }
       if ( $cust_bill_pkg->recur != 0 ) {
-        push @buf, [ "$desc (". time2str("%x", $cust_bill_pkg->sdate). " - "
-                              . time2str("%x", $cust_bill_pkg->edate). ")",
+        push @buf, [ "$itemdesc (". time2str("%x", $cust_bill_pkg->sdate). " - "
+                                  . time2str("%x", $cust_bill_pkg->edate). ")",
                      $money_char. sprintf("%10.2f", $cust_bill_pkg->recur)
                    ];
       }
-
     }
-
   }
 
   push @buf,['','-----------'];
@@ -1530,10 +934,8 @@ sub print_text {
     if $cust_main->address2;
   $FS::cust_bill::_template::address[$l++] =
     $cust_main->city. ", ". $cust_main->state. "  ".  $cust_main->zip;
-
-  my $countrydefault = $conf->config('countrydefault') || 'US';
-  $FS::cust_bill::_template::address[$l++] = code2country($cust_main->country)
-    unless $cust_main->country eq $countrydefault;
+  $FS::cust_bill::_template::address[$l++] = $cust_main->country
+    unless $cust_main->country eq 'US';
 
 	#  #overdue? (variable for the template)
 	#  $FS::cust_bill::_template::overdue = ( 
@@ -1581,14 +983,13 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =cut
 
-#still some false laziness w/print_text and print_html (and send_csv) (mostly print_text should use _items stuff though)
+#still some false laziness w/print_text
 sub print_latex {
 
   my( $self, $today, $template ) = @_;
   $today ||= time;
-  warn "FS::cust_bill::print_latex called on $self with suffix $template\n"
-    if $DEBUG;
 
+#  my $invnum = $self->invnum;
   my $cust_main = $self->cust_main;
   $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
     unless $cust_main->payname && $cust_main->payby !~ /^(CHEK|DCHK)$/;
@@ -1598,45 +999,21 @@ sub print_latex {
   #my $balance_due = $self->owed + $pr_total - $cr_total;
   my $balance_due = $self->owed + $pr_total;
 
+  #my @collect = ();
+  #my($description,$amount);
+  @buf = ();
+
   #create the template
   $template ||= $self->_agent_template;
   my $templatefile = 'invoice_latex';
   my $suffix = length($template) ? "_$template" : '';
   $templatefile .= $suffix;
-  my @invoice_template = map "$_\n", $conf->config($templatefile)
+  my @invoice_template = $conf->config($templatefile)
     or die "cannot load config file $templatefile";
 
-  my($format, $text_template);
-  if ( grep { /^%%Detail/ } @invoice_template ) {
-    #change this to a die when the old code is removed
-    warn "old-style invoice template $templatefile; ".
-         "patch with conf/invoice_latex.diff or use new conf/invoice_latex*\n";
-    $format = 'old';
-  } else {
-    $format = 'Text::Template';
-    $text_template = new Text::Template(
-      TYPE => 'ARRAY',
-      SOURCE => \@invoice_template,
-      DELIMITERS => [ '[@--', '--@]' ],
-    );
-
-    $text_template->compile()
-      or die 'While compiling ' . $templatefile . ': ' . $Text::Template::ERROR;
-  }
-
-  my $returnaddress;
-  if ( length($conf->config_orbase('invoice_latexreturnaddress', $template)) ) {
-    $returnaddress = join("\n",
-      $conf->config_orbase('invoice_latexreturnaddress', $template)
-    );
-  } else {
-    $returnaddress = '~';
-  }
-
   my %invoice_data = (
     'invnum'       => $self->invnum,
     'date'         => time2str('%b %o, %Y', $self->_date),
-    'today'        => time2str('%b %o, %Y', $today),
     'agent'        => _latex_escape($cust_main->agent->agent),
     'payname'      => _latex_escape($cust_main->payname),
     'company'      => _latex_escape($cust_main->company),
@@ -1645,30 +1022,23 @@ sub print_latex {
     'city'         => _latex_escape($cust_main->city),
     'state'        => _latex_escape($cust_main->state),
     'zip'          => _latex_escape($cust_main->zip),
-    'footer'       => join("\n", $conf->config_orbase('invoice_latexfooter', $template) ),
-    'smallfooter'  => join("\n", $conf->config_orbase('invoice_latexsmallfooter', $template) ),
-    'returnaddress' => $returnaddress,
+    'country'      => _latex_escape($cust_main->country),
+    'footer'       => join("\n", $conf->config('invoice_latexfooter') ),
+    'smallfooter'  => join("\n", $conf->config('invoice_latexsmallfooter') ),
     'quantity'     => 1,
     'terms'        => $conf->config('invoice_default_terms') || 'Payable upon receipt',
     #'notes'        => join("\n", $conf->config('invoice_latexnotes') ),
-    'conf_dir'     => "$FS::UID::conf_dir/conf.$FS::UID::datasrc",
   );
 
   my $countrydefault = $conf->config('countrydefault') || 'US';
-  if ( $cust_main->country eq $countrydefault ) {
-    $invoice_data{'country'} = '';
-  } else {
-    $invoice_data{'country'} = _latex_escape(code2country($cust_main->country));
-  }
+  $invoice_data{'country'} = '' if $invoice_data{'country'} eq $countrydefault;
 
+  #do variable substitutions in notes
   $invoice_data{'notes'} =
     join("\n",
-#  #do variable substitutions in notes
-#      map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-        $conf->config_orbase('invoice_latexnotes', $template)
+      map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+        $conf->config_orbase('invoice_latexnotes', $suffix)
     );
-  warn "invoice notes: ". $invoice_data{'notes'}. "\n"
-    if $DEBUG;
 
   $invoice_data{'footer'} =~ s/\n+$//;
   $invoice_data{'smallfooter'} =~ s/\n+$//;
@@ -1679,200 +1049,110 @@ sub print_latex {
       ? _latex_escape("Purchase Order #". $cust_main->payinfo)
       : '~';
 
+  my @line_item = ();
+  my @total_item = ();
   my @filled_in = ();
-  if ( $format eq 'old' ) {
-  
-    my @line_item = ();
-    my @total_item = ();
-    while ( @invoice_template ) {
-      my $line = shift @invoice_template;
-  
-      if ( $line =~ /^%%Detail\s*$/ ) {
-  
-        while ( ( my $line_item_line = shift @invoice_template )
-                !~ /^%%EndDetail\s*$/                            ) {
-          push @line_item, $line_item_line;
-        }
-        foreach my $line_item ( $self->_items ) {
-        #foreach my $line_item ( $self->_items_pkg ) {
-          $invoice_data{'ref'} = $line_item->{'pkgnum'};
-          $invoice_data{'description'} =
-            _latex_escape($line_item->{'description'});
-          if ( exists $line_item->{'ext_description'} ) {
-            $invoice_data{'description'} .=
-              "\\tabularnewline\n~~".
-              join( "\\tabularnewline\n~~",
-                    map _latex_escape($_), @{$line_item->{'ext_description'}}
-                  );
-          }
-          $invoice_data{'amount'} = $line_item->{'amount'};
-          $invoice_data{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
-          push @filled_in,
-            map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b } @line_item;
-        }
-  
-      } elsif ( $line =~ /^%%TotalDetails\s*$/ ) {
-  
-        while ( ( my $total_item_line = shift @invoice_template )
-                !~ /^%%EndTotalDetails\s*$/                      ) {
-          push @total_item, $total_item_line;
-        }
-  
-        my @total_fill = ();
-  
-        my $taxtotal = 0;
-        foreach my $tax ( $self->_items_tax ) {
-          $invoice_data{'total_item'} = _latex_escape($tax->{'description'});
-          $taxtotal += $tax->{'amount'};
-          $invoice_data{'total_amount'} = '\dollar '. $tax->{'amount'};
-          push @total_fill,
-            map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-                @total_item;
-        }
+  while ( @invoice_template ) {
+    my $line = shift @invoice_template;
+
+    if ( $line =~ /^%%Detail\s*$/ ) {
 
-        if ( $taxtotal ) {
-          $invoice_data{'total_item'} = 'Sub-total';
-          $invoice_data{'total_amount'} =
-            '\dollar '. sprintf('%.2f', $self->charged - $taxtotal );
-          unshift @total_fill,
-            map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-                @total_item;
+      while ( ( my $line_item_line = shift @invoice_template )
+              !~ /^%%EndDetail\s*$/                            ) {
+        push @line_item, $line_item_line;
+      }
+      foreach my $line_item ( $self->_items ) {
+      #foreach my $line_item ( $self->_items_pkg ) {
+        $invoice_data{'ref'} = $line_item->{'pkgnum'};
+        $invoice_data{'description'} = _latex_escape($line_item->{'description'});
+        if ( exists $line_item->{'ext_description'} ) {
+          $invoice_data{'description'} .=
+            "\\tabularnewline\n~~".
+            join("\\tabularnewline\n~~", map { _latex_escape($_) } @{$line_item->{'ext_description'}} );
         }
-  
-        $invoice_data{'total_item'} = '\textbf{Total}';
-        $invoice_data{'total_amount'} =
-          '\textbf{\dollar '. sprintf('%.2f', $self->charged + $pr_total ). '}';
+        $invoice_data{'amount'} = $line_item->{'amount'};
+        $invoice_data{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
+        push @filled_in,
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b } @line_item;
+      }
+
+    } elsif ( $line =~ /^%%TotalDetails\s*$/ ) {
+
+      while ( ( my $total_item_line = shift @invoice_template )
+              !~ /^%%EndTotalDetails\s*$/                      ) {
+        push @total_item, $total_item_line;
+      }
+
+      my @total_fill = ();
+
+      my $taxtotal = 0;
+      foreach my $tax ( $self->_items_tax ) {
+        $invoice_data{'total_item'} = _latex_escape($tax->{'description'});
+        $taxtotal += ( $invoice_data{'total_amount'} = $tax->{'amount'} );
         push @total_fill,
           map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
               @total_item;
-  
-        #foreach my $thing ( sort { $a->_date <=> $b->_date } $self->_items_credits, $self->_items_payments
-  
-        # credits
-        foreach my $credit ( $self->_items_credits ) {
-          $invoice_data{'total_item'} = _latex_escape($credit->{'description'});
-          #$credittotal
-          $invoice_data{'total_amount'} = '-\dollar '. $credit->{'amount'};
-          push @total_fill, 
-            map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-                @total_item;
-        }
-  
-        # payments
-        foreach my $payment ( $self->_items_payments ) {
-          $invoice_data{'total_item'} = _latex_escape($payment->{'description'});
-          #$paymenttotal
-          $invoice_data{'total_amount'} = '-\dollar '. $payment->{'amount'};
-          push @total_fill, 
-            map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-                @total_item;
-        }
-  
-        $invoice_data{'total_item'} = '\textbf{'. $self->balance_due_msg. '}';
+      }
+
+      if ( $taxtotal ) {
+        $invoice_data{'total_item'} = 'Sub-total';
         $invoice_data{'total_amount'} =
-          '\textbf{\dollar '. sprintf('%.2f', $self->owed + $pr_total ). '}';
-        push @total_fill,
+          '\dollar '. sprintf('%.2f', $self->charged - $taxtotal );
+        unshift @total_fill,
           map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
               @total_item;
-  
-        push @filled_in, @total_fill;
-  
-      } else {
-        #$line =~ s/\$(\w+)/$invoice_data{$1}/eg;
-        $line =~ s/\$(\w+)/exists($invoice_data{$1}) ? $invoice_data{$1} : nounder($1)/eg;
-        push @filled_in, $line;
       }
-  
-    }
 
-    sub nounder {
-      my $var = $1;
-      $var =~ s/_/\-/g;
-      $var;
-    }
+      $invoice_data{'total_item'} = '\textbf{Total}';
+      $invoice_data{'total_amount'} =
+        '\textbf{\dollar '. sprintf('%.2f', $self->charged + $pr_total ). '}';
+      push @total_fill,
+        map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+            @total_item;
+
+      #foreach my $thing ( sort { $a->_date <=> $b->_date } $self->_items_credits, $self->_items_payments
+
+      # credits
+      foreach my $credit ( $self->_items_credits ) {
+        $invoice_data{'total_item'} = _latex_escape($credit->{'description'});
+        #$credittotal
+        $invoice_data{'total_amount'} = '-\dollar '. $credit->{'amount'};
+        push @total_fill, 
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+              @total_item;
+      }
 
-  } elsif ( $format eq 'Text::Template' ) {
-
-    my @detail_items = ();
-    my @total_items = ();
-
-    $invoice_data{'detail_items'} = \@detail_items;
-    $invoice_data{'total_items'} = \@total_items;
-  
-    foreach my $line_item ( $self->_items ) {
-      my $detail = {
-        ext_description => [],
-      };
-      $detail->{'ref'} = $line_item->{'pkgnum'};
-      $detail->{'quantity'} = 1;
-      $detail->{'description'} = _latex_escape($line_item->{'description'});
-      if ( exists $line_item->{'ext_description'} ) {
-        @{$detail->{'ext_description'}} = map {
-          _latex_escape($_);
-        } @{$line_item->{'ext_description'}};
+      # payments
+      foreach my $payment ( $self->_items_payments ) {
+        $invoice_data{'total_item'} = _latex_escape($payment->{'description'});
+        #$paymenttotal
+        $invoice_data{'total_amount'} = '-\dollar '. $payment->{'amount'};
+        push @total_fill, 
+          map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+              @total_item;
       }
-      $detail->{'amount'} = $line_item->{'amount'};
-      $detail->{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
-  
-      push @detail_items, $detail;
-    }
-  
-  
-    my $taxtotal = 0;
-    foreach my $tax ( $self->_items_tax ) {
-      my $total = {};
-      $total->{'total_item'} = _latex_escape($tax->{'description'});
-      $taxtotal += $tax->{'amount'};
-      $total->{'total_amount'} = '\dollar '. $tax->{'amount'};
-      push @total_items, $total;
-    }
-  
-    if ( $taxtotal ) {
-      my $total = {};
-      $total->{'total_item'} = 'Sub-total';
-      $total->{'total_amount'} =
-        '\dollar '. sprintf('%.2f', $self->charged - $taxtotal );
-      unshift @total_items, $total;
-    }
-  
-    {
-      my $total = {};
-      $total->{'total_item'} = '\textbf{Total}';
-      $total->{'total_amount'} =
-        '\textbf{\dollar '. sprintf('%.2f', $self->charged + $pr_total ). '}';
-      push @total_items, $total;
-    }
-  
-    #foreach my $thing ( sort { $a->_date <=> $b->_date } $self->_items_credits, $self->_items_payments
-  
-    # credits
-    foreach my $credit ( $self->_items_credits ) {
-      my $total;
-      $total->{'total_item'} = _latex_escape($credit->{'description'});
-      #$credittotal
-      $total->{'total_amount'} = '-\dollar '. $credit->{'amount'};
-      push @total_items, $total;
-    }
-  
-    # payments
-    foreach my $payment ( $self->_items_payments ) {
-      my $total = {};
-      $total->{'total_item'} = _latex_escape($payment->{'description'});
-      #$paymenttotal
-      $total->{'total_amount'} = '-\dollar '. $payment->{'amount'};
-      push @total_items, $total;
-    }
-  
-    { 
-      my $total;
-      $total->{'total_item'} = '\textbf{'. $self->balance_due_msg. '}';
-      $total->{'total_amount'} =
+
+      $invoice_data{'total_item'} = '\textbf{'. $self->balance_due_msg. '}';
+      $invoice_data{'total_amount'} =
         '\textbf{\dollar '. sprintf('%.2f', $self->owed + $pr_total ). '}';
-      push @total_items, $total;
+      push @total_fill,
+        map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
+            @total_item;
+
+      push @filled_in, @total_fill;
+
+    } else {
+      #$line =~ s/\$(\w+)/$invoice_data{$1}/eg;
+      $line =~ s/\$(\w+)/exists($invoice_data{$1}) ? $invoice_data{$1} : nounder($1)/eg;
+      push @filled_in, $line;
     }
 
-  } else {
-    die "guru meditation #54";
+  }
+
+  sub nounder {
+    my $var = $1;
+    $var =~ s/_/\-/g;
+    $var;
   }
 
   my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
@@ -1881,13 +1161,7 @@ sub print_latex {
                            SUFFIX   => '.tex',
                            UNLINK   => 0,
                          ) or die "can't open temp file: $!\n";
-  if ( $format eq 'old' ) {
-    print $fh join('', @filled_in );
-  } elsif ( $format eq 'Text::Template' ) {
-    $text_template->fill_in(OUTPUT => $fh, HASH => \%invoice_data);
-  } else {
-    die "guru meditation #32";
-  }
+  print $fh join("\n", @filled_in ), "\n";
   close $fh;
 
   $fh->filename =~ /^(.*).tex$/ or die "unparsable filename: ". $fh->filename;
@@ -1917,12 +1191,12 @@ sub print_ps {
   my $sfile = shell_quote $file;
 
   system("pslatex $sfile.tex >/dev/null 2>&1") == 0
-    or die "pslatex $file.tex failed; see $file.log for details?\n";
+    or die "pslatex $file.tex failed: $!";
   system("pslatex $sfile.tex >/dev/null 2>&1") == 0
-    or die "pslatex $file.tex failed; see $file.log for details?\n";
+    or die "pslatex $file.tex failed: $!";
 
   system('dvips', '-q', '-t', 'letter', "$file.dvi", '-o', "$file.ps" ) == 0
-    or die "dvips failed";
+    or die "dvips failed: $!";
 
   open(POSTSCRIPT, "<$file.ps")
     or die "can't open $file.ps: $! (error in LaTeX template?)\n";
@@ -1966,9 +1240,9 @@ sub print_pdf {
   my $sfile = shell_quote $file;
 
   system("pslatex $sfile.tex >/dev/null 2>&1") == 0
-    or die "pslatex $file.tex failed; see $file.log for details?\n";
+    or die "pslatex $file.tex failed: $!";
   system("pslatex $sfile.tex >/dev/null 2>&1") == 0
-    or die "pslatex $file.tex failed; see $file.log for details?\n";
+    or die "pslatex $file.tex failed: $!";
 
   #system('dvipdf', "$file.dvi", "$file.pdf" );
   system(
@@ -1994,215 +1268,6 @@ sub print_pdf {
 
 }
 
-=item print_html [ TIME [ , TEMPLATE [ , CID ] ] ]
-
-Returns an HTML invoice, as a scalar.
-
-TIME an optional value used to control the printing of overdue messages.  The
-default is now.  It isn't the date of the invoice; that's the `_date' field.
-It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
-L<Time::Local> and L<Date::Parse> for conversion functions.
-
-CID is a MIME Content-ID used to create a "cid:" URL for the logo image, used
-when emailing the invoice as part of a multipart/related MIME email.
-
-=cut
-
-#some falze laziness w/print_text and print_latex (and send_csv)
-sub print_html {
-  my( $self, $today, $template, $cid ) = @_;
-  $today ||= time;
-
-  my $cust_main = $self->cust_main;
-  $cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
-    unless $cust_main->payname && $cust_main->payby !~ /^(CHEK|DCHK)$/;
-
-  $template ||= $self->_agent_template;
-  my $templatefile = 'invoice_html';
-  my $suffix = length($template) ? "_$template" : '';
-  $templatefile .= $suffix;
-  my @html_template = map "$_\n", $conf->config($templatefile)
-    or die "cannot load config file $templatefile";
-
-  my $html_template = new Text::Template(
-    TYPE   => 'ARRAY',
-    SOURCE => \@html_template,
-    DELIMITERS => [ '<%=', '%>' ],
-  );
-
-  $html_template->compile()
-    or die 'While compiling ' . $templatefile . ': ' . $Text::Template::ERROR;
-
-  my %invoice_data = (
-    'invnum'       => $self->invnum,
-    'date'         => time2str('%b&nbsp;%o,&nbsp;%Y', $self->_date),
-    'today'        => time2str('%b %o, %Y', $today),
-    'agent'        => encode_entities($cust_main->agent->agent),
-    'payname'      => encode_entities($cust_main->payname),
-    'company'      => encode_entities($cust_main->company),
-    'address1'     => encode_entities($cust_main->address1),
-    'address2'     => encode_entities($cust_main->address2),
-    'city'         => encode_entities($cust_main->city),
-    'state'        => encode_entities($cust_main->state),
-    'zip'          => encode_entities($cust_main->zip),
-    'terms'        => $conf->config('invoice_default_terms')
-                      || 'Payable upon receipt',
-    'cid'          => $cid,
-    'template'     => $template,
-#    'conf_dir'     => "$FS::UID::conf_dir/conf.$FS::UID::datasrc",
-  );
-
-  if (
-         defined( $conf->config_orbase('invoice_htmlreturnaddress', $template) )
-      && length(  $conf->config_orbase('invoice_htmlreturnaddress', $template) )
-  ) {
-    $invoice_data{'returnaddress'} =
-      join("\n", $conf->config('invoice_htmlreturnaddress', $template) );
-  } else {
-    $invoice_data{'returnaddress'} =
-      join("\n", map { 
-                       s/~/&nbsp;/g;
-                       s/\\\\\*?\s*$/<BR>/;
-                       s/\\hyphenation\{[\w\s\-]+\}//;
-                       $_;
-                     }
-                     $conf->config_orbase( 'invoice_latexreturnaddress',
-                                           $template
-                                         )
-          );
-  }
-
-  my $countrydefault = $conf->config('countrydefault') || 'US';
-  if ( $cust_main->country eq $countrydefault ) {
-    $invoice_data{'country'} = '';
-  } else {
-    $invoice_data{'country'} =
-      encode_entities(code2country($cust_main->country));
-  }
-
-  if (
-         defined( $conf->config_orbase('invoice_htmlnotes', $template) )
-      && length(  $conf->config_orbase('invoice_htmlnotes', $template) )
-  ) {
-    $invoice_data{'notes'} =
-      join("\n", $conf->config_orbase('invoice_htmlnotes', $template) );
-  } else {
-    $invoice_data{'notes'} = 
-      join("\n", map { 
-                       s/%%(.*)$/<!-- $1 -->/;
-                       s/\\section\*\{\\textsc\{(.)(.*)\}\}/<p><b><font size="+1">$1<\/font>\U$2<\/b>/;
-                       s/\\begin\{enumerate\}/<ol>/;
-                       s/\\item /  <li>/;
-                       s/\\end\{enumerate\}/<\/ol>/;
-                       s/\\textbf\{(.*)\}/<b>$1<\/b>/;
-                       $_;
-                     } 
-                     $conf->config_orbase('invoice_latexnotes', $template)
-          );
-  }
-
-#  #do variable substitutions in notes
-#  $invoice_data{'notes'} =
-#    join("\n",
-#      map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-#        $conf->config_orbase('invoice_latexnotes', $suffix)
-#    );
-
-  if (
-         defined( $conf->config_orbase('invoice_htmlfooter', $template) )
-      && length(  $conf->config_orbase('invoice_htmlfooter', $template) )
-  ) {
-   $invoice_data{'footer'} =
-     join("\n", $conf->config_orbase('invoice_htmlfooter', $template) );
-  } else {
-   $invoice_data{'footer'} =
-       join("\n", map { s/~/&nbsp;/g; s/\\\\\*?\s*$/<BR>/; $_; }
-                      $conf->config_orbase('invoice_latexfooter', $template)
-           );
-  }
-
-  $invoice_data{'po_line'} =
-    (  $cust_main->payby eq 'BILL' && $cust_main->payinfo )
-      ? encode_entities("Purchase Order #". $cust_main->payinfo)
-      : '';
-
-  my $money_char = $conf->config('money_char') || '$';
-
-  foreach my $line_item ( $self->_items ) {
-    my $detail = {
-      ext_description => [],
-    };
-    $detail->{'ref'} = $line_item->{'pkgnum'};
-    $detail->{'description'} = encode_entities($line_item->{'description'});
-    if ( exists $line_item->{'ext_description'} ) {
-      @{$detail->{'ext_description'}} = map {
-        encode_entities($_);
-      } @{$line_item->{'ext_description'}};
-    }
-    $detail->{'amount'} = $money_char. $line_item->{'amount'};
-    $detail->{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
-
-    push @{$invoice_data{'detail_items'}}, $detail;
-  }
-
-
-  my $taxtotal = 0;
-  foreach my $tax ( $self->_items_tax ) {
-    my $total = {};
-    $total->{'total_item'} = encode_entities($tax->{'description'});
-    $taxtotal += $tax->{'amount'};
-    $total->{'total_amount'} = $money_char. $tax->{'amount'};
-    push @{$invoice_data{'total_items'}}, $total;
-  }
-
-  if ( $taxtotal ) {
-    my $total = {};
-    $total->{'total_item'} = 'Sub-total';
-    $total->{'total_amount'} =
-      $money_char. sprintf('%.2f', $self->charged - $taxtotal );
-    unshift @{$invoice_data{'total_items'}}, $total;
-  }
-
-  my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
-  {
-    my $total = {};
-    $total->{'total_item'} = '<b>Total</b>';
-    $total->{'total_amount'} =
-      "<b>$money_char".  sprintf('%.2f', $self->charged + $pr_total ). '</b>';
-    push @{$invoice_data{'total_items'}}, $total;
-  }
-
-  #foreach my $thing ( sort { $a->_date <=> $b->_date } $self->_items_credits, $self->_items_payments
-
-  # credits
-  foreach my $credit ( $self->_items_credits ) {
-    my $total;
-    $total->{'total_item'} = encode_entities($credit->{'description'});
-    #$credittotal
-    $total->{'total_amount'} = "-$money_char". $credit->{'amount'};
-    push @{$invoice_data{'total_items'}}, $total;
-  }
-
-  # payments
-  foreach my $payment ( $self->_items_payments ) {
-    my $total = {};
-    $total->{'total_item'} = encode_entities($payment->{'description'});
-    #$paymenttotal
-    $total->{'total_amount'} = "-$money_char". $payment->{'amount'};
-    push @{$invoice_data{'total_items'}}, $total;
-  }
-
-  { 
-    my $total;
-    $total->{'total_item'} = '<b>'. $self->balance_due_msg. '</b>';
-    $total->{'total_amount'} =
-      "<b>$money_char".  sprintf('%.2f', $self->owed + $pr_total ). '</b>';
-    push @{$invoice_data{'total_items'}}, $total;
-  }
-
-  $html_template->fill_in( HASH => \%invoice_data);
-}
-
 # quick subroutine for print_latex
 #
 # There are ten characters that LaTeX treats as special characters, which
@@ -2215,7 +1280,6 @@ sub print_html {
 sub _latex_escape {
   my $value = shift;
   $value =~ s/([#\$%&~_\^{}])( )?/"\\$1". ( ( defined($2) && length($2) ) ? "\\$2" : '' )/ge;
-  $value =~ s/([<>])/\$$1\$/g;
   $value;
 }
 
@@ -2258,7 +1322,7 @@ sub _items_previous {
                        ' ('. time2str('%x',$_->_date). ')',
       #'pkgpart'     => 'N/A',
       'pkgnum'      => 'N/A',
-      'amount'      => sprintf("%.2f", $_->owed),
+      'amount'      => sprintf("%10.2f", $_->owed),
     };
   }
   @b;
@@ -2296,54 +1360,71 @@ sub _items_cust_bill_pkg {
   my @b = ();
   foreach my $cust_bill_pkg ( @$cust_bill_pkg ) {
 
-    my $desc = $cust_bill_pkg->desc;
-
-    if ( $cust_bill_pkg->pkgnum > 0 ) {
+    if ( $cust_bill_pkg->pkgnum ) {
+
+      my $cust_pkg = qsearchs('cust_pkg', { pkgnum =>$cust_bill_pkg->pkgnum } );
+      my $part_pkg = qsearchs('part_pkg', { pkgpart=>$cust_pkg->pkgpart } );
+      my $pkg = $part_pkg->pkg;
+
+      my %labels;
+      #tie %labels, 'Tie::IxHash';
+      push @{ $labels{$_->[0]} }, $_->[1] foreach $cust_pkg->labels;
+      my @ext_description;
+      foreach my $label ( keys %labels ) {
+        my @values = @{ $labels{$label} };
+        my $num = scalar(@values);
+        if ( $num > 5 ) {
+          push @ext_description, "$label ($num)";
+        } else {
+          push @ext_description, map { "$label: $_" } @values;
+        }
+      }
 
       if ( $cust_bill_pkg->setup != 0 ) {
-        my $description = $desc;
+        my $description = $pkg;
         $description .= ' Setup' if $cust_bill_pkg->recur != 0;
-        my @d = $cust_bill_pkg->cust_pkg->h_labels_short($self->_date);
+        my @d = @ext_description;
         push @d, $cust_bill_pkg->details if $cust_bill_pkg->recur == 0;
         push @b, {
-          description     => $description,
-          #pkgpart         => $part_pkg->pkgpart,
-          pkgnum          => $cust_bill_pkg->pkgnum,
-          amount          => sprintf("%.2f", $cust_bill_pkg->setup),
-          ext_description => \@d,
+          'description'     => $description,
+          #'pkgpart'         => $part_pkg->pkgpart,
+          'pkgnum'          => $cust_pkg->pkgnum,
+          'amount'          => sprintf("%10.2f", $cust_bill_pkg->setup),
+          'ext_description' => \@d,
         };
       }
 
       if ( $cust_bill_pkg->recur != 0 ) {
         push @b, {
-          description     => "$desc (" .
+          'description'     => "$pkg (" .
                                time2str('%x', $cust_bill_pkg->sdate). ' - '.
                                time2str('%x', $cust_bill_pkg->edate). ')',
-          #pkgpart         => $part_pkg->pkgpart,
-          pkgnum          => $cust_bill_pkg->pkgnum,
-          amount          => sprintf("%.2f", $cust_bill_pkg->recur),
-          ext_description =>
-            [ $cust_bill_pkg->cust_pkg->h_labels_short( $cust_bill_pkg->edate,
-                                                        $cust_bill_pkg->sdate),
-              $cust_bill_pkg->details,
-            ],
+          #'pkgpart'         => $part_pkg->pkgpart,
+          'pkgnum'          => $cust_pkg->pkgnum,
+          'amount'          => sprintf("%10.2f", $cust_bill_pkg->recur),
+          'ext_description' => [ @ext_description,
+                                 $cust_bill_pkg->details,
+                               ],
         };
       }
 
     } else { #pkgnum tax or one-shot line item (??)
 
+      my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
+                     ? ( $cust_bill_pkg->itemdesc || 'Tax' )
+                     : 'Tax';
       if ( $cust_bill_pkg->setup != 0 ) {
         push @b, {
-          'description' => $desc,
-          'amount'      => sprintf("%.2f", $cust_bill_pkg->setup),
+          'description' => $itemdesc,
+          'amount'      => sprintf("%10.2f", $cust_bill_pkg->setup),
         };
       }
       if ( $cust_bill_pkg->recur != 0 ) {
         push @b, {
-          'description' => "$desc (".
+          'description' => "$itemdesc (".
                            time2str("%x", $cust_bill_pkg->sdate). ' - '.
                            time2str("%x", $cust_bill_pkg->edate). ')',
-          'amount'      => sprintf("%.2f", $cust_bill_pkg->recur),
+          'amount'      => sprintf("%10.2f", $cust_bill_pkg->recur),
         };
       }
 
@@ -2374,7 +1455,7 @@ sub _items_credits {
       #                 $reason,
       'description' => 'Credit applied '.
                        time2str("%x",$_->cust_credit->_date). $reason,
-      'amount'      => sprintf("%.2f",$_->amount),
+      'amount'      => sprintf("%10.2f",$_->amount),
     };
   }
   #foreach ( @cr_cust_credit ) {
@@ -2400,7 +1481,7 @@ sub _items_payments {
     push @b, {
       'description' => "Payment received ".
                        time2str("%x",$_->cust_pay->_date ),
-      'amount'      => sprintf("%.2f", $_->amount )
+      'amount'      => sprintf("%10.2f", $_->amount )
     };
   }
 
@@ -2408,123 +1489,6 @@ sub _items_payments {
 
 }
 
-
-=back
-
-=head1 SUBROUTINES
-
-=over 4
-
-=item reprint
-
-=cut
-
-sub process_reprint {
-  process_re_X('print', @_);
-}
-
-=item reemail
-
-=cut
-
-sub process_reemail {
-  process_re_X('email', @_);
-}
-
-=item refax
-
-=cut
-
-sub process_refax {
-  process_re_X('fax', @_);
-}
-
-use Storable qw(thaw);
-use Data::Dumper;
-use MIME::Base64;
-sub process_re_X {
-  my( $method, $job ) = ( shift, shift );
-
-  my $param = thaw(decode_base64(shift));
-  warn Dumper($param) if $DEBUG;
-
-  re_X(
-    $method,
-    $job,
-    %$param,
-  );
-
-}
-
-sub re_X {
-  my($method, $job, %param ) = @_;
-#              [ 'begin', 'end', 'agentnum', 'open', 'days', 'newest_percust' ],
-
-  #some false laziness w/search/cust_bill.html
-  my $distinct = '';
-  my $orderby = 'ORDER BY cust_bill._date';
-
-  my @where;
-
-  if ( $param{'begin'} =~ /^(\d+)$/ ) {
-    push @where, "cust_bill._date >= $1";
-  }
-  if ( $param{'end'} =~ /^(\d+)$/ ) {
-    push @where, "cust_bill._date < $1";
-  }
-  if ( $param{'agentnum'} =~ /^(\d+)$/ ) {
-    push @where, "cust_main.agentnum = $1";
-  }
-
-  my $owed =
-    "charged - ( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay
-                 WHERE cust_bill_pay.invnum = cust_bill.invnum )
-             - ( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill
-                 WHERE cust_credit_bill.invnum = cust_bill.invnum )";
-
-  push @where, "0 != $owed"
-    if $param{'open'};
-
-  push @where, "cust_bill._date < ". (time-86400*$param{'days'})
-    if $param{'days'};
-
-  my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
-
-  my $addl_from = 'left join cust_main using ( custnum )';
-
-  if ( $param{'newest_percust'} ) {
-    $distinct = 'DISTINCT ON ( cust_bill.custnum )';
-    $orderby = 'ORDER BY cust_bill.custnum ASC, cust_bill._date DESC';
-    #$count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'";
-  }
-     
-  my @cust_bill = qsearch( 'cust_bill',
-                           {},
-                           "$distinct cust_bill.*",
-                           $extra_sql,
-                           '',
-                           $addl_from
-                         );
-
-  my( $num, $last, $min_sec ) = (0, time, 5); #progresbar foo
-  foreach my $cust_bill ( @cust_bill ) {
-    $cust_bill->$method();
-
-    if ( $job ) { #progressbar foo
-      $num++;
-      if ( time - $min_sec > $last ) {
-        my $error = $job->update_statustext(
-          int( 100 * $num / scalar(@cust_bill) )
-        );
-        die $error if $error;
-        $last = time;
-      }
-    }
-
-  }
-
-}
-
 =back
 
 =head1 BUGS
diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index 128e5a5..ddd6762 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -1,15 +1,12 @@
 package FS::cust_bill_event;
 
 use strict;
-use vars qw( @ISA $DEBUG );
+use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs );
-use FS::cust_main_Mixin;
 use FS::cust_bill;
 use FS::part_bill_event;
 
-@ISA = qw(FS::cust_main_Mixin FS::Record);
-
-$DEBUG = 0;
+@ISA = qw(FS::Record);
 
 =head1 NAME
 
@@ -71,13 +68,6 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'cust_bill_event'; }
 
-sub cust_linked { $_[0]->cust_main_custnum; } 
-sub cust_unlinked_msg {
-  my $self = shift;
-  "WARNING: can't find cust_main.custnum ". $self->custnum.
-  ' (cust_bill.invnum '. $self->invnum. ')';
-}
-
 =item insert
 
 Adds this record to the database.  If there is an error, returns the error,
@@ -175,98 +165,6 @@ sub retry {
 
 =back
 
-=head1 SUBROUTINES
-
-=over 4
-
-=item reprint
-
-=cut
-
-sub process_reprint {
-  process_re_X('print', @_);
-}
-
-=item reemail
-
-=cut
-
-sub process_reemail {
-  process_re_X('email', @_);
-}
-
-=item refax
-
-=cut
-
-sub process_refax {
-  process_re_X('fax', @_);
-}
-
-use Storable qw(thaw);
-use Data::Dumper;
-use MIME::Base64;
-sub process_re_X {
-  my( $method, $job ) = ( shift, shift );
-
-  my $param = thaw(decode_base64(shift));
-  warn Dumper($param) if $DEBUG;
-
-  re_X(
-    $method,
-    $param->{'beginning'},
-    $param->{'ending'},
-    $param->{'failed'},
-    $job,
-  );
-
-}
-
-sub re_X {
-  my($method, $beginning, $ending, $failed, $job) = @_;
-
-  my $where = " WHERE plan LIKE 'send%'".
-              "   AND cust_bill_event._date >= $beginning".
-              "   AND cust_bill_event._date <= $ending";
-  $where .= " AND statustext != '' AND statustext IS NOT NULL"
-    if $failed;
-
-  my $from = 'LEFT JOIN part_bill_event USING ( eventpart )';
-
-  my @cust_bill_event = qsearch( 'cust_bill_event', {}, '', $where, '', $from );
-
-  my( $num, $last, $min_sec ) = (0, time, 5); #progresbar foo
-  foreach my $cust_bill_event ( @cust_bill_event ) {
-
-    $cust_bill_event->cust_bill->$method(
-      $cust_bill_event->part_bill_event->templatename
-    );
-
-    if ( $job ) { #progressbar foo
-      $num++;
-      if ( time - $min_sec > $last ) {
-        my $error = $job->update_statustext(
-          int( 100 * $num / scalar(@cust_bill_event) )
-        );
-        die $error if $error;
-        $last = time;
-      }
-    }
-
-  }
-
-  #this doesn't work, but it would be nice
-  #if ( $job ) { #progressbar foo
-  #  my $error = $job->update_statustext(
-  #    scalar(@cust_bill_event). " invoices re-${method}ed"
-  #  );
-  #  die $error if $error;
-  #}
-
-}
-
-=back
-
 =head1 BUGS
 
 Far too early in the morning.
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index d718b05..6800707 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -3,12 +3,11 @@ package FS::cust_bill_pkg;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs dbdef dbh );
-use FS::cust_main_Mixin;
 use FS::cust_pkg;
 use FS::cust_bill;
 use FS::cust_bill_pkg_detail;
 
-@ISA = qw( FS::cust_main_Mixin FS::Record );
+@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -37,11 +36,9 @@ supported:
 
 =over 4
 
-=item billpkgnum - primary key
-
 =item invnum - invoice (see L<FS::cust_bill>)
 
-=item pkgnum - package (see L<FS::cust_pkg>) or 0 for the special virtual sales tax package, or -1 for the virtual line item (itemdesc is used for the line)
+=item pkgnum - package (see L<FS::cust_pkg>) or 0 for the special virtual sales tax package
 
 =item setup - setup fee
 
@@ -51,7 +48,7 @@ supported:
 
 =item edate - ending date of recurring fee
 
-=item itemdesc - Line item description (currentlty used only when pkgnum is 0 or -1)
+=item itemdesc - Line item description (currentlty used only when pkgnum is 0)
 
 =back
 
@@ -156,8 +153,7 @@ sub check {
   my $self = shift;
 
   my $error =
-         $self->ut_numbern('billpkgnum')
-      || $self->ut_snumber('pkgnum')
+    $self->ut_number('pkgnum')
       || $self->ut_number('invnum')
       || $self->ut_money('setup')
       || $self->ut_money('recur')
@@ -167,8 +163,7 @@ sub check {
   ;
   return $error if $error;
 
-  #if ( $self->pkgnum != 0 ) { #allow unchecked pkgnum 0 for tax! (add to part_pkg?)
-  if ( $self->pkgnum > 0 ) { #allow -1 for non-pkg line items and 0 for tax (add to part_pkg?)
+  if ( $self->pkgnum != 0 ) { #allow unchecked pkgnum 0 for tax! (add to part_pkg?)
     return "Unknown pkgnum ". $self->pkgnum
       unless qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
   }
@@ -205,33 +200,6 @@ sub details {
     #qsearch ( 'cust_bill_pkg_detail', { 'lineitemnum' => $self->lineitemnum });
 }
 
-=item desc
-
-Returns a description for this line item.  For typical line items, this is the
-I<pkg> field of the corresponding B<FS::part_pkg> object (see L<FS::part_pkg>).
-For one-shot line items and named taxes, it is the I<itemdesc> field of this
-line item, and for generic taxes, simply returns "Tax".
-
-=cut
-
-sub desc {
-  my $self = shift;
-
-  if ( $self->pkgnum > 0 ) {
-    $self->cust_pkg->part_pkg->pkg;
-  } else {
-    $self->itemdesc || 'Tax';
-  }
-}
-
-=back
-
-=head1 CLASS METHODS
-
-=over 4
-
-=item  
-
 =back
 
 =head1 BUGS
diff --git a/FS/FS/cust_bill_pkg_detail.pm b/FS/FS/cust_bill_pkg_detail.pm
index 4156816..261aa80 100644
--- a/FS/FS/cust_bill_pkg_detail.pm
+++ b/FS/FS/cust_bill_pkg_detail.pm
@@ -103,7 +103,7 @@ sub check {
 
   $self->ut_numbern('detailnum')
     || $self->ut_foreign_key('pkgnum', 'cust_pkg', 'pkgnum')
-    || $self->ut_foreign_key('invnum', 'cust_bill', 'invnum')
+    || $self->ut_foreign_key('invnum', 'cust_pkg', 'invnum')
     || $self->ut_text('detail')
     || $self->SUPER::check
     ;
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 9cc92d2..026b92e 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -4,14 +4,13 @@ use strict;
 use vars qw( @ISA $conf $unsuspendauto );
 use Date::Format;
 use FS::UID qw( dbh getotaker );
-use FS::Misc qw(send_email);
 use FS::Record qw( qsearch qsearchs );
-use FS::cust_main_Mixin;
+use FS::Misc qw(send_email);
 use FS::cust_main;
 use FS::cust_refund;
 use FS::cust_credit_bill;
 
-@ISA = qw( FS::cust_main_Mixin FS::Record );
+@ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
 $FS::UID::callback{'FS::cust_credit'} = sub { 
@@ -76,12 +75,6 @@ Creates a new credit.  To add the credit to the database, see L<"insert">.
 =cut
 
 sub table { 'cust_credit'; }
-sub cust_linked { $_[0]->cust_main_custnum; } 
-sub cust_unlinked_msg {
-  my $self = shift;
-  "WARNING: can't find cust_main.custnum ". $self->custnum.
-  ' (cust_credit.crednum '. $self->crednum. ')';
-}
 
 =item insert
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a265e41..c42d222 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1,8 +1,7 @@
 package FS::cust_main;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK $DEBUG $me $conf @encrypted_fields
-             $import $skip_fuzzyfiles $ignore_expired_card );
+use vars qw( @ISA @EXPORT_OK $conf $DEBUG $import );
 use vars qw( $realtime_bop_decline_quiet ); #ugh
 use Safe;
 use Carp;
@@ -14,17 +13,14 @@ BEGIN {
   #eval "use Time::Local qw(timelocal timelocal_nocheck);";
   eval "use Time::Local qw(timelocal_nocheck);";
 }
-use Digest::MD5 qw(md5_base64);
 use Date::Format;
 #use Date::Manip;
 use String::Approx qw(amatch);
-use Business::CreditCard 0.28;
+use Business::CreditCard;
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearchs qsearch dbdef );
 use FS::Misc qw( send_email );
-use FS::Msgcat qw(gettext);
 use FS::cust_pkg;
-use FS::cust_svc;
 use FS::cust_bill;
 use FS::cust_bill_pkg;
 use FS::cust_pay;
@@ -44,9 +40,7 @@ use FS::part_bill_event;
 use FS::cust_bill_event;
 use FS::cust_tax_exempt;
 use FS::type_pkgs;
-use FS::payment_gateway;
-use FS::agent_payment_gateway;
-use FS::banned_pay;
+use FS::Msgcat qw(gettext);
 
 @ISA = qw( FS::Record );
 
@@ -54,17 +48,10 @@ use FS::banned_pay;
 
 $realtime_bop_decline_quiet = 0;
 
-# 1 is mostly method/subroutine entry and options
-# 2 traces progress of some operations
-# 3 is even more information including possibly sensitive data
 $DEBUG = 0;
-$me = '[FS::cust_main]';
+#$DEBUG = 1;
 
 $import = 0;
-$skip_fuzzyfiles = 0;
-$ignore_expired_card = 0;
-
-@encrypted_fields = ('payinfo', 'paycvv');
 
 #ask FS::UID to run this stuff for us later
 #$FS::UID::callback{'FS::cust_main'} = sub { 
@@ -188,94 +175,16 @@ FS::Record.  The following fields are currently supported:
 
 =item ship_fax - phone (optional)
 
-=item payby 
-
-I<CARD> (credit card - automatic), I<DCRD> (credit card - on-demand), I<CHEK> (electronic check - automatic), I<DCHK> (electronic check - on-demand), I<LECB> (Phone bill billing), I<BILL> (billing), I<COMP> (free), or I<PREPAY> (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to I<BILL>)
-
-=item payinfo 
-
-Card Number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L<FS::prepay_credit>)
-
-=cut 
-
-sub payinfo {
-  my($self,$payinfo) = @_;
-  if ( defined($payinfo) ) {
-    $self->paymask($payinfo);
-    $self->setfield('payinfo', $payinfo); # This is okay since we are the 'setter'
-  } else {
-    $payinfo = $self->getfield('payinfo'); # This is okay since we are the 'getter'
-    return $payinfo;
-  }
-}
-
-
-=item paycvv
- 
-Card Verification Value, "CVV2" (also known as CVC2 or CID), the 3 or 4 digit number on the back (or front, for American Express) of the credit card
-
-=cut
-
-=item paymask - Masked payment type
-
-=over 4 
-
-=item Credit Cards
-
-Mask all but the last four characters.
-
-=item Checks
-
-Mask all but last 2 of account number and bank routing number.
-
-=item Others
-
-Do nothing, return the unmasked string.
-
-=back
-
-=cut 
+=item payby - I<CARD> (credit card - automatic), I<DCRD> (credit card - on-demand), I<CHEK> (electronic check - automatic), I<DCHK> (electronic check - on-demand), I<LECB> (Phone bill billing), I<BILL> (billing), I<COMP> (free), or I<PREPAY> (special billing type: applies a credit - see L<FS::prepay_credit> and sets billing type to I<BILL>)
 
-sub paymask {
-  my($self,$value)=@_;
-
-  # If it doesn't exist then generate it
-  my $paymask=$self->getfield('paymask');
-  if (!defined($value) && (!defined($paymask) || $paymask eq '')) {
-    $value = $self->payinfo;
-  }
+=item payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L<FS::prepay_credit>)
 
-  if ( defined($value) && !$self->is_encrypted($value)) {
-    my $payinfo = $value;
-    my $payby = $self->payby;
-    if ($payby eq 'CARD' || $payby eq 'DCRD') { # Credit Cards (Show last four)
-      $paymask = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
-    } elsif ($payby eq 'CHEK' ||
-             $payby eq 'DCHK' ) { # Checks (Show last 2 @ bank)
-      my( $account, $aba ) = split('@', $payinfo );
-      $paymask = 'x'x(length($account)-2). substr($account,(length($account)-2))."@".$aba;
-    } else { # Tie up loose ends
-      $paymask = $payinfo;
-    }
-    $self->setfield('paymask', $paymask); # This is okay since we are the 'setter'
-  } elsif (defined($value) && $self->is_encrypted($value)) {
-    $paymask = 'N/A';
-  }
-  return $paymask;
-}
+=item paycvv - Card Verification Value, "CVV2" (also known as CVC2 or CID), the 3 or 4 digit number on the back (or front, for American Express) of the credit card
 
 =item paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy
 
-=item paystart_month - start date month (maestro/solo cards only)
-
-=item paystart_year - start date year (maestro/solo cards only)
-
-=item payissue - issue number (maestro/solo cards only)
-
 =item payname - name on card or billing name
 
-=item payip - IP address from which payment information was received
-
 =item tax - tax exempt, empty or `Y'
 
 =item otaker - order taker (assigned automatically, see L<FS::UID>)
@@ -347,7 +256,7 @@ sub insert {
   my $cust_pkgs = @_ ? shift : {};
   my $invoicing_list = @_ ? shift : '';
   my %options = @_;
-  warn "$me insert called with options ".
+  warn "FS::cust_main::insert called with options ".
        join(', ', map { "$_: $options{$_}" } keys %options ). "\n"
     if $DEBUG;
 
@@ -362,38 +271,27 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $prepay_identifier = '';
-  my( $amount, $seconds ) = ( 0, 0 );
-  my $payby = '';
+  my $amount = 0;
+  my $seconds = 0;
   if ( $self->payby eq 'PREPAY' ) {
-
     $self->payby('BILL');
-    $prepay_identifier = $self->payinfo;
-    $self->payinfo('');
-
-    warn "  looking up prepaid card $prepay_identifier\n"
-      if $DEBUG > 1;
-
-    my $error = $self->get_prepay($prepay_identifier, \$amount, \$seconds);
+    my $prepay_credit = qsearchs(
+      'prepay_credit',
+      { 'identifier' => $self->payinfo },
+      '',
+      'FOR UPDATE'
+    );
+    warn "WARNING: can't find pre-found prepay_credit: ". $self->payinfo
+      unless $prepay_credit;
+    $amount = $prepay_credit->amount;
+    $seconds = $prepay_credit->seconds;
+    my $error = $prepay_credit->delete;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      #return "error applying prepaid card (transaction rolled back): $error";
-      return $error;
+      return "removing prepay_credit (transaction rolled back): $error";
     }
-
-    $payby = 'PREP' if $amount;
-
-  } elsif ( $self->payby =~ /^(CASH|WEST|MCRD)$/ ) {
-
-    $payby = $1;
-    $self->payby('BILL');
-    $amount = $self->paid;
-
   }
 
-  warn "  inserting $self\n"
-    if $DEBUG > 1;
-
   my $error = $self->SUPER::insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -401,9 +299,7 @@ sub insert {
     return $error;
   }
 
-  warn "  setting invoicing list\n"
-    if $DEBUG > 1;
-
+  # invoicing list
   if ( $invoicing_list ) {
     $error = $self->check_invoicing_list( $invoicing_list );
     if ( $error ) {
@@ -413,9 +309,7 @@ sub insert {
     $self->invoicing_list( $invoicing_list );
   }
 
-  warn "  ordering packages\n"
-    if $DEBUG > 1;
-
+  # packages
   $error = $self->order_pkgs($cust_pkgs, \$seconds, %options);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -428,28 +322,23 @@ sub insert {
   }
 
   if ( $amount ) {
-    warn "  inserting initial $payby payment of $amount\n"
-      if $DEBUG > 1;
-    $error = $self->insert_cust_pay($payby, $amount, $prepay_identifier);
+    my $cust_credit = new FS::cust_credit {
+      'custnum' => $self->custnum,
+      'amount'  => $amount,
+    };
+    $error = $cust_credit->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return "inserting payment (transaction rolled back): $error";
+      return "inserting credit (transaction rolled back): $error";
     }
   }
 
-  unless ( $import || $skip_fuzzyfiles ) {
-    warn "  queueing fuzzyfiles update\n"
-      if $DEBUG > 1;
-    $error = $self->queue_fuzzyfiles_update;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "updating fuzzy search cache: $error";
-    }
+  $error = $self->queue_fuzzyfiles_update;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "updating fuzzy search cache: $error";
   }
 
-  warn "  insert complete; committing transaction\n"
-    if $DEBUG > 1;
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
@@ -470,9 +359,6 @@ be a better explanation of this, but until then, here's an example:
   );
   $cust_main->order_pkgs( \%hash, \'0', 'noexport'=>1 );
 
-Services can be new, in which case they are inserted, or existing unaudited
-services, in which case they are linked to the newly-created package.
-
 Currently available options are: I<depend_jobnum> and I<noexport>.
 
 If I<depend_jobnum> is set, all provisioning jobs will have a dependancy
@@ -496,7 +382,7 @@ sub order_pkgs {
   my %svc_options = ();
   $svc_options{'depend_jobnum'} = $options{'depend_jobnum'}
     if exists $options{'depend_jobnum'};
-  warn "$me order_pkgs called with options ".
+  warn "FS::cust_main::order_pkgs called with options ".
        join(', ', map { "$_: $options{$_}" } keys %options ). "\n"
     if $DEBUG;
 
@@ -521,19 +407,12 @@ sub order_pkgs {
       return "inserting cust_pkg (transaction rolled back): $error";
     }
     foreach my $svc_something ( @{$cust_pkgs->{$cust_pkg}} ) {
-      if ( $svc_something->svcnum ) {
-        my $old_cust_svc = $svc_something->cust_svc;
-        my $new_cust_svc = new FS::cust_svc { $old_cust_svc->hash };
-        $new_cust_svc->pkgnum( $cust_pkg->pkgnum);
-        $error = $new_cust_svc->replace($old_cust_svc);
-      } else {
-        $svc_something->pkgnum( $cust_pkg->pkgnum );
-        if ( $seconds && $$seconds && $svc_something->isa('FS::svc_acct') ) {
-          $svc_something->seconds( $svc_something->seconds + $$seconds );
-          $$seconds = 0;
-        }
-        $error = $svc_something->insert(%svc_options);
+      $svc_something->pkgnum( $cust_pkg->pkgnum );
+      if ( $seconds && $$seconds && $svc_something->isa('FS::svc_acct') ) {
+        $svc_something->seconds( $svc_something->seconds + $$seconds );
+        $$seconds = 0;
       }
+      $error = $svc_something->insert(%svc_options);
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
         #return "inserting svc_ (transaction rolled back): $error";
@@ -546,223 +425,6 @@ sub order_pkgs {
   ''; #no error
 }
 
-=item recharge_prepay IDENTIFIER | PREPAY_CREDIT_OBJ [ , AMOUNTREF, SECONDSREF ]
-
-Recharges this (existing) customer with the specified prepaid card (see
-L<FS::prepay_credit>), specified either by I<identifier> or as an
-FS::prepay_credit object.  If there is an error, returns the error, otherwise
-returns false.
-
-Optionally, two scalar references can be passed as well.  They will have their
-values filled in with the amount and number of seconds applied by this prepaid
-card.
-
-=cut
-
-sub recharge_prepay { 
-  my( $self, $prepay_credit, $amountref, $secondsref ) = @_;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my( $amount, $seconds ) = ( 0, 0 );
-
-  my $error = $self->get_prepay($prepay_credit, \$amount, \$seconds)
-           || $self->increment_seconds($seconds)
-           || $self->insert_cust_pay_prepay( $amount,
-                                             ref($prepay_credit)
-                                               ? $prepay_credit->identifier
-                                               : $prepay_credit
-                                           );
-
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  if ( defined($amountref)  ) { $$amountref  = $amount;  }
-  if ( defined($secondsref) ) { $$secondsref = $seconds; }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item get_prepay IDENTIFIER | PREPAY_CREDIT_OBJ , AMOUNTREF, SECONDSREF
-
-Looks up and deletes a prepaid card (see L<FS::prepay_credit>),
-specified either by I<identifier> or as an FS::prepay_credit object.
-
-References to I<amount> and I<seconds> scalars should be passed as arguments
-and will be incremented by the values of the prepaid card.
-
-If the prepaid card specifies an I<agentnum> (see L<FS::agent>), it is used to
-check or set this customer's I<agentnum>.
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-
-sub get_prepay {
-  my( $self, $prepay_credit, $amountref, $secondsref ) = @_;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  unless ( ref($prepay_credit) ) {
-
-    my $identifier = $prepay_credit;
-
-    $prepay_credit = qsearchs(
-      'prepay_credit',
-      { 'identifier' => $prepay_credit },
-      '',
-      'FOR UPDATE'
-    );
-
-    unless ( $prepay_credit ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Invalid prepaid card: ". $identifier;
-    }
-
-  }
-
-  if ( $prepay_credit->agentnum ) {
-    if ( $self->agentnum && $self->agentnum != $prepay_credit->agentnum ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "prepaid card not valid for agent ". $self->agentnum;
-    }
-    $self->agentnum($prepay_credit->agentnum);
-  }
-
-  my $error = $prepay_credit->delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "removing prepay_credit (transaction rolled back): $error";
-  }
-
-  $$amountref  += $prepay_credit->amount;
-  $$secondsref += $prepay_credit->seconds;
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item increment_seconds SECONDS
-
-Updates this customer's single or primary account (see L<FS::svc_acct>) by
-the specified number of seconds.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub increment_seconds {
-  my( $self, $seconds ) = @_;
-  warn "$me increment_seconds called: $seconds seconds\n"
-    if $DEBUG;
-
-  my @cust_pkg = grep { $_->part_pkg->svcpart('svc_acct') }
-                      $self->ncancelled_pkgs;
-
-  if ( ! @cust_pkg ) {
-    return 'No packages with primary or single services found'.
-           ' to apply pre-paid time';
-  } elsif ( scalar(@cust_pkg) > 1 ) {
-    #maybe have a way to specify the package/account?
-    return 'Multiple packages found to apply pre-paid time';
-  }
-
-  my $cust_pkg = $cust_pkg[0];
-  warn "  found package pkgnum ". $cust_pkg->pkgnum. "\n"
-    if $DEBUG > 1;
-
-  my @cust_svc =
-    $cust_pkg->cust_svc( $cust_pkg->part_pkg->svcpart('svc_acct') );
-
-  if ( ! @cust_svc ) {
-    return 'No account found to apply pre-paid time';
-  } elsif ( scalar(@cust_svc) > 1 ) {
-    return 'Multiple accounts found to apply pre-paid time';
-  }
-  
-  my $svc_acct = $cust_svc[0]->svc_x;
-  warn "  found service svcnum ". $svc_acct->pkgnum.
-       ' ('. $svc_acct->email. ")\n"
-    if $DEBUG > 1;
-
-  $svc_acct->increment_seconds($seconds);
-
-}
-
-=item insert_cust_pay_prepay AMOUNT [ PAYINFO ]
-
-Inserts a prepayment in the specified amount for this customer.  An optional
-second argument can specify the prepayment identifier for tracking purposes.
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub insert_cust_pay_prepay {
-  shift->insert_cust_pay('PREP', @_);
-}
-
-=item insert_cust_pay_cash AMOUNT [ PAYINFO ]
-
-Inserts a cash payment in the specified amount for this customer.  An optional
-second argument can specify the payment identifier for tracking purposes.
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub insert_cust_pay_cash {
-  shift->insert_cust_pay('CASH', @_);
-}
-
-=item insert_cust_pay_west AMOUNT [ PAYINFO ]
-
-Inserts a Western Union payment in the specified amount for this customer.  An
-optional second argument can specify the prepayment identifier for tracking
-purposes.  If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub insert_cust_pay_west {
-  shift->insert_cust_pay('WEST', @_);
-}
-
-sub insert_cust_pay {
-  my( $self, $payby, $amount ) = splice(@_, 0, 3);
-  my $payinfo = scalar(@_) ? shift : '';
-
-  my $cust_pay = new FS::cust_pay {
-    'custnum' => $self->custnum,
-    'paid'    => sprintf('%.2f', $amount),
-    #'_date'   => #date the prepaid card was purchased???
-    'payby'   => $payby,
-    'payinfo' => $payinfo,
-  };
-  $cust_pay->insert;
-
-}
-
 =item reexport
 
 This method is deprecated.  See the I<depend_jobnum> option to the insert and
@@ -777,7 +439,7 @@ otherwise returns false.
 sub reexport {
   my $self = shift;
 
-  carp "WARNING: FS::cust_main::reexport is deprectated; ".
+  carp "warning: FS::cust_main::reexport is deprectated; ".
        "use the depend_jobnum option to insert or order_pkgs to delay export";
 
   local $SIG{HUP} = 'IGNORE';
@@ -929,27 +591,12 @@ sub replace {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
-  # If the mask is blank then try to set it - if we can...
-  if (!defined($self->getfield('paymask')) || $self->getfield('paymask') eq '') {
-    $self->paymask($self->payinfo);
-  }
-
-  # We absolutely have to have an old vs. new record to make this work.
-  if (!defined($old)) {
-    $old = qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-  }
-
   if ( $self->payby eq 'COMP' && $self->payby ne $old->payby
        && $conf->config('users-allow_comp')                  ) {
     return "You are not permitted to create complimentary accounts."
       unless grep { $_ eq getotaker } $conf->config('users-allow_comp');
   }
 
-  local($ignore_expired_card) = 1
-    if $old->payby  =~ /^(CARD|DCRD)$/
-    && $self->payby =~ /^(CARD|DCRD)$/
-    && $old->payinfo eq $self->payinfo;
-
   my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
@@ -981,12 +628,10 @@ sub replace {
     }
   }
 
-  unless ( $import || $skip_fuzzyfiles ) {
-    $error = $self->queue_fuzzyfiles_update;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "updating fuzzy search cache: $error";
-    }
+  $error = $self->queue_fuzzyfiles_update;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "updating fuzzy search cache: $error";
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -1039,15 +684,14 @@ sub queue_fuzzyfiles_update {
 
 Checks all fields to make sure this is a valid customer record.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
+and repalce methods.
 
 =cut
 
 sub check {
   my $self = shift;
 
-  warn "$me check BEFORE: \n". $self->_dump
-    if $DEBUG > 2;
+  #warn "BEFORE: \n". $self->_dump;
 
   my $error =
     $self->ut_numbern('custnum')
@@ -1076,7 +720,7 @@ sub check {
   return "Unknown refnum"
     unless qsearchs( 'part_referral', { 'refnum' => $self->refnum } );
 
-  return "Unknown referring custnum: ". $self->referral_custnum
+  return "Unknown referring custnum ". $self->referral_custnum
     unless ! $self->referral_custnum 
            || qsearchs( 'cust_main', { 'custnum' => $self->referral_custnum } );
 
@@ -1146,7 +790,7 @@ sub check {
        } ) ) {
         return "Unknown ship_state/ship_county/ship_country: ".
           $self->ship_state. "/". $self->ship_county. "/". $self->ship_country
-          unless qsearch('cust_main_county',{
+          unless qsearchs('cust_main_county',{
             'state'   => $self->ship_state,
             'county'  => $self->ship_county,
             'country' => $self->ship_country,
@@ -1169,34 +813,11 @@ sub check {
     }
   }
 
-  $self->payby =~ /^(CARD|DCRD|CHEK|DCHK|LECB|BILL|COMP|PREPAY|CASH|WEST|MCRD)$/
+  $self->payby =~ /^(CARD|DCRD|CHEK|DCHK|LECB|BILL|COMP|PREPAY)$/
     or return "Illegal payby: ". $self->payby;
-
-  $error =    $self->ut_numbern('paystart_month')
-           || $self->ut_numbern('paystart_year')
-           || $self->ut_numbern('payissue')
-  ;
-  return $error if $error;
-
-  if ( $self->payip eq '' ) {
-    $self->payip('');
-  } else {
-    $error = $self->ut_ip('payip');
-    return $error if $error;
-  }
-
-  # If it is encrypted and the private key is not availaible then we can't
-  # check the credit card.
-
-  my $check_payinfo = 1;
-
-  if ($self->is_encrypted($self->payinfo)) {
-    $check_payinfo = 0;
-  }
-
   $self->payby($1);
 
-  if ( $check_payinfo && $self->payby =~ /^(CARD|DCRD)$/ ) {
+  if ( $self->payby eq 'CARD' || $self->payby eq 'DCRD' ) {
 
     my $payinfo = $self->payinfo;
     $payinfo =~ s/\D//g;
@@ -1206,15 +827,10 @@ sub check {
     $self->payinfo($payinfo);
     validate($payinfo)
       or return gettext('invalid_card'); # . ": ". $self->payinfo;
-
     return gettext('unknown_card_type')
       if cardtype($self->payinfo) eq "Unknown";
-
-    my $ban = qsearchs('banned_pay', $self->_banned_pay_hashref);
-    return "Banned credit card" if $ban;
-
     if ( defined $self->dbdef_table->column('paycvv') ) {
-      if (length($self->paycvv) && !$self->is_encrypted($self->paycvv)) {
+      if ( length($self->paycvv) ) {
         if ( cardtype($self->payinfo) eq 'American Express card' ) {
           $self->paycvv =~ /^(\d{4})$/
             or return "CVV2 (CID) for American Express cards is four digits.";
@@ -1229,31 +845,7 @@ sub check {
       }
     }
 
-    my $cardtype = cardtype($payinfo);
-    if ( $cardtype =~ /^(Switch|Solo)$/i ) {
-
-      return "Start date or issue number is required for $cardtype cards"
-        unless $self->paystart_month && $self->paystart_year or $self->payissue;
-
-      return "Start month must be between 1 and 12"
-        if $self->paystart_month
-           and $self->paystart_month < 1 || $self->paystart_month > 12;
-
-      return "Start year must be 1990 or later"
-        if $self->paystart_year
-           and $self->paystart_year < 1990;
-
-      return "Issue number must be beween 1 and 99"
-        if $self->payissue
-          and $self->payissue < 1 || $self->payissue > 99;
-
-    } else {
-      $self->paystart_month('');
-      $self->paystart_year('');
-      $self->payissue('');
-    }
-
-  } elsif ( $check_payinfo && $self->payby =~ /^(CHEK|DCHK)$/ ) {
+  } elsif ( $self->payby eq 'CHEK' || $self->payby eq 'DCHK' ) {
 
     my $payinfo = $self->payinfo;
     $payinfo =~ s/[^\d\@]//g;
@@ -1262,9 +854,6 @@ sub check {
     $self->payinfo($payinfo);
     $self->paycvv('') if $self->dbdef_table->column('paycvv');
 
-    my $ban = qsearchs('banned_pay', $self->_banned_pay_hashref);
-    return "Banned ACH account" if $ban;
-
   } elsif ( $self->payby eq 'LECB' ) {
 
     my $payinfo = $self->payinfo;
@@ -1306,7 +895,7 @@ sub check {
 
   if ( $self->paydate eq '' || $self->paydate eq '-' ) {
     return "Expriation date required"
-      unless $self->payby =~ /^(BILL|PREPAY|CHEK|DCHK|LECB|CASH|WEST|MCRD)$/;
+      unless $self->payby =~ /^(BILL|PREPAY|CHEK|LECB)$/;
     $self->paydate('');
   } else {
     my( $m, $y );
@@ -1320,9 +909,7 @@ sub check {
     $self->paydate("$y-$m-01");
     my($nowm,$nowy)=(localtime(time))[4,5]; $nowm++; $nowy+=1900;
     return gettext('expired_card')
-      if !$import
-      && !$ignore_expired_card 
-      && ( $y<$nowy || ( $y==$nowy && $1<$nowm ) );
+      if !$import && ( $y<$nowy || ( $y==$nowy && $1<$nowm ) );
   }
 
   if ( $self->payname eq '' && $self->payby !~ /^(CHEK|DCHK)$/ &&
@@ -1331,7 +918,7 @@ sub check {
   ) {
     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
-    $self->payname =~ /^([\w \,\.\-\'\&]+)$/
+    $self->payname =~ /^([\w \,\.\-\']+)$/
       or return gettext('illegal_name'). " payname: ". $self->payname;
     $self->payname($1);
   }
@@ -1341,8 +928,7 @@ sub check {
 
   $self->otaker(getotaker) unless $self->otaker;
 
-  warn "$me check AFTER: \n". $self->_dump
-    if $DEBUG > 2;
+  #warn "AFTER: \n". $self->_dump;
 
   $self->SUPER::check;
 }
@@ -1423,27 +1009,6 @@ sub unsuspended_pkgs {
   grep { ! $_->susp } $self->ncancelled_pkgs;
 }
 
-=item num_cancelled_pkgs
-
-Returns the number of cancelled packages (see L<FS::cust_pkg>) for this
-customer.
-
-=cut
-
-sub num_cancelled_pkgs {
-  my $self = shift;
-  $self->num_pkgs("cancel IS NOT NULL AND cust_pkg.cancel != 0");
-}
-
-sub num_pkgs {
-  my( $self, $sql ) = @_;
-  my $sth = dbh->prepare(
-    "SELECT COUNT(*) FROM cust_pkg WHERE custnum = ? AND $sql"
-  ) or die dbh->errstr;
-  $sth->execute($self->custnum) or die $sth->errstr;
-  $sth->fetchrow_arrayref->[0];
-}
-
 =item unsuspend
 
 Unsuspends all unflagged suspended packages (see L</unflagged_suspended_pkgs>
@@ -1460,8 +1025,7 @@ sub unsuspend {
 =item suspend
 
 Suspends all unsuspended packages (see L<FS::cust_pkg>) for this customer.
-
-Returns a list: an empty list on success or a list of errors.
+Always returns a list: an empty list on success or a list of errors.
 
 =cut
 
@@ -1473,9 +1037,8 @@ sub suspend {
 =item suspend_if_pkgpart PKGPART [ , PKGPART ... ]
 
 Suspends all unsuspended packages (see L<FS::cust_pkg>) matching the listed
-PKGPARTs (see L<FS::part_pkg>).
-
-Returns a list: an empty list on success or a list of errors.
+PKGPARTs (see L<FS::part_pkg>).  Always returns a list: an empty list on
+success or a list of errors.
 
 =cut
 
@@ -1490,9 +1053,8 @@ sub suspend_if_pkgpart {
 =item suspend_unless_pkgpart PKGPART [ , PKGPART ... ]
 
 Suspends all unsuspended packages (see L<FS::cust_pkg>) unless they match the
-listed PKGPARTs (see L<FS::part_pkg>).
-
-Returns a list: an empty list on success or a list of errors.
+listed PKGPARTs (see L<FS::part_pkg>).  Always returns a list: an empty list
+on success or a list of errors.
 
 =cut
 
@@ -1508,56 +1070,19 @@ sub suspend_unless_pkgpart {
 
 Cancels all uncancelled packages (see L<FS::cust_pkg>) for this customer.
 
-Available options are: I<quiet>, I<reasonnum>, and I<ban>
+Available options are: I<quiet>
 
 I<quiet> can be set true to supress email cancellation notices.
 
-# I<reasonnum> can be set to a cancellation reason (see L<FS::cancel_reason>)
-
-I<ban> can be set true to ban this customer's credit card or ACH information,
-if present.
-
 Always returns a list: an empty list on success or a list of errors.
 
 =cut
 
 sub cancel {
   my $self = shift;
-  my %opt = @_;
-
-  if ( $opt{'ban'} && $self->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) {
-
-    #should try decryption (we might have the private key)
-    # and if not maybe queue a job for the server that does?
-    return ( "Can't (yet) ban encrypted credit cards" )
-      if $self->is_encrypted($self->payinfo);
-
-    my $ban = new FS::banned_pay $self->_banned_pay_hashref;
-    my $error = $ban->insert;
-    return ( $error ) if $error;
-
-  }
-
   grep { $_ } map { $_->cancel(@_) } $self->ncancelled_pkgs;
 }
 
-sub _banned_pay_hashref {
-  my $self = shift;
-
-  my %payby2ban = (
-    'CARD' => 'CARD',
-    'DCRD' => 'CARD',
-    'CHEK' => 'CHEK',
-    'DCHK' => 'CHEK'
-  );
-
-  {
-    'payby'   => $payby2ban{$self->payby},
-    'payinfo' => md5_base64($self->payinfo),
-    #'reason'  =>
-  };
-}
-
 =item agent
 
 Returns the agent (see L<FS::agent>) for this customer.
@@ -1596,8 +1121,7 @@ If there is an error, returns the error, otherwise returns false.
 sub bill {
   my( $self, %options ) = @_;
   return '' if $self->payby eq 'COMP';
-  warn "$me bill customer ". $self->custnum. "\n"
-    if $DEBUG;
+  warn "bill customer ". $self->custnum if $DEBUG;
 
   my $time = $options{'time'} || time;
 
@@ -1636,7 +1160,7 @@ sub bill {
     #NO!! next if $cust_pkg->cancel;  
     next if $cust_pkg->getfield('cancel');  
 
-    warn "  bill package ". $cust_pkg->pkgnum. "\n" if $DEBUG > 1;
+    warn "  bill package ". $cust_pkg->pkgnum if $DEBUG;
 
     #? to avoid use of uninitialized value errors... ?
     $cust_pkg->setfield('bill', '')
@@ -1653,7 +1177,7 @@ sub bill {
     my $setup = 0;
     if ( !$cust_pkg->setup || $options{'resetup'} ) {
     
-      warn "    bill setup\n" if $DEBUG > 1;
+      warn "    bill setup" if $DEBUG;
 
       $setup = eval { $cust_pkg->calc_setup( $time ) };
       if ( $@ ) {
@@ -1672,7 +1196,7 @@ sub bill {
          ( $cust_pkg->getfield('bill') || 0 ) <= $time
     ) {
 
-      warn "    bill recur\n" if $DEBUG > 1;
+      warn "    bill recur" if $DEBUG;
 
       # XXX shared with $recur_prog
       $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
@@ -1704,9 +1228,6 @@ sub bill {
       } elsif ( $part_pkg->freq =~ /^(\d+)d$/ ) {
         my $days = $1;
         $mday += $days;
-      } elsif ( $part_pkg->freq =~ /^(\d+)h$/ ) {
-        my $hours = $1;
-        $hour += $hours;
       } else {
         $dbh->rollback if $oldAutoCommit;
         return "unparsable frequency: ". $part_pkg->freq;
@@ -1721,8 +1242,7 @@ sub bill {
 
     if ( $cust_pkg->modified ) {
 
-      warn "  package ". $cust_pkg->pkgnum. " modified; updating\n"
-        if $DEBUG >1;
+      warn "  package ". $cust_pkg->pkgnum. " modified; updating\n" if $DEBUG;
 
       $error=$cust_pkg->replace($old_cust_pkg);
       if ( $error ) { #just in case
@@ -1742,7 +1262,7 @@ sub bill {
       }
       if ( $setup != 0 || $recur != 0 ) {
         warn "    charges (setup=$setup, recur=$recur); queueing line items\n"
-          if $DEBUG > 1;
+          if $DEBUG;
         my $cust_bill_pkg = new FS::cust_bill_pkg ({
           'pkgnum'  => $cust_pkg->pkgnum,
           'setup'   => $setup,
@@ -1802,7 +1322,7 @@ sub bill {
                   || $tax->recurtax =~ /^Y$/i;
             next unless $taxable_charged;
 
-            if ( $tax->exempt_amount && $tax->exempt_amount > 0 ) {
+            if ( $tax->exempt_amount > 0 ) {
               my ($mon,$year) = (localtime($sdate) )[4,5];
               $mon++;
               my $freq = $part_pkg->freq || 1;
@@ -2009,8 +1529,7 @@ sub collect {
   $self->select_for_update; #mutex
 
   my $balance = $self->balance;
-  warn "$me collect customer ". $self->custnum. ": balance $balance\n"
-    if $DEBUG;
+  warn "collect customer ". $self->custnum. ": balance $balance" if $DEBUG;
   unless ( $balance > 0 ) { #redundant?????
     $dbh->rollback if $oldAutoCommit; #hmm
     return '';
@@ -2035,8 +1554,8 @@ sub collect {
 
     last if $self->balance <= 0;
 
-    warn "  invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ")\n"
-      if $DEBUG > 1;
+    warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ")"
+      if $DEBUG;
 
     foreach my $part_bill_event (
       sort {    $a->seconds   <=> $b->seconds
@@ -2056,8 +1575,8 @@ sub collect {
       last if $cust_bill->owed <= 0  # don't run subsequent events if owed<=0
            || $self->balance   <= 0; # or if balance<=0
 
-      warn "  calling invoice event (". $part_bill_event->eventcode. ")\n"
-        if $DEBUG > 1;
+      warn "calling invoice event (". $part_bill_event->eventcode. ")\n"
+        if $DEBUG;
       my $cust_main = $self; #for callback
 
       my $error;
@@ -2197,84 +1716,31 @@ I<quiet> can be set true to surpress email decline notices.
 sub realtime_bop {
   my( $self, $method, $amount, %options ) = @_;
   if ( $DEBUG ) {
-    warn "$me realtime_bop: $method $amount\n";
+    warn "$self $method $amount\n";
     warn "  $_ => $options{$_}\n" foreach keys %options;
   }
 
   $options{'description'} ||= 'Internet services';
 
+  #pre-requisites
+  die "Real-time processing not enabled\n"
+    unless $conf->exists('business-onlinepayment');
   eval "use Business::OnlinePayment";  
   die $@ if $@;
 
-  my $payinfo = exists($options{'payinfo'})
-                  ? $options{'payinfo'}
-                  : $self->payinfo;
-
-  ###
-  # select a gateway
-  ###
-
-  my $taxclass = '';
-  if ( $options{'invnum'} ) {
-    my $cust_bill = qsearchs('cust_bill', { 'invnum' => $options{'invnum'} } );
-    die "invnum ". $options{'invnum'}. " not found" unless $cust_bill;
-    my @taxclasses =
-      map  { $_->part_pkg->taxclass }
-      grep { $_ }
-      map  { $_->cust_pkg }
-      $cust_bill->cust_bill_pkg;
-    unless ( grep { $taxclasses[0] ne $_ } @taxclasses ) { #unless there are
-                                                           #different taxclasses
-      $taxclass = $taxclasses[0];
-    }
-  }
-
-  #look for an agent gateway override first
-  my $cardtype;
-  if ( $method eq 'CC' ) {
-    $cardtype = cardtype($payinfo);
-  } elsif ( $method eq 'ECHECK' ) {
-    $cardtype = 'ACH';
-  } else {
-    $cardtype = $method;
-  }
-
-  my $override =
-       qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
-                                           cardtype => $cardtype,
-                                           taxclass => $taxclass,       } )
-    || qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
-                                           cardtype => '',
-                                           taxclass => $taxclass,       } )
-    || qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
-                                           cardtype => $cardtype,
-                                           taxclass => '',              } )
-    || qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
-                                           cardtype => '',
-                                           taxclass => '',              } );
-
-  my $payment_gateway = '';
-  my( $processor, $login, $password, $action, @bop_options );
-  if ( $override ) { #use a payment gateway override
-
-    $payment_gateway = $override->payment_gateway;
-
-    $processor   = $payment_gateway->gateway_module;
-    $login       = $payment_gateway->gateway_username;
-    $password    = $payment_gateway->gateway_password;
-    $action      = $payment_gateway->gateway_action;
-    @bop_options = $payment_gateway->options;
-
-  } else { #use the standard settings from the config
-
-    ( $processor, $login, $password, $action, @bop_options ) =
-      $self->default_payment_gateway($method);
-
-  }
+  #load up config
+  my $bop_config = 'business-onlinepayment';
+  $bop_config .= '-ach'
+    if $method eq 'ECHECK' && $conf->exists($bop_config. '-ach');
+  my ( $processor, $login, $password, $action, @bop_options ) =
+    $conf->config($bop_config);
+  $action ||= 'normal authorization';
+  pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
+  die "No real-time processor is enabled - ".
+      "did you set the business-onlinepayment configuration value?\n"
+    unless $processor;
 
-  ###
-  # massage data
-  ###
+  #massage data
 
   my $address = exists($options{'address1'})
                     ? $options{'address1'}
@@ -2303,19 +1769,13 @@ sub realtime_bop {
        || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
     push @invoicing_list, $self->all_emails;
   }
+  my $email = $invoicing_list[0];
 
-  my $email = ($conf->exists('business-onlinepayment-email-override'))
-              ? $conf->config('business-onlinepayment-email-override')
-              : $invoicing_list[0];
+  my $payinfo = exists($options{'payinfo'})
+                  ? $options{'payinfo'}
+                  : $self->payinfo;
 
   my %content = ();
-
-  my $payip = exists($options{'payip'})
-                ? $options{'payip'}
-                : $self->payip;
-  $content{customer_ip} = $payip
-    if length($payip);
-
   if ( $method eq 'CC' ) { 
 
     $content{card_number} = $payinfo;
@@ -2325,27 +1785,13 @@ sub realtime_bop {
     $paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
     $content{expiration} = "$2/$1";
 
-    my $paycvv = exists($options{'paycvv'})
-                   ? $options{'paycvv'}
-                   : $self->paycvv;
-    $content{cvv2} = $self->paycvv
-      if length($paycvv);
-
-    my $paystart_month = exists($options{'paystart_month'})
-                           ? $options{'paystart_month'}
-                           : $self->paystart_month;
-
-    my $paystart_year  = exists($options{'paystart_year'})
-                           ? $options{'paystart_year'}
-                           : $self->paystart_year;
-
-    $content{card_start} = "$paystart_month/$paystart_year"
-      if $paystart_month && $paystart_year;
-
-    my $payissue       = exists($options{'payissue'})
-                           ? $options{'payissue'}
-                           : $self->payissue;
-    $content{issue_number} = $payissue if $payissue;
+    if ( defined $self->dbdef_table->column('paycvv') ) {
+      my $paycvv = exists($options{'paycvv'})
+                     ? $options{'paycvv'}
+                     : $self->paycvv;
+      $content{cvv2} = $self->paycvv
+        if length($paycvv);
+    }
 
     $content{recurring_billing} = 'YES'
       if qsearch('cust_pay', { 'custnum' => $self->custnum,
@@ -2367,9 +1813,7 @@ sub realtime_bop {
     $content{phone} = $payinfo;
   }
 
-  ###
-  # run transaction(s)
-  ###
+  #transaction(s)
 
   my( $action1, $action2 ) = split(/\s*\,\s*/, $action );
 
@@ -2447,10 +1891,7 @@ sub realtime_bop {
 
   }
 
-  ###
-  # remove paycvv after initial transaction
-  ###
-
+  #remove paycvv after initial transaction
   #false laziness w/misc/process/payment.cgi - check both to make sure working
   # correctly
   if ( defined $self->dbdef_table->column('paycvv')
@@ -2459,14 +1900,11 @@ sub realtime_bop {
   ) {
     my $error = $self->remove_cvv;
     if ( $error ) {
-      warn "WARNING: error removing cvv: $error\n";
+      warn "error removing cvv: $error\n";
     }
   }
 
-  ###
-  # result handling
-  ###
-
+  #result handling
   if ( $transaction->is_success() ) {
 
     my %method2payby = (
@@ -2475,13 +1913,7 @@ sub realtime_bop {
       'LEC'    => 'LECB',
     );
 
-    my $paybatch = '';
-    if ( $payment_gateway ) { # agent override
-      $paybatch = $payment_gateway->gatewaynum. '-';
-    }
-
-    $paybatch .= "$processor:". $transaction->authorization;
-
+    my $paybatch = "$processor:". $transaction->authorization;
     $paybatch .= ':'. $transaction->order_number
       if $transaction->can('order_number')
       && length($transaction->order_number);
@@ -2548,31 +1980,6 @@ sub realtime_bop {
 
 }
 
-=item default_payment_gateway
-
-=cut
-
-sub default_payment_gateway {
-  my( $self, $method ) = @_;
-
-  die "Real-time processing not enabled\n"
-    unless $conf->exists('business-onlinepayment');
-
-  #load up config
-  my $bop_config = 'business-onlinepayment';
-  $bop_config .= '-ach'
-    if $method eq 'ECHECK' && $conf->exists($bop_config. '-ach');
-  my ( $processor, $login, $password, $action, @bop_options ) =
-    $conf->config($bop_config);
-  $action ||= 'normal authorization';
-  pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
-  die "No real-time processor is enabled - ".
-      "did you set the business-onlinepayment configuration value?\n"
-    unless $processor;
-
-  ( $processor, $login, $password, $action, @bop_options )
-}
-
 =item remove_cvv
 
 Removes the I<paycvv> field from the database directly.
@@ -2629,98 +2036,43 @@ gateway is attempted.
 sub realtime_refund_bop {
   my( $self, $method, %options ) = @_;
   if ( $DEBUG ) {
-    warn "$me realtime_refund_bop: $method refund\n";
+    warn "$self $method refund\n";
     warn "  $_ => $options{$_}\n" foreach keys %options;
   }
 
+  #pre-requisites
+  die "Real-time processing not enabled\n"
+    unless $conf->exists('business-onlinepayment');
   eval "use Business::OnlinePayment";  
   die $@ if $@;
 
-  ###
-  # look up the original payment and optionally a gateway for that payment
-  ###
+  #load up config
+  my $bop_config = 'business-onlinepayment';
+  $bop_config .= '-ach'
+    if $method eq 'ECHECK' && $conf->exists($bop_config. '-ach');
+  my ( $processor, $login, $password, $unused_action, @bop_options ) =
+    $conf->config($bop_config);
+  #$action ||= 'normal authorization';
+  pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
+  die "No real-time processor is enabled - ".
+      "did you set the business-onlinepayment configuration value?\n"
+    unless $processor;
 
   my $cust_pay = '';
   my $amount = $options{'amount'};
-
-  my( $processor, $login, $password, @bop_options ) ;
-  my( $auth, $order_number ) = ( '', '', '' );
-
+  my( $pay_processor, $auth, $order_number ) = ( '', '', '' );
   if ( $options{'paynum'} ) {
-
-    warn "  paynum: $options{paynum}\n" if $DEBUG > 1;
+    warn "FS::cust_main::realtime_bop: paynum: $options{paynum}\n" if $DEBUG;
     $cust_pay = qsearchs('cust_pay', { paynum=>$options{'paynum'} } )
       or return "Unknown paynum $options{'paynum'}";
     $amount ||= $cust_pay->paid;
-
-    $cust_pay->paybatch =~ /^((\d+)\-)?(\w+):\s*([\w\-]*)(:([\w\-]+))?$/
+    $cust_pay->paybatch =~ /^(\w+):(\w*)(:(\w+))?$/
       or return "Can't parse paybatch for paynum $options{'paynum'}: ".
                 $cust_pay->paybatch;
-    my $gatewaynum = '';
-    ( $gatewaynum, $processor, $auth, $order_number ) = ( $2, $3, $4, $6 );
-
-    if ( $gatewaynum ) { #gateway for the payment to be refunded
-
-      my $payment_gateway =
-        qsearchs('payment_gateway', { 'gatewaynum' => $gatewaynum } );
-      die "payment gateway $gatewaynum not found"
-        unless $payment_gateway;
-
-      $processor   = $payment_gateway->gateway_module;
-      $login       = $payment_gateway->gateway_username;
-      $password    = $payment_gateway->gateway_password;
-      @bop_options = $payment_gateway->options;
-
-    } else { #try the default gateway
-
-      my( $conf_processor, $unused_action );
-      ( $conf_processor, $login, $password, $unused_action, @bop_options ) =
-        $self->default_payment_gateway($method);
-
-      return "processor of payment $options{'paynum'} $processor does not".
-             " match default processor $conf_processor"
-        unless $processor eq $conf_processor;
-
-    }
-
-
-  } else { # didn't specify a paynum, so look for agent gateway overrides
-           # like a normal transaction 
-
-    my $cardtype;
-    if ( $method eq 'CC' ) {
-      $cardtype = cardtype($self->payinfo);
-    } elsif ( $method eq 'ECHECK' ) {
-      $cardtype = 'ACH';
-    } else {
-      $cardtype = $method;
-    }
-    my $override =
-           qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
-                                               cardtype => $cardtype,
-                                               taxclass => '',              } )
-        || qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
-                                               cardtype => '',
-                                               taxclass => '',              } );
-
-    if ( $override ) { #use a payment gateway override
- 
-      my $payment_gateway = $override->payment_gateway;
-
-      $processor   = $payment_gateway->gateway_module;
-      $login       = $payment_gateway->gateway_username;
-      $password    = $payment_gateway->gateway_password;
-      #$action      = $payment_gateway->gateway_action;
-      @bop_options = $payment_gateway->options;
-
-    } else { #use the standard settings from the config
-
-      my $unused_action;
-      ( $processor, $login, $password, $unused_action, @bop_options ) =
-        $self->default_payment_gateway($method);
-
-    }
-
+    ( $pay_processor, $auth, $order_number ) = ( $1, $2, $4 );
+    return "processor of payment $options{'paynum'} $pay_processor does not".
+           " match current processor $processor"
+      unless $pay_processor eq $processor;
   }
   return "neither amount nor paynum specified" unless $amount;
 
@@ -2738,7 +2090,6 @@ sub realtime_refund_bop {
 
   #first try void if applicable
   if ( $cust_pay && $cust_pay->paid == $amount ) { #and check dates?
-    warn "  attempting void\n" if $DEBUG > 1;
     my $void = new Business::OnlinePayment( $processor, @bop_options );
     $void->content( 'action' => 'void', %content );
     $void->submit();
@@ -2751,14 +2102,10 @@ sub realtime_refund_bop {
         warn $e;
         return $e;
       }
-      warn "  void successful\n" if $DEBUG > 1;
       return '';
     }
   }
 
-  warn "  void unsuccessful, trying refund\n"
-    if $DEBUG > 1;
-
   #massage data
   my $address = $self->address1;
   $address .= ", ". $self->address2 if $self->address2;
@@ -2775,34 +2122,36 @@ sub realtime_refund_bop {
     $payname =  "$payfirst $paylast";
   }
 
-  my $payinfo = '';
-  if ( $method eq 'CC' ) {
+  if ( $method eq 'CC' ) { 
 
-    if ( $cust_pay ) {
-      $content{card_number} = $payinfo = $cust_pay->payinfo;
-      #$self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-      #$content{expiration} = "$2/$1";
-    } else {
-      $content{card_number} = $payinfo = $self->payinfo;
-      $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-      $content{expiration} = "$2/$1";
-    }
+    $content{card_number} = $self->payinfo;
+    $self->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+    $content{expiration} = "$2/$1";
+
+    #$content{cvv2} = $self->paycvv
+    #  if defined $self->dbdef_table->column('paycvv')
+    #     && length($self->paycvv);
+
+    #$content{recurring_billing} = 'YES'
+    #  if qsearch('cust_pay', { 'custnum' => $self->custnum,
+    #                           'payby'   => 'CARD',
+    #                           'payinfo' => $self->payinfo, } );
 
   } elsif ( $method eq 'ECHECK' ) {
     ( $content{account_number}, $content{routing_code} ) =
-      split('@', $payinfo = $self->payinfo);
+      split('@', $self->payinfo);
     $content{bank_name} = $self->payname;
     $content{account_type} = 'CHECKING';
     $content{account_name} = $payname;
     $content{customer_org} = $self->company ? 'B' : 'I';
     $content{customer_ssn} = $self->ss;
   } elsif ( $method eq 'LEC' ) {
-    $content{phone} = $payinfo = $self->payinfo;
+    $content{phone} = $self->payinfo;
   }
 
   #then try refund
   my $refund = new Business::OnlinePayment( $processor, @bop_options );
-  my %sub_content = $refund->content(
+  $refund->content(
     'action'         => 'credit',
     'customer_id'    => $self->custnum,
     'last_name'      => $paylast,
@@ -2815,8 +2164,6 @@ sub realtime_refund_bop {
     'country'        => $self->country,
     %content, #after
   );
-  warn join('', map { "  $_ => $sub_content{$_}\n" } keys %sub_content )
-    if $DEBUG > 1;
   $refund->submit();
 
   return "$processor error: ". $refund->error_message
@@ -2846,7 +2193,7 @@ sub realtime_refund_bop {
     'refund'   => $amount,
     '_date'    => '',
     'payby'    => $method2payby{$method},
-    'payinfo'  => $payinfo,
+    'payinfo'  => $self->payinfo,
     'paybatch' => $paybatch,
     'reason'   => $options{'reason'} || 'card or ACH refund',
   } );
@@ -3094,17 +2441,15 @@ sub paydate_monthyear {
 
 =item payinfo_masked
 
-Returns a "masked" payinfo field appropriate to the payment type.  Masked characters are replaced by 'x'es.  Use this to display publicly accessable account Information.
-
-Credit Cards - Mask all but the last four characters.
-Checks - Mask all but last 2 of account number and bank routing number.
-Others - Do nothing, return the unmasked string.
+Returns a "masked" payinfo field with all but the last four characters replaced
+by 'x'es.  Useful for displaying credit cards.
 
 =cut
 
 sub payinfo_masked {
   my $self = shift;
-  return $self->paymask;
+  my $payinfo = $self->payinfo;
+  'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
 }
 
 =item invoicing_list [ ARRAYREF ]
@@ -3176,11 +2521,6 @@ is an error, returns the error, otherwise returns false.
 sub check_invoicing_list {
   my( $self, $arrayref ) = @_;
   foreach my $address ( @{$arrayref} ) {
-
-    if ($address eq 'FAX' and $self->getfield('fax') eq '') {
-      return 'Can\'t add FAX invoice destination with a blank FAX number.';
-    }
-
     my $cust_main_invoice = new FS::cust_main_invoice ( {
       'custnum' => $self->custnum,
       'dest'    => $address,
@@ -3298,19 +2638,6 @@ sub referral_cust_pkg {
       $self->referral_cust_main($depth);
 }
 
-=item referring_cust_main
-
-Returns the single cust_main record for the customer who referred this customer
-(referral_custnum), or false.
-
-=cut
-
-sub referring_cust_main {
-  my $self = shift;
-  return '' unless $self->referral_custnum;
-  qsearchs('cust_main', { 'custnum' => $self->referral_custnum } );
-}
-
 =item credit AMOUNT, REASON
 
 Applies a credit to this customer.  If there is an error, returns the error,
@@ -3491,53 +2818,11 @@ Returns a name string for this customer, either "Company (Last, First)" or
 
 sub name {
   my $self = shift;
-  my $name = $self->contact;
+  my $name = $self->get('last'). ', '. $self->first;
   $name = $self->company. " ($name)" if $self->company;
   $name;
 }
 
-=item ship_name
-
-Returns a name string for this (service/shipping) contact, either
-"Company (Last, First)" or "Last, First".
-
-=cut
-
-sub ship_name {
-  my $self = shift;
-  if ( $self->get('ship_last') ) { 
-    my $name = $self->ship_contact;
-    $name = $self->ship_company. " ($name)" if $self->ship_company;
-    $name;
-  } else {
-    $self->name;
-  }
-}
-
-=item contact
-
-Returns this customer's full (billing) contact name only, "Last, First"
-
-=cut
-
-sub contact {
-  my $self = shift;
-  $self->get('last'). ', '. $self->first;
-}
-
-=item ship_contact
-
-Returns this customer's full (shipping) contact name only, "Last, First"
-
-=cut
-
-sub ship_contact {
-  my $self = shift;
-  $self->get('ship_last')
-    ? $self->get('ship_last'). ', '. $self->ship_first
-    : $self->contact;
-}
-
 =item status
 
 Returns a status string for this customer, currently:
@@ -3612,7 +2897,8 @@ Returns an SQL expression identifying active cust_main records.
 sub active_sql { "
   0 < ( SELECT COUNT(*) FROM cust_pkg
           WHERE cust_pkg.custnum = cust_main.custnum
-            AND ". FS::cust_pkg->active_sql. "
+            AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
+            AND ( cust_pkg.susp   IS NULL OR cust_pkg.susp   = 0 )
       )
 "; }
 
@@ -3623,22 +2909,16 @@ Returns an SQL expression identifying suspended cust_main records.
 
 =cut
 
-#my $recurring_sql = FS::cust_pkg->recurring_sql;
-my $recurring_sql = "
-  '0' != ( select freq from part_pkg
-             where cust_pkg.pkgpart = part_pkg.pkgpart )
-";
-
 sub suspended_sql { susp_sql(@_); }
 sub susp_sql { "
     0 < ( SELECT COUNT(*) FROM cust_pkg
             WHERE cust_pkg.custnum = cust_main.custnum
-              AND $recurring_sql
               AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
         )
     AND 0 = ( SELECT COUNT(*) FROM cust_pkg
                 WHERE cust_pkg.custnum = cust_main.custnum
-                  AND ". FS::cust_pkg->active_sql. "
+                  AND ( cust_pkg.susp IS NULL OR cust_pkg.susp = 0 )
+                  AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
             )
 "; }
 
@@ -3656,7 +2936,6 @@ sub cancel_sql { "
       )
   AND 0 = ( SELECT COUNT(*) FROM cust_pkg
               WHERE cust_pkg.custnum = cust_main.custnum
-                AND $recurring_sql
                 AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
           )
 "; }
diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm
deleted file mode 100644
index a114c5a..0000000
--- a/FS/FS/cust_main_Mixin.pm
+++ /dev/null
@@ -1,103 +0,0 @@
-package FS::cust_main_Mixin;
-
-use strict;
-use FS::cust_main;
-
-=head1 NAME
-
-FS::cust_main_Mixin - Mixin class for records that contain fields from cust_main
-
-=head1 SYNOPSIS
-
-package FS::some_table;
-use vars qw(@ISA);
-@ISA = qw( FS::cust_main_Mixin FS::Record );
-
-=head1 DESCRIPTION
-
-This is a mixin class for records that contain fields from the cust_main table,
-for example, from a JOINed search.  See httemplate/search/ for examples.
-
-=head1 METHODS
-
-=over 4
-
-=item name
-
-Given an object that contains fields from cust_main (say, from a JOINed
-search; see httemplate/search/ for examples), returns the equivalent of the
-FS::cust_main I<name> method, or "(unlinked)" if this object is not linked to
-a customer.
-
-=cut
-
-sub cust_unlinked_msg { '(unlinked)'; }
-sub cust_linked { $_[0]->custnum; }
-
-sub name {
-  my $self = shift;
-  $self->cust_linked
-    ? FS::cust_main::name($self)
-    : $self->cust_unlinked_msg;
-}
-
-=item ship_name
-
-Given an object that contains fields from cust_main (say, from a JOINed
-search; see httemplate/search/ for examples), returns the equivalent of the
-FS::cust_main I<ship_name> method, or "(unlinked)" if this object is not
-linked to a customer.
-
-=cut
-
-sub ship_name {
-  my $self = shift;
-  $self->cust_linked
-    ? FS::cust_main::ship_name($self)
-    : $self->cust_unlinked_msg;
-}
-
-=item contact
-
-Given an object that contains fields from cust_main (say, from a JOINed
-search; see httemplate/search/ for examples), returns the equivalent of the
-FS::cust_main I<contact> method, or "(unlinked)" if this object is not linked
-to a customer.
-
-=cut
-
-sub contact {
-  my $self = shift;
-  $self->cust_linked
-    ? FS::cust_main::contact($self)
-    : $self->cust_unlinked_msg;
-}
-
-=item ship_contact
-
-Given an object that contains fields from cust_main (say, from a JOINed
-search; see httemplate/search/ for examples), returns the equivalent of the
-FS::cust_main I<ship_contact> method, or "(unlinked)" if this object is not
-linked to a customer.
-
-=cut
-
-sub ship_contact {
-  my $self = shift;
-  $self->cust_linked
-    ? FS::cust_main::ship_contact($self)
-    : $self->cust_unlinked_msg;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, L<FS::Record>
-
-=cut
-
-1;
-
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 17f3460..d96bd41 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -196,9 +196,8 @@ END
   foreach my $country ( sort keys %cust_main_county ) {
     $script_html .= "\nif ( country == \"$country\" ) {\n";
     foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
-      ( my $dstate = $state ) =~ s/[\n\r]//g;
-      my $text = $dstate || '(n/a)';
-      $script_html .= qq!opt(what.form.${prefix}state, "$dstate", "$text");\n!;
+      my $text = $state || '(n/a)';
+      $script_html .= qq!opt(what.form.${prefix}state, "$state", "$text");\n!;
     }
     $script_html .= "}\n";
   }
@@ -251,7 +250,7 @@ END
   foreach my $state ( sort keys %{ $cust_main_county{$selected_country} } ) {
     my $text = $state || '(n/a)';
     my $selected = $state eq $selected_state ? 'SELECTED' : '';
-    $state_html .= qq(\n<OPTION $selected VALUE="$state">$text</OPTION>);
+    $state_html .= "\n<OPTION $selected VALUE=$state>$text</OPTION>"
   }
   $state_html .= '</SELECT>';
 
@@ -265,7 +264,7 @@ END
       keys %cust_main_county
   ) {
     my $selected = $country eq $selected_country ? ' SELECTED' : '';
-    $country_html .= qq(\n<OPTION$selected VALUE="$country">$country</OPTION>");
+    $country_html .= "\n<OPTION$selected>$country</OPTION>"
   }
   $country_html .= '</SELECT>';
 
diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index 48f47e0..3cabd3a 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -43,7 +43,7 @@ FS::Record.  The following fields are currently supported:
 
 =item custnum - customer (see L<FS::cust_main>)
 
-=item dest - Invoice destination: If numeric, a svcnum (see L<FS::svc_acct>), if string, a literal email address, `POST' to enable mailing (the default if no cust_main_invoice records exist), or `FAX' to enable faxing via a HylaFAX server.
+=item dest - Invoice destination: If numeric, a svcnum (see L<FS::svc_acct>), if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
 
 =back
 
@@ -127,7 +127,7 @@ sub checkdest {
   my $error = $self->ut_text('dest');
   return $error if $error;
 
-  if ( $self->dest =~ /^(POST|FAX)$/ ) {
+  if ( $self->dest eq 'POST' ) {
     #contemplate our navel
   } elsif ( $self->dest =~ /^(\d+)$/ ) {
     return "Unknown local account (specified by svcnum: ". $self->dest. ")"
@@ -136,7 +136,7 @@ sub checkdest {
     my($user, $domain) = ($1, $2);
     $self->dest("$1\@$2");
   } else {
-    return gettext("illegal_email_invoice_address"). ': '. $self->dest;
+    return gettext("illegal_email_invoice_address");
   }
 
   ''; #no error
@@ -144,7 +144,7 @@ sub checkdest {
 
 =item address
 
-Returns the literal email address for this record (or `POST' or `FAX').
+Returns the literal email address for this record (or `POST').
 
 =cut
 
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index f057d2f..1ceb599 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -1,22 +1,19 @@
 package FS::cust_pay;
 
 use strict;
-use vars qw( @ISA $conf $unsuspendauto $ignore_noapply );
+use vars qw( @ISA $conf $unsuspendauto );
 use Date::Format;
 use Business::CreditCard;
 use Text::Template;
-use FS::Misc qw(send_email);
 use FS::Record qw( dbh qsearch qsearchs );
-use FS::cust_main_Mixin;
+use FS::Misc qw(send_email);
 use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_pay_refund;
 use FS::cust_main;
 use FS::cust_pay_void;
 
-@ISA = qw( FS::cust_main_Mixin FS::Record );
-
-$ignore_noapply = 0;
+@ISA = qw( FS::Record );
 
 #ask FS::UID to run this stuff for us later
 FS::UID->install_callback( sub { 
@@ -61,9 +58,7 @@ currently supported:
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
-`LECB' (phone bill billing), `BILL' (billing), `PREP` (prepaid card),
-`CASH' (cash), `WEST' (Western Union), `MCRD' (Manual credit card), or
-`COMP' (free)
+`LECB' (phone bill billing), `BILL' (billing), or `COMP' (free)
 
 =item payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively
 
@@ -84,12 +79,6 @@ Creates a new payment.  To add the payment to the databse, see L<"insert">.
 =cut
 
 sub table { 'cust_pay'; }
-sub cust_linked { $_[0]->cust_main_custnum; } 
-sub cust_unlinked_msg {
-  my $self = shift;
-  "WARNING: can't find cust_main.custnum ". $self->custnum.
-  ' (cust_pay.paynum '. $self->paynum. ')';
-}
 
 =item insert
 
@@ -124,13 +113,12 @@ sub insert {
     $self->custnum($cust_bill->custnum );
   }
 
+  my $cust_main = $self->cust_main;
+  my $old_balance = $cust_main->balance;
 
   my $error = $self->check;
   return $error if $error;
 
-  my $cust_main = $self->cust_main;
-  my $old_balance = $cust_main->balance;
-
   $error = $self->SUPER::insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -146,13 +134,8 @@ sub insert {
     };
     $error = $cust_bill_pay->insert;
     if ( $error ) {
-      if ( $ignore_noapply ) {
-        warn "warning: error inserting $cust_bill_pay: $error ".
-             "(ignore_noapply flag set; inserting cust_pay record anyway)\n";
-      } else {
-        $dbh->rollback if $oldAutoCommit;
-        return "error inserting $cust_bill_pay: $error";
-      }
+      $dbh->rollback if $oldAutoCommit;
+      return "error inserting $cust_bill_pay: $error";
     }
   }
 
@@ -184,7 +167,7 @@ sub insert {
 
   #my $cust_main = $self->cust_main;
   if ( $conf->exists('payment_receipt_email')
-       && grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list
+       && grep { $_ ne 'POST' } $cust_main->invoicing_list
   ) {
 
     my $receipt_template = new Text::Template (
@@ -195,13 +178,12 @@ sub insert {
       return '';
     };
 
-    my @invoicing_list = grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list;
+    my @invoicing_list = grep { $_ ne 'POST' } $cust_main->invoicing_list;
 
     my $payby = $self->payby;
     my $payinfo = $self->payinfo;
     $payby =~ s/^BILL$/Check/ if $payinfo;
-    $payinfo = $self->payinfo_masked if $payby eq 'CARD' || $payby eq 'CHEK';
-    $payby =~ s/^CHEK$/Electronic check/;
+    $payinfo = $self->payinfo_masked if $payby eq 'CARD';
 
     my $error = send_email(
       'from'    => $conf->config('invoice_from'), #??? well as good as any
@@ -375,8 +357,7 @@ sub check {
 
   $self->_date(time) unless $self->_date;
 
-  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREP|CASH|WEST|MCRD)$/
-    or return "Illegal payby";
+  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
   #false laziness with cust_refund::check
@@ -402,61 +383,6 @@ sub check {
   $self->SUPER::check;
 }
 
-=item batch_insert CUST_PAY_OBJECT, ...
-
-Class method which inserts multiple payments.  Takes a list of FS::cust_pay
-objects.  Returns a list, each element representing the status of inserting the
-corresponding payment - empty.  If there is an error inserting any payment, the
-entire transaction is rolled back, i.e. all payments are inserted or none are.
-
-For example:
-
-  my @errors = FS::cust_pay->batch_insert(@cust_pay);
-  my $num_errors = scalar(grep $_, @errors);
-  if ( $num_errors == 0 ) {
-    #success; all payments were inserted
-  } else {
-    #failure; no payments were inserted.
-  }
-
-=cut
-
-sub batch_insert {
-  my $self = shift; #class method
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $errors = 0;
-  
-  my @errors = map {
-    my $error = $_->insert;
-    if ( $error ) { 
-      $errors++;
-    } else {
-      $_->cust_main->apply_payments;
-    }
-    $error;
-  } @_;
-
-  if ( $errors ) {
-    $dbh->rollback if $oldAutoCommit;
-  } else {
-    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  }
-
-  @errors;
-
-}
-
 =item cust_bill_pay
 
 Returns all applications to invoices (see L<FS::cust_bill_pay>) for this
@@ -538,16 +464,8 @@ by 'x'es.  Useful for displaying credit cards.
 
 sub payinfo_masked {
   my $self = shift;
-  #some false laziness w/cust_main::paymask
-  if ( $self->payby eq 'CARD' ) {
-    my $payinfo = $self->payinfo;
-    'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
-  } elsif ( $self->payby eq 'CHEK' ) {
-    my( $account, $aba ) = split('@', $self->payinfo );
-    'x'x(length($account)-2). substr($account,(length($account)-2)). "@". $aba;
-  } else {
-    $self->payinfo;
-  }
+  my $payinfo = $self->payinfo;
+  'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4));
 }
 
 =back
diff --git a/FS/FS/cust_pay_refund.pm b/FS/FS/cust_pay_refund.pm
index 15e0e53..af25f17 100644
--- a/FS/FS/cust_pay_refund.pm
+++ b/FS/FS/cust_pay_refund.pm
@@ -138,26 +138,26 @@ sub check {
   $self->SUPER::check;
 }
 
-=item sub cust_pay
+=item sub cust_credit
 
-Returns the payment (see L<FS::cust_pay>)
+Returns the credit (see L<FS::cust_credit>)
 
 =cut
 
-sub cust_pay {
+sub cust_credit {
   my $self = shift;
-  qsearchs( 'cust_pay', { 'paynum' => $self->paynum } );
+  qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
 }
 
-=item cust_refund
+=item cust_bill 
 
-Returns the refund (see L<FS::cust_refund>)
+Returns the invoice (see L<FS::cust_bill>)
 
 =cut
 
-sub cust_refund {
+sub cust_bill {
   my $self = shift;
-  qsearchs( 'cust_refund', { 'refundnum' => $self->refundnum } );
+  qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
 }
 
 =back
diff --git a/FS/FS/cust_pay_void.pm b/FS/FS/cust_pay_void.pm
index 946d69f..7267929 100644
--- a/FS/FS/cust_pay_void.pm
+++ b/FS/FS/cust_pay_void.pm
@@ -3,8 +3,7 @@ use strict;
 use vars qw( @ISA );
 use Business::CreditCard;
 use FS::UID qw(getotaker);
-use FS::Record qw(qsearchs dbh fields); # qsearch );
-use FS::cust_pay;
+use FS::Record qw(qsearchs); # dbh qsearch );
 #use FS::cust_bill;
 #use FS::cust_bill_pay;
 #use FS::cust_pay_refund;
@@ -48,8 +47,7 @@ are currently supported:
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
-`LECB' (phone bill billing), `BILL' (billing), `CASH' (cash),
-`WEST' (Western Union), `MCRD' (Manual credit card), or `COMP' (free)
+`LECB' (phone bill billing), `BILL' (billing), or `COMP' (free)
 
 =item payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively
 
@@ -79,53 +77,16 @@ sub table { 'cust_pay_void'; }
 
 Adds this voided payment to the database.
 
-=item unvoid 
+=item delete
 
-"Un-void"s this payment: Deletes the voided payment from the database and adds
-back a normal payment.
+Currently unimplemented.
 
 =cut
 
-sub unvoid {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $cust_pay = new FS::cust_pay ( {
-    map { $_ => $self->get($_) } fields('cust_pay')
-  } );
-  my $error = $cust_pay->insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $error = $self->delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
+sub delete {
+  return "Can't delete voided payments!";
 }
 
-=item delete
-
-Deletes this voided payment.  You probably don't want to use this directly; see
-the B<unvoid> method to add the original payment back.
-
 =item replace OLD_RECORD
 
 Currently unimplemented.
@@ -167,8 +128,7 @@ sub check {
 
   $self->void_date(time) unless $self->void_date;
 
-  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREP|CASH|WEST|MCRD)$/
-    or return "Illegal payby";
+  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
   #false laziness with cust_refund::check
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 783cc73..630e88e 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -3,21 +3,18 @@ package FS::cust_pkg;
 use strict;
 use vars qw(@ISA $disable_agentcheck @SVCDB_CANCEL_SEQ $DEBUG);
 use FS::UID qw( getotaker dbh );
-use FS::Misc qw( send_email );
 use FS::Record qw( qsearch qsearchs );
-use FS::cust_main_Mixin;
+use FS::Misc qw( send_email );
 use FS::cust_svc;
 use FS::part_pkg;
 use FS::cust_main;
 use FS::type_pkgs;
 use FS::pkg_svc;
 use FS::cust_bill_pkg;
-use FS::h_cust_svc;
-use FS::reg_code;
 
 # need to 'use' these instead of 'require' in sub { cancel, suspend, unsuspend,
 # setup }
-# because they load configuration by setting FS::UID::callback (see TODO)
+# because they load configuraion by setting FS::UID::callback (see TODO)
 use FS::svc_acct;
 use FS::svc_domain;
 use FS::svc_www;
@@ -26,7 +23,7 @@ use FS::svc_forward;
 # for sending cancel emails in sub cancel
 use FS::Conf;
 
-@ISA = qw( FS::cust_main_Mixin FS::Record );
+@ISA = qw( FS::Record );
 
 $DEBUG = 0;
 
@@ -142,14 +139,8 @@ Create a new billing item.  To add the item to the database, see L<"insert">.
 =cut
 
 sub table { 'cust_pkg'; }
-sub cust_linked { $_[0]->cust_main_custnum; } 
-sub cust_unlinked_msg {
-  my $self = shift;
-  "WARNING: can't find cust_main.custnum ". $self->custnum.
-  ' (cust_pkg.pkgnum '. $self->pkgnum. ')';
-}
 
-=item insert [ OPTION => VALUE ... ]
+=item insert
 
 Adds this billing item to the database ("Orders" the item).  If there is an
 error, returns the error, otherwise returns false.
@@ -158,82 +149,6 @@ If the additional field I<promo_code> is defined instead of I<pkgpart>, it
 will be used to look up the package definition and agent restrictions will be
 ignored.
 
-The following options are available: I<change>
-
-I<change>, if set true, supresses any referral credit to a referring customer.
-
-=cut
-
-sub insert {
-  my( $self, %options ) = @_;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  #if ( $self->reg_code ) {
-  #  my $reg_code = qsearchs('reg_code', { 'code' => $self->reg_code } );
-  #  $error = $reg_code->delete;
-  #  if ( $error ) {
-  #    $dbh->rollback if $oldAutoCommit;
-  #    return $error;
-  #  }
-  #}
-
-  my $conf = new FS::Conf;
-  my $cust_main = $self->cust_main;
-  my $part_pkg = $self->part_pkg;
-  if ( $conf->exists('referral_credit')
-       && $cust_main->referral_custnum
-       && ! $options{'change'}
-       && $part_pkg->freq !~ /^0\D?$/
-     )
-  {
-    my $referring_cust_main = $cust_main->referring_cust_main;
-    if ( $referring_cust_main->status ne 'cancelled' ) {
-      my $error;
-      if ( $part_pkg->freq !~ /^\d+$/ ) {
-        warn 'WARNING: Not crediting customer '. $cust_main->referral_custnum.
-             ' for package '. $self->pkgnum.
-             ' ( customer '. $self->custnum. ')'.
-             ' - One-time referral credits not (yet) available for '.
-             ' packages with '. $part_pkg->freq_pretty. ' frequency';
-      } else {
-
-        my $amount = sprintf( "%.2f", $part_pkg->base_recur / $part_pkg->freq );
-        my $error =
-          $referring_cust_main->credit( $amount,
-                                        'Referral credit for '. $cust_main->name
-                                      );
-        if ( $error ) {
-          $dbh->rollback if $oldAutoCommit;
-          return "Error crediting customer ". $cust_main->referral_custnum.
-               " for referral: $error";
-        }
-
-      }
-
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
 =item delete
 
 This method now works but you probably shouldn't use it.
@@ -264,8 +179,6 @@ suspend is normally updated by the suspend and unsuspend methods.
 cancel is normally updated by the cancel method (and also the order subroutine
 in some cases).
 
-Calls 
-
 =cut
 
 sub replace {
@@ -283,51 +196,7 @@ sub replace {
 
   local($disable_agentcheck) = 1 if $old->pkgpart == $new->pkgpart;
 
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  #save off and freeze RADIUS attributes for any associated svc_acct records
-  my @svc_acct = ();
-  if ( $old->part_pkg->is_prepaid || $new->part_pkg->is_prepaid ) {
-
-                #also check for specific exports?
-                # to avoid spurious modify export events
-    @svc_acct = map  { $_->svc_x }
-                grep { $_->part_svc->svcdb eq 'svc_acct' }
-                     $old->cust_svc;
-
-    $_->snapshot foreach @svc_acct;
-
-  }
-
-  my $error = $new->SUPER::replace($old);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  #for prepaid packages,
-  #trigger export of new RADIUS Expiration attribute when cust_pkg.bill changes
-  foreach my $old_svc_acct ( @svc_acct ) {
-    my $new_svc_acct = new FS::svc_acct { $old_svc_acct->hash };
-    my $s_error = $new_svc_acct->replace($old_svc_acct);
-    if ( $s_error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $s_error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
+  $new->SUPER::replace($old);
 }
 
 =item check
@@ -352,17 +221,7 @@ sub check {
   ;
   return $error if $error;
 
-  if ( $self->reg_code ) {
-
-    unless ( grep { $self->pkgpart == $_->pkgpart }
-             map  { $_->reg_code_pkg }
-             qsearchs( 'reg_code', { 'code'     => $self->reg_code,
-                                     'agentnum' => $self->cust_main->agentnum })
-           ) {
-      return "Unknown registration code";
-    }
-
-  } elsif ( $self->promo_code ) {
+  if ( $self->promo_code ) {
 
     my $promo_part_pkg =
       qsearchs('part_pkg', {
@@ -370,6 +229,7 @@ sub check {
         'promo_code' => { op=>'ILIKE', value=>$self->promo_code },
       } );
     return 'Unknown promotional code' unless $promo_part_pkg;
+    $self->pkgpart($promo_part_pkg->pkgpart);
 
   } else { 
 
@@ -448,20 +308,6 @@ sub cancel {
     }
   }
 
-  # Add a credit for remaining service
-  my $remaining_value = $self->calc_remain();
-  if ( $remaining_value > 0 ) {
-    my $error = $self->cust_main->credit(
-      $remaining_value,
-      'Credit for unused time on '. $self->part_pkg->pkg,
-    );
-    if ($error) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Error crediting customer \$$remaining_value for unused time on".
-             $self->part_pkg->pkg. ": $error";
-    }                                                                          
-  }                                                                            
-
   unless ( $self->getfield('cancel') ) {
     my %hash = $self->hash;
     $hash{'cancel'} = time;
@@ -476,7 +322,7 @@ sub cancel {
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   my $conf = new FS::Conf;
-  my @invoicing_list = grep { $_ !~ /^(POST|FAX)$/ } $self->cust_main->invoicing_list;
+  my @invoicing_list = grep { $_ ne 'POST' } $self->cust_main->invoicing_list;
   if ( !$options{'quiet'} && $conf->exists('emailcancel') && @invoicing_list ) {
     my $conf = new FS::Conf;
     my $error = send_email(
@@ -678,30 +524,6 @@ sub calc_recur {
   $self->part_pkg->calc_recur($self, @_);
 }
 
-=item calc_remain
-
-Calls the I<calc_remain> of the FS::part_pkg object associated with this
-billing item.
-
-=cut
-
-sub calc_remain {
-  my $self = shift;
-  $self->part_pkg->calc_remain($self, @_);
-}
-
-=item calc_cancel
-
-Calls the I<calc_cancel> of the FS::part_pkg object associated with this
-billing item.
-
-=cut
-
-sub calc_cancel {
-  my $self = shift;
-  $self->part_pkg->calc_cancel($self, @_);
-}
-
 =item cust_svc [ SVCPART ]
 
 Returns the services for this package, as FS::cust_svc objects (see
@@ -721,50 +543,21 @@ sub cust_svc {
   #if ( $self->{'_svcnum'} ) {
   #  values %{ $self->{'_svcnum'}->cache };
   #} else {
-    $self->_sort_cust_svc(
-      [ qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } ) ]
-    );
+    map  { $_->[0] }
+    sort { $b->[1] cmp $a->[1]  or  $a->[2] <=> $b->[2] } 
+    map {
+          my $pkg_svc = qsearchs( 'pkg_svc', { 'pkgpart' => $self->pkgpart,
+                                               'svcpart' => $_->svcpart     } );
+          [ $_,
+            $pkg_svc ? $pkg_svc->primary_svc : '',
+            $pkg_svc ? $pkg_svc->quantity : 0,
+          ];
+        }
+    qsearch( 'cust_svc', { 'pkgnum' => $self->pkgnum } );
   #}
 
 }
 
-=item h_cust_svc END_TIMESTAMP [ START_TIMESTAMP ] 
-
-Returns historical services for this package created before END TIMESTAMP and
-(optionally) not cancelled before START_TIMESTAMP, as FS::h_cust_svc objects
-(see L<FS::h_cust_svc>).
-
-=cut
-
-sub h_cust_svc {
-  my $self = shift;
-
-  $self->_sort_cust_svc(
-    [ qsearch( 'h_cust_svc',
-               { 'pkgnum' => $self->pkgnum, },
-               FS::h_cust_svc->sql_h_search(@_),
-             )
-    ]
-  );
-}
-
-sub _sort_cust_svc {
-  my( $self, $arrayref ) = @_;
-
-  map  { $_->[0] }
-  sort { $b->[1] cmp $a->[1]  or  $a->[2] <=> $b->[2] } 
-  map {
-        my $pkg_svc = qsearchs( 'pkg_svc', { 'pkgpart' => $self->pkgpart,
-                                             'svcpart' => $_->svcpart     } );
-        [ $_,
-          $pkg_svc ? $pkg_svc->primary_svc : '',
-          $pkg_svc ? $pkg_svc->quantity : 0,
-        ];
-      }
-  @$arrayref;
-
-}
-
 =item num_cust_svc [ SVCPART ]
 
 Returns the number of provisioned services for this package.  If a svcpart is
@@ -801,54 +594,6 @@ sub available_part_svc {
       $self->part_pkg->pkg_svc;
 }
 
-=item status
-
-Returns a short status string for this package, currently:
-
-=over 4
-
-=item not yet billed
-
-=item one-time charge
-
-=item active
-
-=item suspended
-
-=item cancelled
-
-=back
-
-=cut
-
-sub status {
-  my $self = shift;
-
-  return 'cancelled' if $self->get('cancel');
-  return 'suspended' if $self->susp;
-  return 'not yet billed' unless $self->setup;
-  return 'one-time charge' if $self->part_pkg->freq =~ /^(0|$)/;
-  return 'active';
-}
-
-=item statuscolor
-
-Returns a hex triplet color string for this package's status.
-
-=cut
-
-my %statuscolor = (
-  'not yet billed'  => '000000',
-  'one-time charge' => '000000',
-  'active'          => '00CC00',
-  'suspended'       => 'FF9900',
-  'cancelled'       => 'FF0000',
-);
-sub statuscolor {
-  my $self = shift;
-  $statuscolor{$self->status};
-}
-
 =item labels
 
 Returns a list of lists, calling the label method for all services
@@ -861,52 +606,6 @@ sub labels {
   map { [ $_->label ] } $self->cust_svc;
 }
 
-=item h_labels END_TIMESTAMP [ START_TIMESTAMP ] 
-
-Like the labels method, but returns historical information on services that
-were active as of END_TIMESTAMP and (optionally) not cancelled before
-START_TIMESTAMP.
-
-Returns a list of lists, calling the label method for all (historical) services
-(see L<FS::h_cust_svc>) of this billing item.
-
-=cut
-
-sub h_labels {
-  my $self = shift;
-  map { [ $_->label(@_) ] } $self->h_cust_svc(@_);
-}
-
-=item h_labels_short END_TIMESTAMP [ START_TIMESTAMP ]
-
-Like h_labels, except returns a simple flat list, and shortens long 
-(currently >5) lists of identical services to one line that lists the service
-label and the number of individual services rather than individual items.
-
-=cut
-
-sub h_labels_short {
-  my $self = shift;
-
-  my %labels;
-  #tie %labels, 'Tie::IxHash';
-  push @{ $labels{$_->[0]} }, $_->[1]
-    foreach $self->h_labels(@_);
-  my @labels;
-  foreach my $label ( keys %labels ) {
-    my @values = @{ $labels{$label} };
-    my $num = scalar(@values);
-    if ( $num > 5 ) {
-      push @labels, "$label ($num)";
-    } else {
-      push @labels, map { "$label: $_" } @values;
-    }
-  }
-
- @labels;
-
-}
-
 =item cust_main
 
 Returns the parent customer object (see L<FS::cust_main>).
@@ -1163,60 +862,6 @@ sub reexport {
 
 =back
 
-=head1 CLASS METHOD
-
-=over 4
-
-=item recurring_sql
-
-Returns an SQL expression identifying recurring packages.
-
-=cut
-
-sub recurring_sql { "
-  '0' != ( select freq from part_pkg
-             where cust_pkg.pkgpart = part_pkg.pkgpart )
-"; }
-
-=item active_sql
-
-Returns an SQL expression identifying active packages.
-
-=cut
-
-sub active_sql { "
-  ". $_[0]->recurring_sql(). "
-  AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-  AND ( cust_pkg.susp   IS NULL OR cust_pkg.susp   = 0 )
-"; }
-
-=item susp_sql
-=item suspended_sql
-
-Returns an SQL expression identifying suspended packages.
-
-=cut
-
-sub suspended_sql { susp_sql(@_); }
-sub susp_sql { "
-  ". $_[0]->recurring_sql(). "
-  AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-  AND cust_pkg.susp IS NOT NULL AND cust_pkg.susp != 0
-"; }
-
-=item cancel_sql
-=item cancelled_sql
-
-Returns an SQL exprression identifying cancelled packages.
-
-=cut
-
-sub cancelled_sql { cancel_sql(@_); }
-sub cancel_sql { "
-  ". $_[0]->recurring_sql(). "
-  AND cust_pkg.cancel IS NOT NULL AND cust_pkg.cancel != 0
-"; }
-
 =head1 SUBROUTINES
 
 =over 4
@@ -1261,24 +906,12 @@ sub order {
   my $cust_main = qsearchs('cust_main', { custnum => $custnum });
   return "Customer not found: $custnum" unless $cust_main;
 
-  my @old_cust_pkg = map { qsearchs('cust_pkg', { pkgnum => $_ }) }
-                         @$remove_pkgnum;
-
-  my $change = scalar(@old_cust_pkg) != 0;
-
-  my %hash = (); 
-  if ( scalar(@old_cust_pkg) == 1 ) {
-    #$hash{$_} = $old_cust_pkg[0]->$_() foreach qw( last_bill bill );
-    $hash{'setup'} = time;
-  }
-
   # Create the new packages.
-  foreach my $pkgpart (@$pkgparts) {
-    my $cust_pkg = new FS::cust_pkg { custnum => $custnum,
-                                      pkgpart => $pkgpart,
-                                      %hash,
-                                    };
-    $error = $cust_pkg->insert( 'change' => $change );
+  my $cust_pkg;
+  foreach (@$pkgparts) {
+    $cust_pkg = new FS::cust_pkg { custnum => $custnum,
+                                   pkgpart => $_ };
+    $error = $cust_pkg->insert;
     if ($error) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
@@ -1289,7 +922,8 @@ sub order {
   # created packages.
 
   # Transfer services and cancel old packages.
-  foreach my $old_pkg (@old_cust_pkg) {
+  foreach my $old_pkgnum (@$remove_pkgnum) {
+    my $old_pkg = qsearchs ('cust_pkg', { pkgnum => $old_pkgnum });
 
     foreach my $new_pkg (@$return_cust_pkg) {
       $error = $old_pkg->transfer($new_pkg);
diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 8c672b8..106ccd3 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -51,8 +51,7 @@ inherits from FS::Record.  The following fields are currently supported:
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
-`LECB' (Phone bill billing), `BILL' (billing), `CASH' (cash),
-`WEST' (Western Union), `MCRD' (Manual credit card), or `COMP' (free)
+`LECB' (Phone bill billing), `BILL' (billing), or `COMP' (free)
 
 =item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
 
@@ -212,8 +211,7 @@ sub check {
     unless $self->crednum 
            || qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
-  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|CASH|WEST|MCRD)$/
-    or return "Illegal payby";
+  $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
   #false laziness with cust_pay::check
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index ad87cab..8990d54 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -1,8 +1,8 @@
 package FS::cust_svc;
 
 use strict;
-use vars qw( @ISA $DEBUG $ignore_quantity );
-use Carp qw( carp cluck );
+use vars qw( @ISA $ignore_quantity );
+use Carp qw( cluck );
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::cust_pkg;
@@ -19,8 +19,6 @@ use FS::part_export;
 
 @ISA = qw( FS::Record );
 
-$DEBUG = 0;
-
 $ignore_quantity = 0;
 
 sub _cache {
@@ -178,7 +176,6 @@ sub replace {
   if ( $new->svcpart != $old->svcpart ) {
     my $svc_x = $new->svc_x;
     my $new_svc_x = ref($svc_x)->new({$svc_x->hash, svcpart=>$new->svcpart });
-    local($FS::Record::nowarn_identical) = 1;
     my $error = $new_svc_x->replace($svc_x);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -200,7 +197,7 @@ sub replace {
 =item check
 
 Checks all fields to make sure this is a valid service.  If there is an error,
-returns the error, otherwise returns false.  Called by the insert and
+returns the error, otehrwise returns false.  Called by the insert and
 replace methods.
 
 =cut
@@ -258,8 +255,8 @@ sub part_svc {
 
 =item cust_pkg
 
-Returns the package this service belongs to, as a FS::cust_pkg object (see
-L<FS::cust_pkg>).
+Returns the definition for this service, as a FS::part_svc object (see
+L<FS::part_svc>).
 
 =cut
 
@@ -274,51 +271,42 @@ Returns a list consisting of:
 - The name of this service (from part_svc)
 - A meaningful identifier (username, domain, or mail alias)
 - The table name (i.e. svc_domain) for this service
-- svcnum
 
 =cut
 
 sub label {
   my $self = shift;
-  carp "FS::cust_svc::label called on $self" if $DEBUG;
-  my $svc_x = $self->svc_x
-    or die "can't find ". $self->part_svc->svcdb. '.svcnum '. $self->svcnum;
-  $self->_svc_label($svc_x);
-}
-
-sub _svc_label {
-  my( $self, $svc_x ) = ( shift, shift );
   my $svcdb = $self->part_svc->svcdb;
-
+  my $svc_x = $self->svc_x
+    or die "can't find $svcdb.svcnum ". $self->svcnum;
   my $tag;
   if ( $svcdb eq 'svc_acct' ) {
-    $tag = $svc_x->email(@_);
+    $tag = $svc_x->email;
   } elsif ( $svcdb eq 'svc_forward' ) {
     if ( $svc_x->srcsvc ) {
-      my $svc_acct = $svc_x->srcsvc_acct(@_);
-      $tag = $svc_acct->email(@_);
+      my $svc_acct = $svc_x->srcsvc_acct;
+      $tag = $svc_acct->email;
     } else {
       $tag = $svc_x->src;
     }
     $tag .= '->';
     if ( $svc_x->dstsvc ) {
-      my $svc_acct = $svc_x->dstsvc_acct(@_);
-      $tag .= $svc_acct->email(@_);
+      my $svc_acct = $svc_x->dstsvc_acct;
+      $tag .= $svc_acct->email;
     } else {
       $tag .= $svc_x->dst;
     }
   } elsif ( $svcdb eq 'svc_domain' ) {
     $tag = $svc_x->getfield('domain');
   } elsif ( $svcdb eq 'svc_www' ) {
-    my $domain_record = $svc_x->domain_record(@_);
-    $tag = $domain_record->zone;
+    my $domain = qsearchs( 'domain_record', { 'recnum' => $svc_x->recnum } );
+    $tag = $domain->zone;
   } elsif ( $svcdb eq 'svc_broadband' ) {
     $tag = $svc_x->ip_addr;
   } elsif ( $svcdb eq 'svc_external' ) {
     my $conf = new FS::Conf;
     if ( $conf->config('svc_external-display_type') eq 'artera_turbo' ) {
-      $tag = sprintf('%010d', $svc_x->id). '-'.
-             substr('0000000000'.uc($svc_x->title), -10);
+      $tag = sprintf('%010d', $svc_x->id). '-'. $svc_x->title;
     } else {
       $tag = $svc_x->id. ': '. $svc_x->title;
     }
@@ -326,9 +314,7 @@ sub _svc_label {
     cluck "warning: asked for label of unsupported svcdb; using svcnum";
     $tag = $svc_x->getfield('svcnum');
   }
-
-  $self->part_svc->svc, $tag, $svcdb, $self->svcnum;
-
+  $self->part_svc->svc, $tag, $svcdb;
 }
 
 =item svc_x
@@ -384,9 +370,10 @@ sub seconds_since_sqlradacct {
 
   my $svc_x = $self->svc_x;
 
-  my @part_export = $self->part_svc->part_export_usage;
-  die "no accounting-capable exports are enabled for ". $self->part_svc->svc.
-      " service definition"
+  my @part_export = $self->part_svc->part_export('sqlradius');
+  push @part_export, $self->part_svc->part_export('sqlradius_withdomain');
+  die "no sqlradius or sqlradius_withdomain export configured for this".
+      "service type"
     unless @part_export;
     #or return undef;
 
@@ -411,7 +398,14 @@ sub seconds_since_sqlradacct {
       $str2time = 'extract(epoch from ';
     }
 
-    my $username = $part_export->export_username($svc_x);
+    my $username;
+    if ( $part_export->exporttype eq 'sqlradius' ) {
+      $username = $svc_x->username;
+    } elsif ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
+      $username = $svc_x->email;
+    } else {
+      die 'unknown exporttype '. $part_export->exporttype;
+    }
 
     my $query;
   
@@ -493,9 +487,10 @@ sub attribute_since_sqlradacct {
 
   my $svc_x = $self->svc_x;
 
-  my @part_export = $self->part_svc->part_export_usage;
-  die "no accounting-capable exports are enabled for ". $self->part_svc->svc.
-      " service definition"
+  my @part_export = $self->part_svc->part_export('sqlradius');
+  push @part_export, $self->part_svc->part_export('sqlradius_withdomain');
+  die "no sqlradius or sqlradius_withdomain export configured for this".
+      "service type"
     unless @part_export;
     #or return undef;
 
@@ -521,7 +516,14 @@ sub attribute_since_sqlradacct {
       $str2time = 'extract(epoch from ';
     }
 
-    my $username = $part_export->export_username($svc_x);
+    my $username;
+    if ( $part_export->exporttype eq 'sqlradius' ) {
+      $username = $svc_x->username;
+    } elsif ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
+      $username = $svc_x->email;
+    } else {
+      die 'unknown exporttype '. $part_export->exporttype;
+    }
 
     my $sth = $dbh->prepare("SELECT SUM($attrib)
                                FROM radacct
@@ -540,11 +542,11 @@ sub attribute_since_sqlradacct {
 
 }
 
-=item get_session_history TIMESTAMP_START TIMESTAMP_END
+=item get_session_history_sqlradacct TIMESTAMP_START TIMESTAMP_END
 
-See L<FS::svc_acct/get_session_history>.  Equivalent to
-$cust_svc->svc_x->get_session_history, but more efficient.  Meaningless for
-records where B<svcdb> is not "svc_acct".
+See L<FS::svc_acct/get_session_history_sqlradacct>.  Equivalent to
+$cust_svc->svc_x->get_session_history_sqlradacct, but more efficient.
+Meaningless for records where B<svcdb> is not "svc_acct".
 
 =cut
 
@@ -553,20 +555,21 @@ sub get_session_history {
 
   #$attrib ???
 
-  my @part_export = $self->part_svc->part_export_usage;
-  die "no accounting-capable exports are enabled for ". $self->part_svc->svc.
-      " service definition"
+  #my @part_export = $cust_svc->part_svc->part_export->can('usage_sessions');
+  my @part_export = $self->part_svc->part_export('sqlradius');
+  push @part_export, $self->part_svc->part_export('sqlradius_withdomain');
+  die "no sqlradius or sqlradius_withdomain export configured for this".
+      "service type"
     unless @part_export;
     #or return undef;
                      
   my @sessions = ();
 
   foreach my $part_export ( @part_export ) {
-    push @sessions,
-      @{ $part_export->usage_sessions( $start, $end, $self->svc_x ) };
+    push @sessions, $part_export->usage_sessions( $self->svc_x, $start, $end );
   }
 
-  @sessions;
+  \@sessions;
 
 }
 
diff --git a/FS/FS/domain_record.pm b/FS/FS/domain_record.pm
index 3c65a1a..2a30594 100644
--- a/FS/FS/domain_record.pm
+++ b/FS/FS/domain_record.pm
@@ -10,7 +10,7 @@ use FS::svc_www;
 
 @ISA = qw(FS::Record);
 
-$DEBUG = 0;
+$DEBUG = 1;
 
 =head1 NAME
 
@@ -250,23 +250,15 @@ sub check {
   return "Unknown svcnum (in svc_domain)"
     unless qsearchs('svc_domain', { 'svcnum' => $self->svcnum } );
 
-  my $conf = new FS::Conf;
-
-  if ( $conf->exists('zone-underscore') ) {
-    $self->reczone =~ /^(@|[a-z0-9_\.\-\*]+)$/i
-      or return "Illegal reczone: ". $self->reczone;
-    $self->reczone($1);
-  } else {
-    $self->reczone =~ /^(@|[a-z0-9\.\-\*]+)$/i
-      or return "Illegal reczone: ". $self->reczone;
-    $self->reczone($1);
-  }
+  $self->reczone =~ /^(@|[a-z0-9\.\-\*]+)$/i
+    or return "Illegal reczone: ". $self->reczone;
+  $self->reczone($1);
 
   $self->recaf =~ /^(IN)$/ or return "Illegal recaf: ". $self->recaf;
   $self->recaf($1);
 
-  $self->rectype =~ /^(SOA|NS|MX|A|PTR|CNAME|TXT|_mstr)$/
-    or return "Illegal rectype (only SOA NS MX A PTR CNAME TXT recognized): ".
+  $self->rectype =~ /^(SOA|NS|MX|A|PTR|CNAME|_mstr)$/
+    or return "Illegal rectype (only SOA NS MX A PTR CNAME recognized): ".
               $self->rectype;
   $self->rectype($1);
 
@@ -292,26 +284,13 @@ sub check {
       or return "Illegal data for A record: ". $self->recdata;
     $self->recdata($1);
   } elsif ( $self->rectype eq 'PTR' ) {
-    if ( $conf->exists('zone-underscore') ) {
-      $self->recdata =~ /^([a-z0-9_\.\-]+)$/i
-        or return "Illegal data for PTR record: ". $self->recdata;
-      $self->recdata($1);
-    } else {
-      $self->recdata =~ /^([a-z0-9\.\-]+)$/i
-        or return "Illegal data for PTR record: ". $self->recdata;
-      $self->recdata($1);
-    }
+    $self->recdata =~ /^([a-z0-9\.\-]+)$/i
+      or return "Illegal data for PTR record: ". $self->recdata;
+    $self->recdata($1);
   } elsif ( $self->rectype eq 'CNAME' ) {
     $self->recdata =~ /^([a-z0-9\.\-]+|\@)$/i
       or return "Illegal data for CNAME record: ". $self->recdata;
     $self->recdata($1);
-  } elsif ( $self->rectype eq 'TXT' ) {
-    if ( $self->recdata =~ /^((?:\S+)|(?:".+"))$/ ) {
-      $self->recdata($1);
-    } else {
-      $self->recdata('"'. $self->recdata. '"'); #?
-    }
-    #  or return "Illegal data for TXT record: ". $self->recdata;
   } elsif ( $self->rectype eq '_mstr' ) {
     $self->recdata =~ /^((\d{1,3}\.){3}\d{1,3})$/
       or return "Illegal data for _master pseudo-record: ". $self->recdata;
diff --git a/FS/FS/export_svc.pm b/FS/FS/export_svc.pm
index 0370f5f..d1153c0 100644
--- a/FS/FS/export_svc.pm
+++ b/FS/FS/export_svc.pm
@@ -60,21 +60,16 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'export_svc'; }
 
-=item insert [ JOB, OFFSET, MULTIPLIER ]
+=item insert
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-TODOC: JOB, OFFSET, MULTIPLIER
-
 =cut
 
 sub insert {
   my $self = shift;
-  my( $job, $offset, $mult ) = ( '', 0, 100);
-  $job = shift if @_;
-  $offset = shift if @_;
-  $mult = shift if @_;
+  my $error;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -87,7 +82,7 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $error = $self->check;
+  $error = $self->check;
   return $error if $error;
 
   #check for duplicates!
@@ -131,82 +126,48 @@ sub insert {
     warn "WARNING: No duplicate checking done on merge of $svcdb exports";
   }
 
-  if ( @checks ) {
-  
-    my $done = 0;
-    my $percheck = $mult / scalar(@checks);
-
-    foreach my $check ( @checks ) {
-  
-      if ( $job ) {
-        $error = $job->update_statustext(int( $offset + ($done+.33) *$percheck ));
-        if ( $error ) {
-          $dbh->rollback if $oldAutoCommit;
-          return $error;
-        }
-      }
-  
-      my @current_svc = $self->part_export->svc_x;
-      #warn "current: ". scalar(@current_svc). " $current_svc[0]\n";
-  
-      if ( $job ) {
-        $error = $job->update_statustext(int( $offset + ($done+.67) *$percheck ));
-        if ( $error ) {
-          $dbh->rollback if $oldAutoCommit;
-          return $error;
-        }
-      }
-  
-      my @new_svc = $self->part_svc->svc_x;
-      #warn "new: ". scalar(@new_svc). " $new_svc[0]\n";
-  
-      if ( $job ) {
-        $error = $job->update_statustext(int( $offset + ($done+1) *$percheck ));
-        if ( $error ) {
-          $dbh->rollback if $oldAutoCommit;
-          return $error;
-        }
-      }
-  
-      my $method = $check->{'method'};
-      my %cur_svc = map { $_->$method() => $_ } @current_svc;
-      my @dup_svc = grep { $cur_svc{$_->$method()} } @new_svc;
-      #my @diff_customer = grep { 
-      #                           $_->cust_pkg->custnum != $cur_svc{$_->$method()}->cust_pkg->custnum
-      #                         } @dup_svc;
-  
-  
-  
-      if ( @dup_svc ) { #aye, that's the rub
-        #error out for now, eventually accept different options of adjustments
-        # to make to allow us to continue forward
-        $dbh->rollback if $oldAutoCommit;
-  
-        my @diff_customer_svc = grep {
-          my $cust_pkg = $_->cust_svc->cust_pkg;
-          my $custnum = $cust_pkg ? $cust_pkg->custnum : 0;
-          my $other_cust_pkg = $cur_svc{$_->$method()}->cust_svc->cust_pkg;
-          my $other_custnum = $other_cust_pkg ? $other_cust_pkg->custnum : 0;
-          $custnum != $other_custnum;
-        } @dup_svc;
-  
-        my $label = $check->{'label'};
-        my $sortby = $check->{'sortby'};
-        return "Can't export ".
-               $self->part_svc->svcpart.':'.$self->part_svc->svc. " service to ".
-               $self->part_export->exportnum.':'.$self->part_export->exporttype.
-                 ' on '. $self->part_export->machine.
-               ' : '. scalar(@dup_svc). " duplicate $label".
-               ' ('. scalar(@diff_customer_svc). " from different customers)".
-               ": ". join(', ', sort $sortby map { $_->$method() } @dup_svc )
-               #": ". join(', ', sort $sortby map { $_->$method() } @diff_customer_svc )
-               ;
-      }
-  
-      $done++;
+  foreach my $check ( @checks ) {
+    my @current_svc = $self->part_export->svc_x;
+    #warn "current: ". scalar(@current_svc). " $current_svc[0]\n";
+    my @new_svc = $self->part_svc->svc_x;
+    #warn "new: ". scalar(@new_svc). " $new_svc[0]\n";
+    my $method = $check->{'method'};
+    my %cur_svc = map { $_->$method() => $_ } @current_svc;
+    my @dup_svc = grep { $cur_svc{$_->$method()} } @new_svc;
+    #my @diff_customer = grep { 
+    #                           $_->cust_pkg->custnum != $cur_svc{$_->$method()}->cust_pkg->custnum
+    #                         } @dup_svc;
+
+
+
+    if ( @dup_svc ) { #aye, that's the rub
+      #error out for now, eventually accept different options of adjustments
+      # to make to allow us to continue forward
+      $dbh->rollback if $oldAutoCommit;
+
+      my @diff_customer_svc = grep {
+        my $cust_pkg = $_->cust_svc->cust_pkg;
+        my $custnum = $cust_pkg ? $cust_pkg->custnum : 0;
+        my $other_cust_pkg = $cur_svc{$_->$method()}->cust_svc->cust_pkg;
+        my $other_custnum = $other_cust_pkg ? $other_cust_pkg->custnum : 0;
+        $custnum != $other_custnum;
+      } @dup_svc;
+
+      my $label = $check->{'label'};
+      my $sortby = $check->{'sortby'};
+      return "Can't export ".
+             $self->part_svc->svcpart.':'.$self->part_svc->svc. " service to ".
+             $self->part_export->exportnum.':'.$self->part_export->exporttype.
+               ' on '. $self->part_export->machine.
+             ' : '. scalar(@dup_svc). " duplicate $label".
+             ' ('. scalar(@diff_customer_svc). " from different customers)".
+             #": ". join(', ', sort $sortby map { $_->$method() } @dup_svc )
+             ": ". join(', ', sort $sortby map { $_->$method() } @diff_customer_svc )
+             ;
     }
+  }
 
-  } #end of duplicate check, whew
+  #end of duplicate check, whew
 
   $error = $self->SUPER::insert;
   if ( $error ) {
diff --git a/FS/FS/h_Common.pm b/FS/FS/h_Common.pm
deleted file mode 100644
index d55da8c..0000000
--- a/FS/FS/h_Common.pm
+++ /dev/null
@@ -1,103 +0,0 @@
-package FS::h_Common;
-
-use strict;
-use FS::Record qw(dbdef);
-use Carp qw(confess);
-
-=head1 NAME
-
-FS::h_Common - History table "mixin" common base class
-
-=head1 SYNOPSIS
-
-package FS::h_tablename;
-@ISA = qw( FS::h_Common FS::tablename ); 
-
-sub table { 'h_table_name'; }
-
-sub insert { return "can't insert history records manually"; }
-sub delete { return "can't delete history records"; }
-sub replace { return "can't modify history records"; }
-
-=head1 DESCRIPTION
-
-FS::h_Common is intended as a "mixin" base class for history table classes to
-inherit from.
-
-=head1 METHODS
-
-=over 4
-
-=item sql_h_search END_TIMESTAMP [ START_TIMESTAMP ] 
-
-Returns an a list consisting of the "SELECT" and "EXTRA_SQL" SQL fragments to
-search for the appropriate history records created before END_TIMESTAMP
-and (optionally) not cancelled before START_TIMESTAMP.
-
-=cut
-
-sub sql_h_search {
-  my( $self, $end ) = ( shift, shift );
-
-  my $table = $self->table;
-  my $real_table = ($table =~ /^h_(.*)$/) ? $1 : $table;
-  my $pkey = dbdef->table($real_table)->primary_key
-    or die "can't (yet) search history table $real_table without a primary key";
-
-  unless ($end) {
-    confess 'Called sql_h_search without END_TIMESTAMP';
-  }
-
-  my $notcancelled = '';
-  if ( scalar(@_) && $_[0] ) {
-    $notcancelled = "AND 0 = ( SELECT COUNT(*) FROM $table as notdel
-                                WHERE notdel.$pkey = maintable.$pkey
-                                AND notdel.history_action = 'delete'
-                                AND notdel.history_date > maintable.history_date
-                                AND notdel.history_date <= $_[0]
-                             )";
-  }
-
-  (
-    "DISTINCT ON ( $pkey ) *",
-
-    "AND history_date <= $end
-     AND (    history_action = 'insert'
-           OR history_action = 'replace_new'
-         )
-     $notcancelled
-     ORDER BY $pkey ASC, history_date DESC",
-
-     '',
-
-     'AS maintable',
-  );
-
-}
-
-=item sql_h_searchs END_TIMESTAMP [ START_TIMESTAMP ] 
-
-Like sql_h_search, but limited to the single most recent record (before
-END_TIMESTAMP)
-
-=cut
-
-sub sql_h_searchs {
-  my $self = shift;
-  my($select, $where, $cacheobj, $as) = $self->sql_h_search(@_);
-  $where .= ' LIMIT 1';
-  ($select, $where, $cacheobj, $as);
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation
-
-=cut
-
-1;
-
diff --git a/FS/FS/h_cust_svc.pm b/FS/FS/h_cust_svc.pm
deleted file mode 100644
index af0bf60..0000000
--- a/FS/FS/h_cust_svc.pm
+++ /dev/null
@@ -1,107 +0,0 @@
-package FS::h_cust_svc;
-
-use strict;
-use vars qw( @ISA $DEBUG );
-use Carp;
-use FS::Record qw(qsearchs);
-use FS::h_Common;
-use FS::cust_svc;
-
-@ISA = qw( FS::h_Common FS::cust_svc );
-
-$DEBUG = 0;
-
-sub table { 'h_cust_svc'; }
-
-=head1 NAME
-
-FS::h_cust_svc - Object method for h_cust_svc objects
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-An FS::h_cust_svc object  represents a historical service.  FS::h_cust_svc
-inherits from FS::h_Common and FS::cust_svc.
-
-=head1 METHODS
-
-=over 4
-
-=item label END_TIMESTAMP [ START_TIMESTAMP ] 
-
-Returns a list consisting of:
-- The name of this historical service (from part_svc)
-- A meaningful identifier (username, domain, or mail alias)
-- The table name (i.e. svc_domain) for this historical service
-
-=cut
-
-sub label {
-  my $self = shift;
-  carp "FS::h_cust_svc::label called on $self" if $DEBUG;
-  my $svc_x = $self->h_svc_x(@_);
-  my $part_svc = $self->part_svc;
-
-  unless ($svc_x) {
-    carp "can't find h_". $self->part_svc->svcdb. '.svcnum '. $self->svcnum if $DEBUG;
-    return $part_svc->svc, 'n/a', $part_svc->svcdb;
-  }
-
-  my @label;
-  eval { @label = $self->_svc_label($svc_x, @_); };
-
-  if ($@) {
-    carp 'while resolving history record for svcdb/svcnum ' . 
-         $part_svc->svcdb . '/' . $self->svcnum . ': ' . $@ if $DEBUG;
-    return $part_svc->svc, 'n/a', $part_svc->svcdb;
-  } else {
-    return @label;
-  }
-
-}
-
-=item h_svc_x END_TIMESTAMP [ START_TIMESTAMP ] 
-
-Returns the FS::h_svc_XXX object for this service as of END_TIMESTAMP (i.e. an
-FS::h_svc_acct object or FS::h_svc_domain object, etc.) and (optionally) not
-cancelled before START_TIMESTAMP.
-
-=cut
-
-#false laziness w/cust_pkg::h_cust_svc
-sub h_svc_x {
-  my $self = shift;
-  my $svcdb = $self->part_svc->svcdb;
-
-  warn "requiring FS/h_$svcdb.pm" if $DEBUG;
-  require "FS/h_$svcdb.pm";
-  my $svc_x = qsearchs(
-    "h_$svcdb",
-    { 'svcnum' => $self->svcnum, },
-    "FS::h_$svcdb"->sql_h_searchs(@_),
-  ) || $self->SUPER::svc_x;
-
-  if ($svc_x) {
-    carp "Using $svcdb in place of missing h_${svcdb} record."
-      if ($svc_x->isa('FS::' . $svcdb) and $DEBUG);
-    return $svc_x;
-  } else {
-    return '';
-  }
-
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::h_Common>, L<FS::cust_svc>, L<FS::Record>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/h_domain_record.pm b/FS/FS/h_domain_record.pm
deleted file mode 100644
index 0ab974f..0000000
--- a/FS/FS/h_domain_record.pm
+++ /dev/null
@@ -1,33 +0,0 @@
-package FS::h_domain_record;
-
-use strict;
-use vars qw( @ISA );
-use FS::h_Common;
-use FS::domain_record;
-
-@ISA = qw( FS::h_Common FS::domain_record );
-
-sub table { 'h_domain_record' };
-
-=head1 NAME
-
-FS::h_domain_record - Historical DNS entry objects
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-An FS::h_domain_record object represents a historical entry in a DNS zone.
-FS::h_domain_record inherits from FS::h_Common and FS::domain_record.
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::h_Common>, L<FS::svc_external>, L<FS::Record>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/h_svc_acct.pm b/FS/FS/h_svc_acct.pm
deleted file mode 100644
index 247d20c..0000000
--- a/FS/FS/h_svc_acct.pm
+++ /dev/null
@@ -1,78 +0,0 @@
-package FS::h_svc_acct;
-
-use strict;
-use vars qw( @ISA $DEBUG );
-use Carp qw(carp);
-use FS::Record qw(qsearchs);
-use FS::h_Common;
-use FS::svc_acct;
-use FS::svc_domain;
-use FS::h_svc_domain;
-
-@ISA = qw( FS::h_Common FS::svc_acct );
-
-$DEBUG = 0;
-
-sub table { 'h_svc_acct' };
-
-=head1 NAME
-
-FS::h_svc_acct - Historical account objects
-
-=head1 SYNOPSIS
-
-=head1 METHODS
-
-=over 4
-
-=item svc_domain
-
-=cut
-
-sub svc_domain {
-  my $self = shift;
-  qsearchs( 'h_svc_domain',
-            { 'svcnum' => $self->domsvc },
-            FS::h_svc_domain->sql_h_searchs(@_),
-          );
-}
-
-=item domain
-
-Returns the domain associated with this account.
-
-=cut
-
-sub domain {
-  my $self = shift;
-  die "svc_acct.domsvc is null for svcnum ". $self->svcnum unless $self->domsvc;
-
-  my $svc_domain = $self->svc_domain(@_) || $self->SUPER::svc_domain()
-    or die 'no history svc_domain.svcnum for svc_acct.domsvc ' . $self->domsvc;
-
-  carp 'Using FS::svc_acct record in place of missing FS::h_svc_acct record.'
-    if ($svc_domain->isa('FS::svc_acct') and $DEBUG);
-
-  $svc_domain->domain;
-
-}
-
-
-=back
-
-=head1 DESCRIPTION
-
-An FS::h_svc_acct object represents a historical account.  FS::h_svc_acct
-inherits from FS::h_Common and FS::svc_acct.
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::h_Common>, L<FS::svc_acct>, L<FS::Record>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/h_svc_broadband.pm b/FS/FS/h_svc_broadband.pm
deleted file mode 100644
index d6038fb..0000000
--- a/FS/FS/h_svc_broadband.pm
+++ /dev/null
@@ -1,33 +0,0 @@
-package FS::h_svc_broadband;
-
-use strict;
-use vars qw( @ISA );
-use FS::h_Common;
-use FS::svc_broadband;
-
-@ISA = qw( FS::h_Common FS::svc_broadband );
-
-sub table { 'h_svc_broadband' };
-
-=head1 NAME
-
-FS::h_svc_broadband - Historical broadband connection objects
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-An FS::h_svc_broadband object represents a historical broadband connection.
-FS::h_svc_broadband inherits from FS::h_Common and FS::svc_broadband.
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::h_Common>, L<FS::svc_broadband>, L<FS::Record>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/h_svc_domain.pm b/FS/FS/h_svc_domain.pm
deleted file mode 100644
index 60d54f7..0000000
--- a/FS/FS/h_svc_domain.pm
+++ /dev/null
@@ -1,33 +0,0 @@
-package FS::h_svc_domain;
-
-use strict;
-use vars qw( @ISA );
-use FS::h_Common;
-use FS::svc_domain;
-
-@ISA = qw( FS::h_Common FS::svc_domain );
-
-sub table { 'h_svc_domain' };
-
-=head1 NAME
-
-FS::h_svc_domain - Historical domain objects
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-An FS::h_svc_domain object represents a historical domain.  FS::h_svc_domain
-inherits from FS::h_Common and FS::svc_domain.
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::h_Common>, L<FS::svc_domain>, L<FS::Record>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/h_svc_external.pm b/FS/FS/h_svc_external.pm
deleted file mode 100644
index 5eb7064..0000000
--- a/FS/FS/h_svc_external.pm
+++ /dev/null
@@ -1,33 +0,0 @@
-package FS::h_svc_external;
-
-use strict;
-use vars qw( @ISA );
-use FS::h_Common;
-use FS::svc_external;
-
-@ISA = qw( FS::h_Common FS::svc_external );
-
-sub table { 'h_svc_external' };
-
-=head1 NAME
-
-FS::h_svc_external - Historical externally tracked service objects
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-An FS::h_svc_external object represents a historical externally tracked service.
-FS::h_svc_external inherits from FS::h_Common and FS::svc_external.
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::h_Common>, L<FS::svc_external>, L<FS::Record>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/h_svc_forward.pm b/FS/FS/h_svc_forward.pm
deleted file mode 100644
index 25b2039..0000000
--- a/FS/FS/h_svc_forward.pm
+++ /dev/null
@@ -1,85 +0,0 @@
-package FS::h_svc_forward;
-
-use strict;
-use vars qw( @ISA $DEBUG );
-use FS::Record qw(qsearchs);
-use FS::h_Common;
-use FS::svc_forward;
-use FS::svc_acct;
-use FS::h_svc_acct;
-
-use Carp qw(carp);
-
-$DEBUG = 0;
-
-@ISA = qw( FS::h_Common FS::svc_forward );
-
-sub table { 'h_svc_forward' };
-
-=head1 NAME
-
-FS::h_svc_forward - Historical mail forwarding alias objects
-
-=head1 SYNOPSIS
-
-=head1 METHODS
-
-=over 4
-
-=item srcsvc_acct 
-
-=cut
-
-sub srcsvc_acct {
-  my $self = shift;
-  my $h_svc_acct = qsearchs(
-    'h_svc_acct',
-    { 'svcnum' => $self->srcsvc },
-    FS::h_svc_acct->sql_h_searchs(@_),
-  ) || $self->SUPER::srcsvc_acct
-    or die "no history svc_acct.svcnum for svc_forward.srcsvc ". $self->srcsvc;
-
-  carp 'Using svc_acct in place of missing h_svc_acct record.'
-    if ($h_svc_acct->isa('FS::domain_record') and $DEBUG);
-
-  return $h_svc_acct;
-
-}
-
-=item dstsvc_acct
-
-=cut
-
-sub dstsvc_acct {
-  my $self = shift;
-  my $h_svc_acct = qsearchs(
-    'h_svc_acct',
-    { 'svcnum' => $self->dstsvc },
-    FS::h_svc_acct->sql_h_searchs(@_),
-  ) || $self->SUPER::dstsvc_acct
-    or die "no history svc_acct.svcnum for svc_forward.dstsvc ". $self->dstsvc;
-
-  carp 'Using svc_acct in place of missing h_svc_acct record.'
-    if ($h_svc_acct->isa('FS::domain_record') and $DEBUG);
-
-  return $h_svc_acct;
-}
-
-=back
-
-=head1 DESCRIPTION
-
-An FS::h_svc_forward object represents a historical mail forwarding alias.
-FS::h_svc_forward inherits from FS::h_Common and FS::svc_forward.
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::h_Common>, L<FS::svc_forward>, L<FS::Record>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/h_svc_www.pm b/FS/FS/h_svc_www.pm
deleted file mode 100644
index 2a3b6dc..0000000
--- a/FS/FS/h_svc_www.pm
+++ /dev/null
@@ -1,67 +0,0 @@
-package FS::h_svc_www;
-
-use strict;
-use vars qw( @ISA $DEBUG );
-use Carp qw(carp);
-use FS::Record qw(qsearchs);
-use FS::h_Common;
-use FS::svc_www;
-use FS::h_domain_record;
-
-@ISA = qw( FS::h_Common FS::svc_www );
-
-$DEBUG = 0;
-
-sub table { 'h_svc_www' };
-
-=head1 NAME
-
-FS::h_svc_www - Historical web virtual host objects
-
-=head1 SYNOPSIS
-
-=head1 METHODS
-
-=over 4
-
-=item domain_record
-
-=cut
-
-sub domain_record {
-  my $self = shift;
-
-  carp 'Called FS::h_svc_www->domain_record on svcnum ' . $self->svcnum if $DEBUG;
-
-  my $domain_record = qsearchs(
-    'h_domain_record',
-    { 'recnum' => $self->recnum },
-    FS::h_domain_record->sql_h_searchs(@_),
-  ) || $self->SUPER::domain_record
-    or die "no history domain_record.recnum for svc_www.recnum ". $self->domsvc;
-
-  carp 'Using domain_record in place of missing h_domain_record record.'
-    if ($domain_record->isa('FS::domain_record') and $DEBUG);
-
-  return $domain_record;
-  
-}
-
-=back
-
-=head1 DESCRIPTION
-
-An FS::h_svc_www object represents a historical web virtual host.
-FS::h_svc_www inherits from FS::h_Common and FS::svc_www.
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::h_Common>, L<FS::svc_www>, L<FS::Record>, schema.html from the base
-documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/option_Common.pm b/FS/FS/option_Common.pm
deleted file mode 100644
index f258fa1..0000000
--- a/FS/FS/option_Common.pm
+++ /dev/null
@@ -1,295 +0,0 @@
-package FS::option_Common;
-
-use strict;
-use vars qw( @ISA $DEBUG );
-use FS::Record qw( qsearch qsearchs dbh );
-
-@ISA = qw( FS::Record );
-
-$DEBUG = 0;
-
-=head1 NAME
-
-FS::option_Common - Base class for option sub-classes
-
-=head1 SYNOPSIS
-
-use FS::option_Common;
-
-@ISA = qw( FS::option_Common );
-
-=head1 DESCRIPTION
-
-FS::option_Common is intended as a base class for classes which have a
-simple one-to-many class associated with them, used to store a hash-like data
-structure of keys and values.
-
-=head1 METHODS
-
-=over 4
-
-=item insert [ HASHREF | OPTION => VALUE ... ]
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-If a list or hash reference of options is supplied, option records are also
-created.
-
-=cut
-
-#false laziness w/queue.pm
-sub insert {
-  my $self = shift;
-  my $options = 
-    ( ref($_[0]) eq 'HASH' )
-      ? shift
-      : { @_ };
-  warn "FS::option_Common::insert called on $self with options ".
-       join(', ', map "$_ => ".$options->{$_}, keys %$options)
-    if $DEBUG;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $pkey = $self->pkey;
-  my $option_table = $self->option_table;
-
-  foreach my $optionname ( keys %{$options} ) {
-    my $href = {
-      $pkey         => $self->get($pkey),
-      'optionname'  => $optionname,
-      'optionvalue' => $options->{$optionname},
-    };
-
-    #my $option_record = eval "new FS::$option_table \$href";
-    #if ( $@ ) {
-    #  $dbh->rollback if $oldAutoCommit;
-    #  return $@;
-    #}
-    my $option_record = "FS::$option_table"->new($href);
-
-    $error = $option_record->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item delete
-
-Delete this record from the database.  Any associated option records are also
-deleted.
-
-=cut
-
-#foreign keys would make this much less tedious... grr dumb mysql
-sub delete {
-  my $self = shift;
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-  
-  my $pkey = $self->pkey;
-  #my $option_table = $self->option_table;
-
-  foreach my $obj ( $self->option_objects ) {
-    my $error = $obj->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item replace [ HASHREF | OPTION => VALUE ... ]
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-If a list hash reference of options is supplied, part_export_option records are
-created or modified (see L<FS::part_export_option>).
-
-=cut
-
-sub replace {
-  my $self = shift;
-  my $old = shift;
-  my $options = 
-    ( ref($_[0]) eq 'HASH' )
-      ? shift
-      : { @_ };
-  warn "FS::option_Common::insert called on $self with options ".
-       join(', ', map "$_ => ". $options->{$_}, keys %$options)
-    if $DEBUG;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::replace($old);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $pkey = $self->pkey;
-  my $option_table = $self->option_table;
-
-  foreach my $optionname ( keys %{$options} ) {
-    my $old = qsearchs( $option_table, {
-        $pkey         => $self->get($pkey),
-        'optionname'  => $optionname,
-    } );
-
-    my $href = {
-        $pkey         => $self->get($pkey),
-        'optionname'  => $optionname,
-        'optionvalue' => $options->{$optionname},
-    };
-
-    #my $new = eval "new FS::$option_table \$href";
-    #if ( $@ ) {
-    #  $dbh->rollback if $oldAutoCommit;
-    #  return $@;
-    #}
-    my $new = "FS::$option_table"->new($href);
-
-    $new->optionnum($old->optionnum) if $old;
-    my $error = $old ? $new->replace($old) : $new->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  #remove extraneous old options
-  foreach my $opt (
-    grep { !exists $options->{$_->optionname} } $old->option_objects
-  ) {
-    my $error = $opt->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
-=item option_objects
-
-Returns all options as FS::I<tablename>_option objects.
-
-=cut
-
-sub option_objects {
-  my $self = shift;
-  my $pkey = $self->pkey;
-  my $option_table = $self->option_table;
-  qsearch($option_table, { $pkey => $self->get($pkey) } );
-}
-
-=item options 
-
-Returns a list of option names and values suitable for assigning to a hash.
-
-=cut
-
-sub options {
-  my $self = shift;
-  map { $_->optionname => $_->optionvalue } $self->option_objects;
-}
-
-=item option OPTIONNAME
-
-Returns the option value for the given name, or the empty string.
-
-=cut
-
-sub option {
-  my $self = shift;
-  my $pkey = $self->pkey;
-  my $option_table = $self->option_table;
-  my $obj =
-    qsearchs($option_table, {
-      $pkey      => $self->get($pkey),
-      optionname => shift,
-  } );
-  $obj ? $obj->optionvalue : '';
-}
-
-
-sub pkey {
-  my $self = shift;
-  my $pkey = $self->dbdef_table->primary_key;
-}
-
-sub option_table {
-  my $self = shift;
-  my $option_table = $self->table . '_option';
-  eval "use FS::$option_table";
-  die $@ if $@;
-  $option_table;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index 8143e34..7dfea50 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -126,7 +126,7 @@ sub check {
 
       or $c =~ /^\s*\$cust_bill\->(comp|realtime_(card|ach|lec)|batch_card|send)\(\);\s*$/
 
-      or $c =~ /^\s*\$cust_bill\->send(_if_newest)?\(\'[\w\-\s]+\'\s*(,\s*(\d+|\[\s*\d+(,\s*\d+)*\s*\])\s*,\s*'[\w\@\.\-\+]*'\s*)?\);\s*$/
+      or $c =~ /^\s*\$cust_bill\->send(_if_newest)?\(\'[\w\-\s]+\'\s*(,\s*\d+\s*,\s*'[\w\@\.\-\+]*'\s*)?\);\s*$/
 
       or $c =~ /^\s*\$cust_main\->apply_payments; \$cust_main->apply_credits; "";\s*$/
 
@@ -134,8 +134,6 @@ sub check {
 
       or $c =~ /^\s*\$cust_main\->suspend_(if|unless)_pkgpart\([\d\,\s]*\);\s*$/
 
-      or $c =~ /^\s*\$cust_bill\->cust_suspend_if_balance_over\([\d\.\s]*\);\s*$/
-
       or do {
         #log
         return "illegal eventcode: $c";
@@ -160,12 +158,7 @@ sub check {
   if ( $self->plandata =~ /^(agent_)?templatename\s+(.*)$/m ) {
     my $name= $2;
 
-    foreach my $file (qw( template
-                          latex latexnotes latexreturnaddress latexfooter
-                            latexsmallfooter
-                          html htmlnotes htmlreturnaddress htmlfooter
-                     ))
-    {
+    foreach my $file (qw( template latex latexnotes )) {
       unless ( $conf->exists("invoice_${file}_$name") ) {
         $conf->set(
           "invoice_${file}_$name" =>
@@ -178,32 +171,11 @@ sub check {
   $self->SUPER::check;
 }
 
-=item templatename
-
-Returns the alternate invoice template name, if any, or false if there is
-no alternate template for this invoice event.
-
-=cut
-
-sub templatename {
-  my $self = shift;
-  if (    $self->plan     =~ /^send_(alternate|agent)$/
-       && $self->plandata =~ /^(agent_)?templatename (.*)$/m
-     )
-  {
-    $2;
-  } else {
-    '';
-  }
-}
-
-
 =back
 
 =head1 BUGS
 
-The whole "eventcode" idea is bunk.  This should be refactored with subclasses
-like part_pkg/ and part_export/
+Alas.
 
 =head1 SEE ALSO
 
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index dce2d2a..3f677b2 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -5,12 +5,11 @@ use vars qw( @ISA @EXPORT_OK $DEBUG %exports );
 use Exporter;
 use Tie::IxHash;
 use FS::Record qw( qsearch qsearchs dbh );
-use FS::option_Common;
 use FS::part_svc;
 use FS::part_export_option;
 use FS::export_svc;
 
-@ISA = qw( FS::option_Common );
+@ISA = qw(FS::Record);
 @EXPORT_OK = qw(export_info);
 
 $DEBUG = 0;
@@ -104,6 +103,48 @@ otherwise returns false.
 If a hash reference of options is supplied, part_export_option records are
 created (see L<FS::part_export_option>).
 
+=cut
+
+#false laziness w/queue.pm
+sub insert {
+  my $self = shift;
+  my $options = shift;
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  foreach my $optionname ( keys %{$options} ) {
+    my $part_export_option = new FS::part_export_option ( {
+      'exportnum'   => $self->exportnum,
+      'optionname'  => $optionname,
+      'optionvalue' => $options->{$optionname},
+    } );
+    $error = $part_export_option->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+}
+
 =item delete
 
 Delete this record from the database.
@@ -130,6 +171,14 @@ sub delete {
     return $error;
   }
 
+  foreach my $part_export_option ( $self->part_export_option ) {
+    my $error = $part_export_option->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
   foreach my $export_svc ( $self->export_svc ) {
     my $error = $export_svc->delete;
     if ( $error ) {
@@ -144,6 +193,72 @@ sub delete {
 
 }
 
+=item replace OLD_RECORD HASHREF
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+If a hash reference of options is supplied, part_export_option records are
+created or modified (see L<FS::part_export_option>).
+
+=cut
+
+sub replace {
+  my $self = shift;
+  my $old = shift;
+  my $options = shift;
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::replace($old);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  foreach my $optionname ( keys %{$options} ) {
+    my $old = qsearchs( 'part_export_option', {
+        'exportnum'   => $self->exportnum,
+        'optionname'  => $optionname,
+    } );
+    my $new = new FS::part_export_option ( {
+        'exportnum'   => $self->exportnum,
+        'optionname'  => $optionname,
+        'optionvalue' => $options->{$optionname},
+    } );
+    $new->optionnum($old->optionnum) if $old;
+    my $error = $old ? $new->replace($old) : $new->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  #remove extraneous old options
+  foreach my $opt (
+    grep { !exists $options->{$_->optionname} } $old->part_export_option
+  ) {
+    my $error = $opt->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+};
+
 =item check
 
 Checks all fields to make sure this is a valid export.  If there is
@@ -232,17 +347,36 @@ L<FS::part_export_option>).
 
 sub part_export_option {
   my $self = shift;
-  $self->option_objects;
+  qsearch('part_export_option', { 'exportnum' => $self->exportnum } );
 }
 
 =item options 
 
 Returns a list of option names and values suitable for assigning to a hash.
 
+=cut
+
+sub options {
+  my $self = shift;
+  map { $_->optionname => $_->optionvalue } $self->part_export_option;
+}
+
 =item option OPTIONNAME
 
 Returns the option value for the given name, or the empty string.
 
+=cut
+
+sub option {
+  my $self = shift;
+  my $part_export_option =
+    qsearchs('part_export_option', {
+      exportnum  => $self->exportnum,
+      optionname => shift,
+  } );
+  $part_export_option ? $part_export_option->optionvalue : '';
+}
+
 =item _rebless
 
 Reblesses the object into the FS::part_export::EXPORTTYPE class, where
diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index 4b92e80..fb0299c 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -1,6 +1,6 @@
 package FS::part_export::acct_sql;
 
-use vars qw(@ISA %info);
+use vars qw(@ISA %info @saltset);
 use Tie::IxHash;
 #use Digest::MD5 qw(md5_hex);
 use FS::Record; #qw(qsearchs);
@@ -18,24 +18,7 @@ tie my %options, 'Tie::IxHash',
                             type  => 'textarea',
                           },
   'primary_key'        => { label => 'Database primary key' },
-  'crypt'              => { label => 'Password encryption',
-                            type=>'select', options=>[qw(crypt md5)],
-                            default=>'crypt',
-                          },
-;
-
-tie my %vpopmail_map, 'Tie::IxHash',
-  'pw_name'   => 'username',
-  'pw_domain' => 'domain',
-  'pw_passwd' => 'crypt_password',
-  'pw_uid'    => 'uid',
-  'pw_gid'    => 'gid',
-  'pw_gecos'  => 'finger',
-  'pw_dir'    => 'dir',
-  #'pw_shell'  => 'shell',
-  'pw_shell'  => 'quota',
 ;
-my $vpopmail_map = join('\n', map "$_ $vpopmail_map{$_}", keys %vpopmail_map );
 
 tie my %postfix_courierimap_mailbox_map, 'Tie::IxHash',
   'username' => 'email',
@@ -63,27 +46,23 @@ my $postfix_courierimap_alias_map =
 %info = (
   'svc'      => 'svc_acct',
   'desc'     => 'Real-time export of accounts to SQL databases '.
-                '(vpopmail, Postfix+Courier IMAP, others?)',
+                '(Postfix+Courier IMAP, others?)',
   'options'  => \%options,
   'nodomain' => '',
   'notes'    => <<END
-Export accounts (svc_acct records) to SQL databases.  Currently has default
-configurations for vpopmail and Postfix+Courier IMAP but intended to be
-configurable for other schemas as well.
+Export accounts (svc_acct records) to SQL databases.  Written for
+Postfix+Courier IMAP but intended to be generally useful for generic SQL
+exports, eventually.
 
-<BR><BR>In contrast to sqlmail, this is intended to export just svc_acct
-records only, rather than a single export for svc_acct, svc_forward and
-svc_domain records, to export in "default" database schemas rather than
-configure the MTA or POP/IMAP server for a Freeside-specific schema, and
-to be configured for different mail server setups.
+<BR><BR>In contrast to sqlmail, this is newer and less well tested, and
+currently less flexible.  It is intended to export just svc_acct records only,
+rather than a single export for svc_acct, svc_forward and svc_domain records,
+to export in "default" formats rather than configure the MTA or POP/IMAP server
+for a Freeside-specific schema, and possibly to be configured for different
+mail server setups through some subclassing rather than options.
 
 <BR><BR>Use these buttons for some useful presets:
 <UL>
-  <li><INPUT TYPE="button" VALUE="vpopmail" onClick='
-    this.form.table.value = "vpopmail";
-    this.form.schema.value = "$vpopmail_map";
-    this.form.primary_key.value = "pw_name, pw_domain";
-  '>
   <LI><INPUT TYPE="button" VALUE="postfix_courierimap_mailbox" onClick='
     this.form.table.value = "mailbox";
     this.form.schema.value = "$postfix_courierimap_mailbox_map";
@@ -111,10 +90,7 @@ sub _export_insert {
   my %map = $self->_map;
 
   my %record = map { my $value = $map{$_};
-                     my @arg = ();
-                     push @arg, $self->option('crypt')
-                       if $value eq 'crypt_password' && $self->option('crypt');
-                     $_ => $svc_acct->$value(@arg);
+                     $_ => $svc_acct->$value();
                    } keys %map;
 
   my $err_or_queue =
@@ -134,30 +110,17 @@ sub _export_replace {
   my($self, $new, $old) = (shift, shift, shift);
 
   my %map = $self->_map;
-
-  my @primary_key = ();
-  if ( $self->option('primary_key') =~ /,/ ) {
-    foreach my $key ( split(/\s*,\s*/, $self->option('primary_key') ) ) {
-      my $keymap = $map{$key};
-      push @primary_key, $old->$keymap();
-    }
-  } else {
-    my $keymap = $map{$self->option('primary_key')};
-    push @primary_key, $old->$keymap();
-  }
+  my $keymap = $map{$self->option('primary_key')};
 
   my %record = map { my $value = $map{$_};
-                     my @arg = ();
-                     push @arg, $self->option('crypt')
-                       if $value eq 'crypt_password' && $self->option('crypt');
-                     $_ => $new->$value(@arg);
+                     $_ => $new->$value();
                    } keys %map;
 
   my $err_or_queue = $self->acct_sql_queue(
     $new->svcnum,
     'replace',
     $self->option('table'),
-    $self->option('primary_key'), @primary_key, 
+    $self->option('primary_key') => $old->$keymap(),
     %record,
   );
   return $err_or_queue unless ref($err_or_queue);
@@ -166,26 +129,13 @@ sub _export_replace {
 
 sub _export_delete {
   my ( $self, $svc_acct ) = (shift, shift);
-
   my %map = $self->_map;
-
-  my %primary_key = ();
-  if ( $self->option('primary_key') =~ /,/ ) {
-    foreach my $key ( split(/\s*,\s*/, $self->option('primary_key') ) ) {
-      my $keymap = $map{$key};
-      $primary_key{ $key } = $svc_acct->$keymap();
-    }
-  } else {
-    my $keymap = $map{$self->option('primary_key')};
-    $primary_key{ $self->option('primary_key') } = $svc_acct->$keymap(),
-  }
-
+  my $keymap = $map{$self->option('primary_key')};
   my $err_or_queue = $self->acct_sql_queue(
     $svc_acct->svcnum,
     'delete',
     $self->option('table'),
-    %primary_key,
-    #$self->option('primary_key') => $svc_acct->$keymap(),
+    $self->option('primary_key') => $svc_acct->$keymap(),
   );
   return $err_or_queue unless ref($err_or_queue);
   '';
@@ -236,27 +186,14 @@ sub acct_sql_delete { #subroutine, not method
 
 sub acct_sql_replace { #subroutine, not method
   my $dbh = acct_sql_connect(shift, shift, shift);
-
-  my( $table, $pkey ) = ( shift, shift );
-
-  my %primary_key = ();
-  if ( $pkey =~ /,/ ) {
-    foreach my $key ( split(/\s*,\s*/, $pkey ) ) {
-      $primary_key{$key} = shift;
-    }
-  } else {
-    $primary_key{$pkey} = shift;
-  }
-
-  my %record = @_;
+  my( $table, $pkey, $old_pkey, %record ) = @_;
 
   my $sth = $dbh->prepare(
-    "UPDATE $table".
-    ' SET '.   join(', ',    map "$_ = ?", keys %record      ).
-    ' WHERE '. join(' AND ', map "$_ = ?", keys %primary_key )
+    "UPDATE $table SET ". join(', ', map "$_ = ?", keys %record ).
+    "WHERE $pkey = ?"
   ) or die $dbh->errstr;
 
-  $sth->execute( values(%record), values(%primary_key) );
+  $sth->execute( values(%record), $old_pkey );
 
   $dbh->disconnect;
 }
diff --git a/FS/FS/part_export/artera_turbo.pm b/FS/FS/part_export/artera_turbo.pm
index c006db9..af4c790 100644
--- a/FS/FS/part_export/artera_turbo.pm
+++ b/FS/FS/part_export/artera_turbo.pm
@@ -25,9 +25,6 @@ tie my %options, 'Tie::IxHash',
   'debug'      => { 'label' => 'Enable debug logging',
                     'type'  => 'checkbox',
                   },
-  'enable_edit' => { 'label' => 'Enable local editing of Artera serial numbers and key codes (note that the changes will NOT be exported to Artera)',
-                     'type'  => 'checkbox',
-                   },
 ;
 
 %info = (
@@ -43,7 +40,7 @@ Reseller API.  Requires installation of
 <a href="http://search.cpan.org/dist/Net-Artera">Net::Artera</a>
 from CPAN.  You probably also want to:
 <UL>
-  <LI>In the configuration UI section: set the <B>svc_external-skip_manual</B> and <B>svc_external-display_type</B> configuration values.
+  <LI>In the configuraiton UI section: set the <B>svc_external-skip_manual</B> and <B>svc_external-display_type</B> configuration values.
   <LI>In the message catalog: set <B>svc_external-id</B> to <I>Artera Serial Number</I> and set <B>svc_external-title</B> to <I>Artera Key Code</I>.
 </UL>
 END
@@ -103,8 +100,8 @@ sub _export_insert {
 
   if ( $result->{'id'} == 1 ) {
     my $new = new FS::svc_external { $svc_external->hash };
-    $new->id(sprintf('%010d', $result->{'ASN'}));
-    $new->title( substr('0000000000'.uc($result->{'AKC'}), -10) );
+    $new->id($result->{'ASN'});
+    $new->title($result->{'AKC'});
     $new->replace($svc_external);
   } else {
     $result->{'message'} || 'No response from Artera';
@@ -113,7 +110,6 @@ sub _export_insert {
 
 sub _export_replace {
   my( $self, $new, $old ) = (shift, shift, shift);
-  return '' if $self->option('enable_edit');
   return "can't change serial number with Artera"
     if $old->id != $new->id && $old->id;
   return "can't change key code with Artera"
@@ -123,58 +119,36 @@ sub _export_replace {
 
 sub _export_delete {
   my( $self, $svc_external ) = (shift, shift);
-  $self->queue_statusChange(17, $svc_external);
+  $self->statusChange(17, $svc_external);
 }
 
 sub _export_suspend {
   my( $self, $svc_external ) = (shift, shift);
-  $self->queue_statusChange(16, $svc_external);
+  $self->statusChange(16, $svc_external);
 }
 
 sub _export_unsuspend {
   my( $self, $svc_external ) = (shift, shift);
-  $self->queue_statusChange(15, $svc_external);
-}
-
-sub queue_statusChange {
-  my( $self, $status, $svc_external ) = @_;
-
-  my $queue = new FS::queue {
-    'svcnum' => $svc_external->svcnum,
-    'job'    => 'FS::part_export::artera_turbo::statusChange',
-  };
-  $queue->insert(
-    ( map { $self->option($_) }
-          qw( rid username password production ) ),
-    $status,
-    $svc_external->id,
-    $svc_external->title,
-    $self->option('debug'),
-  );
+  $self->statusChange(15, $svc_external);
 }
 
 sub statusChange {
-  my( $rid, $username, $password, $prod, $status, $id, $title, $debug ) = @_;
+  my( $self, $status, $svc_external ) = @_;
 
   eval "use Net::Artera;";
   return $@ if $@;
-  $Net::Artera::DEBUG = 1 if $debug;
-
-  my $artera = new Net::Artera (
-    'rid'        => $rid,
-    'username'   => $username,
-    'password'   => $password,
-    'production' => $prod,
-  );
+  $Net::Artera::DEBUG = 1 if $self->option('debug');
+  my $artera = $self->_new_Artera;
 
   my $result = $artera->statusChange(
-    'asn'      => sprintf('%010d', $id),
-    'akc'      => substr("0000000000$title", -10),
+    'asn'      => sprintf('%010d', $svc_external->id),
+    'akc'      => $svc_external->title,
     'statusid' => $status,
   );
 
-  die $result->{'message'} unless $result->{'id'} == 1;
-
+  $result->{'id'} == 1
+    ? ''
+    : $result->{'message'};
 }
 
 1;
diff --git a/FS/FS/part_export/cp.pm b/FS/FS/part_export/cp.pm
index 96fa437..a295c57 100644
--- a/FS/FS/part_export/cp.pm
+++ b/FS/FS/part_export/cp.pm
@@ -43,9 +43,8 @@ sub _export_replace {
   my( $self, $new, $old ) = (shift, shift, shift);
   return "can't change domain with Critical Path"
     if $old->domain ne $new->domain;
-  return "can't change username with Critical Path" #CP no longer supports this
-    if $old->username ne $new->username;
-  return '' unless $old->_password ne $new->_password;
+  return '' unless $old->username  ne $new->username
+                || $old->_password ne $new->_password;
   $self->cp_queue( $new->svcnum, 'replace', $new->domain,
     $old->username, $new->username, $old->_password, $new->_password );
 }
diff --git a/FS/FS/part_export/cpanel.pm b/FS/FS/part_export/cpanel.pm
deleted file mode 100644
index 0ad00df..0000000
--- a/FS/FS/part_export/cpanel.pm
+++ /dev/null
@@ -1,192 +0,0 @@
-package FS::part_export::cpanel;
-
-use vars qw(@ISA %info);
-use Tie::IxHash;
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-tie my %options, 'Tie::IxHash',
-  'user'       => { label=>'Remote access username' },
-  'accesshash' => { label=>'Remote access key', type=>'textarea' },
-  'debug'      => { label=>'Enable debugging', type=>'checkbox' },
-;
-
-%info = (
-  'svc'      => 'svc_acct',
-  'desc'     => 'Real-time export to Cpanel control panel.',
-  'options'  => \%options,
-  'nodomain' => 'Y',
-  'notes'    => 'Real time export to a the <a href="http://www.cpanel.net/">Cpanel</a> control panel software.  Service definition names are exported as Cpanel packages.  Requires installation of the Cpanel::Accounting perl module distributed with Cpanel.',
-);
-
-sub rebless { shift; }
-
-sub _export_insert { 
-  my($self, $svc_acct) = (shift, shift);
-  $err_or_queue = $self->cpanel_queue( $svc_acct->svcnum, 'insert',
-    $svc_acct->domain,
-    $svc_acct->username,
-    $svc_acct->_password,
-    $svc_acct->cust_svc->part_svc->svc,
-  );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-  return "can't change username with cpanel"
-    if $old->username ne $new->username;
-  return "can't change password with cpanel"
-    if $old->_passsword ne $new->_password;
-  return "can't change domain with cpanel"
-    if $old->domain ne $new->domain;
-
-  '';
-
-  ##return '' unless $old->_password ne $new->_password;
-  #$err_or_queue = $self->cpanel_queue( $new->svcnum,
-  #  'replace', $new->username, $new->_password );
-  #ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-  $err_or_queue = $self->cpanel_queue( $svc_acct->svcnum,
-    'delete', $svc_acct->username
-  );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_suspend {
-  my( $self, $svc_acct ) = (shift, shift);
-  $err_or_queue = $self->cpanel_queue( $svc_acct->svcnum,
-    'suspend', $svc_acct->username );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_unsuspend {
-  my( $self, $svc_acct ) = (shift, shift);
-  $err_or_queue = $self->cpanel_queue( $svc_acct->svcnum,
-    'unsuspend', $svc_acct->username );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-
-sub cpanel_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::cpanel::cpanel_$method",
-  };
-  $queue->insert(
-    $self->machine,
-    $self->option('user'),
-    $self->option('accesshash'),
-    $self->option('debug'),
-    @_ 
-  ) or $queue;
-}
-
-
-sub cpanel_insert { #subroutine, not method
-  my( $machine, $user, $accesshash, $debug ) = splice(@_,0,4);
-
-#  my $whm = cpanel_connect($machine, $user, $accesshash, $debug);
-#  warn "  cpanel->createacct ". join(', ', @_). "\n"
-#    if $debug;
-#  my $response = $whm->createacct(@_);
-#  die $whm->{'error'} if $whm->{'error'};
-#  warn "  cpanel response: $response\n"
-#    if $debug;
-
-  warn "cpanel_insert: attempting web interface to add POP"
-    if $debug;
-
-  my($domain, $username, $password, $svc) = @_;
-
-  use LWP::UserAgent;
-  use HTTP::Request::Common qw(POST);
-
-  my $url =
-    "http://$user:$accesshash\@$domain:2082/frontend/x/mail/addpop2.html";
-
-  my $ua = LWP::UserAgent->new();
-
-  #$req->authorization_basic($user, $accesshash);
-
-  my $res = $ua->request(
-    POST( $url,
-          [ 
-            'email'    => $username,
-            'domain'   => $domain,
-            'password' => $password,
-            'quota'    => 10, #?
-          ] 
-        )
-  );
-
-  die "Error submitting data to $url: ". $res->status_line
-    unless $res->is_success;
-
-  die "Username in use"
-    if $res->content =~ /exists/;
-
-  die "Account not created: ". $res->content
-    if $res->content =~ /failure/;
-
-}
-
-#sub cpanel_replace { #subroutine, not method
-#}
-
-sub cpanel_delete { #subroutine, not method
-  my( $machine, $user, $accesshash, $debug ) = splice(@_,0,4);
-  my $whm = cpanel_connect($machine, $user, $accesshash, $debug);
-  warn "  cpanel->killacct ". join(', ', @_). "\n"
-    if $debug;
-  my $response = $whm->killacct(shift);
-  die $whm->{'error'} if $whm->{'error'};
-  warn "  cpanel response: $response\n"
-    if $debug;
-}
-
-sub cpanel_suspend { #subroutine, not method
-  my( $machine, $user, $accesshash, $debug ) = splice(@_,0,4);
-  my $whm = cpanel_connect($machine, $user, $accesshash, $debug);
-  warn "  cpanel->suspend ". join(', ', @_). "\n"
-    if $debug;
-  my $response = $whm->suspend(shift);
-  die $whm->{'error'} if $whm->{'error'};
-  warn "  cpanel response: $response\n"
-    if $debug;
-}
-
-sub cpanel_unsuspend { #subroutine, not method
-  my( $machine, $user, $accesshash, $debug ) = splice(@_,0,4);
-  my $whm = cpanel_connect($machine, $user, $accesshash, $debug);
-  warn "  cpanel->unsuspend ". join(', ', @_). "\n"
-    if $debug;
-  my $response = $whm->unsuspend(shift);
-  die $whm->{'error'} if $whm->{'error'};
-  warn "  cpanel response: $response\n"
-    if $debug;
-}
-
-sub cpanel_connect {
-  my( $host, $user, $accesshash, $debug ) = @_;
-
-  eval "use Cpanel::Accounting;";
-  die $@ if $@;
-
-  warn "creating new Cpanel::Accounting connection to $user@$host\n"
-    if $debug;
-
-  my $whm = new Cpanel::Accounting;
-  $whm->{'host'}       = $host;
-  $whm->{'user'}       = $user;
-  $whm->{'accesshash'} = $accesshash;
-  $whm->{'usessl'}     = 1;
-
-  $whm;
-}
diff --git a/FS/FS/part_export/domain_shellcommands.pm b/FS/FS/part_export/domain_shellcommands.pm
index d15f41a..0ba5617 100644
--- a/FS/FS/part_export/domain_shellcommands.pm
+++ b/FS/FS/part_export/domain_shellcommands.pm
@@ -70,7 +70,6 @@ sub _export_delete {
 sub _export_command {
   my ( $self, $action, $svc_domain) = (shift, shift, shift);
   my $command = $self->option($action);
-  return '' if $command =~ /^\s*$/;
 
   #set variable for the command
   no strict 'vars';
diff --git a/FS/FS/part_export/everyone_net.pm b/FS/FS/part_export/everyone_net.pm
deleted file mode 100644
index e04318e..0000000
--- a/FS/FS/part_export/everyone_net.pm
+++ /dev/null
@@ -1,132 +0,0 @@
-package FS::part_export::everyone_net;
-
-use vars qw(@ISA %info);
-use Tie::IxHash;
-use FS::part_export;
-
-@ISA = qw(FS::part_export);
-
-tie my %options, 'Tie::IxHash',
-  'clientID'  => { label=>'clientID' },
-  'password'  => { label=>'Password' },
-  #'workgroup' => { label=>'Default Workgroup' },
-  'debug'     => { label=>'Enable debugging',
-                    type=>'checkbox'          },
-;
-
-%info = (
-  'svc'    => 'svc_acct',
-  'desc'   => 'Real-time export to Everyone.net outsourced mail service',
-  'options'=> \%options,
-  'notes'  => <<'END'
-Real-time export to
-<a href="http://www.cp.net/">Everyone.net</a> via the XRC Remote API.
-Requires installation of
-<a href="http://search.cpan.org/dist/Net-XRC">Net::XRC</a>
-from CPAN.
-END
-);
-
-sub rebless { shift; }
-
-# experiement: want the status of these right away (don't want account to
-# create or whatever and then get error in the queue from dup username or
-# something), so no queueing
-
-sub _export_insert {
-  my( $self, $svc_acct ) = (shift, shift);
-
-  eval "use Net::XRC qw(:types);";
-  return $@ if $@;
-
-  $self->_xrc_command( 'createUser',
-                       $svc_acct->domain,
-                       [],
-                       string($svc_acct->username),
-                       string($svc_acct->_password),
-                     );
-}
-
-sub _xrc_command {
-  my( $self, $method, $domain, @args ) = @_;
-  
-  eval "use Net::XRC qw(:types);";
-  return $@ if $@;
-
-  local($Net::XRC::DEBUG) = 1
-    if $self->option('debug');
-
-  my $xrc = new Net::XRC (
-    'clientID' => $self->option('clientID'),
-    'password' => $self->option('password'),
-  );
-
-  my $dresponse = $xrc->lookupMXReadyClientIDByEmailDomain( string($domain) );
-  return $dresponse->error unless $dresponse->is_success;
-  my $clientID = $dresponse->content;
-  return "clientID for domain $domain not found"
-    if $clientID == -1;
-
-  my $response = $xrc->$method($clientID, @args);
-  return $response->error unless $response->is_success;
-  '';
-
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-
-  eval "use Net::XRC qw(:types);";
-  return $@ if $@;
-
-  return "can't change domain with Everyone.net"
-    if $old->domain ne $new->domain;
-  return "can't change username with Everyone.net"
-    if $old->username ne $new->username;
-  return '' unless $old->_password ne $new->_password;
-
-  $self->_xrc_command( 'setUserPassword',
-                       $new->domain,
-                       string($new->username),
-                       string($new->_password),
-                     );
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-
-  eval "use Net::XRC qw(:types);";
-  return $@ if $@;
-
-  $self->_xrc_command( 'deleteUser',
-                       $svc_acct->domain,
-                       string($svc_acct->username),
-                     );
-}
-
-sub _export_suspend {
-  my( $self, $svc_acct ) = (shift, shift);
-
-  eval "use Net::XRC qw(:types);";
-  return $@ if $@;
-
-  $self->_xrc_command( 'suspendUser',
-                       $svc_acct->domain,
-                       string($svc_acct->username),
-                     );
-}
-
-sub _export_unsuspend {
-  my( $self, $svc_acct ) = (shift, shift);
-
-  eval "use Net::XRC qw(:types);";
-  return $@ if $@;
-
-  $self->_xrc_command( 'unsuspendUser',
-                       $svc_acct->domain,
-                       string($svc_acct->username),
-                     );
-}
-
-1;
-
diff --git a/FS/FS/part_export/forward_shellcommands.pm b/FS/FS/part_export/forward_shellcommands.pm
index cee24e4..fe30435 100644
--- a/FS/FS/part_export/forward_shellcommands.pm
+++ b/FS/FS/part_export/forward_shellcommands.pm
@@ -45,9 +45,8 @@ Run remote commands via SSH, for forwards.  You will need to
 The following variables are available for interpolation (prefixed with
 <code>new_</code> or <code>old_</code> for replace operations):
 <UL>
-  <LI><code>$username</code> - username of forward source
-  <LI><code>$domain</code> - domain of forward source
-  <LI><code>$source</code> - forward source ($username@$domain)
+  <LI><code>$username</code>
+  <LI><code>$domain</code>
   <LI><code>$destination</code> - forward destination
   <LI>All other fields in <a href="../docs/schema.html#svc_forward">svc_forward</a> are also available.
 </UL>
@@ -69,7 +68,6 @@ sub _export_delete {
 sub _export_command {
   my ( $self, $action, $svc_forward ) = (shift, shift, shift);
   my $command = $self->option($action);
-  return '' if $command =~ /^\s*$/;
 
   #set variable for the command
   no strict 'vars';
@@ -78,17 +76,10 @@ sub _export_command {
     ${$_} = $svc_forward->getfield($_) foreach $svc_forward->fields;
   }
 
-  if ( $svc_forward->srcsvc ) {
-    my $srcsvc_acct = $svc_forward->srcsvc_acct;
-    $username = $srcsvc_acct->username;
-    $domain   = $srcsvc_acct->domain;
-    $source   = $srcsvc_acct->email;
-  } else {
-    $source = $svc_forward->src;
-    ( $username, $domain ) = split(/\@/, $source);
-  }
-
-  if ($svc_forward->dstsvc) {
+  my $svc_acct = $svc_forward->srcsvc_acct;
+  $username = $svc_acct->username;
+  $domain = $svc_acct->domain;
+  if ($svc_forward->dstsvc_acct) {
     $destination = $svc_forward->dstsvc_acct->email;
   } else {
     $destination = $svc_forward->dst;
@@ -115,33 +106,19 @@ sub _export_replace {
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
 
-  if ( $old->srcsvc ) {
-    my $srcsvc_acct = $old->srcsvc_acct;
-    $old_username = $srcsvc_acct->username;
-    $old_domain   = $srcsvc_acct->domain;
-    $old_source   = $srcsvc_acct->email;
-  } else {
-    $old_source = $old->src;
-    ( $old_username, $old_domain ) = split(/\@/, $old_source);
-  }
-
-  if ( $old->dstsvc ) {
+  my $old_svc_acct = $old->srcsvc_acct;
+  $old_username = $old_svc_acct->username;
+  $old_domain = $old_svc_acct->domain;
+  if ($old->dstsvc_acct) {
     $old_destination = $old->dstsvc_acct->email;
   } else {
     $old_destination = $old->dst;
   }
 
-  if ( $new->srcsvc ) {
-    my $srcsvc_acct = $new->srcsvc_acct;
-    $new_username = $srcsvc_acct->username;
-    $new_domain   = $srcsvc_acct->domain;
-    $new_source   = $srcsvc_acct->email;
-  } else {
-    $new_source = $new->src;
-    ( $new_username, $new_domain ) = split(/\@/, $new_source);
-  }
-
-  if ( $new->dstsvc ) {
+  my $new_svc_acct = $new->srcsvc_acct;
+  $new_username = $new_svc_acct->username;
+  $new_domain = $new_svc_acct->domain;
+  if ($new->dstsvc) {
     $new_destination = $new->dstsvc_acct->email;
   } else {
     $new_destination = $new->dst;
diff --git a/FS/FS/part_export/http.pm b/FS/FS/part_export/http.pm
index 55d8329..0be2a0f 100644
--- a/FS/FS/part_export/http.pm
+++ b/FS/FS/part_export/http.pm
@@ -18,7 +18,7 @@ tie my %options, 'Tie::IxHash',
     type    => 'textarea',
     default => join("\n",
       'DomainName $svc_x->domain',
-      'Email ( grep { $_ !~ /^(POST|FAX)$/ } $svc_x->cust_svc->cust_pkg->cust_main->invoicing_list)[0]',
+      'Email ( grep { $_ ne "POST" } $svc_x->cust_svc->cust_pkg->cust_main->invoicing_list)[0]',
       'test 1',
       'reseller $svc_x->cust_svc->cust_pkg->part_pkg->pkg =~ /reseller/i',
     ),
diff --git a/FS/FS/part_export/infostreet.pm b/FS/FS/part_export/infostreet.pm
index ef16c7c..309e7ce 100644
--- a/FS/FS/part_export/infostreet.pm
+++ b/FS/FS/part_export/infostreet.pm
@@ -67,7 +67,7 @@ sub _export_insert {
     $_ => $cust_main->getfield( $infostreet2cust_main{$_} );
   } keys %infostreet2cust_main );
 
-  my @emails = grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list;
+  my @emails = grep { $_ ne 'POST' } $cust_main->invoicing_list;
   $contact_info{'email'} = $emails[0] if @emails;
 
   #this one is kinda noment-specific
diff --git a/FS/FS/part_export/radiator.pm b/FS/FS/part_export/radiator.pm
deleted file mode 100644
index 2ac3edb..0000000
--- a/FS/FS/part_export/radiator.pm
+++ /dev/null
@@ -1,167 +0,0 @@
-package FS::part_export::radiator;
-
-use vars qw(@ISA %info $radusers);
-use Tie::IxHash;
-use FS::part_export::sqlradius;
-
-tie my %options, 'Tie::IxHash', %FS::part_export::sqlradius::options;
-
-%info = (
-  'svc'      => 'svc_acct',
-  'desc'     => 'Real-time export to RADIATOR',
-  'options'  => \%options,
-  'nodomain' => '',
-  'notes' => <<'END',
-Real-time export of the <b>radusers</b> table to any SQL database in
-<a href="http://www.open.com.au/radiator/">Radiator</a>-native format.
-To setup accounting, see the RADIATOR documentation for hooks to update
-a standard <b>radacct</b> table.
-END
-);
-
-@ISA = qw(FS::part_export::sqlradius); #for regular sqlradius accounting
-
-$radusers = 'RADUSERS'; #MySQL is case sensitive about table names!  huh
-
-#sub export_username {
-#  my($self, $svc_acct) = (shift, shift);
-#  $svc_acct->email;
-#}
-
-sub _export_insert {
-  my( $self, $svc_acct ) = (shift, shift);
-
-  $self->radiator_queue(
-    $svc_acct->svcnum,
-    'insert',
-    $self->_radiator_hash($svc_acct),
-  );
-}
-
-sub _export_replace {
-  my( $self, $new, $old ) = (shift, shift, shift);
-
-#  return "can't (yet) change domain with radiator export"
-#    if $old->domain ne $new->domain;
-#  return "can't (yet) change username with radiator export"
-#    if $old->username ne $new->username;
-
-  $self->radiator_queue(
-    $new->svcnum,
-    'replace',
-    $self->export_username($old),
-    $self->_radiator_hash($new),
-  );
-}
-
-sub _export_delete {
-  my( $self, $svc_acct ) = (shift, shift);
-
-  $self->radiator_queue(
-    $svc_acct->svcnum,
-    'delete',
-    $self->export_username($svc_acct),
-  );
-}
-
-sub _radiator_hash {
-  my( $self, $svc_acct ) = @_;
-  my %hash = (
-    'username'  => $self->export_username($svc_acct),
-    'pass_word' => $svc_acct->crypt_password,
-    'fullname'  => $svc_acct->finger,
-    map { my $method = "radius_$_"; $_ => $svc_acct->$method(); }
-        qw( framed_filter_id framed_mtu framed_netmask framed_protocol
-            framed_routing login_host login_service login_tcp_port )
-  );
-  $hash{'timeleft'} = $svc_acct->seconds
-    if $svc_acct->seconds =~ /^\d+$/;
-  $hash{'staticaddress'} = $svc_acct->slipip
-    if $svc_acct->slipip =~ /^[\d\.]+$/; # and $self->slipip ne '0.0.0.0';
-
-  $hash{'servicename'} = ( $svc_acct->radius_groups )[0];
-
-  my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
-  $hash{'validto'} = $cust_pkg->bill
-    if $cust_pkg && $cust_pkg->part_pkg->is_prepaid && $cust_pkg->bill;
-
-  #some other random stuff, should probably be attributes or virtual fields
-  #$hash{'state'} = 0; #only inserts
-  #$hash{'badlogins'} = 0; #only inserts
-  $hash{'maxlogins'} = 1;
-  $hash{'addeddate'} = $cust_pkg->setup
-    if $cust_pkg && $cust_pkg->setup;
-  $hash{'validfrom'} = $cust_pkg->last_bill || $cust_pkg->setup
-    if $cust_pkg &&  ( $cust_pkg->last_bill || $cust_pkg->setup );
-  $hash{'state'} = $cust_pkg->susp ? 1 : 0
-    if $cust_pkg;
-
-  %hash;
-}
-
-sub radiator_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => "FS::part_export::radiator::radiator_$method",
-  };
-  $queue->insert(
-    $self->option('datasrc'),
-    $self->option('username'),
-    $self->option('password'),
-    @_,
-  ); # or $queue;
-}
-
-sub radiator_insert { #subroutine, not method
-  my $dbh = radiator_connect(shift, shift, shift);
-  my %hash = @_;
-  $hash{'state'} = 0; #see "random stuff" above
-  $hash{'badlogins'} = 0; #see "random stuff" above
-
-  my $sth = $dbh->prepare(
-    "INSERT INTO $radusers ( ". join(', ', keys %hash ). ' ) '.
-      'VALUES ( '. join(', ', map '?', keys %hash ). ' ) '
-  ) or die $dbh->errstr;
-  $sth->execute( values %hash )
-    or die $sth->errstr;
-
-  $dbh->disconnect;
-
-}
-
-sub radiator_replace { #subroutine, not method
-  my $dbh = radiator_connect(shift, shift, shift);
-  my ( $old_username, %hash ) = @_;
-
-  my $sth = $dbh->prepare(
-    "UPDATE $radusers SET ". join(', ', map " $_ = ?", keys %hash ).
-      ' WHERE username = ?'
-  ) or die $dbh->errstr;
-  $sth->execute( values(%hash), $old_username )
-    or die $sth->errstr;
-
-  $dbh->disconnect;
-}
-
-sub radiator_delete { #subroutine, not method
-  my $dbh = radiator_connect(shift, shift, shift);
-  my ( $username ) = @_;
-
-  my $sth = $dbh->prepare(
-    "DELETE FROM $radusers WHERE username = ?"
-  ) or die $dbh->errstr;
-  $sth->execute( $username )
-    or die $sth->errstr;
-
-  $dbh->disconnect;
-}
-
-
-sub radiator_connect {
-  #my($datasrc, $username, $password) = @_;
-  #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
-  DBI->connect(@_) or die $DBI::errstr;
-}
-
-1;
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 646c5ff..4f201cf 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -1,6 +1,6 @@
 package FS::part_export::shellcommands;
 
-use vars qw(@ISA %info);
+use vars qw(@ISA %info @saltset);
 use Tie::IxHash;
 use String::ShellQuote;
 use FS::part_export;
@@ -26,7 +26,7 @@ tie my %options, 'Tie::IxHash',
                        default=>'',
                      },
   'usermod' => { label=>'Modify command',
-                 default=>'usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -g $new_gid -p $new_crypt_password $old_username',
+                 default=>'usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username',
                 #default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
                  #  'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
                  #  'find . -depth -print | cpio -pdm $new_dir; '.
@@ -38,12 +38,9 @@ tie my %options, 'Tie::IxHash',
                        type =>'textarea',
                        default=>'',
                      },
-  'usermod_pwonly' => { label=>'Disallow username, domain, uid, gid, and dir changes', #and RADIUS group changes',
+  'usermod_pwonly' => { label=>'Disallow username changes',
                         type =>'checkbox',
                       },
-  'usermod_nousername' => { label=>'Disallow just username changes',
-                            type =>'checkbox',
-                          },
   'suspend' => { label=>'Suspension command',
                  default=>'usermod -L $username',
                },
@@ -56,10 +53,6 @@ tie my %options, 'Tie::IxHash',
   'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
                          default=>'',
                        },
-  'crypt' => { label   => 'Default password encryption',
-               type=>'select', options=>[qw(crypt md5)],
-               default => 'crypt',
-             },
 ;
 
 %info = (
@@ -82,7 +75,7 @@ running will not accept a domain as a parameter.  You will need to
       this.form.useradd_stdin.value = "";
       this.form.userdel.value = "userdel -r $username";
       this.form.userdel_stdin.value="";
-      this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -g $new_gid -p $new_crypt_password $old_username";
+      this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username";
       this.form.usermod_stdin.value = "";
       this.form.suspend.value = "usermod -L $username";
       this.form.suspend_stdin.value="";
@@ -91,10 +84,10 @@ running will not accept a domain as a parameter.  You will need to
     '>
   <LI>
     <INPUT TYPE="button" VALUE="FreeBSD before 4.10 / 5.3" onClick='
-      this.form.useradd.value = "lockf /etc/passwd.lock pw useradd $username -d $dir -m -s $shell -u $uid -c $finger -h 0";
+      this.form.useradd.value = "lockf /etc/passwd.lock pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0";
       this.form.useradd_stdin.value = "$_password\n";
       this.form.userdel.value = "lockf /etc/passwd.lock pw userdel $username -r"; this.form.userdel_stdin.value="";
-      this.form.usermod.value = "lockf /etc/passwd.lock pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -g $new_gid -c $new_finger -h 0";
+      this.form.usermod.value = "lockf /etc/passwd.lock pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0";
       this.form.usermod_stdin.value = "$new__password\n"; this.form.suspend.value = "lockf /etc/passwd.lock pw lock $username";
       this.form.suspend_stdin.value="";
       this.form.unsuspend.value = "lockf /etc/passwd.lock pw unlock $username"; this.form.unsuspend_stdin.value="";
@@ -112,7 +105,7 @@ running will not accept a domain as a parameter.  You will need to
       this.form.useradd_stdin.value = "$_password\n";
       this.form.userdel.value = "pw userdel $username -r";
       this.form.userdel_stdin.value="";
-      this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -g $new_gid -c $new_finger -h 0";
+      this.form.usermod.value = "pw usermod $old_username -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -c $new_finger -h 0";
       this.form.usermod_stdin.value = "$new__password\n";
       this.form.suspend.value = "pw lock $username";
       this.form.suspend_stdin.value="";
@@ -125,7 +118,7 @@ running will not accept a domain as a parameter.  You will need to
       this.form.useradd_stdin.value = "";
       this.form.userdel.value = "userdel -r $username";
       this.form.userdel_stdin.value="";
-      this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -g $new_gid -p $new_crypt_password $old_username";
+      this.form.usermod.value = "usermod -c $new_finger -d $new_dir -m -l $new_username -s $new_shell -u $new_uid -p $new_crypt_password $old_username";
       this.form.usermod_stdin.value = "";
       this.form.suspend.value = "";
       this.form.suspend_stdin.value="";
@@ -151,8 +144,8 @@ old_ for replace operations):
 <UL>
   <LI><code>$username</code>
   <LI><code>$_password</code>
-  <LI><code>$quoted_password</code> - unencrypted password, already quoted for the shell (do not add additional quotes)
-  <LI><code>$crypt_password</code> - encrypted password, already quoted for the shell (do not add additional quotes)
+  <LI><code>$quoted_password</code> - unencrypted password quoted for the shell
+  <LI><code>$crypt_password</code> - encrypted password
   <LI><code>$uid</code>
   <LI><code>$gid</code>
   <LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)
@@ -167,6 +160,8 @@ old_ for replace operations):
 END
 );
 
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -221,7 +216,7 @@ sub _export_command {
 
   my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
   if ( $cust_pkg ) {
-    $email = ( grep { $_ !~ /^(POST|FAX)$/ } $cust_pkg->cust_main->invoicing_list )[0];
+    $email = ( grep { $_ ne 'POST' } $cust_pkg->cust_main->invoicing_list )[0];
   } else {
     $email = '';
   }
@@ -234,8 +229,16 @@ sub _export_command {
   $quoted_password = shell_quote $_password;
   $domain = $svc_acct->domain;
 
-  $crypt_password =
-    shell_quote( $svc_acct->crypt_password( $self->option('crypt') ) );
+  #eventually should check a "password-encoding" field
+  if ( length($svc_acct->_password) == 13
+       || $svc_acct->_password =~ /^\$(1|2a?)\$/ ) {
+    $crypt_password = shell_quote $svc_acct->_password;
+  } else {
+    $crypt_password = crypt(
+      $svc_acct->_password,
+      $saltset[int(rand(64))].$saltset[int(rand(64))]
+    );
+  }
 
   @radius_groups = $svc_acct->radius_groups;
 
@@ -267,39 +270,40 @@ sub _export_replace {
   $old_domain = $old->domain;
   $new_domain = $new->domain;
 
-  $new_crypt_password =
-    shell_quote( $new->crypt_password( $self->option('crypt') ) );
+  #eventuall should check a "password-encoding" field
+  if ( length($new->_password) == 13
+       || $new->_password =~ /^\$(1|2a?)\$/ ) {
+    $new_crypt_password = shell_quote $new->_password;
+  } else {
+    $new_crypt_password =
+      crypt( $new->_password, $saltset[int(rand(64))].$saltset[int(rand(64))]
+    );
+  }
 
   @old_radius_groups = $old->radius_groups;
   @new_radius_groups = $new->radius_groups;
 
-  my $error = '';
-  if ( $self->option('usermod_pwonly') || $self->option('usermod_nousername') ){
+  if ( $self->option('usermod_pwonly') ) {
+    my $error = '';
     if ( $old_username ne $new_username ) {
       $error ||= "can't change username";
     }
-  }
-  if ( $self->option('usermod_pwonly') ) {
     if ( $old_domain ne $new_domain ) {
       $error ||= "can't change domain";
     }
     if ( $old_uid != $new_uid ) {
       $error ||= "can't change uid";
     }
-    if ( $old_gid != $new_gid ) {
-      $error ||= "can't change gid";
-    }
     if ( $old_dir ne $new_dir ) {
       $error ||= "can't change dir";
     }
-    #if ( join("\n", sort @old_radius_groups) ne
-    #     join("\n", sort @new_radius_groups)    ) {
-    #  $error ||= "can't change RADIUS groups";
-    #}
+    if ( join("\n", sort @old_radius_groups) ne
+         join("\n", sort @new_radius_groups)    ) {
+      $error ||= "can't change RADIUS groups";
+    }
+    return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
+      if $error;
   }
-  return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
-    if $error;
-
   $self->shellcommands_queue( $new->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index 7c5d904..89ee95f 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -29,12 +29,9 @@ tie my %options, 'Tie::IxHash',
                        type =>'textarea',
                        #default=>"$_password\n$_password\n",
                      },
-  'usermod_pwonly' => { label=>'Disallow username, domain, uid, dir and RADIUS group changes',
+  'usermod_pwonly' => { label=>'Disallow username changes',
                         type =>'checkbox',
                       },
-  'usermod_nousername' => { label=>'Disallow just username changes',
-                            type =>'checkbox',
-                          },
   'suspend' => { label=>'Suspension command',
                  default=>'',
                },
@@ -47,10 +44,6 @@ tie my %options, 'Tie::IxHash',
   'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
                          default=>'',
                        },
-  'crypt' => { label   => 'Default password encryption',
-               type=>'select', options=>[qw(crypt md5)],
-               default => 'crypt',
-             },
 ;
 
 %info = (
@@ -92,8 +85,8 @@ The following variables are available for interpolation (prefixed with
   <LI><code>$username</code>
   <LI><code>$domain</code>
   <LI><code>$_password</code>
-  <LI><code>$quoted_password</code> - unencrypted password, already quoted for the shell (do not add additional quotes)
-  <LI><code>$crypt_password</code> - encrypted password, already quoted for the shell (do not add additional quotes)
+  <LI><code>$quoted_password</code> - unencrypted password quoted for the shell
+  <LI><code>$crypt_password</code> - encrypted password
   <LI><code>$uid</code>
   <LI><code>$gid</code>
   <LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)
diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 10bccb0..e1d862c 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -2,10 +2,8 @@ package FS::part_export::sqlradius;
 
 use vars qw(@ISA $DEBUG %info %options $notes1 $notes2);
 use Tie::IxHash;
-use FS::Record qw( dbh qsearch );
+use FS::Record qw( dbh );
 use FS::part_export;
-use FS::svc_acct;
-use FS::export_svc;
 
 @ISA = qw(FS::part_export);
 
@@ -34,10 +32,10 @@ tie %options, 'Tie::IxHash',
 ;
 
 $notes1 = <<'END';
-Real-time export of <b>radcheck</b>, <b>radreply</b> and <b>usergroup</b>
-tables to any SQL database for
-<a href="http://www.freeradius.org/">FreeRADIUS</a>
-or <a href="http://radius.innercite.com/">ICRADIUS</a>.
+Real-time export of radcheck, radreply and usergroup tables to any SQL database
+for <a href="http://www.freeradius.org/">FreeRADIUS</a>,
+<a href="http://radius.innercite.com/">ICRADIUS</a>
+or <a href="http://www.open.com.au/radiator/">Radiator</a>.  
 END
 
 $notes2 = <<'END';
@@ -66,7 +64,7 @@ END
 
 %info = (
   'svc'      => 'svc_acct',
-  'desc'     => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS)',
+  'desc'     => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator)',
   'options'  => \%options,
   'nodomain' => 'Y',
   'notes'    => $notes1.
@@ -368,6 +366,7 @@ Called-Station-ID.
 #SQL_SELECT defaults to * if unspecified.  It can be useful to set it to 
 #SUM(acctsessiontime) or SUM(AcctInputOctets), etc.
 
+Returns an array of hash references
 Returns an arrayref of hashrefs with the following fields:
 
 =over 4
@@ -468,85 +467,5 @@ sub usage_sessions {
 
 }
 
-=item update_svc_acct
-
-=cut
-
-sub update_svc_acct {
-  my $self = shift;
-
-  my $dbh = sqlradius_connect( map $self->option($_),
-                                   qw( datasrc username password ) );
-
-  my @fields = qw( radacctid username realm acctsessiontime );
-
-  my @param = ();
-  my $where = '';
-
-  my $sth = $dbh->prepare("
-    SELECT RadAcctId, UserName, Realm, AcctSessionTime
-      FROM radacct
-      WHERE FreesideStatus IS NULL
-        AND AcctStopTime != 0
-  ") or die $dbh->errstr;
-  $sth->execute() or die $sth->errstr;
-
-  while ( my $row = $sth->fetchrow_arrayref ) {
-    my($RadAcctId, $UserName, $Realm, $AcctSessionTime) = @$row;
-    warn "processing record: ".
-         "$RadAcctId ($UserName\@$Realm for ${AcctSessionTime}s"
-      if $DEBUG;
-
-    my %search = ( 'username' => $UserName );
-    my $extra_sql = '';
-    if ( ref($self) =~ /withdomain/ ) { #well...
-      $extra_sql = " AND '$Realm' = ( SELECT domain FROM svc_domain
-                          WHERE svc_domain.svcnum = svc_acct.domsvc ) ";
-      my $svc_domain = qsearch
-    }
-
-    my @svc_acct =
-      grep { qsearch( 'export_svc', { 'exportnum' => $self->exportnum,
-                                      'svcpart'   => $_->cust_svc->svcpart, } )
-           }
-      qsearch( 'svc_acct',
-                 { 'username' => $UserName },
-                 '',
-                 $extra_sql
-               );
-
-    my $errinfo = "for RADIUS detail RadAcctID $RadAcctId ".
-                  "(UserName $UserName, Realm $Realm)";
-    my $status = 'skipped';
-    if ( !@svc_acct ) {
-      warn "WARNING: no svc_acct record found $errinfo - skipping\n";
-    } elsif ( scalar(@svc_acct) > 1 ) {
-      warn "WARNING: multiple svc_acct records found $errinfo - skipping\n";
-    } else {
-      my $svc_acct = $svc_acct[0];
-      warn "found svc_acct ". $svc_acct->svcnum. " $errinfo\n" if $DEBUG;
-      if ( $svc_acct->seconds !~ /^$/ ) {
-        warn "  svc_acct.seconds found (". $svc_acct->seconds.
-             ") - decrementing\n"
-          if $DEBUG;
-        my $error = $svc_acct->decrement_seconds($AcctSessionTime);
-        die $error if $error;
-        $status = 'done';
-      } else {
-        warn "  no existing seconds value for svc_acct - skiping\n" if $DEBUG;
-      }
-    }
-
-    warn "setting FreesideStatus to $status $errinfo\n" if $DEBUG; 
-    my $psth = $dbh->prepare("UPDATE radacct
-                                SET FreesideStatus = ?
-                                WHERE RadAcctId = ?"
-    ) or die $dbh->errstr;
-    $psth->execute($status, $RadAcctId) or die $psth->errstr;
-
-  }
-
-}
-
 1;
 
diff --git a/FS/FS/part_export/sqlradius_withdomain.pm b/FS/FS/part_export/sqlradius_withdomain.pm
index e5a7151..6130e5e 100644
--- a/FS/FS/part_export/sqlradius_withdomain.pm
+++ b/FS/FS/part_export/sqlradius_withdomain.pm
@@ -8,7 +8,7 @@ tie my %options, 'Tie::IxHash', %FS::part_export::sqlradius::options;
 
 %info = (
   'svc'      => 'svc_acct',
-  'desc'     => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS) with realms',
+  'desc'     => 'Real-time export to SQL-backed RADIUS (FreeRADIUS, ICRADIUS, Radiator) with realms',
   'options'  => \%options,
   'nodomain' => '',
   'notes' => $FS::part_export::sqlradius::notes1.
diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 9d3564e..0e50d60 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -80,7 +80,6 @@ sub _export_delete {
 sub _export_command {
   my ( $self, $action, $svc_www) = (shift, shift, shift);
   my $command = $self->option($action);
-  return '' if $command =~ /^\s*$/;
 
   #set variable for the command
   no strict 'vars';
diff --git a/FS/FS/part_export_option.pm b/FS/FS/part_export_option.pm
index e759404..33b5e5a 100644
--- a/FS/FS/part_export_option.pm
+++ b/FS/FS/part_export_option.pm
@@ -104,7 +104,7 @@ sub check {
 
   my $error = 
     $self->ut_numbern('optionnum')
-    || $self->ut_foreign_key('exportnum', 'part_export', 'exportnum')
+    || $self->ut_number('exportnum')
     || $self->ut_alpha('optionname')
     || $self->ut_anything('optionvalue')
   ;
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 73f3bae..cef4a61 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -2,7 +2,7 @@ package FS::part_pkg;
 
 use strict;
 use vars qw( @ISA %freq %plans $DEBUG );
-use Carp qw(carp cluck confess);
+use Carp qw(carp cluck);
 use Tie::IxHash;
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs dbh dbdef );
@@ -13,9 +13,7 @@ use FS::agent_type;
 use FS::type_pkgs;
 use FS::part_pkg_option;
 
-@ISA = qw( FS::Record ); # FS::option_Common ); # this can use option_Common
-                                                # when all the plandata bs is
-                                                # gone
+@ISA = qw( FS::Record );
 
 $DEBUG = 0;
 
@@ -118,8 +116,8 @@ sub clone {
 Adds this package definition to the database.  If there is an error,
 returns the error, otherwise returns false.
 
-Currently available options are: I<pkg_svc>, I<primary_svc>, I<cust_pkg>, 
-I<custnum_ref> and I<options>.
+Currently available options are: I<pkg_svc>, I<primary_svc>, I<cust_pkg> and
+I<custnum_ref>.
 
 If I<pkg_svc> is set to a hashref with svcparts as keys and quantities as
 values, appropriate FS::pkg_svc records will be inserted.
@@ -133,9 +131,6 @@ record itself), the object will be updated to point to this package definition.
 In conjunction with I<cust_pkg>, if I<custnum_ref> is set to a scalar reference,
 the scalar will be updated with the custnum value from the cust_pkg record.
 
-If I<options> is set to a hashref of options, appropriate FS::part_pkg_option
-records will be inserted.
-
 =cut
 
 sub insert {
@@ -168,8 +163,7 @@ sub insert {
   }
 
   if ( $plandata ) {
-
-    warn "  inserting part_pkg_option records for plandata" if $DEBUG;
+  warn "  inserting part_pkg_option records for plandata" if $DEBUG;
     foreach my $part_pkg_option ( 
       map { /^(\w+)=(.*)$/ or do { $dbh->rollback if $oldAutoCommit;
                                    return "illegal plandata: $plandata";
@@ -188,27 +182,6 @@ sub insert {
         return $error;
       }
     }
-
-  } elsif ( $options{'options'} ) {
-
-    warn "  inserting part_pkg_option records for options hashref" if $DEBUG;
-    foreach my $optionname ( keys %{$options{'options'}} ) {
-
-      my $part_pkg_option =
-        new FS::part_pkg_option {
-          'pkgpart'     => $self->pkgpart,
-          'optionname'  => $optionname,
-          'optionvalue' => $options{'options'}->{$optionname},
-        };
-
-      my $error = $part_pkg_option->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-
-    }
-
   }
 
   my $conf = new FS::Conf;
@@ -232,10 +205,7 @@ sub insert {
   my $pkg_svc = $options{'pkg_svc'} || {};
   foreach my $part_svc ( qsearch('part_svc', {} ) ) {
     my $quantity = $pkg_svc->{$part_svc->svcpart} || 0;
-    my $primary_svc =
-      ( $options{'primary_svc'} && $options{'primary_svc'}==$part_svc->svcpart )
-        ? 'Y'
-        : '';
+    my $primary_svc = $options{'primary_svc'} == $part_svc->svcpart ? 'Y' : '';
 
     my $pkg_svc = new FS::pkg_svc( {
       'pkgpart'     => $self->pkgpart,
@@ -377,7 +347,6 @@ sub replace {
     next unless $old_quantity != $quantity || $old_primary_svc ne $primary_svc;
   
     my $new_pkg_svc = new FS::pkg_svc( {
-      'pkgsvcnum'   => ( $old_pkg_svc ? $old_pkg_svc->pkgsvcnum : '' ),
       'pkgpart'     => $new->pkgpart,
       'svcpart'     => $part_svc->svcpart,
       'quantity'    => $quantity, 
@@ -420,7 +389,7 @@ sub check {
     my $error = $self->ut_number('freq');
     return $error if $error;
   } else {
-    $self->freq =~ /^(\d+[hdw]?)$/
+    $self->freq =~ /^(\d+[dw]?)$/
       or return "Illegal or empty freq: ". $self->freq;
     $self->freq($1);
   }
@@ -441,10 +410,6 @@ sub check {
   return 'Unknown plan '. $self->plan
     unless exists($plans{$self->plan});
 
-  my $conf = new FS::Conf;
-  return 'Taxclass is required'
-    if ! $self->taxclass && $conf->exists('require_taxclasses');
-
   '';
 }
 
@@ -539,7 +504,6 @@ Returns an english representation of the I<freq> field, such as "monthly",
 
 tie %freq, 'Tie::IxHash', 
   '0'  => '(no recurring fee)',
-  '1h' => 'hourly',
   '1d' => 'daily',
   '1w' => 'weekly',
   '2w' => 'biweekly (every 2 weeks)',
@@ -549,10 +513,6 @@ tie %freq, 'Tie::IxHash',
   '6'  => 'semiannually (every 6 months)',
   '12' => 'annually',
   '24' => 'biannually (every 2 years)',
-  '36' => 'triannually (every 3 years)',
-  '48' => '(every 4 years)',
-  '60' => '(every 5 years)',
-  '120' => '(every 10 years)',
 ;
 
 sub freq_pretty {
@@ -562,8 +522,8 @@ sub freq_pretty {
     $freq{$freq};
   } else {
     my $interval = 'month';
-    if ( $freq =~ /^(\d+)([hdw])$/ ) {
-      my %interval = ( 'h' => 'hour', 'd'=>'day', 'w'=>'week' );
+    if ( $freq =~ /^(\d+)([dw])$/ ) {
+      my %interval = ( 'd'=>'day', 'w'=>'week' );
       $interval = $interval{$2};
     }
     if ( $1 == 1 ) {
@@ -624,7 +584,7 @@ Returns the option value for the given name, or the empty string.
 =cut
 
 sub option {
-  my( $self, $opt, $ornull ) = @_;
+  my( $self, $opt ) = @_;
   my $part_pkg_option =
     qsearchs('part_pkg_option', {
       pkgpart    => $self->pkgpart,
@@ -634,8 +594,7 @@ sub option {
   my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
                      split("\n", $self->get('plandata') );
   return $plandata{$opt} if exists $plandata{$opt};
-  cluck "Package definition option $opt not found in options or plandata!\n"
-    unless $ornull;
+  cluck "Package definition option $opt not found in options or plandata!\n";
   '';
 }
 
@@ -650,16 +609,9 @@ on how to create new price plans, but until then, see L</NEW PLAN CLASSES>.
 sub _rebless {
   my $self = shift;
   my $plan = $self->plan;
-  unless ( $plan ) {
-    confess "no price plan found for pkgpart ". $self->pkgpart. "\n"
-      if $DEBUG;
-    return $self;
-  }
-  return $self if ref($self) =~ /::$plan$/; #already blessed into plan subclass
   my $class = ref($self). "::$plan";
-  warn "reblessing $self into $class" if $DEBUG;
   eval "use $class;";
-  die $@ if $@;
+  #die $@ if $@;
   bless($self, $class) unless $@;
   $self;
 }
@@ -694,11 +646,6 @@ sub _calc_eval {
   $value;
 }
 
-#fallback that return 0 for old legacy packages with no plan
-
-sub calc_remain { 0; }
-sub calc_cancel { 0; }
-
 =back
 
 =head1 SUBROUTINES
@@ -711,7 +658,6 @@ sub calc_cancel { 0; }
 
 my %info;
 foreach my $INC ( @INC ) {
-  warn "globbing $INC/FS/part_pkg/*.pm\n" if $DEBUG;
   foreach my $file ( glob("$INC/FS/part_pkg/*.pm") ) {
     warn "attempting to load plan info from $file\n" if $DEBUG;
     $file =~ /\/(\w+)\.pm$/ or do {
@@ -762,8 +708,6 @@ The delete method is unimplemented.
 setup and recur semantics are not yet defined (and are implemented in
 FS::cust_bill.  hmm.).
 
-plandata should go
-
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_pkg>, L<FS::type_pkgs>, L<FS::pkg_svc>, L<Safe>.
diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 59b6257..b62aebd 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -10,18 +10,14 @@ use FS::part_pkg;
 %info = (
   'name' => 'Flat rate (anniversary billing)',
   'fields' => {
-    'setup_fee'     => { 'name' => 'Setup fee for this package',
-                         'default' => 0,
-                       },
-    'recur_fee'     => { 'name' => 'Recurring fee for this package',
-                         'default' => 0,
-                       },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
+    'setup_fee' => { 'name' => 'Setup fee for this package',
+                     'default' => 0,
+                   },
+    'recur_fee' => { 'name' => 'Recurring fee for this package',
+                     'default' => 0,
+                    },
   },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit' ],
+  'fieldorder' => [ 'setup_fee', 'recur_fee' ],
   #'setup' => 'what.setup_fee.value',
   #'recur' => 'what.recur_fee.value',
   'weight' => 10,
@@ -33,48 +29,12 @@ sub calc_setup {
 }
 
 sub calc_recur {
-  my $self = shift;
-  $self->base_recur(@_);
-}
-
-sub base_recur {
-  my($self, $cust_pkg) = @_;
+  my($self, $cust_pkg ) = @_;
   $self->option('recur_fee');
 }
 
-sub calc_remain {
-  my ($self, $cust_pkg) = @_;
-  my $time = time;  #should be able to pass this in for credit calculation
-  my $next_bill = $cust_pkg->getfield('bill') || 0;
-  my $last_bill = $cust_pkg->last_bill || 0;
-  return 0 if    ! $self->base_recur
-              || ! $self->option('unused_credit', 1)
-              || ! $last_bill
-              || ! $next_bill
-              || $next_bill < $time;
-
-  my %sec = (
-    'h' =>    3600, # 60 * 60
-    'd' =>   86400, # 60 * 60 * 24
-    'w' =>  604800, # 60 * 60 * 24 * 7
-    'm' => 2629744, # 60 * 60 * 24 * 365.2422 / 12 
-  );
-
-  $self->freq =~ /^(\d+)([hdwm]?)$/
-    or die 'unparsable frequency: '. $self->freq;
-  my $freq_sec = $1 * $sec{$2||'m'};
-  return 0 unless $freq_sec;
-
-  sprintf("%.2f", $self->base_recur * ( $next_bill - $time ) / $freq_sec );
-
-}
-
 sub is_free_options {
   qw( setup_fee recur_fee );
 }
 
-sub is_prepaid {
-  0; #no, we're postpaid
-}
-
 1;
diff --git a/FS/FS/part_pkg/flat_comission.pm b/FS/FS/part_pkg/flat_comission.pm
index 442415e..9b288c3 100644
--- a/FS/FS/part_pkg/flat_comission.pm
+++ b/FS/FS/part_pkg/flat_comission.pm
@@ -3,34 +3,30 @@ package FS::part_pkg::flat_comission;
 use strict;
 use vars qw(@ISA %info);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'Flat rate with recurring commission per (any) active package',
-  'fields' => {
-    'setup_fee'     => { 'name' => 'Setup fee for this package',
-                         'default' => 0,
-                       },
-    'recur_fee'     => { 'name' => 'Recurring fee for this package',
-                         'default' => 0,
-                       },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-    'comission_amount' => { 'name' => 'Commission amount per month (per active package)',
-                            'default' => 0,
-                          },
-    'comission_depth'  => { 'name' => 'Number of layers',
-                            'default' => 1,
-                          },
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'comission_depth', 'comission_amount' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  'weight' => 62,
+    'name' => 'Flat rate with recurring commission per (any) active package',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Commission amount per month (per active package)',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
+    'weight' => 62,
 );
 
 sub calc_recur {
diff --git a/FS/FS/part_pkg/flat_comission_cust.pm b/FS/FS/part_pkg/flat_comission_cust.pm
index 4abe66a..8aa993c 100644
--- a/FS/FS/part_pkg/flat_comission_cust.pm
+++ b/FS/FS/part_pkg/flat_comission_cust.pm
@@ -3,34 +3,30 @@ package FS::part_pkg::flat_comission_cust;
 use strict;
 use vars qw(@ISA %info);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'Flat rate with recurring commission per active customer',
-  'fields' => {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
-    'recur_fee' => { 'name' => 'Recurring fee for this package',
-                     'default' => 0,
-                   },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-    'comission_amount' => { 'name' => 'Commission amount per month (per active customer)',
-                            'default' => 0,
-                          },
-    'comission_depth'  => { 'name' => 'Number of layers',
-                            'default' => 1,
-                          },
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'comission_depth', 'comission_amount' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_main_ncancelled(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  'weight' => '60',
+    'name' => 'Flat rate with recurring commission per active customer',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Commission amount per month (per active customer)',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_main_ncancelled(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
+    'weight' => '60',
 );
 
 sub calc_recur {
@@ -38,16 +34,13 @@ sub calc_recur {
 
   my $amount = $self->option('comission_amount');
   my $num_active = scalar(
-    $cust_pkg->cust_main->referral_cust_main_ncancelled(
+    $cust_pkg->cust_main->referral_cust_pkgcust_main_ncancelled(
       $self->option('comission_depth')
     )
   );
 
-  if ( $amount && $num_active ) {
-    my $error =
-      $cust_pkg->cust_main->credit( $amount*$num_active, "commission" );
-    die $error if $error;
-  }
+  my $error = $cust_pkg->cust_main->credit( $amount*$num_active, "commission" );
+  die $error if $error;
 
   $self->option('recur_fee');
 }
diff --git a/FS/FS/part_pkg/flat_comission_pkg.pm b/FS/FS/part_pkg/flat_comission_pkg.pm
index 0f4d02a..befa77e 100644
--- a/FS/FS/part_pkg/flat_comission_pkg.pm
+++ b/FS/FS/part_pkg/flat_comission_pkg.pm
@@ -3,42 +3,38 @@ package FS::part_pkg::flat_comission_pkg;
 use strict;
 use vars qw(@ISA %info);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'Flat rate with recurring commission per (selected) active package',
-  'fields' => {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
-    'recur_fee' => { 'name' => 'Recurring fee for this package',
-                     'default' => 0,
-                   },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-    'comission_amount' => { 'name' => 'Commission amount per month (per uncancelled package)',
-                            'default' => 0,
-                          },
-    'comission_depth'  => { 'name' => 'Number of layers',
-                            'default' => 1,
-                          },
-    'comission_pkgpart' => { 'name' => 'Applicable packages<BR><FONT SIZE="-1">(hold <b>ctrl</b> to select multiple packages)</FONT>',
-                             'type' => 'select_multiple',
-                             'select_table' => 'part_pkg',
-                             'select_hash'  => { 'disabled' => '' } ,
-                             'select_key'   => 'pkgpart',
-                             'select_label' => 'pkg',
-                           },
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'comission_depth', 'comission_amount', 'comission_pkgpart' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '""; var pkgparts = ""; for ( var c=0; c < document.flat_comission_pkg.comission_pkgpart.options.length; c++ ) { if (document.flat_comission_pkg.comission_pkgpart.options[c].selected) { pkgparts = pkgparts + document.flat_comission_pkg.comission_pkgpart.options[c].value + \', \'; } } what.recur.value = \'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar( grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } ( \' + pkgparts + \'  ) } $cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  #'disabled' => 1,
-  'weight' => '64',
+    'name' => 'Flat rate with recurring commission per (selected) active package',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                     },
+      'comission_amount' => { 'name' => 'Commission amount per month (per uncancelled package)',
+                              'default' => 0,
+                            },
+      'comission_depth'  => { 'name' => 'Number of layers',
+                              'default' => 1,
+                            },
+      'comission_pkgpart' => { 'name' => 'Applicable packages<BR><FONT SIZE="-1">(hold <b>ctrl</b> to select multiple packages)</FONT>',
+                               'type' => 'select_multiple',
+                               'select_table' => 'part_pkg',
+                               'select_hash'  => { 'disabled' => '' } ,
+                               'select_key'   => 'pkgpart',
+                               'select_label' => 'pkg',
+                             },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount', 'comission_pkgpart' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '""; var pkgparts = ""; for ( var c=0; c < document.flat_comission_pkg.comission_pkgpart.options.length; c++ ) { if (document.flat_comission_pkg.comission_pkgpart.options[c].selected) { pkgparts = pkgparts + document.flat_comission_pkg.comission_pkgpart.options[c].value + \', \'; } } what.recur.value = \'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar( grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } ( \' + pkgparts + \'  ) } $cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
+    #'disabled' => 1,
+    'weight' => '64',
 );
 
 # XXX this needs to be fixed!!!
diff --git a/FS/FS/part_pkg/flat_delayed.pm b/FS/FS/part_pkg/flat_delayed.pm
index ec11699..f39783f 100644
--- a/FS/FS/part_pkg/flat_delayed.pm
+++ b/FS/FS/part_pkg/flat_delayed.pm
@@ -3,32 +3,28 @@ package FS::part_pkg::flat_delayed;
 use strict;
 use vars qw(@ISA %info);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'Free (or setup fee) for X days, then flat rate'.
-            ' (anniversary billing)',
-  'fields' =>  {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
-    'free_days' => { 'name' => 'Initial free days',
-                     'default' => 0,
-                   },
-    'recur_fee' => { 'name' => 'Recurring fee for this package',
-                     'default' => 0,
-                    },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-  },
-  'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee', 'unused_credit' ],
-  #'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
-  #'recur' => 'what.recur_fee.value',
-  'weight' => 50,
+    'name' => 'Free (or setup fee) for X days, then flat rate'.
+              ' (anniversary billing)',
+    'fields' =>  {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'free_days' => { 'name' => 'Initial free days',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee' ],
+    #'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
+    #'recur' => 'what.recur_fee.value',
+    'weight' => 50,
 );
 
 sub calc_setup {
diff --git a/FS/FS/part_pkg/prepaid.pm b/FS/FS/part_pkg/prepaid.pm
deleted file mode 100644
index 5e7d2ba..0000000
--- a/FS/FS/part_pkg/prepaid.pm
+++ /dev/null
@@ -1,28 +0,0 @@
-package FS::part_pkg::prepaid;
-
-use strict;
-use vars qw(@ISA %info);
-use FS::part_pkg::flat;
-
-@ISA = qw(FS::part_pkg::flat);
-
-%info = (
-  'name' => 'Prepaid, flat rate',
-  'fields' => {
-    'setup_fee' => { 'name' => 'One-time setup fee for this package',
-                     'default' => 0,
-                   },
-    'recur_fee' => { 'name' => 'Initial and recharge fee for this package',
-                     'default' => 0,
-                   }
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', ],
-  'weight' => 25,
-);
-
-sub is_prepaid {
-  1;
-}
-
-1;
-
diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
index 86c64d5..d27adbd 100644
--- a/FS/FS/part_pkg/prorate.pm
+++ b/FS/FS/part_pkg/prorate.pm
@@ -4,29 +4,25 @@ use strict;
 use vars qw(@ISA %info);
 use Time::Local qw(timelocal);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
-  'fields' =>  {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
-    'recur_fee' => { 'name' => 'Recurring fee for this package',
-                     'default' => 0,
-                    },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
-  'freq' => 'm',
-  'weight' => 20,
+    'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
+    'fields' =>  {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
+    'freq' => 'm',
+    'weight' => 20,
 );
 
 sub calc_recur {
diff --git a/FS/FS/part_pkg/sesmon_hour.pm b/FS/FS/part_pkg/sesmon_hour.pm
index 9843edb..0367b2b 100644
--- a/FS/FS/part_pkg/sesmon_hour.pm
+++ b/FS/FS/part_pkg/sesmon_hour.pm
@@ -3,34 +3,30 @@ package FS::part_pkg::sesmon_hour;
 use strict;
 use vars qw(@ISA %info);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'Base charge plus charge per-hour from the session monitor',
-  'fields' => {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
-    'recur_flat' => { 'name' => 'Base recurring fee for this package',
-                      'default' => 0,
-                    },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-    'recur_included_hours' => { 'name' => 'Hours included',
-                                'default' => 0,
-                              },
-    'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
-                               'default' => 0,
-                             },
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_flat', 'unused_credit', 'recur_included_hours', 'recur_hourly_charge' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
-  'weight' => 80,
+    'name' => 'Base charge plus charge per-hour from the session monitor',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_hours' => { 'name' => 'Hours included',
+                                  'default' => 0,
+                                },
+      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
+                                 'default' => 0,
+                               },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+    'weight' => 80,
 );
 
 sub calc_recur {
@@ -48,9 +44,4 @@ sub is_free_options {
   qw( setup_fee recur_fee recur_hourly_charge );
 }
 
-sub base_recur {
-  my($self, $cust_pkg) = @_;
-  $self->option('recur_flat');
-}
-
 1;
diff --git a/FS/FS/part_pkg/sesmon_minute.pm b/FS/FS/part_pkg/sesmon_minute.pm
index 39516f8..7cafbe0 100644
--- a/FS/FS/part_pkg/sesmon_minute.pm
+++ b/FS/FS/part_pkg/sesmon_minute.pm
@@ -3,38 +3,34 @@ package FS::part_pkg::sesmon_minute;
 use strict;
 use vars qw(@ISA %info);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'Base charge plus charge per-minute from the session monitor',
-  'fields' => {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
-    'recur_flat' => { 'name' => 'Base recurring fee for this package',
-                      'default' => 0,
-                    },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-    'recur_included_min' => { 'name' => 'Minutes included',
-                              'default' => 0,
+    'name' => 'Base charge plus charge per-minute from the session monitor',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_min' => { 'name' => 'Minutes included',
+                                'default' => 0,
+                                },
+      'recur_minly_charge' => { 'name' => 'Additional charge per minute',
+                                'default' => 0,
                               },
-    'recur_minly_charge' => { 'name' => 'Additional charge per minute',
-                              'default' => 0,
-                            },
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_flat', 'unused_credit', 'recur_included_min', 'recur_minly_charge' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
-  'weight' => 80,
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
+    'weight' => 80,
 );
 
 
-sub calc_recur {
+sub cakc_recur {
   my( $self, $cust_pkg ) = @);
   my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60;
   $min -= $self->option('recur_included_min');
@@ -47,9 +43,4 @@ sub is_free_options {
   qw( setup_fee recur_fee recur_minly_charge );
 }
 
-sub base_recur {
-  my($self, $cust_pkg) = @_;
-  $self->option('recur_flat');
-}
-
 1;
diff --git a/FS/FS/part_pkg/sql_external.pm b/FS/FS/part_pkg/sql_external.pm
index ca58c4e..8da4d31 100644
--- a/FS/FS/part_pkg/sql_external.pm
+++ b/FS/FS/part_pkg/sql_external.pm
@@ -4,40 +4,36 @@ use strict;
 use vars qw(@ISA %info);
 use DBI;
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'Base charge plus additional fees for external services from a configurable SQL query',
-  'fields' => {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
+    'name' => 'Base charge plus additional fees for external services from a configurable SQL query',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'datasrc' => { 'name' => 'DBI data source',
+                     'default' => '',
                    },
-    'recur_flat' => { 'name' => 'Base recurring fee for this package',
-                      'default' => 0,
-                    },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
+      'db_username' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'db_password' => { 'name' => 'Database password',
+                         'default' => '',
                        },
-    'datasrc' => { 'name' => 'DBI data source',
+      'query' => { 'name' => 'SQL query',
                    'default' => '',
                  },
-    'db_username' => { 'name' => 'Database username',
-                       'default' => '',
-                     },
-    'db_password' => { 'name' => 'Database password',
-                       'default' => '',
-                     },
-    'query' => { 'name' => 'SQL query',
-                 'default' => '',
-               },
-  },
-  'fieldorder' => [qw( setup_fee recur_flat unused_credit datasrc db_username db_password query )],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => q!'my $dbh = DBI->connect("' + what.datasrc.value + '", "' + what.db_username.value + '", "' + what.db_password.value + '" ) or die $DBI::errstr; my $sth = $dbh->prepare("' + what.query.value + '") or die $dbh->errstr; my $price = ' + what.recur_flat.value + '; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_external" } $cust_pkg->cust_svc ){ my $id = $cust_svc->svc_x->id; $sth->execute($id) or die $sth->errstr; $price += $sth->fetchrow_arrayref->[0]; } $price;'!,
-  'weight' => '72',
+    },
+    'fieldorder' => [qw( setup_fee recur_flat datasrc db_username db_password query )],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => q!'my $dbh = DBI->connect("' + what.datasrc.value + '", "' + what.db_username.value + '", "' + what.db_password.value + '" ) or die $DBI::errstr; my $sth = $dbh->prepare("' + what.query.value + '") or die $dbh->errstr; my $price = ' + what.recur_flat.value + '; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_external" } $cust_pkg->cust_svc ){ my $id = $cust_svc->svc_x->id; $sth->execute($id) or die $sth->errstr; $price += $sth->fetchrow_arrayref->[0]; } $price;'!,
+    'weight' => '72',
 );
 
 sub calc_recur {
@@ -68,9 +64,4 @@ sub is_free {
   0;
 }
 
-sub base_recur {
-  my($self, $cust_pkg) = @_;
-  $self->option('recur_flat');
-}
-
 1;
diff --git a/FS/FS/part_pkg/sql_generic.pm b/FS/FS/part_pkg/sql_generic.pm
index 0e6ab7c..b7c7008 100644
--- a/FS/FS/part_pkg/sql_generic.pm
+++ b/FS/FS/part_pkg/sql_generic.pm
@@ -4,48 +4,44 @@ use strict;
 use vars qw(@ISA %info);
 use DBI;
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'Base charge plus a per-domain metered rate from a configurable SQL query',
-  'fields' => {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
+    'name' => 'Base charge plus a per-domain metered rate from a configurable SQL query',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included' => { 'name' => 'Units included',
+                            'default' => 0,
+                          },
+      'recur_unit_charge' => { 'name' => 'Additional charge per unit',
+                               'default' => 0,
+                             },
+      'datasrc' => { 'name' => 'DBI data source',
+                     'default' => '',
                    },
-    'recur_flat' => { 'name' => 'Base recurring fee for this package',
-                      'default' => 0,
-                    },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
+      'db_username' => { 'name' => 'Database username',
+                         'default' => '',
+                       },
+      'db_password' => { 'name' => 'Database username',
+                         'default' => '',
                        },
-    'recur_included' => { 'name' => 'Units included',
-                          'default' => 0,
-                        },
-    'recur_unit_charge' => { 'name' => 'Additional charge per unit',
-                             'default' => 0,
-                           },
-    'datasrc' => { 'name' => 'DBI data source',
+      'query' => { 'name' => 'SQL query',
                    'default' => '',
                  },
-    'db_username' => { 'name' => 'Database username',
-                       'default' => '',
-                     },
-    'db_password' => { 'name' => 'Database username',
-                       'default' => '',
-                     },
-    'query' => { 'name' => 'SQL query',
-                 'default' => '',
-               },
-  },
-  'fieldorder' => [qw( setup_fee recur_flat unused_credit recur_included recur_unit_charge datasrc db_username db_password query )],
- # 'setup' => 'what.setup_fee.value',
- # 'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\") or die $DBI::errstr; \'',
- #'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\", \"\' + what.db_password.value + \'\" ) or die $DBI::errstr; my $sth = $dbh->prepare(\"\' + what.query.value + \'\") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq \"svc_domain\" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge.value + \';\'',
-  #'recur' => '\'my $dbh = DBI->connect("\' + what.datasrc.value + \'", "\' + what.db_username.value + \'", "\' what.db_password.value + \'" ) or die $DBI::errstr; my $sth = $dbh->prepare("\' + what.query.value + \'") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_domain" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge + \';\'',
-  'weight' => '70',
+    },
+    'fieldorder' => [qw( setup_fee recur_flat recur_included recur_unit_charge datasrc db_username db_password query )],
+   # 'setup' => 'what.setup_fee.value',
+   # 'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\") or die $DBI::errstr; \'',
+   #'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\", \"\' + what.db_password.value + \'\" ) or die $DBI::errstr; my $sth = $dbh->prepare(\"\' + what.query.value + \'\") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq \"svc_domain\" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge.value + \';\'',
+    #'recur' => '\'my $dbh = DBI->connect("\' + what.datasrc.value + \'", "\' + what.db_username.value + \'", "\' what.db_password.value + \'" ) or die $DBI::errstr; my $sth = $dbh->prepare("\' + what.query.value + \'") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_domain" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge + \';\'',
+    'weight' => '70',
 );
 
 sub calc_recur {
@@ -79,9 +75,4 @@ sub is_free_options {
   qw( setup_fee recur_flat recur_unit_charge );
 }
 
-sub base_recur {
-  my($self, $cust_pkg) = @_;
-  $self->option('recur_flat');
-}
-
 1;
diff --git a/FS/FS/part_pkg/sqlradacct_hour.pm b/FS/FS/part_pkg/sqlradacct_hour.pm
index e54a8a5..a2550e2 100644
--- a/FS/FS/part_pkg/sqlradacct_hour.pm
+++ b/FS/FS/part_pkg/sqlradacct_hour.pm
@@ -3,83 +3,52 @@ package FS::part_pkg::sqlradacct_hour;
 use strict;
 use vars qw(@ISA %info);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'Base charge plus per-hour (and for data) from an SQL RADIUS radacct table',
-  'fields' => {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
-    'recur_flat' => { 'name' => 'Base recurring fee for this package',
-                      'default' => 0,
-                    },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-
-    'recur_included_hours' => { 'name' => 'Hours included',
+    'name' => 'Base charge plus per-hour (and for data) from an SQL RADIUS radacct table',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'recur_included_hours' => { 'name' => 'Hours included',
+                                  'default' => 0,
+                                },
+      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
+                                 'default' => 0,
+                               },
+      'recur_included_input' => { 'name' => 'Upload megabytes included',
+                                  'default' => 0,
+                                },
+      'recur_input_charge' => { 'name' =>
+                                        'Additional charge per megabyte upload',
                                 'default' => 0,
                               },
-    'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
-                               'default' => 0,
-                             },
-    'recur_hourly_cap'    => { 'name' => 'Maximum overage charge for hours'.
-                                         ' (0 means no cap)',
-
-                               'default' => 0,
-                             },
-
-    'recur_included_input' => { 'name' => 'Upload megabytes included',
+      'recur_included_output' => { 'name' => 'Download megabytes included',
+                                   'default' => 0,
+                                },
+      'recur_output_charge' => { 'name' =>
+                                       'Additional charge per megabyte download',
                                 'default' => 0,
                               },
-    'recur_input_charge' => { 'name' =>
-                                      'Additional charge per megabyte upload',
-                              'default' => 0,
-                            },
-    'recur_input_cap'    => { 'name' => 'Maximum overage charge for upload'.
-                                         ' (0 means no cap)',
-                               'default' => 0,
-                             },
-
-    'recur_included_output' => { 'name' => 'Download megabytes included',
-                                 'default' => 0,
-                              },
-    'recur_output_charge' => { 'name' =>
-                                     'Additional charge per megabyte download',
-                              'default' => 0,
-                            },
-    'recur_output_cap'    => { 'name' => 'Maximum overage charge for download'.
-                                         ' (0 means no cap)',
-                               'default' => 0,
-                             },
-
-    'recur_included_total' => { 'name' =>
-                                     'Total megabytes included',
+      'recur_included_total' => { 'name' =>
+                                       'Total megabytes included',
+                                  'default' => 0,
+                                },
+      'recur_total_charge' => { 'name' =>
+                                 'Additional charge per megabyte total',
                                 'default' => 0,
                               },
-    'recur_total_charge' => { 'name' =>
-                               'Additional charge per megabyte total',
-                              'default' => 0,
-                            },
-    'recur_total_cap'    => { 'name' => 'Maximum overage charge for total'.
-                                        ' megabytes (0 means no cap)',
-                               'default' => 0,
-                             },
-
-    'global_cap'         => { 'name' => 'Global cap on all overage charges'.
-                                        ' (0 means no cap)',
-                              'default' => 0,
-                            },
-
-  },
-  'fieldorder' => [qw( setup_fee recur_flat unused_credit recur_included_hours recur_hourly_charge recur_hourly_cap recur_included_input recur_input_charge recur_input_cap recur_included_output recur_output_charge recur_output_cap recur_included_total recur_total_charge recur_total_cap global_cap )],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + what.recur_hourly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
-  'weight' => 40,
+    },
+    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + what.recur_hourly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
+    'weight' => 40,
 );
 
 sub calc_recur {
@@ -109,27 +78,13 @@ sub calc_recur {
 
   my $totalcharge =
     $total  * sprintf('%.2f', $self->option('recur_total_charge'));
-  $totalcharge = $self->option('recur_total_cap')
-    if $self->option('recur_total_cap')
-    && $totalcharge > $self->option('recur_total_cap');
-
   my $inputcharge =
     $input  * sprintf('%.2f', $self->option('recur_input_charge'));
-  $inputcharge = $self->option('recur_input_cap')
-    if $self->option('recur_input_cap')
-    && $inputcharge > $self->option('recur_input_cap');
-
   my $outputcharge = 
     $output * sprintf('%.2f', $self->option('recur_output_charge'));
-  $outputcharge = $self->option('recur_output_cap')
-    if $self->option('recur_output_cap')
-    && $outputcharge > $self->option('recur_output_cap');
 
   my $hourscharge =
     $hours * sprintf('%.2f', $self->option('recur_hourly_charge'));
-  $hourscharge = $self->option('recur_hours_cap')
-    if $self->option('recur_hours_cap')
-    && $hourscharge > $self->option('recur_hours_cap');
 
   if ( $self->option('recur_total_charge') > 0 ) {
     push @$details, "Last month's data ".
@@ -148,13 +103,8 @@ sub calc_recur {
                    sprintf('%.1f', $hours). " hours: $hourscharge";
   }
 
-  my $charges = $hourscharge + $inputcharge + $outputcharge + $totalcharge;
-  if ( $self->option('global_cap') && $charges > $self->option('global_cap') ) {
-    $charges = $self->option('global_cap');
-    push @$details, "Usage charges capped at: $charges";
-  }
-
-  $self->option('recur_flat') + $charges;
+  $self->option('recur_flat')
+    + $hourscharge + $inputcharge + $outputcharge + $totalcharge;
 }
 
 sub is_free_options {
@@ -162,9 +112,4 @@ sub is_free_options {
       recur_input_charge recur_output_charge recur_total_charge );
 }
 
-sub base_recur {
-  my($self, $cust_pkg) = @_;
-  $self->option('recur_flat');
-}
-
 1;
diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm
index 36b5a96..d057b6b 100644
--- a/FS/FS/part_pkg/subscription.pm
+++ b/FS/FS/part_pkg/subscription.pm
@@ -4,25 +4,25 @@ use strict;
 use vars qw(@ISA %info);
 use Time::Local qw(timelocal);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
-  'name' => 'First partial month full charge, then flat-rate (1st of month billing)',
-  'fields' => {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
-    'recur_fee' => { 'name' => 'Recurring fee for this package',
-                     'default' => 0,
-                   },
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,1,$mon,$year); \' + what.recur_fee.value',
-  'freq' => 'm',
-  'weight' => 30,
+    'name' => 'First partial month full charge, then flat-rate (1st of month billing)',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_fee' => { 'name' => 'Recurring fee for this package',
+                       'default' => 0,
+                      },
+    },
+    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
+    #'setup' => 'what.setup_fee.value',
+    #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,1,$mon,$year); \' + what.recur_fee.value',
+    'freq' => 'm',
+    'weight' => 30,
 );
 
 sub calc_recur {
diff --git a/FS/FS/part_pkg/voip_sqlradacct.pm b/FS/FS/part_pkg/voip_sqlradacct.pm
index fd9c1dd..3989cdb 100644
--- a/FS/FS/part_pkg/voip_sqlradacct.pm
+++ b/FS/FS/part_pkg/voip_sqlradacct.pm
@@ -1,39 +1,32 @@
 package FS::part_pkg::voip_sqlradacct;
 
 use strict;
-use vars qw(@ISA $DEBUG %info);
-use Date::Format;
+use vars qw(@ISA %info);
 use FS::Record qw(qsearchs qsearch);
-use FS::part_pkg::flat;
+use FS::part_pkg;
 #use FS::rate;
 use FS::rate_prefix;
 
-@ISA = qw(FS::part_pkg::flat);
-
-$DEBUG = 1;
+@ISA = qw(FS::part_pkg);
 
 %info = (
-  'name' => 'VoIP rating by plan of CDR records in an SQL RADIUS radacct table',
-  'fields' => {
-    'setup_fee'     => { 'name' => 'Setup fee for this package',
-                         'default' => 0,
-                       },
-    'recur_flat'     => { 'name' => 'Base recurring fee for this package',
-                          'default' => 0,
-                        },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-    'ratenum'   => { 'name' => 'Rate plan',
-                     'type' => 'select',
-                     'select_table' => 'rate',
-                     'select_key'   => 'ratenum',
-                     'select_label' => 'ratename',
-                   },
-  },
-  'fieldorder' => [qw( setup_fee recur_flat unused_credit ratenum ignore_unrateable )],
-  'weight' => 40,
+    'name' => 'VoIP rating by plan of CDR records in an SQL RADIUS radacct table',
+    'fields' => {
+      'setup_fee' => { 'name' => 'Setup fee for this package',
+                       'default' => 0,
+                     },
+      'recur_flat' => { 'name' => 'Base monthly charge for this package',
+                        'default' => 0,
+                      },
+      'ratenum'   => { 'name' => 'Rate plan',
+                       'type' => 'select',
+                       'select_table' => 'rate',
+                       'select_key'   => 'ratenum',
+                       'select_label' => 'ratename',
+                     },
+    },
+    'fieldorder' => [qw( setup_fee recur_flat ratenum )],
+    'weight' => 40,
 );
 
 sub calc_setup {
@@ -59,10 +52,6 @@ sub calc_recur {
     foreach my $session (
       $cust_svc->get_session_history( $last_bill, $$sdate )
     ) {
-      if ( $DEBUG > 1 ) {
-        warn "rating session $session\n".
-             join('', map { "  $_ => ". $session->{$_}. "\n" } keys %$session );
-      }
 
       ###
       # look up rate details based on called station id
@@ -74,21 +63,18 @@ sub calc_recur {
       $dest =~ s/\s//g;
       my $proto = '';
       $dest =~ s/^(\w+):// and $proto = $1; #sip:
-      my $siphost = '';
-      $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
+      my $ip = '';
+      $dest =~ s/\@((\d{1,3}\.){3}\d{1,3})$// and $ip = $1; # @10.54.32.1
 
       #determine the country code
       my $countrycode;
-      if ( $dest =~ /^011(((\d)(\d))(\d))(\d+)$/ ) {
-
-        my( $three, $two, $one, $u1, $u2, $rest ) = ( $1, $2, $3, $4, $5, $6 );
-        #first look for 1 digit country code
-        if ( qsearch('rate_prefix', { 'countrycode' => $one } ) ) {
-          $countrycode = $one;
-          $dest = $u1.$u2.$rest;
-        } elsif ( qsearch('rate_prefix', { 'countrycode' => $two } ) ) { #or 2
+      if ( $dest =~ /^011((\d\d)(\d))(\d+)$/ ) {
+
+        my( $three, $two, $unknown, $rest ) = ( $1, $2, $3, $4 );
+        #first look for 2 digit country code
+        if ( qsearch('rate_prefix', { 'countrycode' => $two } ) ) {
           $countrycode = $two;
-          $dest = $u2.$rest;
+          $dest = $unknown.$rest;
         } else { #3 digit country code
           $countrycode = $three;
           $dest = $rest;
@@ -96,39 +82,31 @@ sub calc_recur {
 
       } else {
         $countrycode = '1';
-        $dest =~ s/^1//;# if length($dest) > 10;
       }
 
-      warn "rating call to +$countrycode $dest\n" if $DEBUG;
-
       #find a rate prefix, first look at most specific (4 digits) then 3, etc.,
       # finally trying the country code only
       my $rate_prefix = '';
-      for my $len ( reverse(1..6) ) {
+      for my $len ( reverse(1..4) ) {
         $rate_prefix = qsearchs('rate_prefix', {
           'countrycode' => $countrycode,
-          #'npa'         => { op=> 'LIKE', value=> substr($dest, 0, $len) }
-          'npa'         => substr($dest, 0, $len),
+          'npa'         => { op=> 'LIKE', value=> substr($dest, 0, $len) }
         } ) and last;
       }
       $rate_prefix ||= qsearchs('rate_prefix', {
         'countrycode' => $countrycode,
         'npa'         => '',
       });
-
-      die "Can't find rate for call to +$countrycode $dest\n"
+      die "Can't find rate for call to countrycode $countrycode number $dest\n"
         unless $rate_prefix;
 
       my $regionnum = $rate_prefix->regionnum;
+
       my $rate_detail = qsearchs('rate_detail', {
         'ratenum'        => $ratenum,
         'dest_regionnum' => $regionnum,
       } );
 
-      warn "  found rate for regionnum $regionnum ".
-           "and rate detail $rate_detail\n"
-        if $DEBUG;
-
       ###
       # find the price and add detail to the invoice
       ###
@@ -152,23 +130,16 @@ sub calc_recur {
         $charges += $charge;
       }
 
-      my $rate_region = $rate_prefix->rate_region;
-      warn "  (rate region $rate_region)\n" if $DEBUG;
-
-      my @call_details = (
-        #time2str("%Y %b %d - %r", $session->{'acctstarttime'}),
-        time2str("%c", $session->{'acctstarttime'}),
-        $minutes.'m',
-        '$'.$charge,
-        "+$countrycode $dest",
-        $rate_region->regionname,
-      );
-
-      warn "  adding details on charge to invoice: ".
-           join(' - ', @call_details )
-        if $DEBUG;
-
-      push @$details, join(' - ', @call_details); #\@call_details,
+      push @$details, 
+        #[
+        join(' - ', 
+          "+$countrycode $dest",
+          $rate_prefix->rate_region->regionname,
+          $minutes.'m',
+          '$'.$charge,
+        #]
+        )
+      ;
 
     } # $session
 
@@ -182,10 +153,5 @@ sub is_free {
   0;
 }
 
-sub base_recur {
-  my($self, $cust_pkg) = @_;
-  $self->option('recur_flat');
-}
-
 1;
 
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 1a478a9..e7f205d 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -1,9 +1,8 @@
 package FS::part_svc;
 
 use strict;
-use vars qw( @ISA $DEBUG );
+use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs fields dbh );
-use FS::Schema qw( dbdef );
 use FS::part_svc_column;
 use FS::part_export;
 use FS::export_svc;
@@ -11,8 +10,6 @@ use FS::cust_svc;
 
 @ISA = qw(FS::Record);
 
-$DEBUG = 0;
-
 =head1 NAME
 
 FS::part_svc - Object methods for part_svc objects
@@ -67,7 +64,7 @@ database, see L<"insert">.
 
 sub table { 'part_svc'; }
 
-=item insert [ EXTRA_FIELDS_ARRAYREF [ , EXPORTNUMS_HASHREF [ , JOB ] ] ] 
+=item insert [ EXTRA_FIELDS_ARRAYREF [ , EXPORTNUMS_HASHREF ] ] 
 
 Adds this service definition to the database.  If there is an error, returns
 the error, otherwise returns false.
@@ -90,8 +87,6 @@ EXTRA_FIELDS_ARRAYREF also.
 If EXPORTNUMS_HASHREF is specified (keys are exportnums and values are
 boolean), the appopriate export_svc records will be inserted.
 
-TODOC: JOB
-
 =cut
 
 sub insert {
@@ -103,8 +98,6 @@ sub insert {
     my $exportnums = shift;
     @exportnums = grep $exportnums->{$_}, keys %$exportnums;
   }
-  my $job = '';
-  $job = shift if @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -163,14 +156,13 @@ sub insert {
   }
 
   # add export_svc records
-  my $slice = 100/scalar(@exportnums) if @exportnums;
-  my $done = 0;
+
   foreach my $exportnum ( @exportnums ) {
     my $export_svc = new FS::export_svc ( {
       'exportnum' => $exportnum,
       'svcpart'   => $self->svcpart,
     } );
-    $error = $export_svc->insert($job, $slice*$done++, $slice);
+    $error = $export_svc->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
@@ -193,7 +185,7 @@ sub delete {
 # check & make sure the svcpart isn't in cust_svc or pkg_svc (in any packages)?
 }
 
-=item replace OLD_RECORD [ '1.3-COMPAT' [ , EXTRA_FIELDS_ARRAYREF [ , EXPORTNUMS_HASHREF [ , JOB ] ] ] ]
+=item replace OLD_RECORD [ '1.3-COMPAT' [ , EXTRA_FIELDS_ARRAYREF [ , EXPORTNUMS_HASHREF ] ] ]
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
@@ -202,26 +194,10 @@ TODOC: 1.3-COMPAT
 
 TODOC: EXTRA_FIELDS_ARRAYREF (same as insert method)
 
-TODOC: JOB
-
 =cut
 
 sub replace {
   my ( $new, $old ) = ( shift, shift );
-  my $compat = '';
-  my @fields = ();
-  my $exportnums;
-  my $job = '';
-  if ( @_ && $_[0] eq '1.3-COMPAT' ) {
-    shift;
-    $compat = '1.3';
-    @fields = @{shift(@_)} if @_;
-    $exportnums = @_ ? shift : '';
-    $job = shift if @_;
-  } else {
-    return 'non-1.3-COMPAT interface not yet written';
-    #not yet implemented
-  }
 
   return "Can't change svcdb for an existing service definition!"
     unless $old->svcdb eq $new->svcdb;
@@ -243,7 +219,11 @@ sub replace {
     return $error;
   }
 
-  if ( $compat eq '1.3' ) {
+  if ( @_ && $_[0] eq '1.3-COMPAT' ) {
+    shift;
+    my @fields = ();
+    @fields = @{shift(@_)} if @_;
+    my $exportnums = @_ ? shift : '';
 
    # maintain part_svc_column records
 
@@ -284,7 +264,6 @@ sub replace {
     if ( $exportnums ) {
 
       #false laziness w/ edit/process/agent_type.cgi
-      my @new_export_svc = ();
       foreach my $part_export ( qsearch('part_export', {}) ) {
         my $exportnum = $part_export->exportnum;
         my $hashref = {
@@ -300,26 +279,14 @@ sub replace {
             return $error;
           }
         } elsif ( ! $export_svc && $exportnums->{$exportnum} ) {
-          push @new_export_svc, new FS::export_svc ( $hashref );
-        }
-
-      }
-
-      my $slice = 100/scalar(@new_export_svc) if @new_export_svc;
-      my $done = 0;
-      foreach my $export_svc (@new_export_svc) {
-        $error = $export_svc->insert($job, $slice*$done++, $slice);
-        if ( $error ) {
-          $dbh->rollback if $oldAutoCommit;
-          return $error;
-        }
-        if ( $job ) {
-          $error = $job->update_statustext( int( $slice * $done ) );
+          $export_svc = new FS::export_svc ( $hashref );
+          $error = $export_svc->insert;
           if ( $error ) {
             $dbh->rollback if $oldAutoCommit;
             return $error;
           }
         }
+        
       }
 
     }
@@ -393,8 +360,8 @@ sub all_part_svc_column {
 
 =item part_export [ EXPORTTYPE ]
 
-Returns a list of all exports (see L<FS::part_export>) for this service, or,
-if an export type is specified, only returns exports of the given type.
+Returns all exports (see L<FS::part_export>) for this service, or, if an
+export type is specified, only returns exports of the given type.
 
 =cut
 
@@ -406,85 +373,15 @@ sub part_export {
     qsearch('export_svc', { 'svcpart' => $self->svcpart } );
 }
 
-=item part_export_usage
-
-Returns a list of any exports (see L<FS::part_export>) for this service that
-are capable of reporting usage information.
-
-=cut
-
-sub part_export_usage {
-  my $self = shift;
-  grep $_->can('usage_sessions'), $self->part_export;
-}
-
-=item cust_svc [ PKGPART ] 
-
-Returns a list of associated customer services (FS::cust_svc records).
+=item cust_svc
 
-If a PKGPART is specified, returns the customer services which are contained
-within packages of that type (see L<FS::part_pkg>).  If PKGPARTis specified as
-B<0>, returns unlinked customer services.
+Returns a list of associated FS::cust_svc records.
 
 =cut
 
 sub cust_svc {
   my $self = shift;
-
-  my $hashref = { 'svcpart' => $self->svcpart };
-
-  my( $addl_from, $extra_sql ) = ( '', '' );
-  if ( @_ ) {
-    my $pkgpart = shift;
-    if ( $pkgpart =~ /^(\d+)$/ ) {
-      $addl_from = 'LEFT JOIN cust_pkg USING ( pkgnum )';
-      $extra_sql = "AND pkgpart = $1";
-    } elsif ( $pkgpart eq '0' ) {
-      $hashref->{'pkgnum'} = '';
-    }
-  }
-
-  qsearch({
-    'table'     => 'cust_svc',
-    'addl_from' => $addl_from,
-    'hashref'   => $hashref,
-    'extra_sql' => $extra_sql,
-  });
-}
-
-=item num_cust_svc [ PKGPART ] 
-
-Returns the number of associated customer services (FS::cust_svc records).
-
-If a PKGPART is specified, returns the number of customer services which are
-contained within packages of that type (see L<FS::part_pkg>).  If PKGPART
-is specified as B<0>, returns the number of unlinked customer services.
-
-=cut
-
-sub num_cust_svc {
-  my $self = shift;
-
-  my @param = ( $self->svcpart );
-
-  my( $join, $and ) = ( '', '' );
-  if ( @_ ) {
-    my $pkgpart = shift;
-    if ( $pkgpart ) {
-      $join = 'LEFT JOIN cust_pkg USING ( pkgnum )';
-      $and = 'AND pkgpart = ?';
-      push @param, $pkgpart;
-    } elsif ( $pkgpart eq '0' ) {
-      $and = 'AND pkgnum IS NULL';
-    }
-  }
-
-  my $sth = dbh->prepare(
-    "SELECT COUNT(*) FROM cust_svc $join WHERE svcpart = ? $and"
-  ) or die dbh->errstr;
-  $sth->execute(@param)
-    or die $sth->errstr;
-  $sth->fetchrow_arrayref->[0];
+  qsearch('cust_svc', { 'svcpart' => $self->svcpart } );
 }
 
 =item svc_x
@@ -498,136 +395,8 @@ sub svc_x {
   map { $_->svc_x } $self->cust_svc;
 }
 
-
 =back
 
-=head1 SUBROUTINES
-
-=over 4
-
-=item process
-
-Job-queue processor for web interface adds/edits
-
-=cut
-
-use Storable qw(thaw);
-use Data::Dumper;
-use MIME::Base64;
-sub process {
-  my $job = shift;
-
-  my $param = thaw(decode_base64(shift));
-  warn Dumper($param) if $DEBUG;
-
-  my $old = qsearchs('part_svc', { 'svcpart' => $param->{'svcpart'} }) 
-    if $param->{'svcpart'};
-
-  $param->{'svc_acct__usergroup'} =
-    ref($param->{'svc_acct__usergroup'})
-      ? join(',', @{$param->{'svc_acct__usergroup'}} )
-      : $param->{'svc_acct__usergroup'};
-  
-  my $new = new FS::part_svc ( {
-    map {
-      $_ => $param->{$_};
-  #  } qw(svcpart svc svcdb)
-    } ( fields('part_svc'),
-        map { my $svcdb = $_;
-              my @fields = fields($svcdb);
-              push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
-              map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
-            } grep defined( dbdef->table($_) ),
-                   qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
-      )
-  } );
-  
-  my %exportnums =
-    map { $_->exportnum => ( $param->{'exportnum'.$_->exportnum} || '') }
-        qsearch('part_export', {} );
-
-  my $error;
-  if ( $param->{'svcpart'} ) {
-    $error = $new->replace( $old,
-                            '1.3-COMPAT',
-                            [ 'usergroup' ],
-                            \%exportnums,
-                            $job
-                          );
-  } else {
-    $error = $new->insert( [ 'usergroup' ],
-                           \%exportnums,
-                           $job,
-                         );
-    $param->{'svcpart'} = $new->getfield('svcpart');
-  }
-
-  die "$error\n" if $error;
-}
-
-=item process_bulk_cust_svc
-
-Job-queue processor for web interface bulk customer service changes
-
-=cut
-
-use Storable qw(thaw);
-use Data::Dumper;
-use MIME::Base64;
-sub process_bulk_cust_svc {
-  my $job = shift;
-
-  my $param = thaw(decode_base64(shift));
-  warn Dumper($param) if $DEBUG;
-
-  my $old_part_svc =
-    qsearchs('part_svc', { 'svcpart' => $param->{'old_svcpart'} } );
-
-  die "Must select a new service definition\n" unless $param->{'new_svcpart'};
-
-  #the rest should be abstracted out to to its own subroutine?
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  local( $FS::cust_svc::ignore_quantity ) = 1;
-
-  my $total = $old_part_svc->num_cust_svc( $param->{'pkgpart'} );
-
-  my $n = 0;
-  foreach my $old_cust_svc ( $old_part_svc->cust_svc( $param->{'pkgpart'} ) ) {
-
-    my $new_cust_svc = new FS::cust_svc { $old_cust_svc->hash };
-
-    $new_cust_svc->svcpart( $param->{'new_svcpart'} );
-    my $error = $new_cust_svc->replace($old_cust_svc);
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      die "$error\n" if $error;
-    }
-
-    $error = $job->update_statustext( int( 100 * ++$n / $total ) );
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      die $error if $error;
-    }
-
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  '';
-
-}
-
 =head1 BUGS
 
 Delete is unimplemented.
@@ -635,7 +404,7 @@ Delete is unimplemented.
 The list of svc_* tables is hardcoded.  When svc_acct_pop is renamed, this
 should be fixed.
 
-all_part_svc_column methods should be documented
+all_part_svc_column method should be documented
 
 =head1 SEE ALSO
 
diff --git a/FS/FS/part_svc_router.pm b/FS/FS/part_svc_router.pm
index df04cc9..0b23ab5 100755
--- a/FS/FS/part_svc_router.pm
+++ b/FS/FS/part_svc_router.pm
@@ -13,8 +13,7 @@ sub table { 'part_svc_router'; }
 sub check {
   my $self = shift;
   my $error =
-       $self->ut_numbern('svcrouternum')
-    || $self->ut_foreign_key('svcpart', 'part_svc', 'svcpart')
+    $self->ut_foreign_key('svcpart', 'part_svc', 'svcpart')
     || $self->ut_foreign_key('routernum', 'router', 'routernum');
   return $error if $error;
   ''; #no error
diff --git a/FS/FS/part_virtual_field.pm b/FS/FS/part_virtual_field.pm
index 992d449..f6a8fe7 100755
--- a/FS/FS/part_virtual_field.pm
+++ b/FS/FS/part_virtual_field.pm
@@ -2,8 +2,7 @@ package FS::part_virtual_field;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearchs qsearch );
-use FS::Schema qw( dbdef );
+use FS::Record qw( qsearchs qsearch dbdef );
 
 @ISA = qw( FS::Record );
 
@@ -162,7 +161,7 @@ sub check {
 
   # Make sure it's a real table with a numeric primary key
   my ($table, $pkey);
-  if($table = dbdef->table($self->dbtable)) {
+  if($table = $FS::Record::dbdef->table($self->dbtable)) {
     if($pkey = $table->primary_key) {
       if($table->column($pkey)->type =~ /int/i) {
         # this is what it should be
diff --git a/FS/FS/payment_gateway.pm b/FS/FS/payment_gateway.pm
deleted file mode 100644
index a5cdd9d..0000000
--- a/FS/FS/payment_gateway.pm
+++ /dev/null
@@ -1,147 +0,0 @@
-package FS::payment_gateway;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::option_Common;
-
-@ISA = qw( FS::option_Common );
-
-=head1 NAME
-
-FS::payment_gateway - Object methods for payment_gateway records
-
-=head1 SYNOPSIS
-
-  use FS::payment_gateway;
-
-  $record = new FS::payment_gateway \%hash;
-  $record = new FS::payment_gateway { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::payment_gateway object represents an payment gateway.
-FS::payment_gateway inherits from FS::Record.  The following fields are
-currently supported:
-
-=over 4
-
-=item gatewaynum - primary key
-
-=item gateway_module - Business::OnlinePayment:: module name
-
-=item gateway_username - payment gateway username
-
-=item gateway_password - payment gateway password
-
-=item gateway_action - optional action or actions (multiple actions are separated with `,': for example: `Authorization Only, Post Authorization').  Defaults to `Normal Authorization'.
-
-=item disabled - Disabled flag, empty or 'Y'
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new payment gateway.  To add the payment gateway to the database, see
-L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'payment_gateway'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid payment gateway.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('gatewaynum')
-    || $self->ut_alpha('gateway_module')
-    || $self->ut_textn('gateway_username')
-    || $self->ut_anything('gateway_password')
-    || $self->ut_enum('disabled', [ '', 'Y' ] )
-    #|| $self->ut_textn('gateway_action')
-  ;
-  return $error if $error;
-
-  if ( $self->gateway_action ) {
-    my @actions = split(/,\s*/, $self->gateway_action);
-    $self->gateway_action(
-      join( ',', map { /^(Normal Authorization|Authorization Only|Credit|Post Authorization)$/
-                         or return "Unknown action $_";
-                       $1
-                     }
-                     @actions
-          )
-   );
-  } else {
-    $self->gateway_action('Normal Authorization');
-  }
-
-  $self->SUPER::check;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/payment_gateway_option.pm b/FS/FS/payment_gateway_option.pm
deleted file mode 100644
index 0576022..0000000
--- a/FS/FS/payment_gateway_option.pm
+++ /dev/null
@@ -1,126 +0,0 @@
-package FS::payment_gateway_option;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::payment_gateway_option - Object methods for payment_gateway_option records
-
-=head1 SYNOPSIS
-
-  use FS::payment_gateway_option;
-
-  $record = new FS::payment_gateway_option \%hash;
-  $record = new FS::payment_gateway_option { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::payment_gateway_option object represents an option key and value for
-a payment gateway.  FS::payment_gateway_option inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item optionnum - primary key
-
-=item gatewaynum - 
-
-=item optionname - 
-
-=item optionvalue - 
-
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new option.  To add the option to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'payment_gateway_option'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid option.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('optionnum')
-    || $self->ut_foreign_key('gatewaynum', 'payment_gateway', 'gatewaynum')
-    || $self->ut_text('optionname')
-    || $self->ut_textn('optionvalue')
-  ;
-  return $error if $error;
-
-  $self->SUPER::check;
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/pkg_svc.pm b/FS/FS/pkg_svc.pm
index 065ddbe..ea52176 100644
--- a/FS/FS/pkg_svc.pm
+++ b/FS/FS/pkg_svc.pm
@@ -39,8 +39,6 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item pkgsvcnum - primary key
-
 =item pkgpart - Billing item definition (see L<FS::part_pkg>)
 
 =item svcpart - Service definition (see L<FS::part_svc>)
@@ -103,8 +101,7 @@ sub check {
 
   my $error;
   $error =
-       $self->ut_numbern('pkgsvcnum')
-    || $self->ut_number('pkgpart')
+    $self->ut_number('pkgpart')
     || $self->ut_number('svcpart')
     || $self->ut_number('quantity')
   ;
diff --git a/FS/FS/prepay_credit.pm b/FS/FS/prepay_credit.pm
index 92f2a30..a9d26d1 100644
--- a/FS/FS/prepay_credit.pm
+++ b/FS/FS/prepay_credit.pm
@@ -2,8 +2,8 @@ package FS::prepay_credit;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw(qsearchs dbh);
-use FS::agent;
+#use FS::Record qw( qsearch qsearchs );
+use FS::Record qw();
 
 @ISA = qw(FS::Record);
 
@@ -37,8 +37,8 @@ FS::prepay_credit - Object methods for prepay_credit records
 
 =head1 DESCRIPTION
 
-An FS::prepay_credit object represents a pre-paid card.  FS::prepay_credit
-inherits from FS::Record.  The following
+An FS::table_name object represents an pre--paid credit, such as a pre-paid
+"calling card".  FS::prepay_credit inherits from FS::Record.  The following
 fields are currently supported:
 
 =over 4
@@ -51,8 +51,6 @@ fields are currently supported:
 
 =item seconds - time amount of credit (see L<FS::svc_acct/seconds>)
 
-=item agentnum - optional agent (see L<FS::agent>) for this prepaid card
-
 =back
 
 =head1 METHODS
@@ -109,76 +107,14 @@ sub check {
   $self->ut_numbern('prepaynum')
   || $self->ut_alpha('identifier')
   || $self->ut_money('amount')
-  || $self->ut_numbern('seconds')
-  || $self->ut_foreign_keyn('agentnum', 'agent', 'agentnum')
+  || $self->utnumbern('seconds')
   || $self->SUPER::check
   ;
 
 }
 
-=item agent
-
-Returns the agent (see L<FS::agent>) for this prepaid card, if any.
-
-=cut
-
-sub agent {
-  my $self = shift;
-  qsearchs('agent', { 'agentnum' => $self->agentnum } );
-}
-
 =back
 
-=head1 SUBROUTINES
-
-=over 4
-
-=item generate NUM TYPE HASHREF
-
-Generates the specified number of prepaid cards.  Returns an array reference of
-the newly generated card identifiers, or a scalar error message.
-
-=cut
-
-#false laziness w/agent::generate_reg_codes
-sub generate {
-  my( $num, $type, $hashref ) = @_;
-
-  my @codeset = ();
-  push @codeset, ( 'A'..'Z' ) if $type =~ /alpha/;
-  push @codeset, ( '1'..'9' ) if $type =~ /numeric/;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my @cards = ();
-  for ( 1 ... $num ) {
-    my $prepay_credit = new FS::prepay_credit {
-      'identifier' => join('', map($codeset[int(rand $#codeset)], (0..7) ) ),
-      %$hashref,
-    };
-    my $error = $prepay_credit->check || $prepay_credit->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "(inserting prepay_credit) $error";
-    }
-    push @cards, $prepay_credit->identifier;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
-  \@cards;
-
-}
-
 =head1 BUGS
 
 =head1 SEE ALSO
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index f42d998..dcac3c6 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -3,7 +3,7 @@ package FS::queue;
 use strict;
 use vars qw( @ISA @EXPORT_OK $DEBUG $conf $jobnums);
 use Exporter;
-use FS::UID qw(myconnect);
+use FS::UID;
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs dbh );
 #use FS::queue;
@@ -15,6 +15,7 @@ use FS::cust_svc;
 @EXPORT_OK = qw( joblisting );
 
 $DEBUG = 0;
+#$DEBUG = 1;
 
 $FS::UID::callback{'FS::queue'} = sub {
   $conf = new FS::Conf;
@@ -306,38 +307,6 @@ sub depended_delete {
   }
 }
 
-=item update_statustext VALUE
-
-Updates the statustext value of this job to supplied value, in the database.
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-use vars qw($_update_statustext_dbh);
-sub update_statustext {
-  my( $self, $statustext ) = @_;
-  return '' if $statustext eq $self->statustext;
-  warn "updating statustext for $self to $statustext" if $DEBUG;
-
-  $_update_statustext_dbh ||= myconnect;
-
-  my $sth = $_update_statustext_dbh->prepare(
-    'UPDATE queue set statustext = ? WHERE jobnum = ?'
-  ) or return $_update_statustext_dbh->errstr;
-
-  $sth->execute($statustext, $self->jobnum) or return $sth->errstr;
-  $_update_statustext_dbh->commit or die $_update_statustext_dbh->errstr;
-  $self->statustext($statustext);
-  '';
-
-  #my $new = new FS::queue { $self->hash };
-  #$new->statustext($statustext);
-  #my $error = $new->replace($self);
-  #return $error if $error;
-  #$self->statustext($statustext);
-  #'';
-}
-
 =back
 
 =head1 SUBROUTINES
diff --git a/FS/FS/raddb.pm b/FS/FS/raddb.pm
index 506b325..efeb739 100644
--- a/FS/FS/raddb.pm
+++ b/FS/FS/raddb.pm
@@ -2,1910 +2,1597 @@ package FS::raddb;
 use vars qw(%attrib);
 
 %attrib = (
-  '3com_user_access_level'   => '3Com-User-Access-Level',
-  '3gpp2_accounting_contain' => '3GPP2-Accounting-Container',
-  '3gpp2_acct_stop_trigger'  => '3GPP2-Acct-Stop-Trigger',
-  '3gpp2_active_time'        => '3GPP2-Active-Time',
-  '3gpp2_airlink_priority'   => '3GPP2-Airlink-Priority',
-  '3gpp2_airlink_record_typ' => '3GPP2-Airlink-Record-Type',
-  '3gpp2_airlink_sequence_n' => '3GPP2-Airlink-Sequence-Number',
-  '3gpp2_allowed_diffserv_m' => '3GPP2-Allowed-Diffserv-Marking',
-  '3gpp2_allowed_persistent' => '3GPP2-Allowed-Persistent-TFTs',
-  '3gpp2_bad_ppp_frame_coun' => '3GPP2-Bad-PPP-Frame-Count',
-  '3gpp2_begin_session'      => '3GPP2-Begin-Session',
-  '3gpp2_bsid'               => '3GPP2-BSID',
-  '3gpp2_compulsory_tunnel_' => '3GPP2-Compulsory-Tunnel-Indicator',
-  '3gpp2_correlation_id'     => '3GPP2-Correlation-Id',
-  '3gpp2_dcch_frame_size'    => '3GPP2-DCCH-Frame-Size',
-  '3gpp2_diffserv_class_opt' => '3GPP2-Diffserv-Class-Option',
-  '3gpp2_disconnect_reason'  => '3GPP2-Disconnect-Reason',
-  '3gpp2_dns_update_capabil' => '3GPP2-DNS-Update-Capability',
-  '3gpp2_dns_update_require' => '3GPP2-DNS-Update-Required',
-  '3gpp2_esn'                => '3GPP2-ESN',
-  '3gpp2_fch_frame_size'     => '3GPP2-FCH-Frame-Size',
-  '3gpp2_foreign_agent_addr' => '3GPP2-Foreign-Agent-Address',
-  '3gpp2_forward_dcch_mux_o' => '3GPP2-Forward-DCCH-Mux-Option',
-  '3gpp2_forward_dcch_rc'    => '3GPP2-Forward-DCCH-RC',
-  '3gpp2_forward_fch_mux_op' => '3GPP2-Forward-FCH-Mux-Option',
-  '3gpp2_forward_fch_rc'     => '3GPP2-Forward-FCH-RC',
-  '3gpp2_forward_pdch_rc'    => '3GPP2-Forward-PDCH-RC',
-  '3gpp2_forward_traffic_ty' => '3GPP2-Forward-Traffic-Type',
-  '3gpp2_home_agent_ip_addr' => '3GPP2-Home-Agent-IP-Address',
-  '3gpp2_ike_preshared_secr' => '3GPP2-Ike-Preshared-Secret-Request',
-  '3gpp2_inbound_mobile_ip_' => '3GPP2-Inbound-Mobile-IP-Sig-Octets',
-  '3gpp2_ip_qos'             => '3GPP2-IP-QoS',
-  '3gpp2_ip_technology'      => '3GPP2-IP-Technology',
-  '3gpp2_keyid'              => '3GPP2-KeyID',
-  '3gpp2_last_user_activity' => '3GPP2-Last-User-Activity-Time',
-  '3gpp2_mip_lifetime'       => '3GPP2-MIP-Lifetime',
-  '3gpp2_mn_aaa_removal_ind' => '3GPP2-MN-AAA-Removal-Indication',
-  '3gpp2_mn_ha_shared_key'   => '3GPP2-MN-HA-Shared-Key',
-  '3gpp2_mn_ha_spi'          => '3GPP2-MN-HA-SPI',
-  '3gpp2_module_orig_term_i' => '3GPP2-Module-Orig-Term-Indicator',
-  '3gpp2_number_active_tran' => '3GPP2-Number-Active-Transitions',
-  '3gpp2_originating_number' => '3GPP2-Originating-Number-SDBs',
-  '3gpp2_originating_sdb_oc' => '3GPP2-Originating-SDB-OCtet-Count',
-  '3gpp2_outbound_mobile_ip' => '3GPP2-Outbound-Mobile-IP-Sig-Octets',
-  '3gpp2_pcf_ip_address'     => '3GPP2-PCF-IP-Address',
-  '3gpp2_pre_shared_secret'  => '3GPP2-Pre-Shared-Secret',
-  '3gpp2_prepaid_acct_capab' => '3GPP2-Prepaid-acct-Capability',
-  '3gpp2_prepaid_acct_quota' => '3GPP2-Prepaid-Acct-Quota',
-  '3gpp2_prepaid_tariff_swi' => '3GPP2-PrePaid-Tariff-Switching',
-  '3gpp2_received_hdlc_octe' => '3GPP2-Received-HDLC-Octets',
-  '3gpp2_release_indicator'  => '3GPP2-Release-Indicator',
-  '3gpp2_remote_address_tab' => '3GPP2-Remote-Address-Table-Index',
-  '3gpp2_remote_ip_address'  => '3GPP2-Remote-IP-Address',
-  '3gpp2_remote_ipv4_addr_o' => '3GPP2-Remote-IPv4-Addr-Octet-Count',
-  '3gpp2_remote_ipv6_addres' => '3GPP2-Remote-IPv6-Address',
-  '3gpp2_remote_ipv6_octet_' => '3GPP2-Remote-IPv6-Octet-Count',
-  '3gpp2_reverse_dcch_mux_o' => '3GPP2-Reverse-DCCH-Mux-Option',
-  '3gpp2_reverse_dhhc_rc'    => '3GPP2-Reverse-DHHC-RC',
-  '3gpp2_reverse_fch_mux_op' => '3GPP2-Reverse-FCH-Mux-Option',
-  '3gpp2_reverse_fch_rc'     => '3GPP2-Reverse-FCH-RC',
-  '3gpp2_reverse_traffic_ty' => '3GPP2-Reverse-Traffic-Type',
-  '3gpp2_reverse_tunnel_spe' => '3GPP2-Reverse-Tunnel-Spec',
-  '3gpp2_rn_packet_data_ina' => '3GPP2-RN-Packet-Data-Inactivity-Timer',
-  '3gpp2_s_key'              => '3GPP2-S-Key',
-  '3gpp2_s_lifetime'         => '3GPP2-S-Lifetime',
-  '3gpp2_s_request'          => '3GPP2-S-Request',
-  '3gpp2_security_level'     => '3GPP2-Security-Level',
-  '3gpp2_service_option'     => '3GPP2-Service-Option',
-  '3gpp2_service_option_pro' => '3GPP2-Service-Option-Profile',
-  '3gpp2_service_reference_' => '3GPP2-Service-Reference-Id',
-  '3gpp2_session_continue'   => '3GPP2-Session-Continue',
-  '3gpp2_session_terminatio' => '3GPP2-Session-Termination-Capability',
-  '3gpp2_terminating_number' => '3GPP2-Terminating-Number-SDBs',
-  '3gpp2_terminating_sdb_oc' => '3GPP2-Terminating-SDB-Octet-Count',
-  '3gpp2_user_id'            => '3GPP2-User-Id',
-  '3gpp_charging_characteri' => '3GPP-Charging-Characteristics',
-  '3gpp_charging_gateway_ad' => '3GPP-Charging-Gateway-Address',
-  '3gpp_charging_gateway_ip' => '3GPP-Charging-Gateway-IPv6-Address',
-  '3gpp_charging_id'         => '3GPP-Charging-ID',
-  '3gpp_ggsn_address'        => '3GPP-GGSN-Address',
-  '3gpp_ggsn_ipv6_address'   => '3GPP-GGSN-IPv6-Address',
-  '3gpp_ggsn_mcc_mnc'        => '3GPP-GGSN-MCC-MNC',
-  '3gpp_gprs_negotiated_qos' => '3GPP-GPRS-Negotiated-QoS-profile',
-  '3gpp_imsi'                => '3GPP-IMSI',
-  '3gpp_imsi_mcc_mnc'        => '3GPP-IMSI-MCC-MNC',
-  '3gpp_ipv6_dns_servers'    => '3GPP-IPv6-DNS-Servers',
-  '3gpp_nsapi'               => '3GPP-NSAPI',
-  '3gpp_pdp_type'            => '3GPP-PDP-Type',
-  '3gpp_selection_mode'      => '3GPP-Selection-Mode',
-  '3gpp_session_stop_indica' => '3GPP-Session-Stop-Indicator',
-  '3gpp_sgsn_address'        => '3GPP-SGSN-Address',
-  '3gpp_sgsn_ipv6_address'   => '3GPP-SGSN-IPv6-Address',
-  'aat_assign_ip_pool'       => 'AAT-Assign-IP-Pool',
-  'aat_atm_direct'           => 'AAT-ATM-Direct',
-  'aat_atm_traffic_profile'  => 'AAT-ATM-Traffic-Profile',
-  'aat_atm_vci'              => 'AAT-ATM-VCI',
-  'aat_atm_vpi'              => 'AAT-ATM-VPI',
-  'aat_client_primary_dns'   => 'AAT-Client-Primary-DNS',
-  'aat_client_primary_wins_' => 'AAT-Client-Primary-WINS-NBNS',
-  'aat_client_secondary_win' => 'AAT-Client-Secondary-WINS-NBNS',
-  'aat_data_filter'          => 'AAT-Data-Filter',
-  'aat_input_octets_diff'    => 'AAT-Input-Octets-Diff',
-  'aat_ip_pool_definition'   => 'AAT-IP-Pool-Definition',
-  'aat_ip_tos'               => 'AAT-IP-TOS',
-  'aat_ip_tos_apply_to'      => 'AAT-IP-TOS-Apply-To',
-  'aat_ip_tos_precedence'    => 'AAT-IP-TOS-Precedence',
-  'aat_mcast_client'         => 'AAT-MCast-Client',
-  'aat_output_octets_diff'   => 'AAT-Output-Octets-Diff',
-  'aat_ppp_address'          => 'AAT-PPP-Address',
-  'aat_require_auth'         => 'AAT-Require-Auth',
-  'aat_source_ip_check'      => 'AAT-Source-IP-Check',
-  'aat_user_mac_address'     => 'AAT-User-MAC-Address',
-  'aat_vrouter_name'         => 'AAT-Vrouter-Name',
-  'acc_access_community'     => 'Acc-Access-Community',
-  'acc_access_partition'     => 'Acc-Access-Partition',
-  'acc_acct_on_off_reason'   => 'Acc-Acct-On-Off-Reason',
-  'acc_ace_token'            => 'Acc-Ace-Token',
-  'acc_ace_token_ttl'        => 'Acc-Ace-Token-Ttl',
-  'acc_apsm_oversubscribed'  => 'Acc-Apsm-Oversubscribed',
-  'acc_bridging_support'     => 'Acc-Bridging-Support',
-  'acc_callback_cbcp_type'   => 'Acc-Callback-CBCP-Type',
-  'acc_callback_delay'       => 'Acc-Callback-Delay',
-  'acc_callback_mode'        => 'Acc-Callback-Mode',
-  'acc_callback_num_valid'   => 'Acc-Callback-Num-Valid',
-  'acc_ccp_option'           => 'Acc-Ccp-Option',
-  'acc_clearing_cause'       => 'Acc-Clearing-Cause',
-  'acc_clearing_location'    => 'Acc-Clearing-Location',
-  'acc_connect_rx_speed'     => 'Acc-Connect-Rx-Speed',
-  'acc_connect_tx_speed'     => 'Acc-Connect-Tx-Speed',
-  'acc_customer_id'          => 'Acc-Customer-Id',
-  'acc_dial_port_index'      => 'Acc-Dial-Port-Index',
-  'acc_dialout_auth_mode'    => 'Acc-Dialout-Auth-Mode',
-  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password',
-  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username',
-  'acc_dns_server_pri'       => 'Acc-Dns-Server-Pri',
-  'acc_dns_server_sec'       => 'Acc-Dns-Server-Sec',
-  'acc_igmp_admin_state'     => 'Acc-Igmp-Admin-State',
-  'acc_igmp_version'         => 'Acc-Igmp-Version',
-  'acc_input_errors'         => 'Acc-Input-Errors',
-  'acc_ip_compression'       => 'Acc-Ip-Compression',
-  'acc_ip_gateway_pri'       => 'Acc-Ip-Gateway-Pri',
-  'acc_ip_gateway_sec'       => 'Acc-Ip-Gateway-Sec',
-  'acc_ip_pool_name'         => 'Acc-Ip-Pool-Name',
-  'acc_ipx_compression'      => 'Acc-Ipx-Compression',
-  'acc_ml_call_threshold'    => 'Acc-ML-Call-Threshold',
-  'acc_ml_clear_threshold'   => 'Acc-ML-Clear-Threshold',
-  'acc_ml_damping_factor'    => 'Acc-ML-Damping-Factor',
-  'acc_ml_mlx_admin_state'   => 'Acc-ML-MLX-Admin-State',
-  'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol',
-  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type',
-  'acc_nbns_server_pri'      => 'Acc-Nbns-Server-Pri',
-  'acc_nbns_server_sec'      => 'Acc-Nbns-Server-Sec',
-  'acc_output_errors'        => 'Acc-Output-Errors',
-  'acc_reason_code'          => 'Acc-Reason-Code',
-  'acc_request_type'         => 'Acc-Request-Type',
-  'acc_route_policy'         => 'Acc-Route-Policy',
-  'acc_service_profile'      => 'Acc-Service-Profile',
-  'acc_tunnel_port'          => 'Acc-Tunnel-Port',
-  'acc_tunnel_secret'        => 'Acc-Tunnel-Secret',
-  'acc_vpsm_reject_cause'    => 'Acc-Vpsm-Reject-Cause',
-  'acct_authentic'           => 'Acct-Authentic',
-  'acct_delay_time'          => 'Acct-Delay-Time',
-  'acct_dyn_ac_ent'          => 'Acct_Dyn_Ac_Ent',
-  'acct_dyn_ac_enu'          => 'Acct-Dyn-Ac-Ent',
-  'acct_input_gigawords'     => 'Acct-Input-Gigawords',
-  'acct_input_octets'        => 'Acct-Input-Octets',
-  'acct_input_octets_64'     => 'Acct_Input_Octets_64',
-  'acct_input_octets_65'     => 'Acct-Input-Octets-64',
-  'acct_input_packets'       => 'Acct-Input-Packets',
-  'acct_input_packets_64'    => 'Acct_Input_Packets_64',
-  'acct_input_packets_65'    => 'Acct-Input-Packets-64',
-  'acct_interim_interval'    => 'Acct-Interim-Interval',
-  'acct_link_count'          => 'Acct-Link-Count',
-  'acct_mcast_in_octets'     => 'Acct_Mcast_In_Octets',
-  'acct_mcast_in_octett'     => 'Acct-Mcast-In-Octets',
-  'acct_mcast_in_packets'    => 'Acct_Mcast_In_Packets',
-  'acct_mcast_in_packett'    => 'Acct-Mcast-In-Packets',
-  'acct_mcast_out_octets'    => 'Acct_Mcast_Out_Octets',
-  'acct_mcast_out_octett'    => 'Acct-Mcast-Out-Octets',
-  'acct_mcast_out_packets'   => 'Acct_Mcast_Out_Packets',
-  'acct_mcast_out_packett'   => 'Acct-Mcast-Out-Packets',
-  'acct_multi_session_id'    => 'Acct-Multi-Session-Id',
-  'acct_output_gigawords'    => 'Acct-Output-Gigawords',
-  'acct_output_octets'       => 'Acct-Output-Octets',
-  'acct_output_octets_64'    => 'Acct_Output_Octets_64',
-  'acct_output_octets_65'    => 'Acct-Output-Octets-64',
-  'acct_output_packets'      => 'Acct-Output-Packets',
-  'acct_output_packets_64'   => 'Acct_Output_Packets_64',
-  'acct_output_packets_65'   => 'Acct-Output-Packets-64',
-  'acct_session_gigawords'   => 'Acct-Session-Gigawords',
-  'acct_session_id'          => 'Acct-Session-Id',
-  'acct_session_input_gigaw' => 'Acct-Session-Input-Gigawords',
-  'acct_session_input_octet' => 'Acct-Session-Input-Octets',
-  'acct_session_octets'      => 'Acct-Session-Octets',
-  'acct_session_output_giga' => 'Acct-Session-Output-Gigawords',
-  'acct_session_output_octe' => 'Acct-Session-Output-Octets',
-  'acct_session_start_time'  => 'Acct-Session-Start-Time',
-  'acct_session_time'        => 'Acct-Session-Time',
-  'acct_status_type'         => 'Acct-Status-Type',
-  'acct_terminate_cause'     => 'Acct-Terminate-Cause',
-  'acct_tunnel_connection'   => 'Acct-Tunnel-Connection',
-  'acct_tunnel_packets_lost' => 'Acct-Tunnel-Packets-Lost',
-  'acct_type'                => 'Acct-Type',
-  'acct_unique_session_id'   => 'Acct-Unique-Session-Id',
-  'add_prefix'               => 'Add-Prefix',
-  'add_suffix'               => 'Add-Suffix',
-  'alteon_service_type'      => 'Alteon-Service-Type',
-  'altiga_access_hours_g_u'  => 'Altiga-Access-Hours-G/U',
-  'altiga_allow_alpha_only_' => 'Altiga-Allow-Alpha-Only-Passwords-G',
-  'altiga_ipsec_allow_passw' => 'Altiga-IPSec-Allow-Passwd-Store-G/U',
-  'altiga_ipsec_authenticat' => 'Altiga-IPSec-Authentication-G',
-  'altiga_ipsec_banner_g'    => 'Altiga-IPSec-Banner-G',
-  'altiga_ipsec_default_dom' => 'Altiga-IPSec-Default-Domain-G',
-  'altiga_ipsec_l2l_keepali' => 'Altiga-IPSec-L2L-Keepalives-G',
-  'altiga_ipsec_mode_config' => 'Altiga-IPSec-Mode-Config-G',
-  'altiga_ipsec_over_nat_g'  => 'Altiga-IPSec-Over-NAT-G',
-  'altiga_ipsec_over_nat_po' => 'Altiga-IPSec-Over-NAT-Port-Num-G',
-  'altiga_ipsec_sec_associa' => 'Altiga-IPSec-Sec-Association-G/U',
-  'altiga_ipsec_secondary_d' => 'Altiga-IPSec-Secondary-Domains-G',
-  'altiga_ipsec_split_tunne' => 'Altiga-IPSec-Split-Tunnel-List-G',
-  'altiga_ipsec_tunnel_type' => 'Altiga-IPSec-Tunnel-Type-G',
-  'altiga_ipsec_user_group_' => 'Altiga-IPSec-User-Group-Lock-G',
-  'altiga_l2tp_encryption_g' => 'Altiga-L2TP-Encryption-G',
-  'altiga_l2tp_min_authenti' => 'Altiga-L2TP-Min-Authentication-G/U',
-  'altiga_min_password_leng' => 'Altiga-Min-Password-Length-G',
-  'altiga_pptp_encryption_g' => 'Altiga-PPTP-Encryption-G',
-  'altiga_pptp_min_authenti' => 'Altiga-PPTP-Min-Authentication-G/U',
-  'altiga_primary_dns_g'     => 'Altiga-Primary-DNS-G',
-  'altiga_primary_wins_g'    => 'Altiga-Primary-WINS-G',
-  'altiga_priority_on_sep_g' => 'Altiga-Priority-on-SEP-G/U',
-  'altiga_secondary_dns_g'   => 'Altiga-Secondary-DNS-G',
-  'altiga_secondary_wins_g'  => 'Altiga-Secondary-WINS-G',
-  'altiga_sep_card_assignme' => 'Altiga-SEP-Card-Assignment-G/U',
-  'altiga_simultaneous_logi' => 'Altiga-Simultaneous-Logins-G/U',
-  'altiga_tunneling_protoco' => 'Altiga-Tunneling-Protocols-G/U',
-  'altiga_use_client_addres' => 'Altiga-Use-Client-Address-G/U',
-  'annex_acct_servers'       => 'Annex-Acct-Servers',
-  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol',
-  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers',
-  'annex_audit_level'        => 'Annex-Audit-Level',
-  'annex_authen_servers'     => 'Annex-Authen-Servers',
-  'annex_begin_modulation'   => 'Annex-Begin-Modulation',
-  'annex_begin_receive_line' => 'Annex-Begin-Receive-Line-Level',
-  'annex_callback_portlist'  => 'Annex-Callback-Portlist',
-  'annex_cli_command'        => 'Annex-CLI-Command',
-  'annex_cli_filter'         => 'Annex-CLI-Filter',
+  'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter',
+  'ms_filter' => 'MS-Filter',
   'annex_compression_protoc' => 'Annex-Compression-Protocol',
-  'annex_connect_progress'   => 'Annex-Connect-Progress',
-  'annex_disconnect_reason'  => 'Annex-Disconnect-Reason',
-  'annex_domain_name'        => 'Annex-Domain-Name',
-  'annex_edo'                => 'Annex-EDO',
-  'annex_end_modulation'     => 'Annex-End-Modulation',
-  'annex_end_receive_line_l' => 'Annex-End-Receive-Line-Level',
+  'xedia_ssh_privileges' => 'Xedia-SSH-Privileges',
+  'usr_blocks_received' => 'USR-Blocks-Received',
+  'shiva_called_number' => 'Shiva-Called-Number',
+  'annex_filter' => 'Annex-Filter',
+  'usr_channel_expansion' => 'USR-Channel-Expansion',
+  'erx_tunnel_tos' => 'ERX-Tunnel-Tos',
+  'session_timeout' => 'Session-Timeout',
+  'ascend_route_ipx' => 'Ascend-Route-IPX',
   'annex_error_correction_p' => 'Annex-Error-Correction-Prot',
-  'annex_filter'             => 'Annex-Filter',
-  'annex_host_allow'         => 'Annex-Host-Allow',
-  'annex_host_restrict'      => 'Annex-Host-Restrict',
-  'annex_input_filter'       => 'Annex-Input-Filter',
-  'annex_keypress_timeout'   => 'Annex-Keypress-Timeout',
-  'annex_local_ip_address'   => 'Annex-Local-IP-Address',
-  'annex_local_username'     => 'Annex-Local-Username',
-  'annex_logical_channel_nu' => 'Annex-Logical-Channel-Number',
-  'annex_maximum_call_durat' => 'Annex-Maximum-Call-Duration',
-  'annex_modem_disc_reason'  => 'Annex-Modem-Disc-Reason',
-  'annex_mrru'               => 'Annex-MRRU',
-  'annex_multicast_rate_lim' => 'Annex-Multicast-Rate-Limit',
-  'annex_multilink_id'       => 'Annex-Multilink-Id',
-  'annex_num_in_multilink'   => 'Annex-Num-In-Multilink',
-  'annex_output_filter'      => 'Annex-Output-Filter',
-  'annex_pool_id'            => 'Annex-Pool-Id',
-  'annex_port'               => 'Annex-Port',
-  'annex_ppp_trace_level'    => 'Annex-PPP-Trace-Level',
-  'annex_pre_input_octets'   => 'Annex-Pre-Input-Octets',
-  'annex_pre_input_packets'  => 'Annex-Pre-Input-Packets',
-  'annex_pre_output_octets'  => 'Annex-Pre-Output-Octets',
-  'annex_pre_output_packets' => 'Annex-Pre-Output-Packets',
-  'annex_primary_dns_server' => 'Annex-Primary-DNS-Server',
-  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server',
-  'annex_product_name'       => 'Annex-Product-Name',
-  'annex_rate_reneg_req_rcv' => 'Annex-Rate-Reneg-Req-Rcvd',
-  'annex_rate_reneg_req_sen' => 'Annex-Rate-Reneg-Req-Sent',
-  'annex_re_chap_timeout'    => 'Annex-Re-CHAP-Timeout',
-  'annex_receive_speed'      => 'Annex-Receive-Speed',
-  'annex_retrain_requests_r' => 'Annex-Retrain-Requests-Rcvd',
-  'annex_retrain_requests_s' => 'Annex-Retrain-Requests-Sent',
-  'annex_retransmitted_pack' => 'Annex-Retransmitted-Packets',
-  'annex_sec_profile_index'  => 'Annex-Sec-Profile-Index',
-  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server',
-  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server',
-  'annex_signal_to_noise_ra' => 'Annex-Signal-to-Noise-Ratio',
-  'annex_sw_version'         => 'Annex-SW-Version',
-  'annex_syslog_tap'         => 'Annex-Syslog-Tap',
+  'acc_callback_mode' => 'Acc-Callback-Mode',
+  'usr_filter_zones' => 'USR-Filter-Zones',
+  'erx_input_gigapkts' => 'ERX-Input-Gigapkts',
+  'ascend_session_svr_key' => 'Ascend-Session-Svr-Key',
+  'bind_l2tp_tunnel_namf' => 'Bind_L2TP_Tunnel_Name',
+  'ascend_dsl_cir_recv_limi' => 'Ascend-Dsl-CIR-Recv-Limit',
+  'altiga_secondary_wins_g' => 'Altiga-Secondary-WINS-G',
+  'ascend_ts_idle_limit' => 'Ascend-TS-Idle-Limit',
+  'usr_port_tap_priority' => 'USR-Port-Tap-Priority',
+  'cvpn3000_ipsec_client_fw' => 'CVPN3000-IPSec-Client-Fw-Filter-Name',
+  'ascend_private_route_req' => 'Ascend-Private-Route-Required',
+  'ascend_private_route' => 'Ascend-Private-Route',
+  'prompt' => 'Prompt',
+  'acct_link_count' => 'Acct-Link-Count',
+  'bind_auth_service_grq' => 'Bind_Auth_Service_Grp',
+  'itk_tunnel_ip' => 'ITK-Tunnel-IP',
+  'login_lat_node' => 'Login-LAT-Node',
+  'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot',
+  'lac_real_poru' => 'LAC_Real_Port',
+  'erx_ingress_statistics' => 'ERX-Ingress-Statistics',
+  'digest_nonce' => 'Digest-Nonce',
   'annex_system_disc_reason' => 'Annex-System-Disc-Reason',
-  'annex_transmit_speed'     => 'Annex-Transmit-Speed',
-  'annex_transmitted_packet' => 'Annex-Transmitted-Packets',
-  'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode',
-  'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type',
-  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time',
-  'annex_user_level'         => 'Annex-User-Level',
+  'pool_name' => 'Pool-Name',
+  'altiga_use_client_addres' => 'Altiga-Use-Client-Address-G/U',
+  'police_bursu' => 'Police_Burst',
+  'usr_call_arrival_time' => 'USR-Call-Arrival-Time',
+  'ascend_disconnect_cause' => 'Ascend-Disconnect-Cause',
+  'ascend_user_acct_time' => 'Ascend-User-Acct-Time',
+  'chap_challenge' => 'CHAP-Challenge',
+  'ascend_mpp_idle_percent' => 'Ascend-MPP-Idle-Percent',
+  'ascend_user_acct_port' => 'Ascend-User-Acct-Port',
+  'ldap_group' => 'Ldap-Group',
+  'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID',
+  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out',
+  'pvc_encapsulation_type' => 'PVC-Encapsulation-Type',
+  'ascend_bir_bridge_group' => 'Ascend-BIR-Bridge-Group',
+  'ascend_atm_group' => 'Ascend-ATM-Group',
+  'ascend_fr_svc_addr' => 'Ascend-FR-SVC-Addr',
+  'x_ascend_send_auth' => 'X-Ascend-Send-Auth',
+  'le_ip_pool' => 'LE-IP-Pool',
+  'post_proxy_type' => 'Post-Proxy-Type',
+  'wispr_session_terminate_' => 'WISPr-Session-Terminate-Time',
+  'bintec_pppextiftable' => 'BinTec-pppExtIfTable',
+  'nomadix_subnet' => 'Nomadix-Subnet',
+  'login_port' => 'Login-Port',
+  'ms_chap2_response' => 'MS-CHAP2-Response',
+  'ascend_ipsec_profile' => 'Ascend-IPSEC-Profile',
+  'usr_compression_algorith' => 'USR-Compression-Algorithm',
+  'usr_accm_type' => 'USR-ACCM-Type',
+  'simultaneous_use' => 'Simultaneous-Use',
+  'cisco_account_info' => 'Cisco-Account-Info',
+  'framed_protocol' => 'Framed-Protocol',
+  'erx_tunnel_maximum_sessi' => 'ERX-Tunnel-Maximum-Sessions',
+  'redcreek_tunneled_wins_t' => 'RedCreek-Tunneled-WINS-Server2',
+  'ascend_recv_name' => 'Ascend-Recv-Name',
+  'usr_call_connecting_time' => 'USR-Call-Connecting-Time',
+  'quintum_h323_gw_id' => 'Quintum-h323-gw-id',
+  'acct_dyn_ac_ent' => 'Acct-Dyn-Ac-Ent',
+  'tunnel_remote_name' => 'Tunnel-Remote-Name',
+  'annex_ppp_trace_level' => 'Annex-PPP-Trace-Level',
+  'cisco_call_type' => 'Cisco-Call-Type',
+  'cisco_fax_recipient_coun' => 'Cisco-Fax-Recipient-Count',
+  'altiga_ipsec_authenticat' => 'Altiga-IPSec-Authentication-G',
+  'wispr_location_id' => 'WISPr-Location-ID',
+  'itk_start_delay' => 'ITK-Start-Delay',
+  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets',
+  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version',
+  'usr_vts_session_key' => 'USR-VTS-Session-Key',
+  'ascend_fr_dce_n393' => 'Ascend-FR-DCE-N393',
+  'login_host' => 'Login-Host',
+  'usr_reply_script3' => 'USR-Reply-Script3',
+  'cvpn3000_ipsec_split_tuo' => 'CVPN3000-IPSec-Split-Tunneling-Policy',
+  'ascend_pppoe_enable' => 'Ascend-PPPoE-Enable',
+  'annex_primary_dns_server' => 'Annex-Primary-DNS-Server',
+  'x_ascend_bridge_address' => 'X-Ascend-Bridge-Address',
+  'usr_number_of_link_naks' => 'USR-Number-of-Link-NAKs',
+  'altiga_priority_on_sep_g' => 'Altiga-Priority-on-SEP-G/U',
+  'annex_cli_command' => 'Annex-CLI-Command',
+  'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2',
+  'session_error_codf' => 'Session_Error_Code',
   'annex_user_server_locati' => 'Annex-User-Server-Location',
-  'annex_wan_number'         => 'Annex-Wan-Number',
-  'arap_challenge_response'  => 'ARAP-Challenge-Response',
-  'arap_features'            => 'ARAP-Features',
-  'arap_password'            => 'ARAP-Password',
-  'arap_security'            => 'ARAP-Security',
-  'arap_security_data'       => 'ARAP-Security-Data',
-  'arap_zone_access'         => 'ARAP-Zone-Access',
-  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA',
-  'ascend_access_intercepta' => 'Ascend-Access-Intercept-Log',
-  'ascend_add_seconds'       => 'Ascend-Add-Seconds',
-  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode',
-  'ascend_appletalk_route'   => 'Ascend-Appletalk-Route',
-  'ascend_ara_pw'            => 'Ascend-Ara-PW',
-  'ascend_assign_ip_client'  => 'Ascend-Assign-IP-Client',
-  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool',
-  'ascend_assign_ip_pool'    => 'Ascend-Assign-IP-Pool',
-  'ascend_assign_ip_server'  => 'Ascend-Assign-IP-Server',
-  'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group',
-  'ascend_atm_connect_vci'   => 'Ascend-ATM-Connect-Vci',
-  'ascend_atm_connect_vpi'   => 'Ascend-ATM-Connect-Vpi',
-  'ascend_atm_direct'        => 'Ascend-ATM-Direct',
-  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile',
-  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management',
-  'ascend_atm_group'         => 'Ascend-ATM-Group',
-  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss',
-  'ascend_atm_vci'           => 'Ascend-ATM-Vci',
-  'ascend_atm_vpi'           => 'Ascend-ATM-Vpi',
-  'ascend_auth_delay'        => 'Ascend-Auth-Delay',
-  'ascend_auth_type'         => 'Ascend-Auth-Type',
-  'ascend_authen_alias'      => 'Ascend-Authen-Alias',
-  'ascend_backup'            => 'Ascend-Backup',
-  'ascend_bacp_enable'       => 'Ascend-BACP-Enable',
-  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count',
-  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth',
-  'ascend_billing_number'    => 'Ascend-Billing-Number',
-  'ascend_bir_bridge_group'  => 'Ascend-BIR-Bridge-Group',
-  'ascend_bir_enable'        => 'Ascend-BIR-Enable',
-  'ascend_bir_proxy'         => 'Ascend-BIR-Proxy',
-  'ascend_bridge'            => 'Ascend-Bridge',
-  'ascend_bridge_address'    => 'Ascend-Bridge-Address',
-  'ascend_bridge_non_pppoe'  => 'Ascend-Bridge-Non-PPPoE',
-  'ascend_cache_refresh'     => 'Ascend-Cache-Refresh',
-  'ascend_cache_time'        => 'Ascend-Cache-Time',
-  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit',
-  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration',
-  'ascend_call_by_call'      => 'Ascend-Call-By-Call',
-  'ascend_call_direction'    => 'Ascend-Call-Direction',
-  'ascend_call_filter'       => 'Ascend-Call-Filter',
-  'ascend_call_type'         => 'Ascend-Call-Type',
-  'ascend_callback'          => 'Ascend-Callback',
-  'ascend_callback_delay'    => 'Ascend-Callback-Delay',
-  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan',
-  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn',
-  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening',
-  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num',
+  'cisco_fax_mdn_address' => 'Cisco-Fax-Mdn-Address',
   'ascend_calling_subaddres' => 'Ascend-Calling-Subaddress',
-  'ascend_cbcp_delay'        => 'Ascend-CBCP-Delay',
-  'ascend_cbcp_enable'       => 'Ascend-CBCP-Enable',
-  'ascend_cbcp_mode'         => 'Ascend-CBCP-Mode',
-  'ascend_cbcp_trunk_group'  => 'Ascend-CBCP-Trunk-Group',
-  'ascend_cir_timer'         => 'Ascend-CIR-Timer',
-  'ascend_ckt_type'          => 'Ascend-Ckt-Type',
-  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS',
-  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS',
-  'ascend_client_gateway'    => 'Ascend-Client-Gateway',
-  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS',
-  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS',
-  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS',
-  'ascend_client_secondarya' => 'Ascend-Client-Secondary-DNS',
-  'ascend_connect_progress'  => 'Ascend-Connect-Progress',
-  'ascend_data_filter'       => 'Ascend-Data-Filter',
-  'ascend_data_rate'         => 'Ascend-Data-Rate',
-  'ascend_data_svc'          => 'Ascend-Data-Svc',
-  'ascend_dba_monitor'       => 'Ascend-DBA-Monitor',
-  'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count',
-  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port',
+  'ascend_call_by_call' => 'Ascend-Call-By-Call',
+  'ascend_first_dest' => 'Ascend-First-Dest',
+  'annex_tunnel_authen_type' => 'Annex-Tunnel-Authen-Type',
+  'acct_type' => 'Acct-Type',
+  'sql_user_name' => 'SQL-User-Name',
+  'erx_secondary_dns' => 'ERX-Secondary-Dns',
+  'bridge_grouq' => 'Bridge_Group',
+  'h323_return_code' => 'h323-return-code',
+  'annex_host_allow' => 'Annex-Host-Allow',
+  'cvx_modem_end_recv_line_' => 'CVX-Modem-End-Recv-Line-Lvl',
+  'sip_method' => 'Sip-Method',
+  'x_ascend_require_auth' => 'X-Ascend-Require-Auth',
+  'cvpn3000_sep_card_assign' => 'CVPN3000-SEP-Card-Assignment',
+  'le_ipsec_deny_action' => 'LE-IPSec-Deny-Action',
+  'annex_edo' => 'Annex-EDO',
+  'acct_delay_time' => 'Acct-Delay-Time',
+  'login_tcp_port' => 'Login-TCP-Port',
+  'ascend_temporary_rtes' => 'Ascend-Temporary-Rtes',
+  'versanet_termination_cau' => 'Versanet-Termination-Cause',
+  'ascend_dialed_number' => 'Ascend-Dialed-Number',
+  'cvpn3000_ipsec_authentic' => 'CVPN3000-IPSec-Authentication',
+  'ascend_fr_dlci' => 'Ascend-FR-DLCI',
+  'annex_modem_disc_reason' => 'Annex-Modem-Disc-Reason',
+  'x_ascend_receive_secret' => 'X-Ascend-Receive-Secret',
+  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index',
+  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option',
+  'char_noecho' => 'Char-Noecho',
+  'redcreek_tunneled_search' => 'RedCreek-Tunneled-Search-List',
+  'ascend_pri_number_type' => 'Ascend-PRI-Number-Type',
+  'aat_ip_tos_apply_to' => 'AAT-IP-TOS-Apply-To',
+  'x_ascend_modem_shelfno' => 'X-Ascend-Modem-ShelfNo',
+  'prefix' => 'Prefix',
+  'usr_rad_dvmrp_metric' => 'USR-Rad-Dvmrp-Metric',
+  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit',
+  'usr_ip_saa_filter' => 'USR-IP-SAA-Filter',
+  'itk_prompt' => 'ITK-Prompt',
+  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol',
+  'cvx_modem_tx_packets' => 'CVX-Modem-Tx-Packets',
+  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint',
+  'ascend_home_network_name' => 'Ascend-Home-Network-Name',
+  'acc_customer_id' => 'Acc-Customer-Id',
+  'message_authenticator' => 'Message-Authenticator',
+  'cisco_fax_coverpage_flag' => 'Cisco-Fax-Coverpage-Flag',
+  'usr_multicast_forwarding' => 'USR-Multicast-Forwarding',
+  'cvpn3000_allow_network_e' => 'CVPN3000-Allow-Network-Extension-Mode',
+  'ascend_call_direction' => 'Ascend-Call-Direction',
+  'acc_connect_rx_speed' => 'Acc-Connect-Rx-Speed',
+  'ascend_force_56' => 'Ascend-Force-56',
+  'st_service_domain' => 'ST-Service-Domain',
+  'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code',
+  'shasta_service_profile' => 'Shasta-Service-Profile',
+  'cisco_maximum_time' => 'Cisco-Maximum-Time',
+  'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname',
+  'acc_ip_gateway_pri' => 'Acc-Ip-Gateway-Pri',
+  'ascend_bridge_address' => 'Ascend-Bridge-Address',
+  'altiga_pptp_min_authenti' => 'Altiga-PPTP-Min-Authentication-G/U',
+  'ns_secondary_wins' => 'NS-Secondary-WINS',
+  'cbbsm_bandwidth' => 'CBBSM-Bandwidth',
+  'x_ascend_fr_link_mgt' => 'X-Ascend-FR-Link-Mgt',
+  'altiga_ipsec_banner_g' => 'Altiga-IPSec-Banner-G',
+  'ascend_handle_ipx' => 'Ascend-Handle-IPX',
+  'ascend_x25_pad_alias_2' => 'Ascend-X25-Pad-Alias-2',
+  'st_policy_name' => 'ST-Policy-Name',
+  'ascend_group' => 'Ascend-Group',
+  'ascend_dsl_rate_type' => 'Ascend-Dsl-Rate-Type',
+  'tunnel_contexu' => 'Tunnel_Context',
+  'ascend_require_auth' => 'Ascend-Require-Auth',
+  'cvx_modem_local_retrains' => 'CVX-Modem-Local-Retrains',
+  'cvpn5000_echo' => 'CVPN5000-Echo',
+  'cvx_secondary_dns' => 'CVX-Secondary-DNS',
+  'x_ascend_billing_number' => 'X-Ascend-Billing-Number',
+  'usr_orig_nas_type' => 'USR-Orig-NAS-Type',
+  'ascend_remote_fw' => 'Ascend-Remote-FW',
+  'acct_output_packets' => 'Acct-Output-Packets',
+  'lm_password' => 'LM-Password',
+  'tunnel_window' => 'Tunnel-Window',
+  'cisco_avpair' => 'Cisco-AVPair',
+  'st_service_name' => 'ST-Service-Name',
+  'shiva_event_flags' => 'Shiva-Event-Flags',
+  'annex_retrain_requests_s' => 'Annex-Retrain-Requests-Sent',
+  'ascend_ts_idle_mode' => 'Ascend-TS-Idle-Mode',
+  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password',
+  'tunnel_deadtimf' => 'Tunnel_Deadtime',
+  'state' => 'State',
+  'usr_keypress_timeout' => 'USR-Keypress-Timeout',
+  'usr_pw_vpn_neighbor' => 'USR-PW_VPN_Neighbor',
+  'erx_pppoe_description' => 'ERX-Pppoe-Description',
+  'ldap_userdn' => 'Ldap-UserDn',
+  'x_ascend_fr_n391' => 'X-Ascend-FR-N391',
+  'ascend_calling_id_presen' => 'Ascend-Calling-Id-Presentatn',
+  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface',
+  'x_ascend_fr_direct' => 'X-Ascend-FR-Direct',
+  'nas_ip_address' => 'NAS-IP-Address',
+  'usr_call_end_time' => 'USR-Call-End-Time',
+  'acct_mcast_out_packett' => 'Acct_Mcast_Out_Packets',
+  'tunnel_algorithm' => 'Tunnel-Algorithm',
+  'usr_vpn_encrypter' => 'USR-VPN-Encrypter',
+  'tunnel_grouq' => 'Tunnel_Group',
+  'ascend_atm_connect_group' => 'Ascend-ATM-Connect-Group',
+  'x_ascend_ft1_caller' => 'X-Ascend-FT1-Caller',
+  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication',
+  'login_callback_number' => 'Login-Callback-Number',
+  'usr_ip_rip_input_filter' => 'USR-IP-RIP-Input-Filter',
+  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz',
+  'h323_disconnect_cause' => 'h323-disconnect-cause',
+  'x_ascend_handle_ipx' => 'X-Ascend-Handle-IPX',
+  'usr_igmp_version' => 'USR-IGMP-Version',
+  'usr_imsi' => 'USR-IMSI',
+  'group_name' => 'Group-Name',
+  'usr_nas_type' => 'USR-NAS-Type',
+  'context_namf' => 'Context-Name',
+  'ascend_ip_tos' => 'Ascend-IP-TOS',
+  'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate',
+  'tunnel_session_auth_serw' => 'Tunnel_Session_Auth_Service_Grp',
+  'ms_chap2_cpw' => 'MS-CHAP2-CPW',
+  'tunnel_session_auth_ctx' => 'Tunnel-Session-Auth-Ctx',
+  'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed',
+  'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot',
+  'ascend_x25_nui' => 'Ascend-X25-Nui',
+  'x_ascend_first_dest' => 'X-Ascend-First-Dest',
+  'usr_send_password' => 'USR-Send-Password',
+  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile',
+  'x_ascend_fr_t391' => 'X-Ascend-FR-T391',
+  'altiga_ipsec_sec_associa' => 'Altiga-IPSec-Sec-Association-G/U',
+  'ip_address_pool_namf' => 'Ip_Address_Pool_Name',
+  'acct_input_octets' => 'Acct-Input-Octets',
+  'cvx_modem_begin_modulati' => 'CVX-Modem-Begin-Modulation',
+  'wispr_session_terminatea' => 'WISPr-Session-Terminate-End-Of-Day',
+  'cvpn3000_use_client_addr' => 'CVPN3000-Use-Client-Address',
+  'bridge_group' => 'Bridge-Group',
+  'annex_sec_profile_index' => 'Annex-Sec-Profile-Index',
+  'acc_dns_server_pri' => 'Acc-Dns-Server-Pri',
+  'ms_acct_auth_type' => 'MS-Acct-Auth-Type',
+  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration',
+  'tunnel_password' => 'Tunnel-Password',
+  'framed_ipv6_prefix' => 'Framed-IPv6-Prefix',
+  'usr_reply_script5' => 'USR-Reply-Script5',
+  'shiva_links_in_bundle' => 'Shiva-Links-In-Bundle',
+  'ascend_fr_profile_name' => 'Ascend-FR-Profile-Name',
+  'ascend_mtu' => 'Ascend-MTU',
+  'nokia_charging_id' => 'Nokia-Charging-Id',
+  'cvpn3000_ms_client_subne' => 'CVPN3000-MS-Client-Subnet-Mask',
+  'cvpn3000_ipsec_sec_assoc' => 'CVPN3000-IPSec-Sec-Association',
+  'cisco_ppp_async_map' => 'Cisco-PPP-Async-Map',
+  'cvpn3000_user_auth_servf' => 'CVPN3000-User-Auth-Server-Port',
+  'cisco_num_in_multilink' => 'Cisco-Num-In-Multilink',
+  'wispr_logoff_url' => 'WISPr-Logoff-URL',
+  'usr_mobile_ip_address' => 'USR-Mobile-IP-Address',
+  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate',
+  'itk_ppp_compression_prot' => 'ITK-PPP-Compression-Prot',
+  'ascend_bridge' => 'Ascend-Bridge',
+  'x_ascend_presession_time' => 'X-Ascend-PreSession-Time',
+  'aat_client_primary_dns' => 'AAT-Client-Primary-DNS',
+  'cvpn3000_strip_realm' => 'CVPN3000-Strip-Realm',
+  'tunnel_cmd_timeout' => 'Tunnel-Cmd-Timeout',
+  'ascend_multicast_client' => 'Ascend-Multicast-Client',
+  'cvx_modem_remote_rate_ne' => 'CVX-Modem-Remote-Rate-Negs',
+  'tunnel_private_group_id' => 'Tunnel-Private-Group-Id',
+  'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl',
+  'calling_station_id' => 'Calling-Station-Id',
+  'tunnel_rate_limit_burst' => 'Tunnel-Rate-Limit-Burst',
+  'usr_device_connected_to' => 'USR-Device-Connected-To',
+  'aat_source_ip_check' => 'AAT-Source-IP-Check',
+  'login_lat_service' => 'Login-LAT-Service',
+  'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address',
+  'usr_called_party_number' => 'USR-Called-Party-Number',
+  'bintec_ipnatpresettable' => 'BinTec-ipNatPresetTable',
+  'ascend_remove_seconds' => 'Ascend-Remove-Seconds',
+  'shiva_user_attributes' => 'Shiva-User-Attributes',
+  'cisco_fax_dsn_flag' => 'Cisco-Fax-Dsn-Flag',
+  'x_ascend_route_ipx' => 'X-Ascend-Route-IPX',
+  'acc_route_policy' => 'Acc-Route-Policy',
+  'bind_l2tp_flow_controm' => 'Bind_L2TP_Flow_Control',
+  'erx_qos_profile_name' => 'ERX-Qos-Profile-Name',
+  'x_ascend_client_gateway' => 'X-Ascend-Client-Gateway',
+  'pre_proxy_type' => 'Pre-Proxy-Type',
+  'smb_account_ctrl_text' => 'SMB-Account-CTRL-TEXT',
+  'x_ascend_data_filter' => 'X-Ascend-Data-Filter',
+  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time',
+  'ascend_atm_direct' => 'Ascend-ATM-Direct',
+  'ascend_session_type' => 'Ascend-Session-Type',
+  'x_ascend_fr_linkup' => 'X-Ascend-FR-LinkUp',
+  'ascend_metric' => 'Ascend-Metric',
+  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client',
+  'usr_speed_of_connection' => 'USR-Speed-Of-Connection',
+  'cvpn3000_require_hw_clie' => 'CVPN3000-Require-HW-Client-Auth',
+  'session_type' => 'Session-Type',
+  'acct_input_octets_65' => 'Acct_Input_Octets_64',
+  'le_nat_outsource_outmap' => 'LE-NAT-Outsource-Outmap',
+  'cvx_modem_local_rate_neg' => 'CVX-Modem-Local-Rate-Negs',
+  'mcast_sene' => 'Mcast_Send',
+  'pppoe_url' => 'PPPOE-URL',
+  'erx_service_bundle' => 'ERX-Service-Bundle',
+  'altiga_secondary_dns_g' => 'Altiga-Secondary-DNS-G',
+  'bg_trans_bpdv' => 'BG_Trans_BPDU',
+  'cvx_data_filter' => 'CVX-Data-Filter',
+  'acct_mcast_out_octets' => 'Acct-Mcast-Out-Octets',
+  'ascend_callback' => 'Ascend-Callback',
+  'tunnel_client_auth_id' => 'Tunnel-Client-Auth-Id',
+  'acct_unique_session_id' => 'Acct-Unique-Session-Id',
+  'usr_port_tap_format' => 'USR-Port-Tap-Format',
+  'ascend_ckt_type' => 'Ascend-Ckt-Type',
+  'ascend_ppp_async_map' => 'Ascend-PPP-Async-Map',
+  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz',
+  'usr_acct_reason_code' => 'USR-Acct-Reason-Code',
+  'ascend_filter' => 'Ascend-Filter',
+  'h323_redirect_number' => 'h323-redirect-number',
+  'port_limit' => 'Port-Limit',
+  'rewrite_rule' => 'Rewrite-Rule',
+  'tunnel_police_rate' => 'Tunnel-Police-Rate',
+  'usr_multicast_proxy' => 'USR-Multicast-Proxy',
+  'ascend_max_shared_users' => 'Ascend-Max-Shared-Users',
+  'usr_bridging' => 'USR-Bridging',
+  'cvx_presession_time' => 'CVX-PreSession-Time',
+  'cvpn5000_vpn_groupinfo' => 'CVPN5000-VPN-GroupInfo',
+  'autz_type' => 'Autz-Type',
+  'x_ascend_fr_dlci' => 'X-Ascend-FR-DLCI',
+  'usr_request_type' => 'USR-Request-Type',
+  'acc_igmp_admin_state' => 'Acc-Igmp-Admin-State',
+  'ascend_host_info' => 'Ascend-Host-Info',
   'ascend_dhcp_maximum_leas' => 'Ascend-DHCP-Maximum-Leases',
-  'ascend_dhcp_pool_number'  => 'Ascend-DHCP-Pool-Number',
-  'ascend_dhcp_reply'        => 'Ascend-DHCP-Reply',
-  'ascend_dial_number'       => 'Ascend-Dial-Number',
-  'ascend_dialed_number'     => 'Ascend-Dialed-Number',
-  'ascend_dialout_allowed'   => 'Ascend-Dialout-Allowed',
-  'ascend_disconnect_cause'  => 'Ascend-Disconnect-Cause',
-  'ascend_dropped_octets'    => 'Ascend-Dropped-Octets',
-  'ascend_dropped_packets'   => 'Ascend-Dropped-Packets',
-  'ascend_dsl_cir_recv_limi' => 'Ascend-Dsl-CIR-Recv-Limit',
-  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit',
-  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit',
-  'ascend_dsl_rate_mode'     => 'Ascend-Dsl-Rate-Mode',
-  'ascend_dsl_rate_type'     => 'Ascend-Dsl-Rate-Type',
-  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit',
-  'ascend_egress_enabled'    => 'Ascend-Egress-Enabled',
-  'ascend_endpoint_disc'     => 'Ascend-Endpoint-Disc',
-  'ascend_event_type'        => 'Ascend-Event-Type',
-  'ascend_expect_callback'   => 'Ascend-Expect-Callback',
-  'ascend_fcp_parameter'     => 'Ascend-FCP-Parameter',
-  'ascend_filter'            => 'Ascend-Filter',
-  'ascend_filter_required'   => 'Ascend-Filter-Required',
-  'ascend_first_dest'        => 'Ascend-First-Dest',
-  'ascend_force_56'          => 'Ascend-Force-56',
-  'ascend_fr_08_mode'        => 'Ascend-FR-08-Mode',
-  'ascend_fr_circuit_name'   => 'Ascend-FR-Circuit-Name',
-  'ascend_fr_dce_n392'       => 'Ascend-FR-DCE-N392',
-  'ascend_fr_dce_n393'       => 'Ascend-FR-DCE-N393',
-  'ascend_fr_direct'         => 'Ascend-FR-Direct',
-  'ascend_fr_direct_dlci'    => 'Ascend-FR-Direct-DLCI',
+  'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates',
+  'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name',
   'ascend_fr_direct_profile' => 'Ascend-FR-Direct-Profile',
-  'ascend_fr_dlci'           => 'Ascend-FR-DLCI',
-  'ascend_fr_dte_n392'       => 'Ascend-FR-DTE-N392',
-  'ascend_fr_dte_n393'       => 'Ascend-FR-DTE-N393',
-  'ascend_fr_link_mgt'       => 'Ascend-FR-Link-Mgt',
-  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI',
-  'ascend_fr_linkup'         => 'Ascend-FR-LinkUp',
-  'ascend_fr_n391'           => 'Ascend-FR-N391',
-  'ascend_fr_nailed_grp'     => 'Ascend-FR-Nailed-Grp',
-  'ascend_fr_profile_name'   => 'Ascend-FR-Profile-Name',
-  'ascend_fr_svc_addr'       => 'Ascend-FR-SVC-Addr',
-  'ascend_fr_t391'           => 'Ascend-FR-T391',
-  'ascend_fr_t392'           => 'Ascend-FR-T392',
-  'ascend_fr_type'           => 'Ascend-FR-Type',
-  'ascend_ft1_caller'        => 'Ascend-FT1-Caller',
-  'ascend_global_call_id'    => 'Ascend-Global-Call-Id',
-  'ascend_group'             => 'Ascend-Group',
-  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id',
-  'ascend_h323_dialed_time'  => 'Ascend-H323-Dialed-Time',
-  'ascend_h323_fegw_address' => 'Ascend-H323-Fegw-Address',
-  'ascend_h323_gatekeeper'   => 'Ascend-H323-Gatekeeper',
-  'ascend_handle_ipx'        => 'Ascend-Handle-IPX',
-  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type',
-  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr',
-  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password',
-  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port',
-  'ascend_home_network_name' => 'Ascend-Home-Network-Name',
-  'ascend_host_info'         => 'Ascend-Host-Info',
-  'ascend_idle_limit'        => 'Ascend-Idle-Limit',
-  'ascend_if_netmask'        => 'Ascend-IF-Netmask',
-  'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count',
-  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter',
-  'ascend_ip_direct'         => 'Ascend-IP-Direct',
-  'ascend_ip_pool_chaining'  => 'Ascend-IP-Pool-Chaining',
-  'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition',
-  'ascend_ip_tos'            => 'Ascend-IP-TOS',
-  'ascend_ip_tos_apply_to'   => 'Ascend-IP-TOS-Apply-To',
-  'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence',
-  'ascend_ipsec_profile'     => 'Ascend-IPSEC-Profile',
-  'ascend_ipx_alias'         => 'Ascend-IPX-Alias',
-  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression',
-  'ascend_ipx_node_addr'     => 'Ascend-IPX-Node-Addr',
-  'ascend_ipx_peer_mode'     => 'Ascend-IPX-Peer-Mode',
-  'ascend_ipx_route'         => 'Ascend-IPX-Route',
-  'ascend_link_compression'  => 'Ascend-Link-Compression',
-  'ascend_max_shared_users'  => 'Ascend-Max-Shared-Users',
-  'ascend_maximum_call_dura' => 'Ascend-Maximum-Call-Duration',
-  'ascend_maximum_channels'  => 'Ascend-Maximum-Channels',
-  'ascend_maximum_time'      => 'Ascend-Maximum-Time',
-  'ascend_menu_item'         => 'Ascend-Menu-Item',
-  'ascend_menu_selector'     => 'Ascend-Menu-Selector',
-  'ascend_metric'            => 'Ascend-Metric',
-  'ascend_minimum_channels'  => 'Ascend-Minimum-Channels',
-  'ascend_modem_portno'      => 'Ascend-Modem-PortNo',
-  'ascend_modem_shelfno'     => 'Ascend-Modem-ShelfNo',
-  'ascend_modem_slotno'      => 'Ascend-Modem-SlotNo',
-  'ascend_mpp_idle_percent'  => 'Ascend-MPP-Idle-Percent',
-  'ascend_mtu'               => 'Ascend-MTU',
-  'ascend_multicast_client'  => 'Ascend-Multicast-Client',
-  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay',
-  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit',
-  'ascend_multilink_id'      => 'Ascend-Multilink-ID',
-  'ascend_nas_port_format'   => 'Ascend-NAS-Port-Format',
-  'ascend_netware_timeout'   => 'Ascend-Netware-timeout',
-  'ascend_num_in_multilink'  => 'Ascend-Num-In-Multilink',
-  'ascend_number_sessions'   => 'Ascend-Number-Sessions',
-  'ascend_numbering_plan_id' => 'Ascend-Numbering-Plan-ID',
-  'ascend_owner_ip_addr'     => 'Ascend-Owner-IP-Addr',
-  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum',
-  'ascend_port_redir_protoc' => 'Ascend-Port-Redir-Protocol',
-  'ascend_port_redir_server' => 'Ascend-Port-Redir-Server',
-  'ascend_ppp_address'       => 'Ascend-PPP-Address',
-  'ascend_ppp_async_map'     => 'Ascend-PPP-Async-Map',
-  'ascend_ppp_vj_1172'       => 'Ascend-PPP-VJ-1172',
-  'ascend_ppp_vj_slot_comp'  => 'Ascend-PPP-VJ-Slot-Comp',
-  'ascend_pppoe_enable'      => 'Ascend-PPPoE-Enable',
-  'ascend_pre_input_octets'  => 'Ascend-Pre-Input-Octets',
-  'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets',
+  'x_ascend_bridge' => 'X-Ascend-Bridge',
+  'tunnel_deadtime' => 'Tunnel-Deadtime',
+  'ms_chap_error' => 'MS-CHAP-Error',
+  'framed_route' => 'Framed-Route',
+  'sip_from' => 'Sip-From',
+  'expiration' => 'Expiration',
+  'ascend_backup' => 'Ascend-Backup',
   'ascend_pre_output_octets' => 'Ascend-Pre-Output-Octets',
-  'ascend_pre_output_packet' => 'Ascend-Pre-Output-Packets',
-  'ascend_preempt_limit'     => 'Ascend-Preempt-Limit',
-  'ascend_presession_time'   => 'Ascend-PreSession-Time',
-  'ascend_pri_number_type'   => 'Ascend-PRI-Number-Type',
+  'ascend_calling_id_number' => 'Ascend-Calling-Id-Number-Plan',
+  'framed_appletalk_zone' => 'Framed-AppleTalk-Zone',
+  'annex_audit_level' => 'Annex-Audit-Level',
+  'digest_algorithm' => 'Digest-Algorithm',
+  'bind_auth_context' => 'Bind-Auth-Context',
+  'ascend_user_acct_base' => 'Ascend-User-Acct-Base',
+  'st_secondary_dns_server' => 'ST-Secondary-DNS-Server',
+  'mcast_receive' => 'Mcast-Receive',
+  'usr_ds0' => 'USR-DS0',
+  'aat_atm_traffic_profile' => 'AAT-ATM-Traffic-Profile',
+  'ms_ras_vendor' => 'MS-RAS-Vendor',
+  'tunnel_domain' => 'Tunnel-Domain',
+  'tunnel_max_sessions' => 'Tunnel-Max-Sessions',
+  'ascend_ip_direct' => 'Ascend-IP-Direct',
+  'xedia_address_pool' => 'Xedia-Address-Pool',
+  'idle_timeout' => 'Idle-Timeout',
+  'tunnel_rate_limit_ratf' => 'Tunnel_Rate_Limit_Rate',
+  'annex_rate_reneg_req_sen' => 'Annex-Rate-Reneg-Req-Sent',
+  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate',
+  'tunnel_server_auth_id' => 'Tunnel-Server-Auth-Id',
+  'cvpn3000_ipsec_banner1' => 'CVPN3000-IPSec-Banner1',
+  'usr_start_time' => 'USR-Start-Time',
+  'usr_ip' => 'USR-IP',
+  'cvpn3000_reqrd_client_fw' => 'CVPN3000-Reqrd-Client-Fw-Vendor-Code',
+  'altiga_ipsec_secondary_d' => 'Altiga-IPSec-Secondary-Domains-G',
+  'usr_gateway_ip_address' => 'USR-Gateway-IP-Address',
+  'ascend_dba_monitor' => 'Ascend-DBA-Monitor',
+  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold',
+  'st_primary_dns_server' => 'ST-Primary-DNS-Server',
+  'acc_ace_token_ttl' => 'Acc-Ace-Token-Ttl',
+  'ms_chap_domain' => 'MS-CHAP-Domain',
+  'cisco_pre_input_octets' => 'Cisco-Pre-Input-Octets',
   'ascend_primary_home_agen' => 'Ascend-Primary-Home-Agent',
-  'ascend_private_route'     => 'Ascend-Private-Route',
-  'ascend_private_route_req' => 'Ascend-Private-Route-Required',
-  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID',
-  'ascend_pw_lifetime'       => 'Ascend-PW-Lifetime',
-  'ascend_pw_warntime'       => 'Ascend-PW-Warntime',
-  'ascend_qos_downstream'    => 'Ascend-QOS-Downstream',
-  'ascend_qos_upstream'      => 'Ascend-QOS-Upstream',
-  'ascend_receive_secret'    => 'Ascend-Receive-Secret',
-  'ascend_recv_name'         => 'Ascend-Recv-Name',
-  'ascend_redirect_number'   => 'Ascend-Redirect-Number',
-  'ascend_remote_addr'       => 'Ascend-Remote-Addr',
-  'ascend_remote_fw'         => 'Ascend-Remote-FW',
-  'ascend_remove_seconds'    => 'Ascend-Remove-Seconds',
-  'ascend_require_auth'      => 'Ascend-Require-Auth',
-  'ascend_route_appletalk'   => 'Ascend-Route-Appletalk',
-  'ascend_route_ip'          => 'Ascend-Route-IP',
-  'ascend_route_ipx'         => 'Ascend-Route-IPX',
+  'acct_session_time' => 'Acct-Session-Time',
+  'framed_ip_address' => 'Framed-IP-Address',
+  'ns_admin_privilege' => 'NS-Admin-Privilege',
+  'medium_type' => 'Medium-Type',
+  'acct_output_octets_64' => 'Acct-Output-Octets-64',
+  'ascend_cir_timer' => 'Ascend-CIR-Timer',
+  'police_rate' => 'Police-Rate',
+  'tunnel_functioo' => 'Tunnel_Function',
+  'quintum_h323_time_and_da' => 'Quintum-h323-time-and-day',
+  'ip_tos_fiele' => 'IP_TOS_Field',
+  'erx_framed_ip_route_tag' => 'ERX-Framed-Ip-Route-Tag',
+  'ms_mppe_send_key' => 'MS-MPPE-Send-Key',
+  'ascend_maximum_call_dura' => 'Ascend-Maximum-Call-Duration',
+  'pppoe_motn' => 'PPPOE_MOTM',
+  'lac_poru' => 'LAC_Port',
+  'bind_dot1q_slou' => 'Bind_Dot1q_Slot',
   'ascend_secondary_home_ag' => 'Ascend-Secondary-Home-Agent',
-  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History',
-  'ascend_send_auth'         => 'Ascend-Send-Auth',
-  'ascend_send_passwd'       => 'Ascend-Send-Passwd',
-  'ascend_send_secret'       => 'Ascend-Send-Secret',
-  'ascend_service_type'      => 'Ascend-Service-Type',
-  'ascend_session_svr_key'   => 'Ascend-Session-Svr-Key',
-  'ascend_session_type'      => 'Ascend-Session-Type',
-  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable',
-  'ascend_source_auth'       => 'Ascend-Source-Auth',
-  'ascend_source_ip_check'   => 'Ascend-Source-IP-Check',
-  'ascend_svc_enabled'       => 'Ascend-SVC-Enabled',
-  'ascend_target_util'       => 'Ascend-Target-Util',
-  'ascend_telnet_profile'    => 'Ascend-Telnet-Profile',
-  'ascend_temporary_rtes'    => 'Ascend-Temporary-Rtes',
-  'ascend_third_prompt'      => 'Ascend-Third-Prompt',
-  'ascend_token_expiry'      => 'Ascend-Token-Expiry',
-  'ascend_token_idle'        => 'Ascend-Token-Idle',
-  'ascend_token_immediate'   => 'Ascend-Token-Immediate',
-  'ascend_traffic_shaper'    => 'Ascend-Traffic-Shaper',
-  'ascend_transit_number'    => 'Ascend-Transit-Number',
-  'ascend_ts_idle_limit'     => 'Ascend-TS-Idle-Limit',
-  'ascend_ts_idle_mode'      => 'Ascend-TS-Idle-Mode',
-  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name',
-  'ascend_tunneling_protoco' => 'Ascend-Tunneling-Protocol',
-  'ascend_user_acct_base'    => 'Ascend-User-Acct-Base',
-  'ascend_user_acct_host'    => 'Ascend-User-Acct-Host',
-  'ascend_user_acct_key'     => 'Ascend-User-Acct-Key',
-  'ascend_user_acct_port'    => 'Ascend-User-Acct-Port',
-  'ascend_user_acct_time'    => 'Ascend-User-Acct-Time',
-  'ascend_user_acct_type'    => 'Ascend-User-Acct-Type',
-  'ascend_uu_info'           => 'Ascend-UU-Info',
-  'ascend_vrouter_name'      => 'Ascend-VRouter-Name',
-  'ascend_x25_cug'           => 'Ascend-X25-Cug',
-  'ascend_x25_nui'           => 'Ascend-X25-Nui',
-  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt',
-  'ascend_x25_nui_prompt'    => 'Ascend-X25-Nui-Prompt',
-  'ascend_x25_pad_alias_1'   => 'Ascend-X25-Pad-Alias-1',
-  'ascend_x25_pad_alias_2'   => 'Ascend-X25-Pad-Alias-2',
-  'ascend_x25_pad_alias_3'   => 'Ascend-X25-Pad-Alias-3',
-  'ascend_x25_pad_banner'    => 'Ascend-X25-Pad-Banner',
-  'ascend_x25_pad_prompt'    => 'Ascend-X25-Pad-Prompt',
-  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters',
-  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile',
-  'ascend_x25_profile_name'  => 'Ascend-X25-Profile-Name',
-  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging',
-  'ascend_x25_rpoa'          => 'Ascend-X25-Rpoa',
-  'ascend_x25_x121_address'  => 'Ascend-X25-X121-Address',
-  'ascend_xmit_rate'         => 'Ascend-Xmit-Rate',
-  'assigned_ip_address'      => 'Assigned_IP_Address',
-  'assigned_ip_addrest'      => 'Assigned-IP-Address',
-  'auth_type'                => 'Auth-Type',
-  'autz_type'                => 'Autz-Type',
-  'bg_aging_time'            => 'BG_Aging_Time',
-  'bg_aging_timf'            => 'BG-Aging-Time',
-  'bg_path_cost'             => 'BG_Path_Cost',
-  'bg_path_cosu'             => 'BG-Path-Cost',
-  'bg_span_dis'              => 'BG_Span_Dis',
-  'bg_span_dit'              => 'BG-Span-Dis',
-  'bg_trans_bpdu'            => 'BG_Trans_BPDU',
-  'bg_trans_bpdv'            => 'BG-Trans-BPDU',
-  'bind_auth_context'        => 'Bind_Auth_Context',
-  'bind_auth_contexu'        => 'Bind-Auth-Context',
-  'bind_auth_max_sessions'   => 'Bind_Auth_Max_Sessions',
-  'bind_auth_max_sessiont'   => 'Bind-Auth-Max-Sessions',
-  'bind_auth_protocol'       => 'Bind_Auth_Protocol',
-  'bind_auth_protocom'       => 'Bind-Auth-Protocol',
-  'bind_auth_service_grp'    => 'Bind_Auth_Service_Grp',
-  'bind_auth_service_grq'    => 'Bind-Auth-Service-Grp',
-  'bind_bypass_bypass'       => 'Bind_Bypass_Bypass',
-  'bind_bypass_bypast'       => 'Bind-Bypass-Bypass',
-  'bind_bypass_context'      => 'Bind_Bypass_Context',
-  'bind_bypass_contexu'      => 'Bind-Bypass-Context',
-  'bind_dot1q_port'          => 'Bind_Dot1q_Port',
-  'bind_dot1q_poru'          => 'Bind-Dot1q-Port',
-  'bind_dot1q_slot'          => 'Bind_Dot1q_Slot',
-  'bind_dot1q_slou'          => 'Bind-Dot1q-Slot',
-  'bind_dot1q_vlan_tag_id'   => 'Bind_Dot1q_Vlan_Tag_Id',
-  'bind_dot1q_vlan_tag_ie'   => 'Bind-Dot1q-Vlan-Tag-Id',
-  'bind_int_context'         => 'Bind_Int_Context',
-  'bind_int_contexu'         => 'Bind-Int-Context',
-  'bind_int_interface_name'  => 'Bind_Int_Interface_Name',
-  'bind_int_interface_namf'  => 'Bind-Int-Interface-Name',
-  'bind_l2tp_flow_control'   => 'Bind_L2TP_Flow_Control',
-  'bind_l2tp_flow_controm'   => 'Bind-L2TP-Flow-Control',
-  'bind_l2tp_tunnel_name'    => 'Bind_L2TP_Tunnel_Name',
-  'bind_l2tp_tunnel_namf'    => 'Bind-L2TP-Tunnel-Name',
-  'bind_ses_context'         => 'Bind_Ses_Context',
-  'bind_ses_contexu'         => 'Bind-Ses-Context',
-  'bind_sub_password'        => 'Bind_Sub_Password',
-  'bind_sub_passwore'        => 'Bind-Sub-Password',
-  'bind_sub_user_at_context' => 'Bind_Sub_User_At_Context',
-  'bind_sub_user_at_contexu' => 'Bind-Sub-User-At-Context',
-  'bind_tun_context'         => 'Bind_Tun_Context',
-  'bind_tun_contexu'         => 'Bind-Tun-Context',
-  'bind_type'                => 'Bind_Type',
-  'bind_typf'                => 'Bind-Type',
-  'bintec_bibodialtable'     => 'BinTec-biboDialTable',
-  'bintec_biboppptable'      => 'BinTec-biboPPPTable',
-  'bintec_ipextiftable'      => 'BinTec-ipExtIfTable',
-  'bintec_ipextrttable'      => 'BinTec-ipExtRtTable',
-  'bintec_ipfiltertable'     => 'BinTec-ipFilterTable',
-  'bintec_ipnatpresettable'  => 'BinTec-ipNatPresetTable',
-  'bintec_ipqostable'        => 'BinTec-ipQoSTable',
-  'bintec_iproutetable'      => 'BinTec-ipRouteTable',
-  'bintec_ipxcirctable'      => 'BinTec-ipxCircTable',
-  'bintec_ipxstaticroutetab' => 'BinTec-ipxStaticRouteTable',
-  'bintec_ipxstaticservtabl' => 'BinTec-ipxStaticServTable',
-  'bintec_ospfiftable'       => 'BinTec-ospfIfTable',
-  'bintec_pppextiftable'     => 'BinTec-pppExtIfTable',
-  'bintec_qosiftable'        => 'BinTec-qosIfTable',
-  'bintec_qospolicytable'    => 'BinTec-qosPolicyTable',
-  'bintec_ripcirctable'      => 'BinTec-ripCircTable',
-  'bintec_sapcirctable'      => 'BinTec-sapCircTable',
-  'bridge_group'             => 'Bridge_Group',
-  'bridge_grouq'             => 'Bridge-Group',
-  'cabletron_protocol_calla' => 'Cabletron-Protocol-Callable',
-  'cabletron_protocol_enabl' => 'Cabletron-Protocol-Enable',
-  'call_id'                  => 'call-id',
-  'callback_id'              => 'Callback-Id',
-  'callback_number'          => 'Callback-Number',
-  'called_station_id'        => 'Called-Station-Id',
-  'caller_id'                => 'Caller-ID',
-  'calling_station_id'       => 'Calling-Station-Id',
-  'cbbsm_bandwidth'          => 'CBBSM-Bandwidth',
-  'challenge_state'          => 'Challenge-State',
-  'chap_challenge'           => 'CHAP-Challenge',
-  'chap_password'            => 'CHAP-Password',
-  'char_noecho'              => 'Char-Noecho',
-  'cisco_abort_cause'        => 'Cisco-Abort-Cause',
-  'cisco_account_info'       => 'Cisco-Account-Info',
-  'cisco_assign_ip_pool'     => 'Cisco-Assign-IP-Pool',
-  'cisco_avpair'             => 'Cisco-AVPair',
-  'cisco_call_filter'        => 'Cisco-Call-Filter',
-  'cisco_call_type'          => 'Cisco-Call-Type',
-  'cisco_command_code'       => 'Cisco-Command-Code',
-  'cisco_control_info'       => 'Cisco-Control-Info',
-  'cisco_data_filter'        => 'Cisco-Data-Filter',
-  'cisco_data_rate'          => 'Cisco-Data-Rate',
-  'cisco_disconnect_cause'   => 'Cisco-Disconnect-Cause',
-  'cisco_email_server_ack_f' => 'Cisco-Email-Server-Ack-Flag',
-  'cisco_email_server_addre' => 'Cisco-Email-Server-Address',
-  'cisco_fax_account_id_ori' => 'Cisco-Fax-Account-Id-Origin',
-  'cisco_fax_auth_status'    => 'Cisco-Fax-Auth-Status',
-  'cisco_fax_connect_speed'  => 'Cisco-Fax-Connect-Speed',
-  'cisco_fax_coverpage_flag' => 'Cisco-Fax-Coverpage-Flag',
-  'cisco_fax_dsn_address'    => 'Cisco-Fax-Dsn-Address',
-  'cisco_fax_dsn_flag'       => 'Cisco-Fax-Dsn-Flag',
-  'cisco_fax_mdn_address'    => 'Cisco-Fax-Mdn-Address',
-  'cisco_fax_mdn_flag'       => 'Cisco-Fax-Mdn-Flag',
-  'cisco_fax_modem_time'     => 'Cisco-Fax-Modem-Time',
-  'cisco_fax_msg_id'         => 'Cisco-Fax-Msg-Id',
-  'cisco_fax_pages'          => 'Cisco-Fax-Pages',
-  'cisco_fax_process_abort_' => 'Cisco-Fax-Process-Abort-Flag',
-  'cisco_fax_recipient_coun' => 'Cisco-Fax-Recipient-Count',
-  'cisco_gateway_id'         => 'Cisco-Gateway-Id',
-  'cisco_idle_limit'         => 'Cisco-Idle-Limit',
-  'cisco_ip_direct'          => 'Cisco-IP-Direct',
-  'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition',
-  'cisco_link_compression'   => 'Cisco-Link-Compression',
-  'cisco_maximum_channels'   => 'Cisco-Maximum-Channels',
-  'cisco_maximum_time'       => 'Cisco-Maximum-Time',
-  'cisco_multilink_id'       => 'Cisco-Multilink-ID',
-  'cisco_nas_port'           => 'Cisco-NAS-Port',
-  'cisco_num_in_multilink'   => 'Cisco-Num-In-Multilink',
-  'cisco_port_used'          => 'Cisco-Port-Used',
-  'cisco_ppp_async_map'      => 'Cisco-PPP-Async-Map',
-  'cisco_ppp_vj_slot_comp'   => 'Cisco-PPP-VJ-Slot-Comp',
-  'cisco_pre_input_octets'   => 'Cisco-Pre-Input-Octets',
-  'cisco_pre_input_packets'  => 'Cisco-Pre-Input-Packets',
-  'cisco_pre_output_octets'  => 'Cisco-Pre-Output-Octets',
-  'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets',
-  'cisco_presession_time'    => 'Cisco-PreSession-Time',
-  'cisco_pw_lifetime'        => 'Cisco-PW-Lifetime',
-  'cisco_route_ip'           => 'Cisco-Route-IP',
-  'cisco_service_info'       => 'Cisco-Service-Info',
-  'cisco_target_util'        => 'Cisco-Target-Util',
-  'cisco_xmit_rate'          => 'Cisco-Xmit-Rate',
-  'class'                    => 'Class',
-  'client_dns_pri'           => 'Client_DNS_Pri',
-  'client_dns_prj'           => 'Client-DNS-Pri',
-  'client_dns_sec'           => 'Client_DNS_Sec',
-  'client_dns_sed'           => 'Client-DNS-Sec',
-  'client_id'                => 'Client-Id',
-  'client_ip_address'        => 'Client-IP-Address',
-  'client_port_dnis'         => 'Client-Port-DNIS',
-  'client_port_id'           => 'Client-Port-Id',
-  'colubris_avpair'          => 'Colubris-AVPair',
-  'configuration_token'      => 'Configuration-Token',
-  'connect_info'             => 'Connect-Info',
-  'connect_rate'             => 'Connect-Rate',
-  'context_name'             => 'Context_Name',
-  'context_namf'             => 'Context-Name',
-  'crypt_password'           => 'Crypt-Password',
-  'current_time'             => 'Current-Time',
-  'cvpn3000_access_hours'    => 'CVPN3000-Access-Hours',
-  'cvpn3000_allow_network_e' => 'CVPN3000-Allow-Network-Extension-Mode',
-  'cvpn3000_auth_server_pas' => 'CVPN3000-Auth-Server-Password',
-  'cvpn3000_auth_server_pri' => 'CVPN3000-Auth-Server-Priority',
-  'cvpn3000_auth_server_typ' => 'CVPN3000-Auth-Server-Type',
-  'cvpn3000_authd_user_idle' => 'CVPN3000-Authd-User-Idle-Timeout',
-  'cvpn3000_cisco_ip_phone_' => 'CVPN3000-Cisco-IP-Phone-Bypass',
-  'cvpn3000_dhcp_network_sc' => 'CVPN3000-DHCP-Network-Scope',
-  'cvpn3000_ike_keep_alives' => 'CVPN3000-IKE-Keep-Alives',
+  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter',
+  'x_ascend_host_info' => 'X-Ascend-Host-Info',
+  'erx_egress_policy_name' => 'ERX-Egress-Policy-Name',
+  'erx_ppp_password' => 'ERX-PPP-Password',
+  'user_name' => 'User-Name',
+  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost',
+  'bind_bypass_bypass' => 'Bind-Bypass-Bypass',
+  'usr_rad_multicast_routip' => 'USR-Rad-Multicast-Routing-Proto',
+  'annex_acct_servers' => 'Annex-Acct-Servers',
+  'cvpn5000_tunnel_throughp' => 'CVPN5000-Tunnel-Throughput',
+  'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel',
+  'annex_input_filter' => 'Annex-Input-Filter',
+  'wispr_billing_class_of_s' => 'WISPr-Billing-Class-Of-Service',
+  'nas_port_type' => 'NAS-Port-Type',
+  'cvx_client_assign_dns' => 'CVX-Client-Assign-DNS',
+  'nomadix_maxbytesdown' => 'Nomadix-MaxBytesDown',
+  'ascend_endpoint_disc' => 'Ascend-Endpoint-Disc',
+  'tunnel_police_burst' => 'Tunnel-Police-Burst',
+  'bind_auth_max_sessions' => 'Bind-Auth-Max-Sessions',
+  'cvx_identification' => 'CVX-Identification',
   'cvpn3000_ipsec_allow_pas' => 'CVPN3000-IPSec-Allow-Passwd-Store',
-  'cvpn3000_ipsec_auth_on_r' => 'CVPN3000-IPSec-Auth-On-Rekey',
-  'cvpn3000_ipsec_authentic' => 'CVPN3000-IPSec-Authentication',
-  'cvpn3000_ipsec_authoriza' => 'CVPN3000-IPSec-Authorization-Type',
-  'cvpn3000_ipsec_authorizb' => 'CVPN3000-IPSec-Authorization-Required',
-  'cvpn3000_ipsec_backup_se' => 'CVPN3000-IPSec-Backup-Servers',
-  'cvpn3000_ipsec_backup_sf' => 'CVPN3000-IPSec-Backup-Server-List',
-  'cvpn3000_ipsec_banner1'   => 'CVPN3000-IPSec-Banner1',
-  'cvpn3000_ipsec_banner2'   => 'CVPN3000-IPSec-Banner2',
-  'cvpn3000_ipsec_client_fw' => 'CVPN3000-IPSec-Client-Fw-Filter-Name',
-  'cvpn3000_ipsec_client_fx' => 'CVPN3000-IPSec-Client-Fw-Filter-Opt',
-  'cvpn3000_ipsec_confidenc' => 'CVPN3000-IPSec-Confidence-Level',
-  'cvpn3000_ipsec_default_d' => 'CVPN3000-IPSec-Default-Domain',
-  'cvpn3000_ipsec_dn_field'  => 'CVPN3000-IPSec-DN-Field',
-  'cvpn3000_ipsec_group_nam' => 'CVPN3000-IPSec-Group-Name',
-  'cvpn3000_ipsec_ike_peer_' => 'CVPN3000-IPSec-IKE-Peer-ID-Check',
-  'cvpn3000_ipsec_ip_compre' => 'CVPN3000-IPSec-IP-Compression',
-  'cvpn3000_ipsec_ltl_keepa' => 'CVPN3000-IPSec-LTL-Keepalives',
-  'cvpn3000_ipsec_mode_conf' => 'CVPN3000-IPSec-Mode-Config',
-  'cvpn3000_ipsec_over_udp'  => 'CVPN3000-IPSec-Over-UDP',
-  'cvpn3000_ipsec_over_udp_' => 'CVPN3000-IPSec-Over-UDP-Port',
+  'ascend_calling_id_type_o' => 'Ascend-Calling-Id-Type-Of-Num',
+  'x_ascend_fr_dce_n392' => 'X-Ascend-FR-DCE-N392',
+  'usr_connect_term_reason' => 'USR-Connect-Term-Reason',
+  'erx_egress_statistics' => 'ERX-Egress-Statistics',
+  'ascend_fr_dte_n392' => 'Ascend-FR-DTE-N392',
+  'usr_esn' => 'USR-ESN',
+  'x_ascend_fr_dte_n392' => 'X-Ascend-FR-DTE-N392',
+  'itk_modem_init_string' => 'ITK-Modem-Init-String',
+  'x_ascend_fr_nailed_grp' => 'X-Ascend-FR-Nailed-Grp',
+  'ascend_bridge_non_pppoe' => 'Ascend-Bridge-Non-PPPoE',
   'cvpn3000_ipsec_reqrd_cli' => 'CVPN3000-IPSec-Reqrd-Client-Fw-Cap',
-  'cvpn3000_ipsec_sec_assoc' => 'CVPN3000-IPSec-Sec-Association',
-  'cvpn3000_ipsec_split_dns' => 'CVPN3000-IPSec-Split-DNS-Names',
-  'cvpn3000_ipsec_split_tun' => 'CVPN3000-IPSec-Split-Tunnel-List',
-  'cvpn3000_ipsec_split_tuo' => 'CVPN3000-IPSec-Split-Tunneling-Policy',
-  'cvpn3000_ipsec_tunnel_ty' => 'CVPN3000-IPSec-Tunnel-Type',
-  'cvpn3000_ipsec_user_grou' => 'CVPN3000-IPSec-User-Group-Lock',
+  'ascend_ipx_alias' => 'Ascend-IPX-Alias',
+  'acc_tunnel_port' => 'Acc-Tunnel-Port',
+  'quintum_h323_return_code' => 'Quintum-h323-return-code',
   'cvpn3000_l2tp_encryption' => 'CVPN3000-L2TP-Encryption',
-  'cvpn3000_l2tp_min_auth_p' => 'CVPN3000-L2TP-Min-Auth-Protocol',
-  'cvpn3000_l2tp_mppc_compr' => 'CVPN3000-L2TP-MPPC-Compression',
-  'cvpn3000_leap_bypass'     => 'CVPN3000-LEAP-Bypass',
-  'cvpn3000_ms_client_icpt_' => 'CVPN3000-MS-Client-Icpt-DHCP-Conf-Msg',
-  'cvpn3000_ms_client_subne' => 'CVPN3000-MS-Client-Subnet-Mask',
-  'cvpn3000_partition_max_s' => 'CVPN3000-Partition-Max-Sessions',
-  'cvpn3000_partition_mobil' => 'CVPN3000-Partition-Mobile-IP-Key',
-  'cvpn3000_partition_mobim' => 'CVPN3000-Partition-Mobile-IP-Address',
-  'cvpn3000_partition_mobin' => 'CVPN3000-Partition-Mobile-IP-SPI',
-  'cvpn3000_partition_premi' => 'CVPN3000-Partition-Premise-Router',
-  'cvpn3000_partition_prima' => 'CVPN3000-Partition-Primary-DHCP',
-  'cvpn3000_partition_secon' => 'CVPN3000-Partition-Secondary-DHCP',
-  'cvpn3000_pptp_encryption' => 'CVPN3000-PPTP-Encryption',
-  'cvpn3000_pptp_min_auth_p' => 'CVPN3000-PPTP-Min-Auth-Protocol',
-  'cvpn3000_pptp_mppc_compr' => 'CVPN3000-PPTP-MPPC-Compression',
-  'cvpn3000_primary_dns'     => 'CVPN3000-Primary-DNS',
-  'cvpn3000_primary_wins'    => 'CVPN3000-Primary-WINS',
-  'cvpn3000_priority_on_sep' => 'CVPN3000-Priority-On-SEP',
-  'cvpn3000_reqrd_client_fw' => 'CVPN3000-Reqrd-Client-Fw-Vendor-Code',
-  'cvpn3000_reqrd_client_fx' => 'CVPN3000-Reqrd-Client-Fw-Product-Code',
+  'acct_input_gigawords' => 'Acct-Input-Gigawords',
+  'bind_dot1q_poru' => 'Bind_Dot1q_Port',
+  'altiga_primary_wins_g' => 'Altiga-Primary-WINS-G',
+  'ascend_maximum_channels' => 'Ascend-Maximum-Channels',
+  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password',
+  'x_ascend_ppp_async_map' => 'X-Ascend-PPP-Async-Map',
+  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID',
+  'usr_retrains_requested' => 'USR-Retrains-Requested',
+  'x_ascend_metric' => 'X-Ascend-Metric',
+  'acc_apsm_oversubscribed' => 'Acc-Apsm-Oversubscribed',
+  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode',
+  'erx_atm_pcr' => 'ERX-Atm-PCR',
+  'itk_nas_name' => 'ITK-NAS-Name',
+  'usr_ipx_routing' => 'USR-IPX-Routing',
+  'usr_tunneled_mlpp' => 'USR-Tunneled-MLPP',
+  'usr_send_script5' => 'USR-Send-Script5',
+  'ascend_traffic_shaper' => 'Ascend-Traffic-Shaper',
+  'ascend_client_secondarya' => 'Ascend-Client-Secondary-DNS',
+  'ascend_bacp_enable' => 'Ascend-BACP-Enable',
+  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT',
+  'login_time' => 'Login-Time',
+  'bg_path_cosu' => 'BG_Path_Cost',
+  'aat_require_auth' => 'AAT-Require-Auth',
   'cvpn3000_reqrd_client_fy' => 'CVPN3000-Reqrd-Client-Fw-Description',
-  'cvpn3000_request_auth_ve' => 'CVPN3000-Request-Auth-Vector',
-  'cvpn3000_require_hw_clie' => 'CVPN3000-Require-HW-Client-Auth',
-  'cvpn3000_require_individ' => 'CVPN3000-Require-Individual-User-Auth',
-  'cvpn3000_secondary_dns'   => 'CVPN3000-Secondary-DNS',
-  'cvpn3000_secondary_wins'  => 'CVPN3000-Secondary-WINS',
-  'cvpn3000_sep_card_assign' => 'CVPN3000-SEP-Card-Assignment',
-  'cvpn3000_simultaneous_lo' => 'CVPN3000-Simultaneous-Logins',
-  'cvpn3000_strip_realm'     => 'CVPN3000-Strip-Realm',
-  'cvpn3000_tunneling_proto' => 'CVPN3000-Tunneling-Protocols',
-  'cvpn3000_use_client_addr' => 'CVPN3000-Use-Client-Address',
-  'cvpn3000_user_auth_serve' => 'CVPN3000-User-Auth-Server-Name',
-  'cvpn3000_user_auth_servf' => 'CVPN3000-User-Auth-Server-Port',
-  'cvpn3000_user_auth_servg' => 'CVPN3000-User-Auth-Server-Secret',
-  'cvpn5000_client_assigned' => 'CVPN5000-Client-Assigned-IP',
-  'cvpn5000_client_assignee' => 'CVPN5000-Client-Assigned-IPX',
-  'cvpn5000_client_real_ip'  => 'CVPN5000-Client-Real-IP',
-  'cvpn5000_echo'            => 'CVPN5000-Echo',
-  'cvpn5000_tunnel_throughp' => 'CVPN5000-Tunnel-Throughput',
-  'cvpn5000_vpn_groupinfo'   => 'CVPN5000-VPN-GroupInfo',
-  'cvpn5000_vpn_password'    => 'CVPN5000-VPN-Password',
-  'cvx_assign_ip_pool'       => 'CVX-Assign-IP-Pool',
-  'cvx_client_assign_dns'    => 'CVX-Client-Assign-DNS',
-  'cvx_data_filter'          => 'CVX-Data-Filter',
-  'cvx_data_rate'            => 'CVX-Data-Rate',
-  'cvx_disconnect_cause'     => 'CVX-Disconnect-Cause',
-  'cvx_identification'       => 'CVX-Identification',
-  'cvx_idle_limit'           => 'CVX-Idle-Limit',
-  'cvx_ipsvc_aznlvl'         => 'CVX-IPSVC-AZNLVL',
-  'cvx_ipsvc_mask'           => 'CVX-IPSVC-Mask',
-  'cvx_maximum_channels'     => 'CVX-Maximum-Channels',
-  'cvx_modem_begin_modulati' => 'CVX-Modem-Begin-Modulation',
-  'cvx_modem_begin_recv_lin' => 'CVX-Modem-Begin-Recv-Line-Lvl',
-  'cvx_modem_data_compressi' => 'CVX-Modem-Data-Compression',
+  'ascend_call_type' => 'Ascend-Call-Type',
+  'erx_address_pool_name' => 'ERX-Address-Pool-Name',
+  'cvpn3000_ipsec_backup_sf' => 'CVPN3000-IPSec-Backup-Server-List',
+  'h323_incoming_conf_id' => 'h323-incoming-conf-id',
+  'user_profile' => 'User-Profile',
+  'ip_host_adds' => 'Ip_Host_Addr',
+  'ns_primary_wins' => 'NS-Primary-WINS',
+  'packet_type' => 'Packet-Type',
+  'bind_auth_max_sessiont' => 'Bind_Auth_Max_Sessions',
+  'altiga_allow_alpha_only_' => 'Altiga-Allow-Alpha-Only-Passwords-G',
+  'usr_security_resp_limit' => 'USR-Security-Resp-Limit',
+  'ip_address_pool_name' => 'Ip-Address-Pool-Name',
+  'ascend_ipx_node_addr' => 'Ascend-IPX-Node-Addr',
+  'ascend_cbcp_trunk_group' => 'Ascend-CBCP-Trunk-Group',
+  'ascend_menu_selector' => 'Ascend-Menu-Selector',
+  'ascend_assign_ip_global_' => 'Ascend-Assign-IP-Global-Pool',
+  'usr_ds0s' => 'USR-DS0s',
+  'usr_actual_voltage' => 'USR-Actual-Voltage',
+  'quintum_h323_call_type' => 'Quintum-h323-call-type',
+  'annex_sw_version' => 'Annex-SW-Version',
+  'ascend_receive_secret' => 'Ascend-Receive-Secret',
+  'bintec_qospolicytable' => 'BinTec-qosPolicyTable',
+  'usr_ip_rip_policies' => 'USR-IP-RIP-Policies',
+  'redcreek_tunneled_ip_add' => 'RedCreek-Tunneled-IP-Addr',
+  'ascend_pw_warntime' => 'Ascend-PW-Warntime',
+  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count',
+  'usr_blocks_resent' => 'USR-Blocks-Resent',
+  'usr_fallback_enabled' => 'USR-Fallback-Enabled',
+  'arap_challenge_response' => 'ARAP-Challenge-Response',
+  'tunnel_session_auth' => 'Tunnel-Session-Auth',
+  'usr_sync_async_mode' => 'USR-Sync-Async-Mode',
+  'itk_dialout_type' => 'ITK-Dialout-Type',
+  'extreme_netlogin_url' => 'Extreme-Netlogin-Url',
+  'client_port_dnis' => 'Client-Port-DNIS',
+  'digest_realm' => 'Digest-Realm',
+  'ascend_ppp_vj_1172' => 'Ascend-PPP-VJ-1172',
+  'ascend_fr_n391' => 'Ascend-FR-N391',
+  'ascend_remote_addr' => 'Ascend-Remote-Addr',
+  'client_port_id' => 'Client-Port-Id',
+  'digest_body_digest' => 'Digest-Body-Digest',
+  'le_ipsec_active_profile' => 'LE-IPSec-Active-Profile',
+  'digest_cnonce' => 'Digest-CNonce',
+  'usr_port_tap_facility' => 'USR-Port-Tap-Facility',
+  'usr_callback_type' => 'USR-Callback-Type',
+  'client_dns_prj' => 'Client_DNS_Pri',
+  'digest_response' => 'Digest-Response',
+  'login_lat_group' => 'Login-LAT-Group',
+  'x_ascend_call_type' => 'X-Ascend-Call-Type',
+  'ascend_route_ip' => 'Ascend-Route-IP',
+  'usr_rad_multicast_routio' => 'USR-Rad-Multicast-Routing-RtLim',
+  'usr_pw_vpn_id' => 'USR-PW_VPN_ID',
   'cvx_modem_end_modulation' => 'CVX-Modem-End-Modulation',
-  'cvx_modem_end_recv_line_' => 'CVX-Modem-End-Recv-Line-Lvl',
-  'cvx_modem_error_correcti' => 'CVX-Modem-Error-Correction',
-  'cvx_modem_local_rate_neg' => 'CVX-Modem-Local-Rate-Negs',
-  'cvx_modem_local_retrains' => 'CVX-Modem-Local-Retrains',
-  'cvx_modem_remote_rate_ne' => 'CVX-Modem-Remote-Rate-Negs',
-  'cvx_modem_remote_retrain' => 'CVX-Modem-Remote-Retrains',
-  'cvx_modem_retx_packets'   => 'CVX-Modem-ReTx-Packets',
-  'cvx_modem_snr'            => 'CVX-Modem-SNR',
-  'cvx_modem_tx_packets'     => 'CVX-Modem-Tx-Packets',
-  'cvx_multicast_client'     => 'CVX-Multicast-Client',
-  'cvx_multicast_rate_limit' => 'CVX-Multicast-Rate-Limit',
-  'cvx_multilink_group_numb' => 'CVX-Multilink-Group-Number',
-  'cvx_multilink_match_info' => 'CVX-Multilink-Match-Info',
-  'cvx_ppp_address'          => 'CVX-PPP-Address',
-  'cvx_ppp_log_mask'         => 'CVX-PPP-Log-Mask',
-  'cvx_presession_time'      => 'CVX-PreSession-Time',
-  'cvx_primary_dns'          => 'CVX-Primary-DNS',
-  'cvx_radius_redirect'      => 'CVX-Radius-Redirect',
-  'cvx_secondary_dns'        => 'CVX-Secondary-DNS',
-  'cvx_ss7_session_id_type'  => 'CVX-SS7-Session-ID-Type',
-  'cvx_vpop_id'              => 'CVX-VPOP-ID',
-  'cvx_xmit_rate'            => 'CVX-Xmit-Rate',
-  'dhcp_max_leases'          => 'DHCP_Max_Leases',
-  'dhcp_max_leaset'          => 'DHCP-Max-Leases',
-  'dialback_name'            => 'Dialback-Name',
-  'dialback_no'              => 'Dialback-No',
-  'digest_algorithm'         => 'Digest-Algorithm',
-  'digest_attributes'        => 'Digest-Attributes',
-  'digest_body_digest'       => 'Digest-Body-Digest',
-  'digest_cnonce'            => 'Digest-CNonce',
-  'digest_method'            => 'Digest-Method',
-  'digest_nonce'             => 'Digest-Nonce',
-  'digest_nonce_count'       => 'Digest-Nonce-Count',
-  'digest_qop'               => 'Digest-QOP',
-  'digest_realm'             => 'Digest-Realm',
-  'digest_response'          => 'Digest-Response',
-  'digest_uri'               => 'Digest-URI',
-  'digest_user_name'         => 'Digest-User-Name',
-  'eap_code'                 => 'EAP-Code',
-  'eap_id'                   => 'EAP-Id',
-  'eap_md5_password'         => 'EAP-MD5-Password',
-  'eap_message'              => 'EAP-Message',
-  'eap_sim_any_id_req'       => 'EAP-Sim-ANY_ID_REQ',
-  'eap_sim_checkcode'        => 'EAP-Sim-CHECKCODE',
-  'eap_sim_counter'          => 'EAP-Sim-COUNTER',
-  'eap_sim_counter_too_smal' => 'EAP-Sim-COUNTER_TOO_SMALL',
-  'eap_sim_encr_data'        => 'EAP-Sim-ENCR_DATA',
-  'eap_sim_extra'            => 'EAP-Sim-EXTRA',
-  'eap_sim_fullauth_id_req'  => 'EAP-Sim-FULLAUTH_ID_REQ',
-  'eap_sim_hmac'             => 'EAP-Sim-HMAC',
-  'eap_sim_identity'         => 'EAP-Sim-IDENTITY',
-  'eap_sim_imsi'             => 'EAP-Sim-IMSI',
-  'eap_sim_iv'               => 'EAP-Sim-IV',
-  'eap_sim_kc1'              => 'EAP-Sim-KC1',
-  'eap_sim_kc2'              => 'EAP-Sim-KC2',
-  'eap_sim_kc3'              => 'EAP-Sim-KC3',
-  'eap_sim_key'              => 'EAP-Sim-KEY',
-  'eap_sim_mac'              => 'EAP-Sim-MAC',
-  'eap_sim_next_pseudonum'   => 'EAP-Sim-NEXT_PSEUDONUM',
-  'eap_sim_next_reauth_id'   => 'EAP-Sim-NEXT_REAUTH_ID',
-  'eap_sim_nonce_mt'         => 'EAP-Sim-NONCE_MT',
-  'eap_sim_nonce_s'          => 'EAP-Sim-NONCE_S',
-  'eap_sim_notification'     => 'EAP-Sim-NOTIFICATION',
-  'eap_sim_padding'          => 'EAP-Sim-PADDING',
-  'eap_sim_permanent_id_req' => 'EAP-Sim-PERMANENT_ID_REQ',
-  'eap_sim_rand'             => 'EAP-Sim-RAND',
-  'eap_sim_rand1'            => 'EAP-Sim-Rand1',
-  'eap_sim_rand2'            => 'EAP-Sim-Rand2',
-  'eap_sim_rand3'            => 'EAP-Sim-Rand3',
-  'eap_sim_selected_version' => 'EAP-Sim-SELECTED_VERSION',
-  'eap_sim_sres1'            => 'EAP-Sim-SRES1',
-  'eap_sim_sres2'            => 'EAP-Sim-SRES2',
-  'eap_sim_sres3'            => 'EAP-Sim-SRES3',
-  'eap_sim_state'            => 'EAP-Sim-State',
-  'eap_sim_subtype'          => 'EAP-Sim-Subtype',
-  'eap_sim_version_list'     => 'EAP-Sim-VERSION_LIST',
-  'eap_tls_require_client_c' => 'EAP-TLS-Require-Client-Cert',
-  'eap_type'                 => 'EAP-Type',
-  'eap_type_gtc'             => 'EAP-Type-GTC',
-  'eap_type_identity'        => 'EAP-Type-Identity',
-  'eap_type_leap'            => 'EAP-Type-LEAP',
-  'eap_type_md5'             => 'EAP-Type-MD5',
-  'eap_type_nak'             => 'EAP-Type-NAK',
-  'eap_type_notification'    => 'EAP-Type-Notification',
-  'eap_type_otp'             => 'EAP-Type-OTP',
-  'eap_type_peap'            => 'EAP-Type-PEAP',
-  'eap_type_sim'             => 'EAP-Type-SIM',
-  'eap_type_sim2'            => 'EAP-Type-SIM2',
-  'eap_type_tls'             => 'EAP-Type-TLS',
-  'eap_type_ttls'            => 'EAP-Type-TTLS',
-  'error_cause'              => 'Error-Cause',
-  'erx_address_pool_name'    => 'ERX-Address-Pool-Name',
-  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level',
-  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name',
-  'erx_atm_mbs'              => 'ERX-Atm-MBS',
-  'erx_atm_pcr'              => 'ERX-Atm-PCR',
-  'erx_atm_scr'              => 'ERX-Atm-SCR',
-  'erx_atm_service_category' => 'ERX-Atm-Service-Category',
-  'erx_bearer_type'          => 'ERX-Bearer-Type',
-  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access',
-  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level',
-  'erx_dial_out_number'      => 'ERX-Dial-Out-Number',
-  'erx_egress_policy_name'   => 'ERX-Egress-Policy-Name',
-  'erx_egress_statistics'    => 'ERX-Egress-Statistics',
-  'erx_framed_ip_route_tag'  => 'ERX-Framed-Ip-Route-Tag',
-  'erx_igmp_enable'          => 'ERX-Igmp-Enable',
-  'erx_ingress_policy_name'  => 'ERX-Ingress-Policy-Name',
-  'erx_ingress_statistics'   => 'ERX-Ingress-Statistics',
-  'erx_input_gigapkts'       => 'ERX-Input-Gigapkts',
-  'erx_ipv6_local_interface' => 'ERX-IpV6-Local-Interface',
-  'erx_ipv6_primary_dns'     => 'ERX-Ipv6-Primary-Dns',
-  'erx_ipv6_secondary_dns'   => 'ERX-Ipv6-Secondary-Dns',
-  'erx_ipv6_virtual_router'  => 'ERX-IpV6-Virtual-Router',
-  'erx_local_loopback_inter' => 'ERX-Local-Loopback-Interface',
-  'erx_maximum_bps'          => 'ERX-Maximum-BPS',
-  'erx_minimum_bps'          => 'ERX-Minimum-BPS',
-  'erx_output_gigapkts'      => 'ERX-Output-Gigapkts',
-  'erx_ppp_auth_protocol'    => 'ERX-PPP-Auth-Protocol',
-  'erx_ppp_password'         => 'ERX-PPP-Password',
-  'erx_ppp_username'         => 'ERX-PPP-Username',
-  'erx_pppoe_description'    => 'ERX-Pppoe-Description',
-  'erx_pppoe_max_sessions'   => 'ERX-Pppoe-Max-Sessions',
-  'erx_pppoe_url'            => 'ERX-Pppoe-Url',
-  'erx_primary_dns'          => 'ERX-Primary-Dns',
-  'erx_primary_wins'         => 'ERX-Primary-Wins',
-  'erx_qos_profile_interfac' => 'ERX-Qos-Profile-Interface-Type',
-  'erx_qos_profile_name'     => 'ERX-Qos-Profile-Name',
-  'erx_redirect_vr_name'     => 'ERX-Redirect-VR-Name',
-  'erx_sa_validate'          => 'ERX-Sa-Validate',
-  'erx_secondary_dns'        => 'ERX-Secondary-Dns',
-  'erx_secondary_wins'       => 'ERX-Secondary-Wins',
-  'erx_service_bundle'       => 'ERX-Service-Bundle',
-  'erx_tunnel_interface_id'  => 'ERX-Tunnel-Interface-Id',
-  'erx_tunnel_maximum_sessi' => 'ERX-Tunnel-Maximum-Sessions',
+  'cvpn3000_pptp_mppc_compr' => 'CVPN3000-PPTP-MPPC-Compression',
+  'cisco_pre_output_octets' => 'Cisco-Pre-Output-Octets',
+  'h323_billing_model' => 'h323-billing-model',
+  'usr_equalization_type' => 'USR-Equalization-Type',
+  'acc_clearing_cause' => 'Acc-Clearing-Cause',
+  'altiga_access_hours_g_u' => 'Altiga-Access-Hours-G/U',
+  'cvpn3000_ipsec_user_grou' => 'CVPN3000-IPSec-User-Group-Lock',
+  'x_ascend_menu_selector' => 'X-Ascend-Menu-Selector',
+  'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout',
+  'ascend_fr_linkup' => 'Ascend-FR-LinkUp',
+  'annex_num_in_multilink' => 'Annex-Num-In-Multilink',
+  'police_burst' => 'Police-Burst',
+  'altiga_l2tp_min_authenti' => 'Altiga-L2TP-Min-Authentication-G/U',
+  'ascend_filter_required' => 'Ascend-Filter-Required',
+  'x_ascend_idle_limit' => 'X-Ascend-Idle-Limit',
+  'nomadix_logoff_url' => 'Nomadix-Logoff-URL',
+  'cvpn3000_ms_client_icpt_' => 'CVPN3000-MS-Client-Icpt-DHCP-Conf-Msg',
+  'ip_tos_field' => 'IP-TOS-Field',
+  'ascend_ip_tos_apply_to' => 'Ascend-IP-TOS-Apply-To',
+  'usr_call_event_code' => 'USR-Call-Event-Code',
+  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter',
+  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action',
+  'usr_rmmie_product_code' => 'USR-RMMIE-Product-Code',
+  'usr_host_type' => 'USR-Host-Type',
+  'erx_tunnel_interface_id' => 'ERX-Tunnel-Interface-Id',
+  'ascend_send_auth' => 'Ascend-Send-Auth',
+  'shiva_compression_type' => 'Shiva-Compression-Type',
+  'itk_banner' => 'ITK-Banner',
+  'ascend_ft1_caller' => 'Ascend-FT1-Caller',
+  'filter_id' => 'Filter-Id',
+  'annex_pre_output_octets' => 'Annex-Pre-Output-Octets',
+  'acct_mcast_in_octett' => 'Acct_Mcast_In_Octets',
+  'usr_log_filter_packets' => 'USR-Log-Filter-Packets',
+  'ascend_fr_nailed_grp' => 'Ascend-FR-Nailed-Grp',
+  'ascend_atm_loopback_cell' => 'Ascend-ATM-Loopback-Cell-Loss',
+  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter',
+  'acc_input_errors' => 'Acc-Input-Errors',
+  'x_ascend_user_acct_port' => 'X-Ascend-User-Acct-Port',
+  'erx_secondary_wins' => 'ERX-Secondary-Wins',
+  'usr_rmmie_serial_number' => 'USR-RMMIE-Serial-Number',
+  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter',
+  'ns_primary_dns' => 'NS-Primary-DNS',
+  'usr_slot_connected_to' => 'USR-Slot-Connected-To',
+  'shiva_disconnect_reason' => 'Shiva-Disconnect-Reason',
+  'cvpn5000_client_assignee' => 'CVPN5000-Client-Assigned-IPX',
+  'cvx_radius_redirect' => 'CVX-Radius-Redirect',
+  'usr_receive_acc_map' => 'USR-Receive-Acc-Map',
+  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol',
+  'itk_acct_serv_ip' => 'ITK-Acct-Serv-IP',
+  'ascend_fr_type' => 'Ascend-FR-Type',
+  'ascend_client_assign_dns' => 'Ascend-Client-Assign-DNS',
+  'annex_retrain_requests_r' => 'Annex-Retrain-Requests-Rcvd',
+  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool',
+  'tunnel_client_endpoint' => 'Tunnel-Client-Endpoint',
+  'alteon_service_type' => 'Alteon-Service-Type',
+  'x_ascend_send_secret' => 'X-Ascend-Send-Secret',
+  'x_ascend_call_filter' => 'X-Ascend-Call-Filter',
+  'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter',
+  'x_ascend_maximum_time' => 'X-Ascend-Maximum-Time',
+  'pvc_profile_name' => 'PVC-Profile-Name',
+  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name',
+  'cvpn3000_ipsec_split_dns' => 'CVPN3000-IPSec-Split-DNS-Names',
+  'ascend_global_call_id' => 'Ascend-Global-Call-Id',
+  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate',
+  'st_primary_nbns_server' => 'ST-Primary-NBNS-Server',
+  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit',
+  'tunnel_local_name' => 'Tunnel-Local-Name',
+  'ascend_fr_t392' => 'Ascend-FR-T392',
+  'annex_pool_id' => 'Annex-Pool-Id',
+  'ascend_token_immediate' => 'Ascend-Token-Immediate',
+  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date',
+  'wispr_bandwidth_min_down' => 'WISPr-Bandwidth-Min-Down',
+  'usr_chassis_call_slot' => 'USR-Chassis-Call-Slot',
+  'rate_limit_burst' => 'Rate-Limit-Burst',
+  'cisco_route_ip' => 'Cisco-Route-IP',
+  'xedia_netbios_server' => 'Xedia-NetBios-Server',
+  'session_error_msg' => 'Session-Error-Msg',
+  'dhcp_max_leases' => 'DHCP-Max-Leases',
+  'acc_vpsm_reject_cause' => 'Acc-Vpsm-Reject-Cause',
+  'user_category' => 'User-Category',
+  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit',
+  'cvpn3000_ipsec_auth_on_r' => 'CVPN3000-IPSec-Auth-On-Rekey',
+  'altiga_min_password_leng' => 'Altiga-Min-Password-Length-G',
+  'bind_type' => 'Bind-Type',
+  'ascend_tunneling_protoco' => 'Ascend-Tunneling-Protocol',
+  'cvx_modem_retx_packets' => 'CVX-Modem-ReTx-Packets',
+  'usr_framed_ipx_route' => 'USR-Framed-IPX-Route',
+  'rate_limit_rate' => 'Rate-Limit-Rate',
+  'ascend_atm_connect_vpi' => 'Ascend-ATM-Connect-Vpi',
+  'connect_info' => 'Connect-Info',
+  'usr_port_tap_address' => 'USR-Port-Tap-Address',
+  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels',
+  'mcast_receivf' => 'Mcast_Receive',
+  'annex_begin_modulation' => 'Annex-Begin-Modulation',
+  'usr_pw_usr_ifilter_ip' => 'USR-PW_USR_IFilter_IP',
+  'ascend_route_appletalk' => 'Ascend-Route-Appletalk',
+  'ms_chap_lm_enc_pw' => 'MS-CHAP-LM-Enc-PW',
+  'altiga_ipsec_over_nat_po' => 'Altiga-IPSec-Over-NAT-Port-Num-G',
+  'itk_isdn_prot' => 'ITK-ISDN-Prot',
+  'ascend_callback_delay' => 'Ascend-Callback-Delay',
+  'session_error_code' => 'Session-Error-Code',
+  'nomadix_endofsession' => 'Nomadix-EndofSession',
+  'x_ascend_bacp_enable' => 'X-Ascend-BACP-Enable',
+  'bg_trans_bpdu' => 'BG-Trans-BPDU',
+  'bind_int_interface_namf' => 'Bind_Int_Interface_Name',
+  'foundry_privilege_level' => 'Foundry-Privilege-Level',
+  'huntgroup_name' => 'Huntgroup-Name',
+  'x_ascend_ipx_alias' => 'X-Ascend-IPX-Alias',
+  'tunnel_l2f_second_passwp' => 'Tunnel_L2F_Second_Password',
+  'xedia_dns_server' => 'Xedia-DNS-Server',
+  'usr_ipx_wan' => 'USR-IPX-WAN',
+  'annex_addr_resolution_se' => 'Annex-Addr-Resolution-Servers',
+  'acct_output_octets_65' => 'Acct_Output_Octets_64',
+  'menu' => 'Menu',
   'erx_tunnel_nas_port_meth' => 'ERX-Tunnel-Nas-Port-Method',
-  'erx_tunnel_password'      => 'ERX-Tunnel-Password',
-  'erx_tunnel_tos'           => 'ERX-Tunnel-Tos',
+  'aat_output_octets_diff' => 'AAT-Output-Octets-Diff',
+  'x_ascend_fr_direct_dlci' => 'X-Ascend-FR-Direct-DLCI',
+  'acct_status_type' => 'Acct-Status-Type',
+  'ascend_port_redir_server' => 'Ascend-Port-Redir-Server',
+  'telebit_port_name' => 'Telebit-Port-Name',
+  'acc_dns_server_sec' => 'Acc-Dns-Server-Sec',
+  'cvx_modem_remote_retrain' => 'CVX-Modem-Remote-Retrains',
+  'ascend_minimum_channels' => 'Ascend-Minimum-Channels',
+  'ascend_ipx_route' => 'Ascend-IPX-Route',
+  'ascend_telnet_profile' => 'Ascend-Telnet-Profile',
+  'usr_call_connect_in_gmt' => 'USR-Call-Connect-in-GMT',
+  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules',
+  'x_ascend_dba_monitor' => 'X-Ascend-DBA-Monitor',
+  'response_packet_type' => 'Response-Packet-Type',
+  'usr_event_id' => 'USR-Event-Id',
+  'cvpn3000_ipsec_over_udp_' => 'CVPN3000-IPSec-Over-UDP-Port',
+  'ascend_inc_channel_count' => 'Ascend-Inc-Channel-Count',
+  'usr_send_script3' => 'USR-Send-Script3',
+  'annex_pre_input_packets' => 'Annex-Pre-Input-Packets',
+  'framed_callback_id' => 'Framed-Callback-Id',
+  'xedia_client_access_netw' => 'Xedia-Client-Access-Network',
+  'arap_zone_access' => 'ARAP-Zone-Access',
+  'ascend_port_redir_portnu' => 'Ascend-Port-Redir-Portnum',
+  'service_type' => 'Service-Type',
+  'usr_nfas_id' => 'USR-NFAS-ID',
+  'shiva_calling_number' => 'Shiva-Calling-Number',
+  'ascend_user_acct_host' => 'Ascend-User-Acct-Host',
+  'tunnel_session_auth_serv' => 'Tunnel-Session-Auth-Service-Grp',
+  'juniper_deny_commands' => 'Juniper-Deny-Commands',
+  'ascend_fr_link_mgt' => 'Ascend-FR-Link-Mgt',
+  'nokia_imsi' => 'Nokia-IMSI',
+  'quintum_h323_prompt_id' => 'Quintum-h323-prompt-id',
+  'cvpn3000_require_individ' => 'CVPN3000-Require-Individual-User-Auth',
+  'tunnel_retransmiu' => 'Tunnel_Retransmit',
+  'source_validatioo' => 'Source_Validation',
+  'sip_to' => 'Sip-To',
+  'ms_primary_nbns_server' => 'MS-Primary-NBNS-Server',
+  'quintum_avpair' => 'Quintum-AVPair',
+  'ascend_transit_number' => 'Ascend-Transit-Number',
+  'ascend_cache_refresh' => 'Ascend-Cache-Refresh',
+  'ascend_user_acct_type' => 'Ascend-User-Acct-Type',
+  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed',
+  'usr_mic' => 'USR-MIC',
+  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason',
+  'cisco_fax_auth_status' => 'Cisco-Fax-Auth-Status',
+  'bind_dot1q_vlan_tag_ie' => 'Bind_Dot1q_Vlan_Tag_Id',
+  'ms_chap2_success' => 'MS-CHAP2-Success',
   'erx_tunnel_virtual_route' => 'ERX-Tunnel-Virtual-Router',
-  'erx_virtual_router_name'  => 'ERX-Virtual-Router-Name',
-  'event_timestamp'          => 'Event-Timestamp',
-  'exec_program'             => 'Exec-Program',
-  'exec_program_wait'        => 'Exec-Program-Wait',
-  'expiration'               => 'Expiration',
-  'extreme_netlogin_only'    => 'Extreme-Netlogin-Only',
-  'extreme_netlogin_url'     => 'Extreme-Netlogin-Url',
+  'cisco_idle_limit' => 'Cisco-Idle-Limit',
+  'ascend_pw_lifetime' => 'Ascend-PW-Lifetime',
+  'cvpn3000_access_hours' => 'CVPN3000-Access-Hours',
+  'bintec_sapcirctable' => 'BinTec-sapCircTable',
+  'usr_packet_bus_session' => 'USR-Packet-Bus-Session',
+  'acct_input_packets_64' => 'Acct-Input-Packets-64',
+  'ascend_x25_pad_x3_parame' => 'Ascend-X25-Pad-X3-Parameters',
+  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server',
+  'ascend_modem_slotno' => 'Ascend-Modem-SlotNo',
+  'digest_qop' => 'Digest-QOP',
+  'usr_characters_received' => 'USR-Characters-Received',
+  'rate_limit_ratf' => 'Rate_Limit_Rate',
+  'ms_bap_usage' => 'MS-BAP-Usage',
+  'cisco_data_filter' => 'Cisco-Data-Filter',
+  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage',
+  'h323_setup_time' => 'h323-setup-time',
+  'annex_wan_number' => 'Annex-Wan-Number',
+  'cvx_vpop_id' => 'CVX-VPOP-ID',
+  'usr_pw_tunnel_authentica' => 'USR-PW_Tunnel_Authentication',
+  'le_nat_outsource_inmap' => 'LE-NAT-Outsource-Inmap',
+  'cvx_modem_begin_recv_lin' => 'CVX-Modem-Begin-Recv-Line-Lvl',
+  'telebit_login_command' => 'Telebit-Login-Command',
+  'cisco_command_code' => 'Cisco-Command-Code',
+  'itk_ppp_auth_type' => 'ITK-PPP-Auth-Type',
+  'bintec_qosiftable' => 'BinTec-qosIfTable',
+  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent',
+  'usr_sap_filter_in' => 'USR-SAP-Filter-In',
+  'framed_appletalk_link' => 'Framed-AppleTalk-Link',
+  'tunnel_domaio' => 'Tunnel_Domain',
+  'usr_ipx' => 'USR-IPX',
+  'nas_real_poru' => 'NAS_Real_Port',
+  'shiva_connect_reason' => 'Shiva-Connect-Reason',
+  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets',
+  'cisco_ppp_vj_slot_comp' => 'Cisco-PPP-VJ-Slot-Comp',
+  'freeradius_proxied_to' => 'Freeradius-Proxied-To',
+  'ascend_atm_vpi' => 'Ascend-ATM-Vpi',
+  'acc_ml_mlx_admin_state' => 'Acc-ML-MLX-Admin-State',
+  'cvx_modem_snr' => 'CVX-Modem-SNR',
+  'usr_igmp_robustness' => 'USR-IGMP-Robustness',
+  'annex_rate_reneg_req_rcv' => 'Annex-Rate-Reneg-Req-Rcvd',
+  'add_prefix' => 'Add-Prefix',
+  'x_ascend_call_by_call' => 'X-Ascend-Call-By-Call',
+  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI',
+  'postauth_type' => 'PostAuth-Type',
+  'pvc_circuit_paddinh' => 'PVC_Circuit_Padding',
+  'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter',
+  'erx_igmp_enable' => 'ERX-Igmp-Enable',
+  'bind_bypass_contexu' => 'Bind_Bypass_Context',
+  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink',
+  'usr_pw_packet' => 'USR-PW_Packet',
+  'dialback_no' => 'Dialback-No',
+  'ascend_ip_tos_precedence' => 'Ascend-IP-TOS-Precedence',
+  'cvpn5000_vpn_password' => 'CVPN5000-VPN-Password',
+  'annex_cli_filter' => 'Annex-CLI-Filter',
+  'x_ascend_dial_number' => 'X-Ascend-Dial-Number',
+  'usr_iwf_call_identifier' => 'USR-IWF-Call-Identifier',
+  'ms_secondary_dns_server' => 'MS-Secondary-DNS-Server',
+  'shiva_type_of_service' => 'Shiva-Type-Of-Service',
+  'bind_ses_context' => 'Bind-Ses-Context',
+  'acc_reason_code' => 'Acc-Reason-Code',
+  'ms_chap_cpw_1' => 'MS-CHAP-CPW-1',
+  'wispr_bandwidth_max_down' => 'WISPr-Bandwidth-Max-Down',
+  'h323_call_type' => 'h323-call-type',
+  'bind_bypass_bypast' => 'Bind_Bypass_Bypass',
+  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts',
+  'ascend_fr_08_mode' => 'Ascend-FR-08-Mode',
+  'usr_calling_party_number' => 'USR-Calling-Party-Number',
+  'usr_reply_script2' => 'USR-Reply-Script2',
+  'usr_security_login_limit' => 'USR-Security-Login-Limit',
+  'cisco_link_compression' => 'Cisco-Link-Compression',
+  'ascend_vrouter_name' => 'Ascend-VRouter-Name',
+  'erx_ppp_auth_protocol' => 'ERX-PPP-Auth-Protocol',
+  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration',
+  'usr_modem_setup_time' => 'USR-Modem-Setup-Time',
+  'pppoe_urm' => 'PPPOE_URL',
+  'cisco_ip_direct' => 'Cisco-IP-Direct',
+  'x_ascend_temporary_rtes' => 'X-Ascend-Temporary-Rtes',
+  'ascend_x25_pad_alias_3' => 'Ascend-X25-Pad-Alias-3',
+  'annex_multilink_id' => 'Annex-Multilink-Id',
+  'mcast_maxgroupt' => 'Mcast_MaxGroups',
+  'configuration_token' => 'Configuration-Token',
+  'ascend_h323_conference_i' => 'Ascend-H323-Conference-Id',
+  'ascend_ipx_header_compre' => 'Ascend-IPX-Header-Compression',
+  'stripped_user_name' => 'Stripped-User-Name',
+  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter',
+  'cisco_call_filter' => 'Cisco-Call-Filter',
+  'nas_ipv6_address' => 'NAS-IPv6-Address',
+  'termination_menu' => 'Termination-Menu',
+  'ascend_shared_profile_en' => 'Ascend-Shared-Profile-Enable',
+  'port_message' => 'Port-Message',
+  'erx_ingress_policy_name' => 'ERX-Ingress-Policy-Name',
+  'acc_service_profile' => 'Acc-Service-Profile',
+  'ascend_bir_proxy' => 'Ascend-BIR-Proxy',
+  'aat_ppp_address' => 'AAT-PPP-Address',
+  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line',
+  'ascend_x25_nui_prompt' => 'Ascend-X25-Nui-Prompt',
+  'itk_modem_pool_id' => 'ITK-Modem-Pool-Id',
+  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode',
+  'usr_unauthenticated_time' => 'USR-Unauthenticated-Time',
+  'ascend_multicast_gleave_' => 'Ascend-Multicast-GLeave-Delay',
+  'acc_callback_cbcp_type' => 'Acc-Callback-CBCP-Type',
+  'medium_typf' => 'Medium_Type',
+  'login_service' => 'Login-Service',
+  'itk_username_prompt' => 'ITK-Username-Prompt',
+  'ascend_dial_number' => 'Ascend-Dial-Number',
+  'framed_ipv6_route' => 'Framed-IPv6-Route',
+  'x_ascend_remote_addr' => 'X-Ascend-Remote-Addr',
+  'usr_call_end_date_time' => 'USR-Call-End-Date-Time',
+  'bind_dot1q_slot' => 'Bind-Dot1q-Slot',
+  'le_connect_detail' => 'LE-Connect-Detail',
+  'annex_user_level' => 'Annex-User-Level',
+  'tunnel_dnis' => 'Tunnel-DNIS',
+  'assigned_ip_address' => 'Assigned-IP-Address',
+  'acc_bridging_support' => 'Acc-Bridging-Support',
+  'usr_channel' => 'USR-Channel',
+  'arap_security_data' => 'ARAP-Security-Data',
+  'bind_auth_service_grp' => 'Bind-Auth-Service-Grp',
+  'cisco_abort_cause' => 'Cisco-Abort-Cause',
+  'bg_span_dit' => 'BG_Span_Dis',
+  'h323_voice_quality' => 'h323-voice-quality',
+  'lac_real_port_typf' => 'LAC_Real_Port_Type',
+  'usr_channel_connected_to' => 'USR-Channel-Connected-To',
+  'ascend_client_assign_win' => 'Ascend-Client-Assign-WINS',
+  'redcreek_tunneled_gatewa' => 'RedCreek-Tunneled-Gateway',
+  'usr_number_of_fallbacks' => 'USR-Number-of-Fallbacks',
+  'nokia_prepaid_ind' => 'Nokia-Prepaid-Ind',
+  'nomadix_maxbytesup' => 'Nomadix-MaxBytesUp',
+  'login_hosu' => 'Login-Host',
+  'ascend_bir_enable' => 'Ascend-BIR-Enable',
+  'usr_connect_time_limit' => 'USR-Connect-Time-Limit',
+  'ascend_presession_time' => 'Ascend-PreSession-Time',
+  'altiga_simultaneous_logi' => 'Altiga-Simultaneous-Logins-G/U',
+  'cvpn3000_ipsec_default_d' => 'CVPN3000-IPSec-Default-Domain',
+  'aat_atm_vci' => 'AAT-ATM-VCI',
   'extreme_netlogin_url_des' => 'Extreme-Netlogin-Url-Desc',
-  'extreme_netlogin_vlan'    => 'Extreme-Netlogin-Vlan',
-  'fall_through'             => 'Fall-Through',
-  'filter_id'                => 'Filter-Id',
-  'foundry_command_exceptio' => 'Foundry-Command-Exception-Flag',
-  'foundry_command_string'   => 'Foundry-Command-String',
-  'foundry_inm_privilege'    => 'Foundry-INM-Privilege',
-  'foundry_privilege_level'  => 'Foundry-Privilege-Level',
-  'framed_address'           => 'Framed-Address',
-  'framed_appletalk_link'    => 'Framed-AppleTalk-Link',
-  'framed_appletalk_network' => 'Framed-AppleTalk-Network',
-  'framed_appletalk_zone'    => 'Framed-AppleTalk-Zone',
-  'framed_callback_id'       => 'Framed-Callback-Id',
-  'framed_compression'       => 'Framed-Compression',
-  'framed_filter_id'         => 'Framed-Filter-Id',
-  'framed_interface_id'      => 'Framed-Interface-Id',
-  'framed_ip_address'        => 'Framed-IP-Address',
-  'framed_ip_netmask'        => 'Framed-IP-Netmask',
-  'framed_ipv6_pool'         => 'Framed-IPv6-Pool',
-  'framed_ipv6_prefix'       => 'Framed-IPv6-Prefix',
-  'framed_ipv6_route'        => 'Framed-IPv6-Route',
-  'framed_ipx_network'       => 'Framed-IPX-Network',
-  'framed_mtu'               => 'Framed-MTU',
-  'framed_netmask'           => 'Framed-Netmask',
-  'framed_pool'              => 'Framed-Pool',
-  'framed_protocol'          => 'Framed-Protocol',
-  'framed_route'             => 'Framed-Route',
-  'framed_routing'           => 'Framed-Routing',
-  'freeradius_proxied_to'    => 'FreeRADIUS-Proxied-To',
-  'gandalf_around_the_corne' => 'Gandalf-Around-The-Corner',
-  'gandalf_authentication_s' => 'Gandalf-Authentication-String',
-  'gandalf_calling_line_id_' => 'Gandalf-Calling-Line-ID-1',
-  'gandalf_calling_line_ida' => 'Gandalf-Calling-Line-ID-2',
-  'gandalf_channel_group_na' => 'Gandalf-Channel-Group-Name-1',
-  'gandalf_channel_group_nb' => 'Gandalf-Channel-Group-Name-2',
-  'gandalf_compression_stat' => 'Gandalf-Compression-Status',
-  'gandalf_dial_prefix_name' => 'Gandalf-Dial-Prefix-Name-1',
-  'gandalf_dial_prefix_namf' => 'Gandalf-Dial-Prefix-Name-2',
-  'gandalf_fwd_broadcast_in' => 'Gandalf-Fwd-Broadcast-In',
-  'gandalf_fwd_broadcast_ou' => 'Gandalf-Fwd-Broadcast-Out',
-  'gandalf_fwd_multicast_in' => 'Gandalf-Fwd-Multicast-In',
-  'gandalf_fwd_multicast_ou' => 'Gandalf-Fwd-Multicast-Out',
-  'gandalf_fwd_unicast_in'   => 'Gandalf-Fwd-Unicast-In',
-  'gandalf_fwd_unicast_out'  => 'Gandalf-Fwd-Unicast-Out',
-  'gandalf_hunt_group'       => 'Gandalf-Hunt-Group',
-  'gandalf_ipx_spoofing_sta' => 'Gandalf-IPX-Spoofing-State',
-  'gandalf_ipx_watchdog_spo' => 'Gandalf-IPX-Watchdog-Spoof',
-  'gandalf_min_outgoing_bea' => 'Gandalf-Min-Outgoing-Bearer',
-  'gandalf_modem_mode'       => 'Gandalf-Modem-Mode',
-  'gandalf_modem_required_1' => 'Gandalf-Modem-Required-1',
-  'gandalf_modem_required_2' => 'Gandalf-Modem-Required-2',
-  'gandalf_operational_mode' => 'Gandalf-Operational-Modes',
-  'gandalf_phone_number_1'   => 'Gandalf-Phone-Number-1',
-  'gandalf_phone_number_2'   => 'Gandalf-Phone-Number-2',
-  'gandalf_ppp_authenticati' => 'Gandalf-PPP-Authentication',
-  'gandalf_ppp_ncp_type'     => 'Gandalf-PPP-NCP-Type',
-  'gandalf_remote_lan_name'  => 'Gandalf-Remote-LAN-Name',
-  'gandalf_sap_group_name_1' => 'Gandalf-SAP-Group-Name-1',
-  'gandalf_sap_group_name_2' => 'Gandalf-SAP-Group-Name-2',
-  'gandalf_sap_group_name_3' => 'Gandalf-SAP-Group-Name-3',
-  'gandalf_sap_group_name_4' => 'Gandalf-SAP-Group-Name-4',
-  'gandalf_sap_group_name_5' => 'Gandalf-SAP-Group-Name-5',
-  'garderos_location_name'   => 'Garderos-Location-Name',
-  'garderos_service_name'    => 'Garderos-Service-Name',
-  'group'                    => 'Group',
-  'group_name'               => 'Group-Name',
-  'gw_final_xlated_cdn'      => 'gw-final-xlated-cdn',
-  'gw_rxd_cdn'               => 'gw-rxd-cdn',
-  'h323_billing_model'       => 'h323-billing-model',
-  'h323_call_origin'         => 'h323-call-origin',
-  'h323_call_type'           => 'h323-call-type',
-  'h323_conf_id'             => 'h323-conf-id',
-  'h323_connect_time'        => 'h323-connect-time',
-  'h323_credit_amount'       => 'h323-credit-amount',
-  'h323_credit_time'         => 'h323-credit-time',
-  'h323_currency'            => 'h323-currency',
-  'h323_disconnect_cause'    => 'h323-disconnect-cause',
-  'h323_disconnect_time'     => 'h323-disconnect-time',
-  'h323_gw_id'               => 'h323-gw-id',
-  'h323_incoming_conf_id'    => 'h323-incoming-conf-id',
-  'h323_preferred_lang'      => 'h323-preferred-lang',
-  'h323_prompt_id'           => 'h323-prompt-id',
+  'itk_auth_serv_ip' => 'ITK-Auth-Serv-IP',
+  'erx_alternate_cli_vroute' => 'ERX-Alternate-Cli-Vrouter-Name',
+  'framed_compression' => 'Framed-Compression',
+  'ascend_svc_enabled' => 'Ascend-SVC-Enabled',
+  'proxy_state' => 'Proxy-State',
+  'aat_vrouter_name' => 'AAT-Vrouter-Name',
+  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc',
+  'nas_poru' => 'NAS-Port',
+  'wispr_location_name' => 'WISPr-Location-Name',
+  'digest_user_name' => 'Digest-User-Name',
+  'ascend_modem_shelfno' => 'Ascend-Modem-ShelfNo',
+  'shasta_user_privilege' => 'Shasta-User-Privilege',
+  'bind_auth_protocol' => 'Bind-Auth-Protocol',
+  'ascend_home_agent_passwo' => 'Ascend-Home-Agent-Password',
+  'acct_interim_interval' => 'Acct-Interim-Interval',
+  'ascend_history_weigh_typ' => 'Ascend-History-Weigh-Type',
+  'ms_link_drop_time_limit' => 'MS-Link-Drop-Time-Limit',
+  'hint' => 'Hint',
+  'x_ascend_target_util' => 'X-Ascend-Target-Util',
+  'acc_access_partition' => 'Acc-Access-Partition',
+  'usr_power_supply_number' => 'USR-Power-Supply-Number',
+  'x_ascend_multilink_id' => 'X-Ascend-Multilink-ID',
+  'redcreek_tunneled_domain' => 'RedCreek-Tunneled-DomainName',
+  'nomadix_bw_down' => 'Nomadix-Bw-Down',
+  'acc_ipx_compression' => 'Acc-Ipx-Compression',
+  'quintum_h323_setup_time' => 'Quintum-h323-setup-time',
+  'cisco_target_util' => 'Cisco-Target-Util',
+  'acc_ip_gateway_sec' => 'Acc-Ip-Gateway-Sec',
+  'ascend_dsl_cir_xmit_limi' => 'Ascend-Dsl-CIR-Xmit-Limit',
+  'ascend_ip_pool_definitio' => 'Ascend-IP-Pool-Definition',
+  'bind_sub_user_at_contexu' => 'Bind_Sub_User_At_Context',
+  'itk_dest_no' => 'ITK-Dest-No',
+  'usr_connect_time' => 'USR-Connect-Time',
+  'usr_call_start_date_time' => 'USR-Call-Start-Date-Time',
+  'altiga_l2tp_encryption_g' => 'Altiga-L2TP-Encryption-G',
+  'ascend_auth_delay' => 'Ascend-Auth-Delay',
+  'ascend_x25_pad_x3_profil' => 'Ascend-X25-Pad-X3-Profile',
+  'ascend_access_intercepta' => 'Ascend-Access-Intercept-Log',
+  'ascend_home_agent_udp_po' => 'Ascend-Home-Agent-UDP-Port',
+  'bind_tun_context' => 'Bind-Tun-Context',
+  'dialback_name' => 'Dialback-Name',
   'h323_redirect_ip_address' => 'h323-redirect-ip-address',
-  'h323_redirect_number'     => 'h323-redirect-number',
-  'h323_remote_address'      => 'h323-remote-address',
-  'h323_return_code'         => 'h323-return-code',
-  'h323_setup_time'          => 'h323-setup-time',
-  'h323_time_and_day'        => 'h323-time-and-day',
-  'h323_voice_quality'       => 'h323-voice-quality',
-  'hint'                     => 'Hint',
-  'huntgroup_name'           => 'Huntgroup-Name',
-  'idle_timeout'             => 'Idle-Timeout',
-  'incoming_req_uri'         => 'incoming-req-uri',
-  'initial_modulation_type'  => 'Initial-Modulation-Type',
-  'ip3_ip_option'            => 'IP3-IP-Option',
-  'ip3_rdata_rate'           => 'IP3-RData-Rate',
-  'ip3_xdata_rate'           => 'IP3-XData-Rate',
-  'ip_address_pool_name'     => 'Ip_Address_Pool_Name',
-  'ip_address_pool_namf'     => 'Ip-Address-Pool-Name',
-  'ip_host_addr'             => 'Ip_Host_Addr',
-  'ip_host_adds'             => 'Ip-Host-Addr',
-  'ip_tos_field'             => 'IP_TOS_Field',
-  'ip_tos_fiele'             => 'IP-TOS-Field',
-  'itk_acct_serv_ip'         => 'ITK-Acct-Serv-IP',
-  'itk_acct_serv_prot'       => 'ITK-Acct-Serv-Prot',
-  'itk_auth_req_type'        => 'ITK-Auth-Req-Type',
-  'itk_auth_serv_ip'         => 'ITK-Auth-Serv-IP',
-  'itk_auth_serv_prot'       => 'ITK-Auth-Serv-Prot',
-  'itk_banner'               => 'ITK-Banner',
-  'itk_channel_binding'      => 'ITK-Channel-Binding',
-  'itk_ddi'                  => 'ITK-DDI',
-  'itk_dest_no'              => 'ITK-Dest-No',
-  'itk_dialout_type'         => 'ITK-Dialout-Type',
-  'itk_filter_rule'          => 'ITK-Filter-Rule',
-  'itk_ftp_auth_ip'          => 'ITK-Ftp-Auth-IP',
-  'itk_ip_pool'              => 'ITK-IP-Pool',
-  'itk_isdn_prot'            => 'ITK-ISDN-Prot',
-  'itk_modem_init_string'    => 'ITK-Modem-Init-String',
-  'itk_modem_pool_id'        => 'ITK-Modem-Pool-Id',
-  'itk_nas_name'             => 'ITK-NAS-Name',
-  'itk_password_prompt'      => 'ITK-Password-Prompt',
-  'itk_ppp_auth_type'        => 'ITK-PPP-Auth-Type',
-  'itk_ppp_client_server_mo' => 'ITK-PPP-Client-Server-Mode',
-  'itk_ppp_compression_prot' => 'ITK-PPP-Compression-Prot',
-  'itk_prompt'               => 'ITK-Prompt',
-  'itk_provider_id'          => 'ITK-Provider-Id',
-  'itk_start_delay'          => 'ITK-Start-Delay',
-  'itk_tunnel_ip'            => 'ITK-Tunnel-IP',
-  'itk_tunnel_prot'          => 'ITK-Tunnel-Prot',
-  'itk_usergroup'            => 'ITK-Usergroup',
-  'itk_username'             => 'ITK-Username',
-  'itk_username_prompt'      => 'ITK-Username-Prompt',
-  'itk_users_default_entry'  => 'ITK-Users-Default-Entry',
-  'itk_users_default_pw'     => 'ITK-Users-Default-Pw',
-  'itk_welcome_message'      => 'ITK-Welcome-Message',
-  'juniper_allow_commands'   => 'Juniper-Allow-Commands',
-  'juniper_allow_configurat' => 'Juniper-Allow-Configuration',
-  'juniper_deny_commands'    => 'Juniper-Deny-Commands',
-  'juniper_deny_configurati' => 'Juniper-Deny-Configuration',
-  'juniper_local_user_name'  => 'Juniper-Local-User-Name',
-  'karlnet_turbocell_name'   => 'KarlNet-TurboCell-Name',
-  'karlnet_turbocell_opmode' => 'KarlNet-TurboCell-OpMode',
-  'karlnet_turbocell_opstat' => 'KarlNet-TurboCell-OpState',
-  'karlnet_turbocell_txrate' => 'KarlNet-TurboCell-TxRate',
-  'lac_port'                 => 'LAC_Port',
-  'lac_port_type'            => 'LAC_Port_Type',
-  'lac_port_typf'            => 'LAC-Port-Type',
-  'lac_poru'                 => 'LAC-Port',
-  'lac_real_port'            => 'LAC_Real_Port',
-  'lac_real_port_type'       => 'LAC_Real_Port_Type',
-  'lac_real_port_typf'       => 'LAC-Real-Port-Type',
-  'lac_real_poru'            => 'LAC-Real-Port',
-  'ldap_group'               => 'Ldap-Group',
-  'ldap_userdn'              => 'Ldap-UserDn',
-  'le_admin_group'           => 'LE-Admin-Group',
-  'le_advice_of_charge'      => 'LE-Advice-of-Charge',
-  'le_connect_detail'        => 'LE-Connect-Detail',
-  'le_ip_gateway'            => 'LE-IP-Gateway',
-  'le_ip_pool'               => 'LE-IP-Pool',
-  'le_ipsec_active_profile'  => 'LE-IPSec-Active-Profile',
-  'le_ipsec_deny_action'     => 'LE-IPSec-Deny-Action',
-  'le_ipsec_log_options'     => 'LE-IPSec-Log-Options',
-  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile',
-  'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile',
-  'le_modem_info'            => 'LE-Modem-Info',
-  'le_multicast_client'      => 'LE-Multicast-Client',
-  'le_nat_inmap'             => 'LE-NAT-Inmap',
-  'le_nat_log_options'       => 'LE-NAT-Log-Options',
-  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout',
-  'le_nat_outmap'            => 'LE-NAT-Outmap',
-  'le_nat_outsource_inmap'   => 'LE-NAT-Outsource-Inmap',
-  'le_nat_outsource_outmap'  => 'LE-NAT-Outsource-Outmap',
-  'le_nat_sess_dir_fail_act' => 'LE-NAT-Sess-Dir-Fail-Action',
-  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout',
-  'le_terminate_detail'      => 'LE-Terminate-Detail',
-  'lm_password'              => 'LM-Password',
-  'local_web_acct_duration'  => 'Local-Web-Acct-Duration',
-  'local_web_acct_interim_r' => 'Local-Web-Acct-Interim-Rx-Bytes',
-  'local_web_acct_interim_s' => 'Local-Web-Acct-Interim-Rx-Gigawords',
-  'local_web_acct_interim_t' => 'Local-Web-Acct-Interim-Tx-Bytes',
-  'local_web_acct_interim_u' => 'Local-Web-Acct-Interim-Tx-Gigawords',
-  'local_web_acct_interim_v' => 'Local-Web-Acct-Interim-Tx-Mgmt',
-  'local_web_acct_interim_w' => 'Local-Web-Acct-Interim-Rx-Mgmt',
-  'local_web_acct_rx_mgmt'   => 'Local-Web-Acct-Rx-Mgmt',
-  'local_web_acct_time'      => 'Local-Web-Acct-Time',
-  'local_web_acct_tx_mgmt'   => 'Local-Web-Acct-Tx-Mgmt',
-  'local_web_border_router'  => 'Local-Web-Border-Router',
-  'local_web_client_ip'      => 'Local-Web-Client-Ip',
-  'local_web_reauth_counter' => 'Local-Web-Reauth-Counter',
-  'local_web_rx_limit'       => 'Local-Web-Rx-Limit',
-  'local_web_tx_limit'       => 'Local-Web-Tx-Limit',
-  'login_callback_number'    => 'Login-Callback-Number',
-  'login_host'               => 'Login-Host',
-  'login_ip_host'            => 'Login-IP-Host',
-  'login_ipv6_host'          => 'Login-IPv6-Host',
-  'login_lat_group'          => 'Login-LAT-Group',
-  'login_lat_node'           => 'Login-LAT-Node',
-  'login_lat_port'           => 'Login-LAT-Port',
-  'login_lat_service'        => 'Login-LAT-Service',
-  'login_port'               => 'Login-Port',
-  'login_service'            => 'Login-Service',
-  'login_tcp_port'           => 'Login-TCP-Port',
-  'login_time'               => 'Login-Time',
-  'mcast_maxgroups'          => 'Mcast_MaxGroups',
-  'mcast_maxgroupt'          => 'Mcast-MaxGroups',
-  'mcast_receive'            => 'Mcast_Receive',
-  'mcast_receivf'            => 'Mcast-Receive',
-  'mcast_send'               => 'Mcast_Send',
-  'mcast_sene'               => 'Mcast-Send',
-  'medium_type'              => 'Medium_Type',
-  'medium_typf'              => 'Medium-Type',
-  'menu'                     => 'Menu',
-  'merit_proxy_action'       => 'Merit-Proxy-Action',
-  'merit_user_id'            => 'Merit-User-Id',
-  'merit_user_realm'         => 'Merit-User-Realm',
-  'message_authenticator'    => 'Message-Authenticator',
-  'method'                   => 'method',
-  'mikrotik_group'           => 'Mikrotik-Group',
-  'mikrotik_recv_limit'      => 'Mikrotik-Recv-Limit',
-  'mikrotik_xmit_limit'      => 'Mikrotik-Xmit-Limit',
-  'module_failure_message'   => 'Module-Failure-Message',
-  'module_success_message'   => 'Module-Success-Message',
-  'motorola_canopy_cirenabl' => 'Motorola-Canopy-CIRENABLE',
-  'motorola_canopy_dlba'     => 'Motorola-Canopy-DLBA',
-  'motorola_canopy_enable'   => 'Motorola-Canopy-Enable',
-  'motorola_canopy_higherbw' => 'Motorola-Canopy-HIGHERBW',
-  'motorola_canopy_hpcenabl' => 'Motorola-Canopy-HPCENABLE',
-  'motorola_canopy_hpsdldr'  => 'Motorola-Canopy-HPSDLDR',
-  'motorola_canopy_hpsuldr'  => 'Motorola-Canopy-HPSULDR',
-  'motorola_canopy_lpsdldr'  => 'Motorola-Canopy-LPSDLDR',
-  'motorola_canopy_lpsuldr'  => 'Motorola-Canopy-LPSULDR',
-  'motorola_canopy_sdldr'    => 'Motorola-Canopy-SDLDR',
-  'motorola_canopy_shared_s' => 'Motorola-Canopy-Shared-Secret',
-  'motorola_canopy_suldr'    => 'Motorola-Canopy-SULDR',
-  'motorola_canopy_ulba'     => 'Motorola-Canopy-ULBA',
-  'ms_acct_auth_type'        => 'MS-Acct-Auth-Type',
-  'ms_acct_eap_type'         => 'MS-Acct-EAP-Type',
+  'annex_keypress_timeout' => 'Annex-Keypress-Timeout',
+  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name',
+  'ascend_x25_pad_alias_1' => 'Ascend-X25-Pad-Alias-1',
+  'ascend_call_attempt_limi' => 'Ascend-Call-Attempt-Limit',
+  'quintum_h323_currency_ty' => 'Quintum-h323-currency-type',
+  'ms_chap_response' => 'MS-CHAP-Response',
+  'st_secondary_nbns_server' => 'ST-Secondary-NBNS-Server',
+  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type',
+  'usr_max_channels' => 'USR-Max-Channels',
+  'ascend_fr_dte_n393' => 'Ascend-FR-DTE-N393',
+  'ascend_pre_input_octets' => 'Ascend-Pre-Input-Octets',
+  'erx_atm_mbs' => 'ERX-Atm-MBS',
+  'cvpn3000_simultaneous_lo' => 'CVPN3000-Simultaneous-Logins',
+  'juniper_allow_commands' => 'Juniper-Allow-Commands',
+  'usr_line_reversals' => 'USR-Line-Reversals',
+  'itk_users_default_pw' => 'ITK-Users-Default-Pw',
+  'x_ascend_third_prompt' => 'X-Ascend-Third-Prompt',
+  'cisco_fax_msg_id' => 'Cisco-Fax-Msg-Id',
+  'x_ascend_pw_warntime' => 'X-Ascend-PW-Warntime',
+  'ascend_data_filter' => 'Ascend-Data-Filter',
+  'framed_address' => 'Framed-Address',
+  'context_name' => 'Context-Name',
+  'usr_send_script2' => 'USR-Send-Script2',
   'ms_arap_pw_change_reason' => 'MS-ARAP-PW-Change-Reason',
-  'ms_bap_usage'             => 'MS-BAP-Usage',
-  'ms_chap2_cpw'             => 'MS-CHAP2-CPW',
-  'ms_chap2_response'        => 'MS-CHAP2-Response',
-  'ms_chap2_success'         => 'MS-CHAP2-Success',
-  'ms_chap_challenge'        => 'MS-CHAP-Challenge',
-  'ms_chap_cpw_1'            => 'MS-CHAP-CPW-1',
-  'ms_chap_cpw_2'            => 'MS-CHAP-CPW-2',
-  'ms_chap_domain'           => 'MS-CHAP-Domain',
-  'ms_chap_error'            => 'MS-CHAP-Error',
-  'ms_chap_lm_enc_pw'        => 'MS-CHAP-LM-Enc-PW',
-  'ms_chap_mppe_keys'        => 'MS-CHAP-MPPE-Keys',
-  'ms_chap_nt_enc_pw'        => 'MS-CHAP-NT-Enc-PW',
-  'ms_chap_response'         => 'MS-CHAP-Response',
-  'ms_chap_use_ntlm_auth'    => 'MS-CHAP-Use-NTLM-Auth',
-  'ms_filter'                => 'MS-Filter',
-  'ms_link_drop_time_limit'  => 'MS-Link-Drop-Time-Limit',
-  'ms_link_utilization_thre' => 'MS-Link-Utilization-Threshold',
-  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy',
-  'ms_mppe_encryption_type'  => 'MS-MPPE-Encryption-Type',
-  'ms_mppe_encryption_types' => 'MS-MPPE-Encryption-Types',
-  'ms_mppe_recv_key'         => 'MS-MPPE-Recv-Key',
-  'ms_mppe_send_key'         => 'MS-MPPE-Send-Key',
-  'ms_new_arap_password'     => 'MS-New-ARAP-Password',
-  'ms_old_arap_password'     => 'MS-Old-ARAP-Password',
-  'ms_primary_dns_server'    => 'MS-Primary-DNS-Server',
-  'ms_primary_nbns_server'   => 'MS-Primary-NBNS-Server',
-  'ms_ras_vendor'            => 'MS-RAS-Vendor',
-  'ms_ras_version'           => 'MS-RAS-Version',
-  'ms_secondary_dns_server'  => 'MS-Secondary-DNS-Server',
-  'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server',
-  'multi_link_flag'          => 'Multi-Link-Flag',
-  'nas_identifier'           => 'NAS-Identifier',
-  'nas_ip_address'           => 'NAS-IP-Address',
-  'nas_ipv6_address'         => 'NAS-IPv6-Address',
-  'nas_port'                 => 'NAS-Port',
-  'nas_port_id'              => 'NAS-Port-Id',
-  'nas_port_type'            => 'NAS-Port-Type',
-  'nas_real_port'            => 'NAS_Real_Port',
-  'nas_real_poru'            => 'NAS-Real-Port',
-  'navini_avpair'            => 'Navini-AVPair',
-  'next_hop_dn'              => 'next-hop-dn',
-  'next_hop_ip'              => 'next-hop-ip',
-  'nn_data_rate'             => 'NN-Data-Rate',
-  'nn_data_rate_ceiling'     => 'NN-Data-Rate-Ceiling',
-  'nn_homenode'              => 'NN-Homenode',
-  'nn_homeservice'           => 'NN-Homeservice',
-  'nn_homeservice_name'      => 'NN-Homeservice-Name',
-  'no_such_attribute'        => 'No-Such-Attribute',
-  'nokia_charging_id'        => 'Nokia-Charging-Id',
-  'nokia_ggsn_ip_address'    => 'Nokia-GGSN-IP-Address',
-  'nokia_imsi'               => 'Nokia-IMSI',
-  'nokia_prepaid_ind'        => 'Nokia-Prepaid-Ind',
-  'nokia_sgsn_ip_address'    => 'Nokia-SGSN-IP-Address',
-  'nomadix_bw_down'          => 'Nomadix-Bw-Down',
-  'nomadix_bw_up'            => 'Nomadix-Bw-Up',
-  'nomadix_config_url'       => 'Nomadix-Config-URL',
-  'nomadix_endofsession'     => 'Nomadix-EndofSession',
-  'nomadix_expiration'       => 'Nomadix-Expiration',
-  'nomadix_goodbye_url'      => 'Nomadix-Goodbye-URL',
-  'nomadix_ip_upsell'        => 'Nomadix-IP-Upsell',
-  'nomadix_logoff_url'       => 'Nomadix-Logoff-URL',
-  'nomadix_maxbytesdown'     => 'Nomadix-MaxBytesDown',
-  'nomadix_maxbytesup'       => 'Nomadix-MaxBytesUp',
-  'nomadix_net_vlan'         => 'Nomadix-Net-VLAN',
-  'nomadix_subnet'           => 'Nomadix-Subnet',
-  'nomadix_url_redirection'  => 'Nomadix-URL-Redirection',
-  'ns_admin_privilege'       => 'NS-Admin-Privilege',
-  'ns_mta_md5_password'      => 'NS-MTA-MD5-Password',
-  'ns_primary_dns'           => 'NS-Primary-DNS',
-  'ns_primary_wins'          => 'NS-Primary-WINS',
-  'ns_secondary_dns'         => 'NS-Secondary-DNS',
-  'ns_secondary_wins'        => 'NS-Secondary-WINS',
-  'ns_user_group'            => 'NS-User-Group',
-  'ns_vsys_name'             => 'NS-VSYS-Name',
-  'nt_password'              => 'NT-Password',
-  'ntlm_user_name'           => 'NTLM-User-Name',
-  'old_password'             => 'Old-Password',
-  'outgoing_req_uri'         => 'outgoing-req-uri',
-  'packet_dst_port'          => 'Packet-Dst-Port',
-  'packet_type'              => 'Packet-Type',
-  'pam_auth'                 => 'Pam-Auth',
-  'password'                 => 'Password',
-  'password_retry'           => 'Password-Retry',
-  'police_burst'             => 'Police_Burst',
-  'police_bursu'             => 'Police-Burst',
-  'police_rate'              => 'Police_Rate',
-  'police_ratf'              => 'Police-Rate',
-  'pool_name'                => 'Pool-Name',
-  'port_limit'               => 'Port-Limit',
-  'port_message'             => 'Port-Message',
-  'post_auth_type'           => 'Post-Auth-Type',
-  'post_proxy_type'          => 'Post-Proxy-Type',
-  'postauth_type'            => 'PostAuth-Type',
-  'pppoe_motm'               => 'PPPOE_MOTM',
-  'pppoe_motn'               => 'PPPOE-MOTM',
-  'pppoe_url'                => 'PPPOE_URL',
-  'pppoe_urm'                => 'PPPOE-URL',
-  'pre_acct_type'            => 'Pre-Acct-Type',
-  'pre_proxy_type'           => 'Pre-Proxy-Type',
-  'prefix'                   => 'Prefix',
-  'prev_hop_ip'              => 'prev-hop-ip',
-  'prev_hop_via'             => 'prev-hop-via',
-  'prompt'                   => 'Prompt',
-  'propel_accelerate'        => 'Propel-Accelerate',
-  'propel_client_ip_address' => 'Propel-Client-IP-Address',
-  'propel_client_nas_ip_add' => 'Propel-Client-NAS-IP-Address',
-  'propel_client_source_id'  => 'Propel-Client-Source-ID',
-  'propel_dialed_digits'     => 'Propel-Dialed-Digits',
-  'proxy_state'              => 'Proxy-State',
-  'proxy_to_realm'           => 'Proxy-To-Realm',
-  'pvc_circuit_padding'      => 'PVC_Circuit_Padding',
-  'pvc_circuit_paddinh'      => 'PVC-Circuit-Padding',
-  'pvc_encapsulation_type'   => 'PVC_Encapsulation_Type',
-  'pvc_encapsulation_typf'   => 'PVC-Encapsulation-Type',
-  'pvc_profile_name'         => 'PVC_Profile_Name',
-  'pvc_profile_namf'         => 'PVC-Profile-Name',
-  'quintum_avpair'           => 'Quintum-AVPair',
-  'quintum_h323_billing_mod' => 'Quintum-h323-billing-model',
+  'tunnel_session_auth_cty' => 'Tunnel_Session_Auth_Ctx',
+  'acct_session_id' => 'Acct-Session-Id',
+  'annex_port' => 'Annex-Port',
   'quintum_h323_call_origin' => 'Quintum-h323-call-origin',
-  'quintum_h323_call_type'   => 'Quintum-h323-call-type',
-  'quintum_h323_conf_id'     => 'Quintum-h323-conf-id',
-  'quintum_h323_connect_tim' => 'Quintum-h323-connect-time',
+  'erx_cli_initial_access_l' => 'ERX-Cli-Initial-Access-Level',
+  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable',
+  'tunnel_cmd_timeouu' => 'Tunnel_Cmd_Timeout',
+  'initial_modulation_type' => 'Initial-Modulation-Type',
+  'ascend_h323_gatekeeper' => 'Ascend-H323-Gatekeeper',
+  'x_ascend_fcp_parameter' => 'X-Ascend-FCP-Parameter',
+  'multi_link_flag' => 'Multi-Link-Flag',
+  'tunnel_type' => 'Tunnel-Type',
+  'erx_output_gigapkts' => 'ERX-Output-Gigapkts',
+  'ascend_idle_limit' => 'Ascend-Idle-Limit',
+  'ns_user_group' => 'NS-User-Group',
+  'password_retry' => 'Password-Retry',
+  'h323_remote_address' => 'h323-remote-address',
+  'erx_atm_service_category' => 'ERX-Atm-Service-Category',
+  'acct_input_packets' => 'Acct-Input-Packets',
+  'h323_disconnect_time' => 'h323-disconnect-time',
+  'usr_syslog_tap' => 'USR-Syslog-Tap',
+  'telebit_accounting_info' => 'Telebit-Accounting-Info',
+  'ascend_billing_number' => 'Ascend-Billing-Number',
+  'ascend_tunnel_vrouter_na' => 'Ascend-Tunnel-VRouter-Name',
+  'ms_mppe_encryption_type' => 'MS-MPPE-Encryption-Type',
   'quintum_h323_credit_amou' => 'Quintum-h323-credit-amount',
-  'quintum_h323_credit_time' => 'Quintum-h323-credit-time',
-  'quintum_h323_currency_ty' => 'Quintum-h323-currency-type',
-  'quintum_h323_disconnect_' => 'Quintum-h323-disconnect-time',
-  'quintum_h323_disconnecta' => 'Quintum-h323-disconnect-cause',
-  'quintum_h323_gw_id'       => 'Quintum-h323-gw-id',
-  'quintum_h323_incoming_co' => 'Quintum-h323-incoming-conf-id',
-  'quintum_h323_preferred_l' => 'Quintum-h323-preferred-lang',
-  'quintum_h323_prompt_id'   => 'Quintum-h323-prompt-id',
+  'acc_ace_token' => 'Acc-Ace-Token',
+  'ascend_assign_ip_pool' => 'Ascend-Assign-IP-Pool',
+  'annex_end_modulation' => 'Annex-End-Modulation',
+  'usr_routing_protocol' => 'USR-Routing-Protocol',
+  'cvx_assign_ip_pool' => 'CVX-Assign-IP-Pool',
+  'usr_rad_location_type' => 'USR-Rad-Location-Type',
+  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl',
+  'usr_characters_sent' => 'USR-Characters-Sent',
+  'usr_mp_edo_hiper' => 'USR-MP-EDO-HIPER',
+  'ascend_x25_nui_password_' => 'Ascend-X25-Nui-Password-Prompt',
+  'annex_host_restrict' => 'Annex-Host-Restrict',
+  'user_service_type' => 'User-Service-Type',
+  'acct_multi_session_id' => 'Acct-Multi-Session-Id',
+  'ms_chap_cpw_2' => 'MS-CHAP-CPW-2',
+  'x_ascend_secondary_home_' => 'X-Ascend-Secondary-Home-Agent',
+  'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed',
+  'ascend_connect_progress' => 'Ascend-Connect-Progress',
+  'x_ascend_ara_pw' => 'X-Ascend-Ara-PW',
+  'cisco_fax_modem_time' => 'Cisco-Fax-Modem-Time',
+  'sql_group' => 'Sql-Group',
+  'annex_multicast_rate_lim' => 'Annex-Multicast-Rate-Limit',
+  'cvpn3000_user_auth_servg' => 'CVPN3000-User-Auth-Server-Secret',
+  'ns_mta_md5_password' => 'NS-MTA-MD5-Password',
+  'annex_addr_resolution_pr' => 'Annex-Addr-Resolution-Protocol',
+  'callback_number' => 'Callback-Number',
+  'cvx_multilink_match_info' => 'CVX-Multilink-Match-Info',
+  'tunnel_max_tunnelt' => 'Tunnel_Max_Tunnels',
+  'tunnel_local_namf' => 'Tunnel_Local_Name',
+  'quintum_h323_conf_id' => 'Quintum-h323-conf-id',
+  'acct_output_packets_64' => 'Acct-Output-Packets-64',
+  'annex_signal_to_noise_ra' => 'Annex-Signal-to-Noise-Ratio',
+  'acct_output_packets_65' => 'Acct_Output_Packets_64',
+  'x_ascend_user_acct_key' => 'X-Ascend-User-Acct-Key',
+  'erx_dial_out_number' => 'ERX-Dial-Out-Number',
+  'ascend_modem_portno' => 'Ascend-Modem-PortNo',
+  'ascend_assign_ip_server' => 'Ascend-Assign-IP-Server',
+  'ascend_fcp_parameter' => 'Ascend-FCP-Parameter',
+  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold',
+  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator',
+  'tunnel_rate_limit_bursu' => 'Tunnel_Rate_Limit_Burst',
+  'client_ip_address' => 'Client-IP-Address',
+  'le_nat_tcp_session_timeo' => 'LE-NAT-TCP-Session-Timeout',
   'quintum_h323_redirect_ip' => 'Quintum-h323-redirect-ip-address',
-  'quintum_h323_redirect_nu' => 'Quintum-h323-redirect-number',
+  'ms_acct_eap_type' => 'MS-Acct-EAP-Type',
+  'usr_rmmie_x2_status' => 'USR-RMMIE-x2-Status',
+  'x_ascend_user_acct_type' => 'X-Ascend-User-Acct-Type',
+  'shiva_customer_id' => 'Shiva-Customer-Id',
+  'pvc_encapsulation_typf' => 'PVC_Encapsulation_Type',
+  'st_acct_vc_connection_id' => 'ST-Acct-VC-Connection-Id',
+  'lac_real_port' => 'LAC-Real-Port',
+  'h323_connect_time' => 'h323-connect-time',
+  'usr_vpn_gw_location_id' => 'USR-VPN-GW-Location-Id',
+  'old_password' => 'Old-Password',
+  'x_ascend_if_netmask' => 'X-Ascend-IF-Netmask',
+  'add_suffix' => 'Add-Suffix',
+  'lac_port_typf' => 'LAC_Port_Type',
+  'acc_ip_pool_name' => 'Acc-Ip-Pool-Name',
+  'usr_terminal_type' => 'USR-Terminal-Type',
+  'usr_spoofing' => 'USR-Spoofing',
+  'erx_tunnel_password' => 'ERX-Tunnel-Password',
+  'ascend_inter_arrival_jit' => 'Ascend-Inter-Arrival-Jitter',
+  'ascend_call_block_durati' => 'Ascend-Call-Block-Duration',
+  'itk_channel_binding' => 'ITK-Channel-Binding',
+  'usr_server_time' => 'USR-Server-Time',
+  'ascend_assign_ip_client' => 'Ascend-Assign-IP-Client',
+  'erx_pppoe_max_sessions' => 'ERX-Pppoe-Max-Sessions',
+  'cvx_multilink_group_numb' => 'CVX-Multilink-Group-Number',
+  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS',
+  'erx_pppoe_url' => 'ERX-Pppoe-Url',
+  'police_ratf' => 'Police_Rate',
+  'ascend_data_svc' => 'Ascend-Data-Svc',
+  'annex_authen_servers' => 'Annex-Authen-Servers',
+  'nomadix_bw_up' => 'Nomadix-Bw-Up',
+  'cvx_modem_data_compressi' => 'CVX-Modem-Data-Compression',
+  'shiva_link_speed' => 'Shiva-Link-Speed',
+  'usr_reply_script6' => 'USR-Reply-Script6',
+  'usr_expansion_algorithm' => 'USR-Expansion-Algorithm',
+  'cabletron_protocol_calla' => 'Cabletron-Protocol-Callable',
+  'cisco_data_rate' => 'Cisco-Data-Rate',
+  'usr_primary_dns_server' => 'USR-Primary_DNS_Server',
+  'juniper_deny_configurati' => 'Juniper-Deny-Configuration',
+  'ascend_target_util' => 'Ascend-Target-Util',
+  'digest_method' => 'Digest-Method',
+  'altiga_ipsec_split_tunne' => 'Altiga-IPSec-Split-Tunnel-List-G',
+  'erx_alternate_cli_access' => 'ERX-Alternate-Cli-Access-Level',
+  'x_ascend_event_type' => 'X-Ascend-Event-Type',
+  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value',
+  'usr_mp_mrru' => 'USR-MP-MRRU',
+  'cvx_ipsvc_mask' => 'CVX-IPSVC-Mask',
+  'bind_bypass_context' => 'Bind-Bypass-Context',
+  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event',
+  'no_such_attribute' => 'No-Such-Attribute',
+  'acct_mcast_out_packets' => 'Acct-Mcast-Out-Packets',
+  'tunnel_medium_type' => 'Tunnel-Medium-Type',
   'quintum_h323_remote_addr' => 'Quintum-h323-remote-address',
-  'quintum_h323_return_code' => 'Quintum-h323-return-code',
-  'quintum_h323_setup_time'  => 'Quintum-h323-setup-time',
-  'quintum_h323_time_and_da' => 'Quintum-h323-time-and-day',
-  'quintum_h323_voice_quali' => 'Quintum-h323-voice-quality',
-  'quintum_nas_port'         => 'Quintum-NAS-Port',
-  'rate_limit_burst'         => 'Rate_Limit_Burst',
-  'rate_limit_bursu'         => 'Rate-Limit-Burst',
-  'rate_limit_rate'          => 'Rate_Limit_Rate',
-  'rate_limit_ratf'          => 'Rate-Limit-Rate',
-  'realm'                    => 'Realm',
-  'redcreek_tunneled_dns_se' => 'RedCreek-Tunneled-DNS-Server',
-  'redcreek_tunneled_domain' => 'RedCreek-Tunneled-DomainName',
-  'redcreek_tunneled_gatewa' => 'RedCreek-Tunneled-Gateway',
-  'redcreek_tunneled_hostna' => 'RedCreek-Tunneled-HostName',
-  'redcreek_tunneled_ip_add' => 'RedCreek-Tunneled-IP-Addr',
-  'redcreek_tunneled_ip_net' => 'RedCreek-Tunneled-IP-Netmask',
-  'redcreek_tunneled_search' => 'RedCreek-Tunneled-Search-List',
+  'acc_callback_delay' => 'Acc-Callback-Delay',
+  'acct_input_octets_64' => 'Acct-Input-Octets-64',
+  'ascend_base_channel_coun' => 'Ascend-Base-Channel-Count',
+  'ascend_atm_connect_vci' => 'Ascend-ATM-Connect-Vci',
+  'erx_primary_dns' => 'ERX-Primary-Dns',
+  'altiga_ipsec_over_nat_g' => 'Altiga-IPSec-Over-NAT-G',
+  'cvx_multicast_rate_limit' => 'CVX-Multicast-Rate-Limit',
+  'ascend_xmit_rate' => 'Ascend-Xmit-Rate',
+  'ms_new_arap_password' => 'MS-New-ARAP-Password',
+  'usr_call_error_code' => 'USR-Call-Error-Code',
+  'acct_output_octets' => 'Acct-Output-Octets',
+  'ascend_client_primary_wi' => 'Ascend-Client-Primary-WINS',
+  'cvpn3000_primary_wins' => 'CVPN3000-Primary-WINS',
+  'bintec_ipextrttable' => 'BinTec-ipExtRtTable',
+  'cisco_fax_mdn_flag' => 'Cisco-Fax-Mdn-Flag',
+  'ascend_destination_nas_p' => 'Ascend-Destination-Nas-Port',
+  'ascend_num_in_multilink' => 'Ascend-Num-In-Multilink',
+  'digest_attributes' => 'Digest-Attributes',
+  'cvpn3000_ipsec_tunnel_ty' => 'CVPN3000-IPSec-Tunnel-Type',
+  'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions',
+  'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter',
+  'tunnel_police_bursu' => 'Tunnel_Police_Burst',
   'redcreek_tunneled_wins_s' => 'RedCreek-Tunneled-WINS-Server1',
-  'redcreek_tunneled_wins_t' => 'RedCreek-Tunneled-WINS-Server2',
-  'replicate_to_realm'       => 'Replicate-To-Realm',
-  'reply_message'            => 'Reply-Message',
-  'response_packet_type'     => 'Response-Packet-Type',
-  'rewrite_rule'             => 'Rewrite-Rule',
-  'sdx_service_name'         => 'Sdx-Service-Name',
-  'sdx_session_volume_quota' => 'Sdx-Session-Volume-Quota',
-  'sdx_tunnel_disconnect_ca' => 'Sdx-Tunnel-Disconnect-Cause-Info',
-  'service_type'             => 'Service-Type',
-  'session'                  => 'Session',
-  'session_error_code'       => 'Session_Error_Code',
-  'session_error_codf'       => 'Session-Error-Code',
-  'session_error_msg'        => 'Session_Error_Msg',
-  'session_error_msh'        => 'Session-Error-Msg',
-  'session_protocol'         => 'session-protocol',
-  'session_timeout'          => 'Session-Timeout',
-  'session_type'             => 'Session-Type',
-  'shasta_service_profile'   => 'Shasta-Service-Profile',
-  'shasta_user_privilege'    => 'Shasta-User-Privilege',
-  'shasta_vpn_name'          => 'Shasta-VPN-Name',
-  'shiva_acct_serv_switch'   => 'Shiva-Acct-Serv-Switch',
-  'shiva_called_number'      => 'Shiva-Called-Number',
-  'shiva_calling_number'     => 'Shiva-Calling-Number',
-  'shiva_compression_type'   => 'Shiva-Compression-Type',
-  'shiva_connect_reason'     => 'Shiva-Connect-Reason',
-  'shiva_customer_id'        => 'Shiva-Customer-Id',
-  'shiva_disconnect_reason'  => 'Shiva-Disconnect-Reason',
-  'shiva_event_flags'        => 'Shiva-Event-Flags',
-  'shiva_function'           => 'Shiva-Function',
-  'shiva_link_protocol'      => 'Shiva-Link-Protocol',
-  'shiva_link_speed'         => 'Shiva-Link-Speed',
-  'shiva_links_in_bundle'    => 'Shiva-Links-In-Bundle',
-  'shiva_network_protocols'  => 'Shiva-Network-Protocols',
-  'shiva_session_id'         => 'Shiva-Session-Id',
-  'shiva_type_of_service'    => 'Shiva-Type-Of-Service',
-  'shiva_user_attributes'    => 'Shiva-User-Attributes',
-  'simultaneous_use'         => 'Simultaneous-Use',
-  'sip_from'                 => 'Sip-From',
-  'sip_hdr'                  => 'sip-hdr',
-  'sip_method'               => 'Sip-Method',
-  'sip_to'                   => 'Sip-To',
-  'sip_translated_request_u' => 'Sip-Translated-Request-URI',
-  'smb_account_ctrl'         => 'SMB-Account-CTRL',
-  'smb_account_ctrl_text'    => 'SMB-Account-CTRL-TEXT',
-  'sonicwall_user_group'     => 'SonicWall-User-Group',
-  'sonicwall_user_privilege' => 'SonicWall-User-Privilege',
-  'source_validation'        => 'Source_Validation',
-  'source_validatioo'        => 'Source-Validation',
-  'sql_group'                => 'Sql-Group',
-  'sql_user_name'            => 'SQL-User-Name',
-  'ss3_firewall_user_privil' => 'SS3-Firewall-User-Privilege',
-  'st_acct_vc_connection_id' => 'ST-Acct-VC-Connection-Id',
-  'st_policy_name'           => 'ST-Policy-Name',
-  'st_primary_dns_server'    => 'ST-Primary-DNS-Server',
-  'st_primary_nbns_server'   => 'ST-Primary-NBNS-Server',
-  'st_secondary_dns_server'  => 'ST-Secondary-DNS-Server',
-  'st_secondary_nbns_server' => 'ST-Secondary-NBNS-Server',
-  'st_service_domain'        => 'ST-Service-Domain',
-  'st_service_name'          => 'ST-Service-Name',
-  'state'                    => 'State',
-  'strip_user_name'          => 'Strip-User-Name',
-  'stripped_user_name'       => 'Stripped-User-Name',
-  'subscriber'               => 'subscriber',
-  'suffix'                   => 'Suffix',
-  'telebit_accounting_info'  => 'Telebit-Accounting-Info',
-  'telebit_activate_command' => 'Telebit-Activate-Command',
-  'telebit_login_command'    => 'Telebit-Login-Command',
-  'telebit_port_name'        => 'Telebit-Port-Name',
-  'termination_action'       => 'Termination-Action',
-  'termination_menu'         => 'Termination-Menu',
-  'trapeze_encryption_type'  => 'Trapeze-Encryption-Type',
-  'trapeze_end_date'         => 'Trapeze-End-Date',
-  'trapeze_mobility_profile' => 'Trapeze-Mobility-Profile',
-  'trapeze_ssid'             => 'Trapeze-SSID',
-  'trapeze_start_date'       => 'Trapeze-Start-Date',
-  'trapeze_time_of_day'      => 'Trapeze-Time-Of-Day',
-  'trapeze_url'              => 'Trapeze-URL',
-  'trapeze_vlan_name'        => 'Trapeze-VLAN-Name',
-  'tty_level_max'            => 'TTY_Level_Max',
-  'tty_level_may'            => 'TTY-Level-Max',
-  'tty_level_start'          => 'TTY_Level_Start',
-  'tty_level_staru'          => 'TTY-Level-Start',
-  'tunnel_algorithm'         => 'Tunnel_Algorithm',
-  'tunnel_algorithn'         => 'Tunnel-Algorithm',
-  'tunnel_assignment_id'     => 'Tunnel-Assignment-Id',
-  'tunnel_client_auth_id'    => 'Tunnel-Client-Auth-Id',
-  'tunnel_client_endpoint'   => 'Tunnel-Client-Endpoint',
-  'tunnel_cmd_timeout'       => 'Tunnel_Cmd_Timeout',
-  'tunnel_cmd_timeouu'       => 'Tunnel-Cmd-Timeout',
-  'tunnel_connection_id'     => 'Tunnel-Connection-Id',
-  'tunnel_context'           => 'Tunnel_Context',
-  'tunnel_contexu'           => 'Tunnel-Context',
-  'tunnel_deadtime'          => 'Tunnel_Deadtime',
-  'tunnel_deadtimf'          => 'Tunnel-Deadtime',
-  'tunnel_dnis'              => 'Tunnel_DNIS',
-  'tunnel_dnit'              => 'Tunnel-DNIS',
-  'tunnel_domain'            => 'Tunnel_Domain',
-  'tunnel_domaio'            => 'Tunnel-Domain',
-  'tunnel_function'          => 'Tunnel_Function',
-  'tunnel_functioo'          => 'Tunnel-Function',
-  'tunnel_group'             => 'Tunnel_Group',
-  'tunnel_grouq'             => 'Tunnel-Group',
-  'tunnel_l2f_second_passwo' => 'Tunnel_L2F_Second_Password',
-  'tunnel_l2f_second_passwp' => 'Tunnel-L2F-Second-Password',
-  'tunnel_local_name'        => 'Tunnel_Local_Name',
-  'tunnel_local_namf'        => 'Tunnel-Local-Name',
-  'tunnel_max_sessions'      => 'Tunnel_Max_Sessions',
-  'tunnel_max_sessiont'      => 'Tunnel-Max-Sessions',
-  'tunnel_max_tunnels'       => 'Tunnel_Max_Tunnels',
-  'tunnel_max_tunnelt'       => 'Tunnel-Max-Tunnels',
-  'tunnel_medium_type'       => 'Tunnel-Medium-Type',
-  'tunnel_password'          => 'Tunnel-Password',
-  'tunnel_police_burst'      => 'Tunnel_Police_Burst',
-  'tunnel_police_bursu'      => 'Tunnel-Police-Burst',
-  'tunnel_police_rate'       => 'Tunnel_Police_Rate',
-  'tunnel_police_ratf'       => 'Tunnel-Police-Rate',
-  'tunnel_preference'        => 'Tunnel-Preference',
-  'tunnel_private_group_id'  => 'Tunnel-Private-Group-Id',
-  'tunnel_rate_limit_burst'  => 'Tunnel_Rate_Limit_Burst',
-  'tunnel_rate_limit_bursu'  => 'Tunnel-Rate-Limit-Burst',
-  'tunnel_rate_limit_rate'   => 'Tunnel_Rate_Limit_Rate',
-  'tunnel_rate_limit_ratf'   => 'Tunnel-Rate-Limit-Rate',
-  'tunnel_remote_name'       => 'Tunnel_Remote_Name',
-  'tunnel_remote_namf'       => 'Tunnel-Remote-Name',
-  'tunnel_retransmit'        => 'Tunnel_Retransmit',
-  'tunnel_retransmiu'        => 'Tunnel-Retransmit',
-  'tunnel_server_auth_id'    => 'Tunnel-Server-Auth-Id',
-  'tunnel_server_endpoint'   => 'Tunnel-Server-Endpoint',
-  'tunnel_session_auth'      => 'Tunnel_Session_Auth',
-  'tunnel_session_auth_ctx'  => 'Tunnel_Session_Auth_Ctx',
-  'tunnel_session_auth_cty'  => 'Tunnel-Session-Auth-Ctx',
-  'tunnel_session_auth_serv' => 'Tunnel_Session_Auth_Service_Grp',
-  'tunnel_session_auth_serw' => 'Tunnel-Session-Auth-Service-Grp',
-  'tunnel_session_auti'      => 'Tunnel-Session-Auth',
-  'tunnel_type'              => 'Tunnel-Type',
-  'tunnel_window'            => 'Tunnel_Window',
-  'tunnel_windox'            => 'Tunnel-Window',
-  'unix_ftp_gid'             => 'Unix-FTP-GID',
-  'unix_ftp_group_ids'       => 'Unix-FTP-Group-Ids',
-  'unix_ftp_group_names'     => 'Unix-FTP-Group-Names',
-  'unix_ftp_home'            => 'Unix-FTP-Home',
-  'unix_ftp_shell'           => 'Unix-FTP-Shell',
-  'unix_ftp_uid'             => 'Unix-FTP-UID',
-  'user_category'            => 'User-Category',
-  'user_name'                => 'User-Name',
-  'user_name_is_star'        => 'User-Name-Is-Star',
-  'user_password'            => 'User-Password',
-  'user_profile'             => 'User-Profile',
-  'user_service_type'        => 'User-Service-Type',
-  'usr_accm_type'            => 'USR-ACCM-Type',
-  'usr_acct_reason_code'     => 'USR-Acct-Reason-Code',
-  'usr_actual_voltage'       => 'USR-Actual-Voltage',
-  'usr_appletalk'            => 'USR-Appletalk',
-  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range',
+  'usr_blocks_sent' => 'USR-Blocks-Sent',
+  'erx_cli_allow_all_vr_acc' => 'ERX-Cli-Allow-All-VR-Access',
+  'tunnel_police_ratf' => 'Tunnel_Police_Rate',
+  'usr_ids0_call_type' => 'USR-IDS0-Call-Type',
+  'acc_ccp_option' => 'Acc-Ccp-Option',
+  'ascend_client_gateway' => 'Ascend-Client-Gateway',
+  'cvx_maximum_channels' => 'CVX-Maximum-Channels',
+  'bg_aging_timf' => 'BG_Aging_Time',
+  'annex_secondary_dns_serv' => 'Annex-Secondary-DNS-Server',
+  'le_ipsec_passive_profile' => 'LE-IPSec-Passive-Profile',
+  'usr_chassis_call_span' => 'USR-Chassis-Call-Span',
+  'aat_client_primary_wins_' => 'AAT-Client-Primary-WINS-NBNS',
+  'h323_currency' => 'h323-currency',
+  'password' => 'Password',
+  'le_nat_log_options' => 'LE-NAT-Log-Options',
+  'usr_fallback_limit' => 'USR-Fallback-Limit',
+  'x_ascend_ppp_address' => 'X-Ascend-PPP-Address',
+  'suffix' => 'Suffix',
+  'usr_multicast_receive' => 'USR-Multicast-Receive',
+  'client_dns_sec' => 'Client-DNS-Sec',
+  'annex_product_name' => 'Annex-Product-Name',
+  'cisco_pw_lifetime' => 'Cisco-PW-Lifetime',
+  'x_ascend_fr_dce_n393' => 'X-Ascend-FR-DCE-N393',
+  'x_ascend_ts_idle_limit' => 'X-Ascend-TS-Idle-Limit',
+  'mcast_send' => 'Mcast-Send',
+  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent',
+  'tunnel_max_sessiont' => 'Tunnel_Max_Sessions',
+  'pppoe_motm' => 'PPPOE-MOTM',
+  'usr_pw_usr_ifilter_ipx' => 'USR-PW_USR_IFilter_IPX',
+  'ms_ras_version' => 'MS-RAS-Version',
+  'ascend_source_ip_check' => 'Ascend-Source-IP-Check',
+  'bintec_ospfiftable' => 'BinTec-ospfIfTable',
+  'acc_ml_call_threshold' => 'Acc-ML-Call-Threshold',
+  'x_ascend_modem_slotno' => 'X-Ascend-Modem-SlotNo',
+  'ascend_menu_item' => 'Ascend-Menu-Item',
+  'callback_id' => 'Callback-Id',
+  'framed_ipx_network' => 'Framed-IPX-Network',
+  'altiga_pptp_encryption_g' => 'Altiga-PPTP-Encryption-G',
+  'ascend_x25_reverse_charg' => 'Ascend-X25-Reverse-Charging',
+  'ascend_user_acct_key' => 'Ascend-User-Acct-Key',
+  'x_ascend_pw_lifetime' => 'X-Ascend-PW-Lifetime',
+  'user_name_is_star' => 'User-Name-Is-Star',
+  'nomadix_url_redirection' => 'Nomadix-URL-Redirection',
+  'framed_pool' => 'Framed-Pool',
+  'x_ascend_authen_alias' => 'X-Ascend-Authen-Alias',
+  'cisco_fax_dsn_address' => 'Cisco-Fax-Dsn-Address',
+  'ms_primary_dns_server' => 'MS-Primary-DNS-Server',
+  'acc_dialout_auth_usernam' => 'Acc-Dialout-Auth-Username',
+  'realm' => 'Realm',
+  'arap_features' => 'ARAP-Features',
+  'bind_auth_protocom' => 'Bind_Auth_Protocol',
+  'acc_connect_tx_speed' => 'Acc-Connect-Tx-Speed',
+  'usr_chassis_temperature' => 'USR-Chassis-Temperature',
+  'altiga_ipsec_mode_config' => 'Altiga-IPSec-Mode-Config-G',
+  'ascend_home_agent_ip_add' => 'Ascend-Home-Agent-IP-Addr',
+  'x_ascend_xmit_rate' => 'X-Ascend-Xmit-Rate',
+  'cvpn3000_secondary_dns' => 'CVPN3000-Secondary-DNS',
+  'x_ascend_send_passwd' => 'X-Ascend-Send-Passwd',
+  'bind_int_contexu' => 'Bind_Int_Context',
+  'cisco_fax_account_id_ori' => 'Cisco-Fax-Account-Id-Origin',
+  'le_modem_info' => 'LE-Modem-Info',
+  'ascend_ipx_peer_mode' => 'Ascend-IPX-Peer-Mode',
+  'juniper_local_user_name' => 'Juniper-Local-User-Name',
+  'tunnel_rate_limit_rate' => 'Tunnel-Rate-Limit-Rate',
+  'quintum_h323_credit_time' => 'Quintum-h323-credit-time',
+  'acc_modem_modulation_typ' => 'Acc-Modem-Modulation-Type',
+  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History',
+  'ascend_dhcp_pool_number' => 'Ascend-DHCP-Pool-Number',
+  'redcreek_tunneled_ip_net' => 'RedCreek-Tunneled-IP-Netmask',
+  'x_ascend_callback' => 'X-Ascend-Callback',
+  'usr_iwf_ip_address' => 'USR-IWF-IP-Address',
+  'aat_input_octets_diff' => 'AAT-Input-Octets-Diff',
+  'nas_port_id' => 'NAS-Port-Id',
+  'le_advice_of_charge' => 'LE-Advice-of-Charge',
+  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number',
+  'ascend_add_seconds' => 'Ascend-Add-Seconds',
+  'annex_transmit_speed' => 'Annex-Transmit-Speed',
+  'usr_port_tap' => 'USR-Port-Tap',
   'usr_at_call_input_filter' => 'USR-AT-Call-Input-Filter',
-  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter',
-  'usr_at_input_filter'      => 'USR-AT-Input-Filter',
-  'usr_at_output_filter'     => 'USR-AT-Output-Filter',
-  'usr_at_rtmp_input_filter' => 'USR-AT-RTMP-Input-Filter',
-  'usr_at_rtmp_output_filte' => 'USR-AT-RTMP-Output-Filter',
-  'usr_at_zip_input_filter'  => 'USR-AT-Zip-Input-Filter',
-  'usr_at_zip_output_filter' => 'USR-AT-Zip-Output-Filter',
-  'usr_auth_mode'            => 'USR-Auth-Mode',
-  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate',
-  'usr_bearer_capabilities'  => 'USR-Bearer-Capabilities',
-  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit',
-  'usr_blocks_received'      => 'USR-Blocks-Received',
-  'usr_blocks_resent'        => 'USR-Blocks-Resent',
-  'usr_blocks_sent'          => 'USR-Blocks-Sent',
-  'usr_bridging'             => 'USR-Bridging',
-  'usr_call_arrival_in_gmt'  => 'USR-Call-Arrival-in-GMT',
-  'usr_call_arrival_time'    => 'USR-Call-Arrival-Time',
-  'usr_call_connect_in_gmt'  => 'USR-Call-Connect-in-GMT',
-  'usr_call_connecting_time' => 'USR-Call-Connecting-Time',
-  'usr_call_end_date_time'   => 'USR-Call-End-Date-Time',
-  'usr_call_end_time'        => 'USR-Call-End-Time',
-  'usr_call_error_code'      => 'USR-Call-Error-Code',
-  'usr_call_event_code'      => 'USR-Call-Event-Code',
-  'usr_call_reference_numbe' => 'USR-Call-Reference-Number',
-  'usr_call_start_date_time' => 'USR-Call-Start-Date-Time',
-  'usr_call_terminate_in_gm' => 'USR-Call-Terminate-in-GMT',
-  'usr_call_type'            => 'USR-Call-Type',
-  'usr_callback_type'        => 'USR-Callback-Type',
-  'usr_called_party_number'  => 'USR-Called-Party-Number',
-  'usr_calling_party_number' => 'USR-Calling-Party-Number',
-  'usr_card_type'            => 'USR-Card-Type',
-  'usr_ccp_algorithm'        => 'USR-CCP-Algorithm',
-  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number',
-  'usr_channel'              => 'USR-Channel',
-  'usr_channel_connected_to' => 'USR-Channel-Connected-To',
-  'usr_channel_decrement'    => 'USR-Channel-Decrement',
-  'usr_channel_expansion'    => 'USR-Channel-Expansion',
-  'usr_characters_received'  => 'USR-Characters-Received',
-  'usr_characters_sent'      => 'USR-Characters-Sent',
-  'usr_chassis_call_channel' => 'USR-Chassis-Call-Channel',
-  'usr_chassis_call_slot'    => 'USR-Chassis-Call-Slot',
-  'usr_chassis_call_span'    => 'USR-Chassis-Call-Span',
-  'usr_chassis_slot'         => 'USR-Chassis-Slot',
-  'usr_chassis_temp_thresho' => 'USR-Chassis-Temp-Threshold',
-  'usr_chassis_temperature'  => 'USR-Chassis-Temperature',
-  'usr_chat_script_name'     => 'USR-Chat-Script-Name',
-  'usr_compression_algorith' => 'USR-Compression-Algorithm',
-  'usr_compression_reset_mo' => 'USR-Compression-Reset-Mode',
-  'usr_compression_type'     => 'USR-Compression-Type',
-  'usr_connect_speed'        => 'USR-Connect-Speed',
-  'usr_connect_term_reason'  => 'USR-Connect-Term-Reason',
-  'usr_connect_time'         => 'USR-Connect-Time',
-  'usr_connect_time_limit'   => 'USR-Connect-Time-Limit',
-  'usr_cusr_hat_script_rule' => 'USR-CUSR-hat-Script-Rules',
-  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate',
-  'usr_device_connected_to'  => 'USR-Device-Connected-To',
-  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator',
-  'usr_dnis_reauthenticatio' => 'USR-DNIS-ReAuthentication',
-  'usr_ds0'                  => 'USR-DS0',
-  'usr_ds0s'                 => 'USR-DS0s',
-  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout',
-  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit',
-  'usr_dtr_false_timeout'    => 'USR-DTR-False-Timeout',
-  'usr_dtr_true_timeout'     => 'USR-DTR-True-Timeout',
-  'usr_end_time'             => 'USR-End-Time',
-  'usr_equalization_type'    => 'USR-Equalization-Type',
-  'usr_esn'                  => 'USR-ESN',
-  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte',
-  'usr_et_bridge_input_filt' => 'USR-ET-Bridge-Input-Filter',
-  'usr_et_bridge_output_fil' => 'USR-ET-Bridge-Output-Filter',
-  'usr_event_date_time'      => 'USR-Event-Date-Time',
-  'usr_event_id'             => 'USR-Event-Id',
-  'usr_expansion_algorithm'  => 'USR-Expansion-Algorithm',
-  'usr_expected_voltage'     => 'USR-Expected-Voltage',
-  'usr_failure_to_connect_r' => 'USR-Failure-to-Connect-Reason',
-  'usr_fallback_enabled'     => 'USR-Fallback-Enabled',
-  'usr_fallback_limit'       => 'USR-Fallback-Limit',
-  'usr_filter_zones'         => 'USR-Filter-Zones',
-  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate',
-  'usr_final_tx_link_data_r' => 'USR-Final-Tx-Link-Data-Rate',
-  'usr_framed_ip_address_po' => 'USR-Framed_IP_Address_Pool_Name',
-  'usr_framed_ipx_route'     => 'USR-Framed-IPX-Route',
-  'usr_gateway_ip_address'   => 'USR-Gateway-IP-Address',
-  'usr_harc_disconnect_code' => 'USR-HARC-Disconnect-Code',
-  'usr_host_type'            => 'USR-Host-Type',
-  'usr_ids0_call_type'       => 'USR-IDS0-Call-Type',
-  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time',
-  'usr_igmp_query_interval'  => 'USR-IGMP-Query-Interval',
-  'usr_igmp_robustness'      => 'USR-IGMP-Robustness',
-  'usr_igmp_routing'         => 'USR-IGMP-Routing',
-  'usr_igmp_version'         => 'USR-IGMP-Version',
-  'usr_imsi'                 => 'USR-IMSI',
-  'usr_initial_rx_link_data' => 'USR-Initial-Rx-Link-Data-Rate',
-  'usr_initial_tx_link_data' => 'USR-Initial-Tx-Link-Data-Rate',
-  'usr_interface_index'      => 'USR-Interface-Index',
-  'usr_ip'                   => 'USR-IP',
-  'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter',
-  'usr_ip_call_output_filte' => 'USR-IP-Call-Output-Filter',
-  'usr_ip_default_route_opt' => 'USR-IP-Default-Route-Option',
-  'usr_ip_rip_input_filter'  => 'USR-IP-RIP-Input-Filter',
-  'usr_ip_rip_output_filter' => 'USR-IP-RIP-Output-Filter',
-  'usr_ip_rip_policies'      => 'USR-IP-RIP-Policies',
-  'usr_ip_rip_simple_auth_p' => 'USR-IP-RIP-Simple-Auth-Password',
-  'usr_ip_saa_filter'        => 'USR-IP-SAA-Filter',
-  'usr_ipx'                  => 'USR-IPX',
-  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter',
-  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter',
-  'usr_ipx_rip_input_filter' => 'USR-IPX-RIP-Input-Filter',
-  'usr_ipx_rip_output_filte' => 'USR-IPX-RIP-Output-Filter',
-  'usr_ipx_routing'          => 'USR-IPX-Routing',
-  'usr_ipx_wan'              => 'USR-IPX-WAN',
-  'usr_iwf_call_identifier'  => 'USR-IWF-Call-Identifier',
-  'usr_iwf_ip_address'       => 'USR-IWF-IP-Address',
-  'usr_keypress_timeout'     => 'USR-Keypress-Timeout',
-  'usr_last_callers_number_' => 'USR-Last-Callers-Number-ANI',
-  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS',
-  'usr_last_number_dialed_o' => 'USR-Last-Number-Dialed-Out',
-  'usr_line_reversals'       => 'USR-Line-Reversals',
-  'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr',
-  'usr_local_ip_address'     => 'USR-Local-IP-Address',
-  'usr_log_filter_packets'   => 'USR-Log-Filter-Packets',
-  'usr_max_channels'         => 'USR-Max-Channels',
-  'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used',
-  'usr_mbi_ct_pri_card_slot' => 'USR-Mbi_Ct_PRI_Card_Slot',
-  'usr_mbi_ct_pri_card_span' => 'USR-Mbi_Ct_PRI_Card_Span_Line',
-  'usr_mbi_ct_tdm_time_slot' => 'USR-Mbi_Ct_TDM_Time_Slot',
-  'usr_mic'                  => 'USR-MIC',
-  'usr_min_compression_size' => 'USR-Min-Compression-Size',
-  'usr_mobile_ip_address'    => 'USR-Mobile-IP-Address',
-  'usr_mobile_numbytes_rxed' => 'USR-Mobile-NumBytes-Rxed',
-  'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed',
-  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address',
-  'usr_modem_group'          => 'USR-Modem-Group',
-  'usr_modem_setup_time'     => 'USR-Modem-Setup-Time',
-  'usr_modem_training_time'  => 'USR-Modem-Training-Time',
-  'usr_modulation_type'      => 'USR-Modulation-Type',
-  'usr_mp_edo'               => 'USR-MP-EDO',
-  'usr_mp_edo_hiper'         => 'USR-MP-EDO-HIPER',
-  'usr_mp_mrru'              => 'USR-MP-MRRU',
-  'usr_mpip_tunnel_originat' => 'USR-MPIP-Tunnel-Originator',
-  'usr_multicast_forwarding' => 'USR-Multicast-Forwarding',
-  'usr_multicast_proxy'      => 'USR-Multicast-Proxy',
-  'usr_multicast_receive'    => 'USR-Multicast-Receive',
-  'usr_nas_type'             => 'USR-NAS-Type',
-  'usr_nfas_id'              => 'USR-NFAS-ID',
-  'usr_num_fax_pages_proces' => 'USR-Num-Fax-Pages-Processed',
-  'usr_number_of_blers'      => 'USR-Number-of-Blers',
-  'usr_number_of_characters' => 'USR-Number-Of-Characters-Lost',
-  'usr_number_of_fallbacks'  => 'USR-Number-of-Fallbacks',
-  'usr_number_of_link_naks'  => 'USR-Number-of-Link-NAKs',
-  'usr_number_of_link_timeo' => 'USR-Number-of-Link-Timeouts',
-  'usr_number_of_rings_limi' => 'USR-Number-of-Rings-Limit',
-  'usr_number_of_upshifts'   => 'USR-Number-of-Upshifts',
-  'usr_orig_nas_type'        => 'USR-Orig-NAS-Type',
-  'usr_originate_answer_mod' => 'USR-Originate-Answer-Mode',
-  'usr_ospf_addressless_ind' => 'USR-OSPF-Addressless-Index',
-  'usr_packet_bus_session'   => 'USR-Packet-Bus-Session',
-  'usr_physical_state'       => 'USR-Physical-State',
-  'usr_port_tap'             => 'USR-Port-Tap',
-  'usr_port_tap_address'     => 'USR-Port-Tap-Address',
-  'usr_port_tap_facility'    => 'USR-Port-Tap-Facility',
-  'usr_port_tap_format'      => 'USR-Port-Tap-Format',
-  'usr_port_tap_output'      => 'USR-Port-Tap-Output',
-  'usr_port_tap_priority'    => 'USR-Port-Tap-Priority',
-  'usr_power_supply_number'  => 'USR-Power-Supply-Number',
-  'usr_primary_dns_server'   => 'USR-Primary_DNS_Server',
-  'usr_primary_nbns_server'  => 'USR-Primary_NBNS_Server',
-  'usr_pw_cutoff'            => 'USR-PW_Cutoff',
-  'usr_pw_framed_routing_v2' => 'USR-PW_Framed_Routing_V2',
-  'usr_pw_index'             => 'USR-PW_Index',
-  'usr_pw_packet'            => 'USR-PW_Packet',
-  'usr_pw_tunnel_authentica' => 'USR-PW_Tunnel_Authentication',
-  'usr_pw_usr_ifilter_ip'    => 'USR-PW_USR_IFilter_IP',
-  'usr_pw_usr_ifilter_ipx'   => 'USR-PW_USR_IFilter_IPX',
-  'usr_pw_usr_ofilter_ip'    => 'USR-PW_USR_OFilter_IP',
-  'usr_pw_usr_ofilter_ipx'   => 'USR-PW_USR_OFilter_IPX',
-  'usr_pw_usr_ofilter_sap'   => 'USR-PW_USR_OFilter_SAP',
-  'usr_pw_vpn_gateway'       => 'USR-PW_VPN_Gateway',
-  'usr_pw_vpn_id'            => 'USR-PW_VPN_ID',
-  'usr_pw_vpn_name'          => 'USR-PW_VPN_Name',
-  'usr_pw_vpn_neighbor'      => 'USR-PW_VPN_Neighbor',
-  'usr_q931_call_reference_' => 'USR-Q931-Call-Reference-Value',
-  'usr_rad_dvmrp_metric'     => 'USR-Rad-Dvmrp-Metric',
-  'usr_rad_location_type'    => 'USR-Rad-Location-Type',
-  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl',
-  'usr_rad_multicast_routio' => 'USR-Rad-Multicast-Routing-RtLim',
-  'usr_rad_multicast_routip' => 'USR-Rad-Multicast-Routing-Proto',
+  'framed_ipv6_pool' => 'Framed-IPv6-Pool',
+  'ascend_qos_downstream' => 'Ascend-QOS-Downstream',
+  'lac_port' => 'LAC-Port',
+  'tunnel_assignment_id' => 'Tunnel-Assignment-Id',
+  'acct_mcast_out_octett' => 'Acct_Mcast_Out_Octets',
+  'ascend_bi_directional_au' => 'Ascend-Bi-Directional-Auth',
+  'fall_through' => 'Fall-Through',
+  'cvpn3000_ipsec_ip_compre' => 'CVPN3000-IPSec-IP-Compression',
+  'cisco_disconnect_cause' => 'Cisco-Disconnect-Cause',
   'usr_rad_multicast_routiq' => 'USR-Rad-Multicast-Routing-Bound',
-  'usr_re_chap_timeout'      => 'USR-Re-Chap-Timeout',
-  'usr_receive_acc_map'      => 'USR-Receive-Acc-Map',
-  'usr_reply_script1'        => 'USR-Reply-Script1',
-  'usr_reply_script2'        => 'USR-Reply-Script2',
-  'usr_reply_script3'        => 'USR-Reply-Script3',
-  'usr_reply_script4'        => 'USR-Reply-Script4',
-  'usr_reply_script5'        => 'USR-Reply-Script5',
-  'usr_reply_script6'        => 'USR-Reply-Script6',
-  'usr_request_type'         => 'USR-Request-Type',
-  'usr_retrains_granted'     => 'USR-Retrains-Granted',
-  'usr_retrains_requested'   => 'USR-Retrains-Requested',
-  'usr_rmmie_firmware_build' => 'USR-RMMIE-Firmware-Build-Date',
-  'usr_rmmie_firmware_versi' => 'USR-RMMIE-Firmware-Version',
-  'usr_rmmie_last_update_ev' => 'USR-RMMIE-Last-Update-Event',
-  'usr_rmmie_last_update_ti' => 'USR-RMMIE-Last-Update-Time',
-  'usr_rmmie_manufacturer_i' => 'USR-RMMIE-Manufacturer-ID',
-  'usr_rmmie_num_of_updates' => 'USR-RMMIE-Num-Of-Updates',
-  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect',
-  'usr_rmmie_product_code'   => 'USR-RMMIE-Product-Code',
-  'usr_rmmie_pwrlvl_farecho' => 'USR-RMMIE-PwrLvl-FarEcho-Canc',
-  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc',
-  'usr_rmmie_pwrlvl_noise_l' => 'USR-RMMIE-PwrLvl-Noise-Lvl',
-  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl',
-  'usr_rmmie_rcv_pwrlvl_330' => 'USR-RMMIE-Rcv-PwrLvl-3300Hz',
-  'usr_rmmie_rcv_pwrlvl_375' => 'USR-RMMIE-Rcv-PwrLvl-3750Hz',
-  'usr_rmmie_rcv_tot_pwrlvl' => 'USR-RMMIE-Rcv-Tot-PwrLvl',
-  'usr_rmmie_serial_number'  => 'USR-RMMIE-Serial-Number',
-  'usr_rmmie_status'         => 'USR-RMMIE-Status',
-  'usr_rmmie_x2_status'      => 'USR-RMMIE-x2-Status',
-  'usr_routing_protocol'     => 'USR-Routing-Protocol',
-  'usr_sap_filter_in'        => 'USR-SAP-Filter-In',
-  'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server',
-  'usr_secondary_nbns_serve' => 'USR-Secondary_NBNS_Server',
-  'usr_security_login_limit' => 'USR-Security-Login-Limit',
-  'usr_security_resp_limit'  => 'USR-Security-Resp-Limit',
-  'usr_send_name'            => 'USR-Send-Name',
-  'usr_send_password'        => 'USR-Send-Password',
-  'usr_send_script1'         => 'USR-Send-Script1',
-  'usr_send_script2'         => 'USR-Send-Script2',
-  'usr_send_script3'         => 'USR-Send-Script3',
-  'usr_send_script4'         => 'USR-Send-Script4',
-  'usr_send_script5'         => 'USR-Send-Script5',
-  'usr_send_script6'         => 'USR-Send-Script6',
-  'usr_server_time'          => 'USR-Server-Time',
-  'usr_service_option'       => 'USR-Service-Option',
-  'usr_simplified_mnp_level' => 'USR-Simplified-MNP-Levels',
-  'usr_simplified_v42bis_us' => 'USR-Simplified-V42bis-Usage',
-  'usr_slot_connected_to'    => 'USR-Slot-Connected-To',
-  'usr_speed_of_connection'  => 'USR-Speed-Of-Connection',
-  'usr_spoofing'             => 'USR-Spoofing',
-  'usr_start_time'           => 'USR-Start-Time',
-  'usr_supports_tags'        => 'USR-Supports-Tags',
-  'usr_sync_async_mode'      => 'USR-Sync-Async-Mode',
-  'usr_syslog_tap'           => 'USR-Syslog-Tap',
-  'usr_terminal_type'        => 'USR-Terminal-Type',
-  'usr_transmit_acc_map'     => 'USR-Transmit-Acc-Map',
-  'usr_tunnel_auth_hostname' => 'USR-Tunnel-Auth-Hostname',
-  'usr_tunnel_security'      => 'USR-Tunnel-Security',
-  'usr_tunnel_switch_endpoi' => 'USR-Tunnel-Switch-Endpoint',
-  'usr_tunneled_mlpp'        => 'USR-Tunneled-MLPP',
-  'usr_unauthenticated_time' => 'USR-Unauthenticated-Time',
-  'usr_vpn_encrypter'        => 'USR-VPN-Encrypter',
-  'usr_vpn_gw_location_id'   => 'USR-VPN-GW-Location-Id',
-  'usr_vts_session_key'      => 'USR-VTS-Session-Key',
-  'vendor_specific'          => 'Vendor-Specific',
-  'versanet_termination_cau' => 'Versanet-Termination-Cause',
-  'vnc_pppoe_cbq_rx'         => 'VNC-PPPoE-CBQ-RX',
-  'vnc_pppoe_cbq_rx_fallbac' => 'VNC-PPPoE-CBQ-RX-Fallback',
-  'vnc_pppoe_cbq_tx'         => 'VNC-PPPoE-CBQ-TX',
-  'vnc_pppoe_cbq_tx_fallbac' => 'VNC-PPPoE-CBQ-TX-Fallback',
-  'vnc_splash'               => 'VNC-Splash',
-  'wispr_bandwidth_max_down' => 'WISPr-Bandwidth-Max-Down',
-  'wispr_bandwidth_max_up'   => 'WISPr-Bandwidth-Max-Up',
-  'wispr_bandwidth_min_down' => 'WISPr-Bandwidth-Min-Down',
-  'wispr_bandwidth_min_up'   => 'WISPr-Bandwidth-Min-Up',
-  'wispr_billing_class_of_s' => 'WISPr-Billing-Class-Of-Service',
-  'wispr_location_id'        => 'WISPr-Location-ID',
-  'wispr_location_name'      => 'WISPr-Location-Name',
-  'wispr_logoff_url'         => 'WISPr-Logoff-URL',
-  'wispr_redirection_url'    => 'WISPr-Redirection-URL',
-  'wispr_session_terminate_' => 'WISPr-Session-Terminate-Time',
-  'wispr_session_terminatea' => 'WISPr-Session-Terminate-End-Of-Day',
-  'x_ascend_add_seconds'     => 'X-Ascend-Add-Seconds',
-  'x_ascend_ara_pw'          => 'X-Ascend-Ara-PW',
-  'x_ascend_assign_ip_clien' => 'X-Ascend-Assign-IP-Client',
-  'x_ascend_assign_ip_globa' => 'X-Ascend-Assign-IP-Global-Pool',
-  'x_ascend_assign_ip_pool'  => 'X-Ascend-Assign-IP-Pool',
-  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server',
-  'x_ascend_authen_alias'    => 'X-Ascend-Authen-Alias',
-  'x_ascend_backup'          => 'X-Ascend-Backup',
-  'x_ascend_bacp_enable'     => 'X-Ascend-BACP-Enable',
+  'altiga_tunneling_protoco' => 'Altiga-Tunneling-Protocols-G/U',
+  'itk_tunnel_prot' => 'ITK-Tunnel-Prot',
+  'client_dns_sed' => 'Client_DNS_Sec',
+  'framed_ip_netmask' => 'Framed-IP-Netmask',
+  'usr_call_reference_numbe' => 'USR-Call-Reference-Number',
+  'ascend_egress_enabled' => 'Ascend-Egress-Enabled',
+  'ascend_dsl_rate_mode' => 'Ascend-Dsl-Rate-Mode',
+  'usr_pw_usr_ofilter_sap' => 'USR-PW_USR_OFilter_SAP',
+  'bintec_iproutetable' => 'BinTec-ipRouteTable',
+  'acct_terminate_cause' => 'Acct-Terminate-Cause',
+  'x_ascend_fr_dte_n393' => 'X-Ascend-FR-DTE-N393',
+  'ascend_ppp_address' => 'Ascend-PPP-Address',
+  'erx_maximum_bps' => 'ERX-Maximum-BPS',
+  'caller_id' => 'Caller-ID',
+  'bintec_ipfiltertable' => 'BinTec-ipFilterTable',
   'x_ascend_base_channel_co' => 'X-Ascend-Base-Channel-Count',
-  'x_ascend_billing_number'  => 'X-Ascend-Billing-Number',
-  'x_ascend_bridge'          => 'X-Ascend-Bridge',
-  'x_ascend_bridge_address'  => 'X-Ascend-Bridge-Address',
-  'x_ascend_call_attempt_li' => 'X-Ascend-Call-Attempt-Limit',
-  'x_ascend_call_block_dura' => 'X-Ascend-Call-Block-Duration',
-  'x_ascend_call_by_call'    => 'X-Ascend-Call-By-Call',
-  'x_ascend_call_filter'     => 'X-Ascend-Call-Filter',
-  'x_ascend_call_type'       => 'X-Ascend-Call-Type',
-  'x_ascend_callback'        => 'X-Ascend-Callback',
-  'x_ascend_client_assign_d' => 'X-Ascend-Client-Assign-DNS',
-  'x_ascend_client_gateway'  => 'X-Ascend-Client-Gateway',
+  'bind_int_interface_name' => 'Bind-Int-Interface-Name',
+  'usr_modem_group' => 'USR-Modem-Group',
+  'cisco_maximum_channels' => 'Cisco-Maximum-Channels',
+  'erx_ppp_username' => 'ERX-PPP-Username',
+  'ascend_link_compression' => 'Ascend-Link-Compression',
+  'annex_retransmitted_pack' => 'Annex-Retransmitted-Packets',
+  'usr_retrains_granted' => 'USR-Retrains-Granted',
+  'ascend_dropped_packets' => 'Ascend-Dropped-Packets',
+  'erx_bearer_type' => 'ERX-Bearer-Type',
+  'usr_pw_usr_ofilter_ip' => 'USR-PW_USR_OFilter_IP',
+  'quintum_nas_port' => 'Quintum-NAS-Port',
+  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets',
+  'usr_cdma_call_reference_' => 'USR-CDMA-Call-Reference-Number',
+  'tunnel_function' => 'Tunnel-Function',
+  'annex_tunnel_authen_mode' => 'Annex-Tunnel-Authen-Mode',
+  'usr_mp_edo' => 'USR-MP-EDO',
+  'le_nat_outmap' => 'LE-NAT-Outmap',
+  'cvpn3000_primary_dns' => 'CVPN3000-Primary-DNS',
+  'usr_modulation_type' => 'USR-Modulation-Type',
+  'ascend_calling_id_screen' => 'Ascend-Calling-Id-Screening',
+  'ascend_maximum_time' => 'Ascend-Maximum-Time',
+  'user_password' => 'User-Password',
+  'annex_callback_portlist' => 'Annex-Callback-Portlist',
+  'cvpn3000_ipsec_split_tun' => 'CVPN3000-IPSec-Split-Tunnel-List',
+  'annex_pre_output_packets' => 'Annex-Pre-Output-Packets',
+  'usr_at_call_output_filte' => 'USR-AT-Call-Output-Filter',
   'x_ascend_client_primary_' => 'X-Ascend-Client-Primary-DNS',
+  'tunnel_server_endpoint' => 'Tunnel-Server-Endpoint',
+  'x_ascend_remove_seconds' => 'X-Ascend-Remove-Seconds',
+  'cvpn3000_user_auth_serve' => 'CVPN3000-User-Auth-Server-Name',
+  'arap_password' => 'ARAP-Password',
+  'x_ascend_assign_ip_serve' => 'X-Ascend-Assign-IP-Server',
+  'cisco_fax_pages' => 'Cisco-Fax-Pages',
+  'ms_chap_mppe_keys' => 'MS-CHAP-MPPE-Keys',
+  'ascend_source_auth' => 'Ascend-Source-Auth',
+  'group' => 'Group',
+  'usr_send_script6' => 'USR-Send-Script6',
+  'le_nat_inmap' => 'LE-NAT-Inmap',
+  'chap_password' => 'CHAP-Password',
+  'annex_receive_speed' => 'Annex-Receive-Speed',
+  'usr_mobileip_home_agent_' => 'USR-MobileIP-Home-Agent-Address',
+  'bind_l2tp_flow_control' => 'Bind-L2TP-Flow-Control',
+  'smb_account_ctrl' => 'SMB-Account-CTRL',
+  'ascend_ip_pool_chaining' => 'Ascend-IP-Pool-Chaining',
+  'le_admin_group' => 'LE-Admin-Group',
+  'tunnel_connection_id' => 'Tunnel-Connection-Id',
+  'tunnel_windox' => 'Tunnel_Window',
+  'nas_identifier' => 'NAS-Identifier',
+  'dhcp_max_leaset' => 'DHCP_Max_Leases',
+  'digest_nonce_count' => 'Digest-Nonce-Count',
+  'nas_real_port' => 'NAS-Real-Port',
+  'ms_old_arap_password' => 'MS-Old-ARAP-Password',
+  'usr_pw_index' => 'USR-PW_Index',
+  'erx_primary_wins' => 'ERX-Primary-Wins',
+  'ascend_appletalk_peer_mo' => 'Ascend-Appletalk-Peer-Mode',
+  'le_ipsec_log_options' => 'LE-IPSec-Log-Options',
+  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels',
+  'cvx_ipsvc_aznlvl' => 'CVX-IPSVC-AZNLVL',
   'x_ascend_client_secondar' => 'X-Ascend-Client-Secondary-DNS',
+  'annex_re_chap_timeout' => 'Annex-Re-CHAP-Timeout',
+  'aat_ip_pool_definition' => 'AAT-IP-Pool-Definition',
+  'client_dns_pri' => 'Client-DNS-Pri',
+  'cisco_service_info' => 'Cisco-Service-Info',
+  'usr_primary_nbns_server' => 'USR-Primary_NBNS_Server',
+  'aat_atm_direct' => 'AAT-ATM-Direct',
+  'bind_ses_contexu' => 'Bind_Ses_Context',
+  'sip_translated_request_u' => 'Sip-Translated-Request-URI',
+  'acc_acct_on_off_reason' => 'Acc-Acct-On-Off-Reason',
+  'le_multicast_client' => 'LE-Multicast-Client',
+  'bind_sub_passwore' => 'Bind_Sub_Password',
+  'cvpn3000_cisco_ip_phone_' => 'CVPN3000-Cisco-IP-Phone-Bypass',
+  'ascend_send_passwd' => 'Ascend-Send-Passwd',
+  'tunnel_remote_namf' => 'Tunnel_Remote_Name',
+  'cvx_disconnect_cause' => 'CVX-Disconnect-Cause',
+  'itk_auth_serv_prot' => 'ITK-Auth-Serv-Prot',
+  'tunnel_context' => 'Tunnel-Context',
+  'digest_uri' => 'Digest-URI',
+  'usr_channel_decrement' => 'USR-Channel-Decrement',
+  'acc_nbns_server_sec' => 'Acc-Nbns-Server-Sec',
+  'ms_chap_challenge' => 'MS-CHAP-Challenge',
+  'cisco_assign_ip_pool' => 'Cisco-Assign-IP-Pool',
+  'ascend_cbcp_mode' => 'Ascend-CBCP-Mode',
+  'ascend_x25_rpoa' => 'Ascend-X25-Rpoa',
+  'usr_dtr_false_timeout' => 'USR-DTR-False-Timeout',
+  'acct_dyn_ac_enu' => 'Acct_Dyn_Ac_Ent',
+  'usr_physical_state' => 'USR-Physical-State',
+  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp',
+  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression',
+  'ascend_fr_t391' => 'Ascend-FR-T391',
+  'bind_dot1q_port' => 'Bind-Dot1q-Port',
+  'ns_secondary_dns' => 'NS-Secondary-DNS',
+  'altiga_ipsec_tunnel_type' => 'Altiga-IPSec-Tunnel-Type-G',
+  'lac_port_type' => 'LAC-Port-Type',
+  'bg_aging_time' => 'BG-Aging-Time',
+  'erx_atm_scr' => 'ERX-Atm-SCR',
+  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets',
+  'cisco_fax_connect_speed' => 'Cisco-Fax-Connect-Speed',
+  'x_ascend_menu_item' => 'X-Ascend-Menu-Item',
+  'quintum_h323_voice_quali' => 'Quintum-h323-voice-quality',
+  'ascend_x25_pad_banner' => 'Ascend-X25-Pad-Banner',
+  'module_failure_message' => 'Module-Failure-Message',
+  'h323_gw_id' => 'h323-gw-id',
+  'h323_preferred_lang' => 'h323-preferred-lang',
+  'usr_min_compression_size' => 'USR-Min-Compression-Size',
+  'usr_compression_type' => 'USR-Compression-Type',
+  'bintec_ipxstaticroutetab' => 'BinTec-ipxStaticRouteTable',
+  'ascend_dialout_allowed' => 'Ascend-Dialout-Allowed',
+  'annex_local_username' => 'Annex-Local-Username',
+  'cisco_pre_input_packets' => 'Cisco-Pre-Input-Packets',
+  'shiva_function' => 'Shiva-Function',
+  'ascend_send_secret' => 'Ascend-Send-Secret',
+  'usr_number_of_blers' => 'USR-Number-of-Blers',
+  'usr_dte_data_idle_timout' => 'USR-DTE-Data-Idle-Timout',
+  'usr_card_type' => 'USR-Card-Type',
   'x_ascend_connect_progres' => 'X-Ascend-Connect-Progress',
-  'x_ascend_data_filter'     => 'X-Ascend-Data-Filter',
-  'x_ascend_data_rate'       => 'X-Ascend-Data-Rate',
-  'x_ascend_data_svc'        => 'X-Ascend-Data-Svc',
-  'x_ascend_dba_monitor'     => 'X-Ascend-DBA-Monitor',
-  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count',
-  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases',
-  'x_ascend_dhcp_pool_numbe' => 'X-Ascend-DHCP-Pool-Number',
-  'x_ascend_dhcp_reply'      => 'X-Ascend-DHCP-Reply',
-  'x_ascend_dial_number'     => 'X-Ascend-Dial-Number',
-  'x_ascend_dialout_allowed' => 'X-Ascend-Dialout-Allowed',
-  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause',
-  'x_ascend_event_type'      => 'X-Ascend-Event-Type',
+  'x_ascend_group' => 'X-Ascend-Group',
+  'ascend_token_idle' => 'Ascend-Token-Idle',
+  'erx_qos_profile_interfac' => 'ERX-Qos-Profile-Interface-Type',
+  'ascend_private_route_tab' => 'Ascend-Private-Route-Table-ID',
+  'nt_password' => 'NT-Password',
+  'acct_mcast_in_packets' => 'Acct-Mcast-In-Packets',
+  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client',
+  'usr_supports_tags' => 'USR-Supports-Tags',
+  'cvpn3000_authd_user_idle' => 'CVPN3000-Authd-User-Idle-Timeout',
+  'ascend_number_sessions' => 'Ascend-Number-Sessions',
+  'x_ascend_add_seconds' => 'X-Ascend-Add-Seconds',
+  'usr_number_of_upshifts' => 'USR-Number-of-Upshifts',
+  'proxy_to_realm' => 'Proxy-To-Realm',
+  'aat_client_secondary_win' => 'AAT-Client-Secondary-WINS-NBNS',
+  'aat_ip_tos_precedence' => 'AAT-IP-TOS-Precedence',
+  'acc_callback_num_valid' => 'Acc-Callback-Num-Valid',
+  'nokia_ggsn_ip_address' => 'Nokia-GGSN-IP-Address',
+  'acc_access_community' => 'Acc-Access-Community',
+  'ascend_multicast_rate_li' => 'Ascend-Multicast-Rate-Limit',
+  'usr_default_dte_data_rat' => 'USR-Default-DTE-Data-Rate',
+  'usr_rmmie_pwrlvl_nearech' => 'USR-RMMIE-PwrLvl-NearEcho-Canc',
+  'usr_send_name' => 'USR-Send-Name',
+  'usr_chassis_slot' => 'USR-Chassis-Slot',
+  'login_ip_host' => 'Login-IP-Host',
+  'ascend_netware_timeout' => 'Ascend-Netware-timeout',
+  'bind_sub_user_at_context' => 'Bind-Sub-User-At-Context',
+  'vendor_specific' => 'Vendor-Specific',
+  'ascend_fr_direct_dlci' => 'Ascend-FR-Direct-DLCI',
+  'ascend_qos_upstream' => 'Ascend-QOS-Upstream',
+  'aat_user_mac_address' => 'AAT-User-MAC-Address',
+  'source_validation' => 'Source-Validation',
+  'x_ascend_token_expiry' => 'X-Ascend-Token-Expiry',
+  'altiga_ipsec_user_group_' => 'Altiga-IPSec-User-Group-Lock-G',
+  'ascend_dec_channel_count' => 'Ascend-Dec-Channel-Count',
+  'assigned_ip_addrest' => 'Assigned_IP_Address',
+  'usr_local_framed_ip_addr' => 'USR-Local-Framed-IP-Addr',
+  'usr_service_option' => 'USR-Service-Option',
+  'usr_transmit_acc_map' => 'USR-Transmit-Acc-Map',
+  'ascend_fr_direct' => 'Ascend-FR-Direct',
+  'usr_final_rx_link_data_r' => 'USR-Final-Rx-Link-Data-Rate',
   'x_ascend_expect_callback' => 'X-Ascend-Expect-Callback',
-  'x_ascend_fcp_parameter'   => 'X-Ascend-FCP-Parameter',
-  'x_ascend_first_dest'      => 'X-Ascend-First-Dest',
-  'x_ascend_force_56'        => 'X-Ascend-Force-56',
-  'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name',
-  'x_ascend_fr_dce_n392'     => 'X-Ascend-FR-DCE-N392',
-  'x_ascend_fr_dce_n393'     => 'X-Ascend-FR-DCE-N393',
-  'x_ascend_fr_direct'       => 'X-Ascend-FR-Direct',
-  'x_ascend_fr_direct_dlci'  => 'X-Ascend-FR-Direct-DLCI',
-  'x_ascend_fr_direct_profi' => 'X-Ascend-FR-Direct-Profile',
-  'x_ascend_fr_dlci'         => 'X-Ascend-FR-DLCI',
-  'x_ascend_fr_dte_n392'     => 'X-Ascend-FR-DTE-N392',
-  'x_ascend_fr_dte_n393'     => 'X-Ascend-FR-DTE-N393',
-  'x_ascend_fr_link_mgt'     => 'X-Ascend-FR-Link-Mgt',
-  'x_ascend_fr_linkup'       => 'X-Ascend-FR-LinkUp',
-  'x_ascend_fr_n391'         => 'X-Ascend-FR-N391',
-  'x_ascend_fr_nailed_grp'   => 'X-Ascend-FR-Nailed-Grp',
-  'x_ascend_fr_profile_name' => 'X-Ascend-FR-Profile-Name',
-  'x_ascend_fr_t391'         => 'X-Ascend-FR-T391',
-  'x_ascend_fr_t392'         => 'X-Ascend-FR-T392',
-  'x_ascend_fr_type'         => 'X-Ascend-FR-Type',
-  'x_ascend_ft1_caller'      => 'X-Ascend-FT1-Caller',
-  'x_ascend_group'           => 'X-Ascend-Group',
-  'x_ascend_handle_ipx'      => 'X-Ascend-Handle-IPX',
-  'x_ascend_history_weigh_t' => 'X-Ascend-History-Weigh-Type',
+  'x_ascend_disconnect_caus' => 'X-Ascend-Disconnect-Cause',
+  'acc_ml_damping_factor' => 'Acc-ML-Damping-Factor',
+  'framed_netmask' => 'Framed-Netmask',
+  'usr_connect_speed' => 'USR-Connect-Speed',
   'x_ascend_home_agent_ip_a' => 'X-Ascend-Home-Agent-IP-Addr',
-  'x_ascend_home_agent_pass' => 'X-Ascend-Home-Agent-Password',
+  'usr_disconnect_cause_ind' => 'USR-Disconnect-Cause-Indicator',
+  'bg_span_dis' => 'BG-Span-Dis',
+  'cisco_multilink_id' => 'Cisco-Multilink-ID',
+  'tunnel_max_tunnels' => 'Tunnel-Max-Tunnels',
+  'ascend_dsl_downstream_li' => 'Ascend-Dsl-Downstream-Limit',
+  'ascend_multilink_id' => 'Ascend-Multilink-ID',
+  'altiga_ipsec_default_dom' => 'Altiga-IPSec-Default-Domain-G',
+  'ascend_dhcp_reply' => 'Ascend-DHCP-Reply',
+  'login_ipv6_host' => 'Login-IPv6-Host',
+  'ascend_x25_cug' => 'Ascend-X25-Cug',
+  'shiva_network_protocols' => 'Shiva-Network-Protocols',
+  'cvpn3000_ipsec_mode_conf' => 'CVPN3000-IPSec-Mode-Config',
+  'extreme_netlogin_vlan' => 'Extreme-Netlogin-Vlan',
+  'ascend_ara_pw' => 'Ascend-Ara-PW',
+  'tunnel_l2f_second_passwo' => 'Tunnel-L2F-Second-Password',
+  'altiga_sep_card_assignme' => 'Altiga-SEP-Card-Assignment-G/U',
+  'ip_host_addr' => 'Ip-Host-Addr',
+  'le_ip_gateway' => 'LE-IP-Gateway',
+  'usr_mobile_numbytes_txed' => 'USR-Mobile-NumBytes-Txed',
+  'altiga_ipsec_allow_passw' => 'Altiga-IPSec-Allow-Passwd-Store-G/U',
+  'itk_users_default_entry' => 'ITK-Users-Default-Entry',
+  'quintum_h323_redirect_nu' => 'Quintum-h323-redirect-number',
+  'x_ascend_fr_t392' => 'X-Ascend-FR-T392',
+  'acc_igmp_version' => 'Acc-Igmp-Version',
+  'cisco_pre_output_packets' => 'Cisco-Pre-Output-Packets',
+  'tunnel_group' => 'Tunnel-Group',
   'x_ascend_home_agent_udp_' => 'X-Ascend-Home-Agent-UDP-Port',
-  'x_ascend_home_network_na' => 'X-Ascend-Home-Network-Name',
-  'x_ascend_host_info'       => 'X-Ascend-Host-Info',
-  'x_ascend_idle_limit'      => 'X-Ascend-Idle-Limit',
-  'x_ascend_if_netmask'      => 'X-Ascend-IF-Netmask',
-  'x_ascend_inc_channel_cou' => 'X-Ascend-Inc-Channel-Count',
-  'x_ascend_ip_direct'       => 'X-Ascend-IP-Direct',
+  'cvpn3000_tunneling_proto' => 'CVPN3000-Tunneling-Protocols',
+  'usr_igmp_maximum_respons' => 'USR-IGMP-Maximum-Response-Time',
+  'bind_sub_password' => 'Bind-Sub-Password',
+  'eap_message' => 'EAP-Message',
+  'exec_program' => 'Exec-Program',
+  'cvpn3000_reqrd_client_fx' => 'CVPN3000-Reqrd-Client-Fw-Product-Code',
+  'bg_path_cost' => 'BG-Path-Cost',
+  'usr_modem_training_time' => 'USR-Modem-Training-Time',
+  'auth_type' => 'Auth-Type',
+  'itk_acct_serv_prot' => 'ITK-Acct-Serv-Prot',
+  'x_ascend_ipx_route' => 'X-Ascend-IPX-Route',
+  'altiga_primary_dns_g' => 'Altiga-Primary-DNS-G',
+  'ascend_cbcp_enable' => 'Ascend-CBCP-Enable',
+  'ms_mppe_encryption_polic' => 'MS-MPPE-Encryption-Policy',
+  'annex_unauthenticated_ti' => 'Annex-Unauthenticated-Time',
+  'annex_begin_receive_line' => 'Annex-Begin-Receive-Line-Level',
+  'ascend_atm_direct_profil' => 'Ascend-ATM-Direct-Profile',
+  'redcreek_tunneled_dns_se' => 'RedCreek-Tunneled-DNS-Server',
+  'ascend_redirect_number' => 'Ascend-Redirect-Number',
+  'h323_credit_time' => 'h323-credit-time',
+  'cvx_idle_limit' => 'CVX-Idle-Limit',
+  'ascend_appletalk_route' => 'Ascend-Appletalk-Route',
+  'aat_ip_tos' => 'AAT-IP-TOS',
+  'cvx_ppp_address' => 'CVX-PPP-Address',
+  'aat_data_filter' => 'AAT-Data-Filter',
+  'cvx_primary_dns' => 'CVX-Primary-DNS',
+  'shiva_link_protocol' => 'Shiva-Link-Protocol',
+  'x_ascend_fr_circuit_name' => 'X-Ascend-FR-Circuit-Name',
+  'usr_appletalk' => 'USR-Appletalk',
+  'client_id' => 'Client-Id',
+  'tunnel_algorithn' => 'Tunnel_Algorithm',
+  'aat_assign_ip_pool' => 'AAT-Assign-IP-Pool',
+  'quintum_h323_incoming_co' => 'Quintum-h323-incoming-conf-id',
+  'aat_atm_vpi' => 'AAT-ATM-VPI',
+  'annex_output_filter' => 'Annex-Output-Filter',
+  'pvc_circuit_padding' => 'PVC-Circuit-Padding',
+  'usr_ipx_call_output_filt' => 'USR-IPX-Call-Output-Filter',
+  'usr_rmmie_planned_discon' => 'USR-RMMIE-Planned-Disconnect',
+  'session_error_msh' => 'Session_Error_Msg',
+  'usr_rad_multicast_routin' => 'USR-Rad-Multicast-Routing-Ttl',
+  'h323_time_and_day' => 'h323-time-and-day',
+  'cvpn3000_ipsec_backup_se' => 'CVPN3000-IPSec-Backup-Servers',
+  'termination_action' => 'Termination-Action',
+  'cvpn3000_ipsec_client_fx' => 'CVPN3000-IPSec-Client-Fw-Filter-Opt',
+  'aat_client_primary_dnt' => 'AAT-Client-Primary-DNS',
+  'acct_tunnel_packets_lost' => 'Acct-Tunnel-Packets-Lost',
+  'x_ascend_modem_portno' => 'X-Ascend-Modem-PortNo',
+  'framed_filter_id' => 'Framed-Filter-Id',
+  'usr_ccp_algorithm' => 'USR-CCP-Algorithm',
+  'quintum_h323_preferred_l' => 'Quintum-h323-preferred-lang',
+  'ascend_fr_link_status_dl' => 'Ascend-FR-Link-Status-DLCI',
+  'ascend_token_expiry' => 'Ascend-Token-Expiry',
+  'itk_auth_req_type' => 'ITK-Auth-Req-Type',
+  'acc_modem_error_protocol' => 'Acc-Modem-Error-Protocol',
+  'acc_request_type' => 'Acc-Request-Type',
+  'usr_last_number_dialed_i' => 'USR-Last-Number-Dialed-In-DNIS',
+  'x_ascend_ipx_peer_mode' => 'X-Ascend-IPX-Peer-Mode',
+  'ascend_ppp_vj_slot_comp' => 'Ascend-PPP-VJ-Slot-Comp',
+  'cisco_presession_time' => 'Cisco-PreSession-Time',
+  'usr_chat_script_name' => 'USR-Chat-Script-Name',
+  'tunnel_session_auti' => 'Tunnel_Session_Auth',
+  'ascend_fr_circuit_name' => 'Ascend-FR-Circuit-Name',
+  'ascend_expect_callback' => 'Ascend-Expect-Callback',
+  'framed_mtu' => 'Framed-MTU',
+  'usr_pw_vpn_name' => 'USR-PW_VPN_Name',
+  'nomadix_ip_upsell' => 'Nomadix-IP-Upsell',
+  'ascend_nas_port_format' => 'Ascend-NAS-Port-Format',
+  'usr_dtr_true_timeout' => 'USR-DTR-True-Timeout',
+  'shasta_vpn_name' => 'Shasta-VPN-Name',
+  'connect_rate' => 'Connect-Rate',
+  'ascend_third_prompt' => 'Ascend-Third-Prompt',
+  'cabletron_protocol_enabl' => 'Cabletron-Protocol-Enable',
+  'annex_pre_input_octets' => 'Annex-Pre-Input-Octets',
+  'cvx_modem_error_correcti' => 'CVX-Modem-Error-Correction',
+  'cvx_ss7_session_id_type' => 'CVX-SS7-Session-ID-Type',
+  'called_station_id' => 'Called-Station-Id',
+  'itk_ddi' => 'ITK-DDI',
+  'usr_pw_cutoff' => 'USR-PW_Cutoff',
+  'ascend_data_rate' => 'Ascend-Data-Rate',
+  'acct_input_packets_65' => 'Acct_Input_Packets_64',
+  'x_ascend_ts_idle_mode' => 'X-Ascend-TS-Idle-Mode',
+  'ascend_x25_pad_prompt' => 'Ascend-X25-Pad-Prompt',
+  'x_ascend_dhcp_reply' => 'X-Ascend-DHCP-Reply',
+  'acc_nbns_server_pri' => 'Acc-Nbns-Server-Pri',
+  'post_auth_type' => 'Post-Auth-Type',
+  'ascend_call_filter' => 'Ascend-Call-Filter',
+  'acc_tunnel_secret' => 'Acc-Tunnel-Secret',
+  'colubris_avpair' => 'Colubris-AVPair',
+  'bind_int_context' => 'Bind-Int-Context',
+  'annex_logical_channel_nu' => 'Annex-Logical-Channel-Number',
+  'erx_virtual_router_name' => 'ERX-Virtual-Router-Name',
+  'wispr_redirection_url' => 'WISPr-Redirection-URL',
+  'bintec_ipextiftable' => 'BinTec-ipExtIfTable',
+  'crypt_password' => 'Crypt-Password',
+  'challenge_state' => 'Challenge-State',
+  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets',
+  'altiga_ipsec_l2l_keepali' => 'Altiga-IPSec-L2L-Keepalives-G',
+  'x_ascend_dhcp_maximum_le' => 'X-Ascend-DHCP-Maximum-Leases',
+  'acc_dialout_auth_passwor' => 'Acc-Dialout-Auth-Password',
+  'itk_ip_pool' => 'ITK-IP-Pool',
+  'pvc_profile_namf' => 'PVC_Profile_Name',
+  'x_ascend_user_acct_host' => 'X-Ascend-User-Acct-Host',
+  'strip_user_name' => 'Strip-User-Name',
+  'itk_ppp_client_server_mo' => 'ITK-PPP-Client-Server-Mode',
+  'usr_mbi_ct_bchannel_used' => 'USR-Mbi_Ct_BChannel_Used',
+  'x_ascend_route_ip' => 'X-Ascend-Route-IP',
+  'ascend_seconds_of_histor' => 'Ascend-Seconds-Of-History',
+  'cvx_data_rate' => 'CVX-Data-Rate',
+  'ascend_x25_profile_name' => 'Ascend-X25-Profile-Name',
+  'itk_ftp_auth_ip' => 'ITK-Ftp-Auth-IP',
+  'cisco_control_info' => 'Cisco-Control-Info',
+  'cvpn3000_secondary_wins' => 'CVPN3000-Secondary-WINS',
+  'usr_call_type' => 'USR-Call-Type',
+  'x_ascend_user_acct_base' => 'X-Ascend-User-Acct-Base',
+  'acct_mcast_in_packett' => 'Acct_Mcast_In_Packets',
+  'ns_vsys_name' => 'NS-VSYS-Name',
+  'acct_output_gigawords' => 'Acct-Output-Gigawords',
+  'bind_typf' => 'Bind_Type',
+  'bintec_ipqostable' => 'BinTec-ipQoSTable',
+  'bintec_ipxstaticservtabl' => 'BinTec-ipxStaticServTable',
+  'cvpn3000_l2tp_mppc_compr' => 'CVPN3000-L2TP-MPPC-Compression',
+  'login_lat_port' => 'Login-LAT-Port',
+  'usr_call_arrival_in_gmt' => 'USR-Call-Arrival-in-GMT',
+  'acct_mcast_in_octets' => 'Acct-Mcast-In-Octets',
+  'erx_sa_validate' => 'ERX-Sa-Validate',
+  'ascend_service_type' => 'Ascend-Service-Type',
+  'usr_pw_vpn_gateway' => 'USR-PW_VPN_Gateway',
+  'acc_ip_compression' => 'Acc-Ip-Compression',
+  'ascend_fr_dce_n392' => 'Ascend-FR-DCE-N392',
+  'bintec_ipxcirctable' => 'BinTec-ipxCircTable',
+  'lac_real_port_type' => 'LAC-Real-Port-Type',
+  'ascend_client_primary_dn' => 'Ascend-Client-Primary-DNS',
+  'acct_session_start_time' => 'Acct-Session-Start-Time',
+  'ascend_if_netmask' => 'Ascend-IF-Netmask',
+  'ms_chap_nt_enc_pw' => 'MS-CHAP-NT-Enc-PW',
+  'ms_mppe_encryption_types' => 'MS-MPPE-Encryption-Types',
+  'cisco_fax_process_abort_' => 'Cisco-Fax-Process-Abort-Flag',
+  'mcast_maxgroups' => 'Mcast-MaxGroups',
+  'annex_end_receive_line_l' => 'Annex-End-Receive-Line-Level',
+  'usr_ipx_call_input_filte' => 'USR-IPX-Call-Input-Filter',
+  'usr_back_channel_data_ra' => 'USR-Back-Channel-Data-Rate',
+  'ascend_cache_time' => 'Ascend-Cache-Time',
+  'x_ascend_data_svc' => 'X-Ascend-Data-Svc',
+  'usr_re_chap_timeout' => 'USR-Re-Chap-Timeout',
+  'bintec_bibodialtable' => 'BinTec-biboDialTable',
+  'annex_connect_progress' => 'Annex-Connect-Progress',
+  'x_ascend_ppp_vj_1172' => 'X-Ascend-PPP-VJ-1172',
+  'usr_igmp_routing' => 'USR-IGMP-Routing',
   'x_ascend_ip_pool_definit' => 'X-Ascend-IP-Pool-Definition',
-  'x_ascend_ipx_alias'       => 'X-Ascend-IPX-Alias',
-  'x_ascend_ipx_node_addr'   => 'X-Ascend-IPX-Node-Addr',
-  'x_ascend_ipx_peer_mode'   => 'X-Ascend-IPX-Peer-Mode',
-  'x_ascend_ipx_route'       => 'X-Ascend-IPX-Route',
-  'x_ascend_link_compressio' => 'X-Ascend-Link-Compression',
-  'x_ascend_maximum_call_du' => 'X-Ascend-Maximum-Call-Duration',
-  'x_ascend_maximum_channel' => 'X-Ascend-Maximum-Channels',
-  'x_ascend_maximum_time'    => 'X-Ascend-Maximum-Time',
-  'x_ascend_menu_item'       => 'X-Ascend-Menu-Item',
-  'x_ascend_menu_selector'   => 'X-Ascend-Menu-Selector',
-  'x_ascend_metric'          => 'X-Ascend-Metric',
+  'h323_prompt_id' => 'h323-prompt-id',
+  'foundry_command_string' => 'Foundry-Command-String',
+  'le_terminate_detail' => 'LE-Terminate-Detail',
+  'cvpn3000_pptp_encryption' => 'CVPN3000-PPTP-Encryption',
+  'quintum_h323_disconnect_' => 'Quintum-h323-disconnect-time',
+  'acc_ml_clear_threshold' => 'Acc-ML-Clear-Threshold',
+  'x_ascend_ip_direct' => 'X-Ascend-IP-Direct',
+  'usr_ip_call_input_filter' => 'USR-IP-Call-Input-Filter',
+  'x_ascend_data_rate' => 'X-Ascend-Data-Rate',
+  'nas_port' => 'NAS-Port',
+  'ascend_client_secondary_' => 'Ascend-Client-Secondary-WINS',
+  'ascend_auth_type' => 'Ascend-Auth-Type',
+  'x_ascend_preempt_limit' => 'X-Ascend-Preempt-Limit',
+  'cvx_xmit_rate' => 'CVX-Xmit-Rate',
+  'annex_transmitted_packet' => 'Annex-Transmitted-Packets',
+  'h323_credit_amount' => 'h323-credit-amount',
+  'usr_reply_script1' => 'USR-Reply-Script1',
+  'current_time' => 'Current-Time',
+  'cisco_xmit_rate' => 'Cisco-Xmit-Rate',
+  'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key',
+  'ascend_authen_alias' => 'Ascend-Authen-Alias',
+  'erx_redirect_vr_name' => 'ERX-Redirect-VR-Name',
+  'module_success_message' => 'Module-Success-Message',
+  'acc_dialout_auth_mode' => 'Acc-Dialout-Auth-Mode',
+  'bind_auth_contexu' => 'Bind_Auth_Context',
   'x_ascend_minimum_channel' => 'X-Ascend-Minimum-Channels',
-  'x_ascend_modem_portno'    => 'X-Ascend-Modem-PortNo',
-  'x_ascend_modem_shelfno'   => 'X-Ascend-Modem-ShelfNo',
-  'x_ascend_modem_slotno'    => 'X-Ascend-Modem-SlotNo',
-  'x_ascend_mpp_idle_percen' => 'X-Ascend-MPP-Idle-Percent',
-  'x_ascend_multicast_clien' => 'X-Ascend-Multicast-Client',
-  'x_ascend_multicast_rate_' => 'X-Ascend-Multicast-Rate-Limit',
-  'x_ascend_multilink_id'    => 'X-Ascend-Multilink-ID',
-  'x_ascend_netware_timeout' => 'X-Ascend-Netware-timeout',
-  'x_ascend_num_in_multilin' => 'X-Ascend-Num-In-Multilink',
-  'x_ascend_number_sessions' => 'X-Ascend-Number-Sessions',
-  'x_ascend_ppp_address'     => 'X-Ascend-PPP-Address',
-  'x_ascend_ppp_async_map'   => 'X-Ascend-PPP-Async-Map',
-  'x_ascend_ppp_vj_1172'     => 'X-Ascend-PPP-VJ-1172',
-  'x_ascend_ppp_vj_slot_com' => 'X-Ascend-PPP-VJ-Slot-Comp',
-  'x_ascend_pre_input_octet' => 'X-Ascend-Pre-Input-Octets',
-  'x_ascend_pre_input_packe' => 'X-Ascend-Pre-Input-Packets',
-  'x_ascend_pre_output_octe' => 'X-Ascend-Pre-Output-Octets',
-  'x_ascend_pre_output_pack' => 'X-Ascend-Pre-Output-Packets',
-  'x_ascend_preempt_limit'   => 'X-Ascend-Preempt-Limit',
-  'x_ascend_presession_time' => 'X-Ascend-PreSession-Time',
+  'usr_event_date_time' => 'USR-Event-Date-Time',
+  'x_ascend_ipx_node_addr' => 'X-Ascend-IPX-Node-Addr',
+  'cvpn3000_ipsec_over_udp' => 'CVPN3000-IPSec-Over-UDP',
+  'x_ascend_user_acct_time' => 'X-Ascend-User-Acct-Time',
+  'cisco_email_server_ack_f' => 'Cisco-Email-Server-Ack-Flag',
+  'telebit_activate_command' => 'Telebit-Activate-Command',
+  'acc_output_errors' => 'Acc-Output-Errors',
+  'juniper_allow_configurat' => 'Juniper-Allow-Configuration',
+  'bind_l2tp_tunnel_name' => 'Bind-L2TP-Tunnel-Name',
   'x_ascend_pri_number_type' => 'X-Ascend-PRI-Number-Type',
-  'x_ascend_primary_home_ag' => 'X-Ascend-Primary-Home-Agent',
-  'x_ascend_pw_lifetime'     => 'X-Ascend-PW-Lifetime',
-  'x_ascend_pw_warntime'     => 'X-Ascend-PW-Warntime',
-  'x_ascend_receive_secret'  => 'X-Ascend-Receive-Secret',
-  'x_ascend_remote_addr'     => 'X-Ascend-Remote-Addr',
-  'x_ascend_remove_seconds'  => 'X-Ascend-Remove-Seconds',
-  'x_ascend_require_auth'    => 'X-Ascend-Require-Auth',
-  'x_ascend_route_ip'        => 'X-Ascend-Route-IP',
-  'x_ascend_route_ipx'       => 'X-Ascend-Route-IPX',
-  'x_ascend_secondary_home_' => 'X-Ascend-Secondary-Home-Agent',
-  'x_ascend_seconds_of_hist' => 'X-Ascend-Seconds-Of-History',
-  'x_ascend_send_auth'       => 'X-Ascend-Send-Auth',
-  'x_ascend_send_passwd'     => 'X-Ascend-Send-Passwd',
-  'x_ascend_send_secret'     => 'X-Ascend-Send-Secret',
-  'x_ascend_session_svr_key' => 'X-Ascend-Session-Svr-Key',
-  'x_ascend_shared_profile_' => 'X-Ascend-Shared-Profile-Enable',
-  'x_ascend_target_util'     => 'X-Ascend-Target-Util',
-  'x_ascend_temporary_rtes'  => 'X-Ascend-Temporary-Rtes',
-  'x_ascend_third_prompt'    => 'X-Ascend-Third-Prompt',
-  'x_ascend_token_expiry'    => 'X-Ascend-Token-Expiry',
-  'x_ascend_token_idle'      => 'X-Ascend-Token-Idle',
-  'x_ascend_token_immediate' => 'X-Ascend-Token-Immediate',
-  'x_ascend_transit_number'  => 'X-Ascend-Transit-Number',
-  'x_ascend_ts_idle_limit'   => 'X-Ascend-TS-Idle-Limit',
-  'x_ascend_ts_idle_mode'    => 'X-Ascend-TS-Idle-Mode',
-  'x_ascend_tunneling_proto' => 'X-Ascend-Tunneling-Protocol',
-  'x_ascend_user_acct_base'  => 'X-Ascend-User-Acct-Base',
-  'x_ascend_user_acct_host'  => 'X-Ascend-User-Acct-Host',
-  'x_ascend_user_acct_key'   => 'X-Ascend-User-Acct-Key',
-  'x_ascend_user_acct_port'  => 'X-Ascend-User-Acct-Port',
-  'x_ascend_user_acct_time'  => 'X-Ascend-User-Acct-Time',
-  'x_ascend_user_acct_type'  => 'X-Ascend-User-Acct-Type',
-  'x_ascend_xmit_rate'       => 'X-Ascend-Xmit-Rate',
-  'xedia_address_pool'       => 'Xedia-Address-Pool',
-  'xedia_client_access_netw' => 'Xedia-Client-Access-Network',
-  'xedia_dns_server'         => 'Xedia-DNS-Server',
-  'xedia_netbios_server'     => 'Xedia-NetBios-Server',
-  'xedia_ppp_echo_interval'  => 'Xedia-PPP-Echo-Interval',
-  'xedia_ssh_privileges'     => 'Xedia-SSH-Privileges',
+  'bintec_biboppptable' => 'BinTec-biboPPPTable',
+  'le_ipsec_outsource_profi' => 'LE-IPSec-Outsource-Profile',
+  'usr_at_zip_input_filter' => 'USR-AT-Zip-Input-Filter',
+  'replicate_to_realm' => 'Replicate-To-Realm',
+  'annex_mrru' => 'Annex-MRRU',
+  'event_timestamp' => 'Event-Timestamp',
+  'nokia_sgsn_ip_address' => 'Nokia-SGSN-IP-Address',
+  'ascend_pre_input_packets' => 'Ascend-Pre-Input-Packets',
+  'cvpn5000_client_assigned' => 'CVPN5000-Client-Assigned-IP',
+  'tunnel_dnit' => 'Tunnel_DNIS',
+  'h323_call_origin' => 'h323-call-origin',
+  'x_ascend_fr_type' => 'X-Ascend-FR-Type',
+  'itk_provider_id' => 'ITK-Provider-Id',
+  'cvx_ppp_log_mask' => 'CVX-PPP-Log-Mask',
+  'x_ascend_token_idle' => 'X-Ascend-Token-Idle',
+  'usr_rmmie_pwrlvl_xmit_lv' => 'USR-RMMIE-PwrLvl-Xmit-Lvl',
+  'usr_igmp_query_interval' => 'USR-IGMP-Query-Interval',
+  'quintum_h323_billing_mod' => 'Quintum-h323-billing-model',
+  'ascend_atm_vci' => 'Ascend-ATM-Vci',
+  'usr_port_tap_output' => 'USR-Port-Tap-Output',
+  'session' => 'Session',
+  'itk_welcome_message' => 'ITK-Welcome-Message',
+  'cvpn3000_ike_keep_alives' => 'CVPN3000-IKE-Keep-Alives',
+  'ascend_uu_info' => 'Ascend-UU-Info',
+  'usr_et_bridge_call_outpu' => 'USR-ET-Bridge-Call-Output-Filte',
+  'usr_secondary_dns_server' => 'USR-Secondary_DNS_Server',
+  'ms_mppe_recv_key' => 'MS-MPPE-Recv-Key',
+  'bintec_ripcirctable' => 'BinTec-ripCircTable',
+  'acc_dial_port_index' => 'Acc-Dial-Port-Index',
+  'cisco_nas_port' => 'Cisco-NAS-Port',
+  'itk_username' => 'ITK-Username',
+  'usr_send_script1' => 'USR-Send-Script1',
+  'cvpn3000_ipsec_ike_peer_' => 'CVPN3000-IPSec-IKE-Peer-ID-Check',
+  'ascend_dsl_upstream_limi' => 'Ascend-Dsl-Upstream-Limit',
+  'x_ascend_dec_channel_cou' => 'X-Ascend-Dec-Channel-Count',
+  'usr_tunnel_security' => 'USR-Tunnel-Security',
+  'arap_security' => 'ARAP-Security',
+  'tunnel_preference' => 'Tunnel-Preference',
+  'cisco_port_used' => 'Cisco-Port-Used',
+  'usr_reply_script4' => 'USR-Reply-Script4',
+  'cvpn5000_client_real_ip' => 'CVPN5000-Client-Real-IP',
+  'usr_rmmie_status' => 'USR-RMMIE-Status',
+  'usr_send_script4' => 'USR-Send-Script4',
+  'quintum_h323_connect_tim' => 'Quintum-h323-connect-time',
+  'annex_syslog_tap' => 'Annex-Syslog-Tap',
+  'redcreek_tunneled_hostna' => 'RedCreek-Tunneled-HostName',
+  'acc_clearing_location' => 'Acc-Clearing-Location',
+  'ascend_access_intercept_' => 'Ascend-Access-Intercept-LEA',
+  'annex_disconnect_reason' => 'Annex-Disconnect-Reason',
+  'usr_at_input_filter' => 'USR-AT-Input-Filter',
+  'usr_auth_mode' => 'USR-Auth-Mode',
+  'usr_expected_voltage' => 'USR-Expected-Voltage',
+  'shiva_session_id' => 'Shiva-Session-Id',
+  'annex_maximum_call_durat' => 'Annex-Maximum-Call-Duration',
+  'usr_block_error_count_li' => 'USR-Block-Error-Count-Limit',
+  'ascend_owner_ip_addr' => 'Ascend-Owner-IP-Addr',
+  'bind_tun_contexu' => 'Bind_Tun_Context',
+  'usr_pw_usr_ofilter_ipx' => 'USR-PW_USR_OFilter_IPX',
+  'framed_routing' => 'Framed-Routing',
+  'annex_primary_nbns_serve' => 'Annex-Primary-NBNS-Server',
+  'usr_interface_index' => 'USR-Interface-Index',
+  'pam_auth' => 'Pam-Auth',
+  'usr_end_time' => 'USR-End-Time',
+  'rate_limit_bursu' => 'Rate_Limit_Burst',
+  'nomadix_expiration' => 'Nomadix-Expiration',
+  'x_ascend_transit_number' => 'X-Ascend-Transit-Number',
+  'itk_usergroup' => 'ITK-Usergroup',
+  'x_ascend_assign_ip_pool' => 'X-Ascend-Assign-IP-Pool',
+  'annex_secondary_nbns_ser' => 'Annex-Secondary-NBNS-Server',
+  'bind_dot1q_vlan_tag_id' => 'Bind-Dot1q-Vlan-Tag-Id',
+  'ms_secondary_nbns_server' => 'MS-Secondary-NBNS-Server',
+  'tunnel_retransmit' => 'Tunnel-Retransmit',
+  'acct_tunnel_connection' => 'Acct-Tunnel-Connection',
+  'x_ascend_backup' => 'X-Ascend-Backup',
+  'xedia_ppp_echo_interval' => 'Xedia-PPP-Echo-Interval',
+  'usr_bearer_capabilities' => 'USR-Bearer-Capabilities',
+  'shiva_acct_serv_switch' => 'Shiva-Acct-Serv-Switch',
+  'acct_authentic' => 'Acct-Authentic',
+  'le_nat_other_session_tim' => 'LE-NAT-Other-Session-Timeout',
+  'cvpn3000_ipsec_banner2' => 'CVPN3000-IPSec-Banner2',
+  'x_ascend_force_56' => 'X-Ascend-Force-56',
+  'framed_appletalk_network' => 'Framed-AppleTalk-Network',
+  'reply_message' => 'Reply-Message',
+  'class' => 'Class',
+  'h323_conf_id' => 'h323-conf-id',
+  'quintum_h323_disconnecta' => 'Quintum-h323-disconnect-cause',
+  'itk_filter_rule' => 'ITK-Filter-Rule',
+  'wispr_bandwidth_max_up' => 'WISPr-Bandwidth-Max-Up',
+  'usr_appletalk_network_ra' => 'USR-Appletalk-Network-Range',
+  'ascend_cbcp_delay' => 'Ascend-CBCP-Delay',
+  'usr_dte_ring_no_answer_l' => 'USR-DTE-Ring-No-Answer-Limit',
+  'pre_acct_type' => 'Pre-Acct-Type',
+  'usr_local_ip_address' => 'USR-Local-IP-Address',
+  'ascend_dropped_octets' => 'Ascend-Dropped-Octets',
+  'ascend_h323_dialed_time' => 'Ascend-H323-Dialed-Time',
+  'cisco_email_server_addre' => 'Cisco-Email-Server-Address',
+  'ascend_x25_x121_address' => 'Ascend-X25-X121-Address',
+  'cvx_multicast_client' => 'CVX-Multicast-Client',
+  'wispr_bandwidth_min_up' => 'WISPr-Bandwidth-Min-Up',
+  'usr_at_output_filter' => 'USR-AT-Output-Filter',
+  'annex_local_ip_address' => 'Annex-Local-IP-Address',
+  'cisco_ip_pool_definition' => 'Cisco-IP-Pool-Definition',
+  'cisco_gateway_id' => 'Cisco-Gateway-Id',
+  'itk_password_prompt' => 'ITK-Password-Prompt',
+  'annex_domain_name' => 'Annex-Domain-Name',
+  'foundry_command_exceptio' => 'Foundry-Command-Exception-Flag',
+  'ascend_preempt_limit' => 'Ascend-Preempt-Limit',
+  'erx_minimum_bps' => 'ERX-Minimum-BPS',
+  'aat_mcast_client' => 'AAT-MCast-Client',
+  'ascend_atm_fault_managem' => 'Ascend-ATM-Fault-Management',
+  'ascend_event_type' => 'Ascend-Event-Type',
+  'exec_program_wait' => 'Exec-Program-Wait',
+  'framed_interface_id' => 'Framed-Interface-Id',
 
   #NETC.NET.AU (RADIATOR?)
-  'authentication_type'      => 'Authentication-Type',
-
-  #wtxs (dunno)
-  #'radius_operator'          => 'Radius-Operator',
+  'authentication_type' => 'Authentication-Type',
 
 );
 
diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm
index a471e2e..b8a6940 100644
--- a/FS/FS/rate.pm
+++ b/FS/FS/rate.pm
@@ -1,14 +1,12 @@
 package FS::rate;
 
 use strict;
-use vars qw( @ISA $DEBUG );
-use FS::Record qw( qsearch qsearchs dbh fields );
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::rate_detail;
 
 @ISA = qw(FS::Record);
 
-$DEBUG = 1;
-
 =head1 NAME
 
 FS::rate - Object methods for rate records
@@ -96,32 +94,13 @@ sub insert {
   }
 
   if ( $options{'rate_detail'} ) {
-
-    my( $num, $last, $min_sec ) = (0, time, 5); #progressbar foo
-
     foreach my $rate_detail ( @{$options{'rate_detail'}} ) {
-
       $rate_detail->ratenum($self->ratenum);
       $error = $rate_detail->insert;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
         return $error;
       }
-
-      if ( $options{'job'} ) {
-        $num++;
-        if ( time - $min_sec > $last ) {
-          my $error = $options{'job'}->update_statustext(
-            int( 100 * $num / scalar( @{$options{'rate_detail'}} ) )
-          );
-          if ( $error ) {
-            $dbh->rollback if $oldAutoCommit;
-            return $error;
-          }
-          $last = time;
-        }
-      }
-
     }
   }
 
@@ -169,8 +148,8 @@ sub replace {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-#  my @old_rate_detail = ();
-#  @old_rate_detail = $old->rate_detail if $options{'rate_detail'};
+  my @old_rate_detail = ();
+  @old_rate_detail = $old->rate_detail if $options{'rate_detail'};
 
   my $error = $new->SUPER::replace($old);
   if ($error) {
@@ -178,67 +157,21 @@ sub replace {
     return $error;
   }
 
-#  foreach my $old_rate_detail ( @old_rate_detail ) {
-#
-#    my $error = $old_rate_detail->delete;
-#    if ($error) {
-#      $dbh->rollback if $oldAutoCommit;
-#      return $error;
-#    }
-#
-#    if ( $options{'job'} ) {
-#      $num++;
-#      if ( time - $min_sec > $last ) {
-#        my $error = $options{'job'}->update_statustext(
-#          int( 50 * $num / scalar( @old_rate_detail ) )
-#        );
-#        if ( $error ) {
-#          $dbh->rollback if $oldAutoCommit;
-#          return $error;
-#        }
-#        $last = time;
-#      }
-#    }
-#
-#  }
-  if ( $options{'rate_detail'} ) {
-    my $sth = $dbh->prepare('DELETE FROM rate_detail WHERE ratenum = ?') or do {
-      $dbh->rollback if $oldAutoCommit;
-      return $dbh->errstr;
-    };
-  
-    $sth->execute($old->ratenum) or do {
+  foreach my $old_rate_detail ( @old_rate_detail ) {
+    my $error = $old_rate_detail->delete;
+    if ($error) {
       $dbh->rollback if $oldAutoCommit;
-      return $sth->errstr;
-    };
-
-    my( $num, $last, $min_sec ) = (0, time, 5); #progresbar foo
-#  $num = 0;
-    foreach my $rate_detail ( @{$options{'rate_detail'}} ) {
-  
-      $rate_detail->ratenum($new->ratenum);
-      $error = $rate_detail->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-  
-      if ( $options{'job'} ) {
-        $num++;
-        if ( time - $min_sec > $last ) {
-          my $error = $options{'job'}->update_statustext(
-            int( 100 * $num / scalar( @{$options{'rate_detail'}} ) )
-          );
-          if ( $error ) {
-            $dbh->rollback if $oldAutoCommit;
-            return $error;
-          }
-          $last = time;
-        }
-      }
-  
+      return $error;
     }
+  }
 
+  foreach my $rate_detail ( @{$options{'rate_detail'}} ) {
+    $rate_detail->ratenum($new->ratenum);
+    $error = $rate_detail->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -297,76 +230,6 @@ sub rate_detail {
 
 =back
 
-=head1 SUBROUTINES
-
-=over 4
-
-=item process
-
-Experimental job-queue processor for web interface adds/edits
-
-=cut
-
-use Storable qw(thaw);
-use Data::Dumper;
-use MIME::Base64;
-sub process {
-  my $job = shift;
-
-  my $param = thaw(decode_base64(shift));
-  warn Dumper($param) if $DEBUG;
-
-  my $old = qsearchs('rate', { 'ratenum' => $param->{'ratenum'} } )
-    if $param->{'ratenum'};
-
-  my @rate_detail = map {
-
-    my $regionnum = $_->regionnum;
-    if ( $param->{"sec_granularity$regionnum"} ) {
-
-      new FS::rate_detail {
-        'dest_regionnum'  => $regionnum,
-        map { $_ => $param->{"$_$regionnum"} }
-            qw( min_included min_charge sec_granularity )
-      };
-
-    } else {
-
-      new FS::rate_detail {
-        'dest_regionnum'  => $regionnum,
-        'min_included'    => 0,
-        'min_charge'      => 0,
-        'sec_granularity' => '60'
-      };
-
-    }
-    
-  } qsearch('rate_region', {} );
-  
-  my $rate = new FS::rate {
-    map { $_ => $param->{$_} }
-        fields('rate')
-  };
-
-  my $error = '';
-  if ( $param->{'ratenum'} ) {
-    warn "$rate replacing $old (". $param->{'ratenum'}. ")\n" if $DEBUG;
-    $error = $rate->replace( $old,
-                             'rate_detail' => \@rate_detail,
-                             'job'         => $job,
-                           );
-  } else {
-    warn "inserting $rate\n" if $DEBUG;
-    $error = $rate->insert( 'rate_detail' => \@rate_detail,
-                            'job'         => $job,
-                          );
-    #$ratenum = $rate->getfield('ratenum');
-  }
-
-  die "$error\n" if $error;
-
-}
-
 =head1 BUGS
 
 =head1 SEE ALSO
diff --git a/FS/FS/rate_detail.pm b/FS/FS/rate_detail.pm
index 7d54355..313b053 100644
--- a/FS/FS/rate_detail.pm
+++ b/FS/FS/rate_detail.pm
@@ -34,8 +34,6 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item ratedetailnum - primary key
-
 =item ratenum - rate plan (see L<FS::rate>)
 
 =item orig_regionnum - call origination region
@@ -108,8 +106,7 @@ sub check {
   my $self = shift;
 
   my $error = 
-       $self->ut_numbern('ratedetailnum')
-    || $self->ut_foreign_key('ratenum', 'rate', 'ratenum')
+       $self->ut_foreign_key('ratenum', 'rate', 'ratenum')
     || $self->ut_foreign_keyn('orig_regionnum', 'rate_region', 'regionnum' )
     || $self->ut_foreign_key('dest_regionnum', 'rate_region', 'regionnum' )
     || $self->ut_number('min_included')
diff --git a/FS/FS/rate_prefix.pm b/FS/FS/rate_prefix.pm
index 42b004f..500462a 100644
--- a/FS/FS/rate_prefix.pm
+++ b/FS/FS/rate_prefix.pm
@@ -122,7 +122,7 @@ Returns the rate region (see L<FS::rate_region>) for this prefix.
 
 sub rate_region {
   my $self = shift;
-  qsearchs('rate_region', { 'regionnum' => $self->regionnum } );
+  qsearch('rate_region', { 'regionnum' => $self->regionnum } );
 }
 
 =back
diff --git a/FS/FS/reg_code.pm b/FS/FS/reg_code.pm
deleted file mode 100644
index f48ccf0..0000000
--- a/FS/FS/reg_code.pm
+++ /dev/null
@@ -1,223 +0,0 @@
-package FS::reg_code;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw(qsearch dbh);
-use FS::agent;
-use FS::reg_code_pkg;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::reg_code - One-time registration codes
-
-=head1 SYNOPSIS
-
-  use FS::reg_code;
-
-  $record = new FS::reg_code \%hash;
-  $record = new FS::reg_code { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::reg_code object is a one-time registration code.  FS::reg_code inherits
-from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item codenum - primary key
-
-=item code - registration code string
-
-=item agentnum - Agent (see L<FS::agent>)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new registration code.  To add the code to the database, see
-L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'reg_code'; }
-
-=item insert [ PKGPART_ARRAYREF ] 
-
-Adds this record to the database.  If an arrayref of pkgparts
-(see L<FS::part_pkg>) is specified, the appropriate reg_code_pkg records
-(see L<FS::reg_code_pkg>) will be inserted.
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub insert {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::insert;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  if ( @_ ) {
-    my $pkgparts = shift;
-    foreach my $pkgpart ( @$pkgparts ) {
-      my $reg_code_pkg = new FS::reg_code_pkg ( {
-        'codenum' => $self->codenum,
-        'pkgpart' => $pkgpart,
-      } );
-      $error = $reg_code_pkg->insert;
-      if ( $error ) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
-      }
-    }
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item delete
-
-Delete this record (and all associated reg_code_pkg records) from the database.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  foreach my $reg_code_pkg ( $self->reg_code_pkg ) {
-    my $error = $reg_code_pkg->delete;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-  }
-
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid registration code.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('codenum')
-    || $self->ut_alpha('code')
-    || $self->ut_foreign_key('agentnum', 'agent', 'agentnum')
-  ;
-  return $error if $error;
-
-  $self->SUPER::check;
-}
-
-=item part_pkg
-
-Returns all package definitions (see L<FS::part_pkg> for this registration
-code.
-
-=cut
-
-sub part_pkg {
-  my $self = shift;
-  map { $_->part_pkg } $self->reg_code_pkg;
-}
-
-=item reg_code_pkg
-
-Returns all FS::reg_code_pkg records for this registration code.
-
-=cut
-
-sub reg_code_pkg {
-  my $self = shift;
-  qsearch('reg_code_pkg', { 'codenum' => $self->codenum } );
-}
-
-
-=back
-
-=head1 BUGS
-
-Feeping creaturitis.
-
-=head1 SEE ALSO
-
-L<FS::reg_code_pkg>, L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
-
diff --git a/FS/FS/reg_code_pkg.pm b/FS/FS/reg_code_pkg.pm
deleted file mode 100644
index 9b9a877..0000000
--- a/FS/FS/reg_code_pkg.pm
+++ /dev/null
@@ -1,138 +0,0 @@
-package FS::reg_code_pkg;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw(qsearchs);
-use FS::reg_code;
-use FS::part_pkg;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::reg_code_pkg - Class linking registration codes (see L<FS::reg_code>) with package definitions (see L<FS::part_pkg>)
-
-=head1 SYNOPSIS
-
-  use FS::reg_code_pkg;
-
-  $record = new FS::reg_code_pkg \%hash;
-  $record = new FS::reg_code_pkg { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::reg_code_pkg object links a registration code to a package definition.
-FS::table_name inherits from FS::Record.  The following fields are currently
-supported:
-
-=over 4
-
-=item codepkgnum - primary key
-
-=item codenum - registration code (see L<FS::reg_code>)
-
-=item pkgpart - package definition (see L<FS::part_pkg>)
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new example.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'reg_code_pkg'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid record.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-       $self->ut_numbern('codepkgnum')
-    || $self->ut_foreign_key('codenum', 'reg_code', 'codenum')
-    || $self->ut_foreign_key('pkgpart', 'part_pkg', 'pkgpart')
-  ;
-  return $error if $error;
-
-  $self->SUPER::check;
-}
-
-=item part_pkg
-
-Returns the package definition (see L<FS::part_pkg>)
-
-=cut
-
-sub part_pkg {
-  my $self = shift;
-  qsearchs('part_pkg', { 'pkgpart' => $self->pkgpart } );
-}
-
-=back
-
-=head1 BUGS
-
-Feeping creaturitis.
-
-=head1 SEE ALSO
-
-L<FS::reg_code_pkg>, L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
-
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 962e36a..10ff3f9 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -2,17 +2,15 @@ package FS::svc_Common;
 
 use strict;
 use vars qw( @ISA $noexport_hack $DEBUG );
-use Carp;
 use FS::Record qw( qsearch qsearchs fields dbh );
-use FS::cust_main_Mixin;
 use FS::cust_svc;
 use FS::part_svc;
 use FS::queue;
-use FS::cust_main;
 
-@ISA = qw( FS::cust_main_Mixin FS::Record );
+@ISA = qw( FS::Record );
 
 $DEBUG = 0;
+#$DEBUG = 1;
 
 =head1 NAME
 
@@ -35,38 +33,6 @@ inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.
 
 =cut
 
-sub new {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self = {};
-  bless ($self, $class);
-
-  unless ( defined ( $self->table ) ) {
-    $self->{'Table'} = shift;
-    carp "warning: FS::Record::new called with table name ". $self->{'Table'};
-  }
-  
-  #$self->{'Hash'} = shift;
-  my $newhash = shift;
-  $self->{'Hash'} = { map { $_ => $newhash->{$_} } qw(svcnum svcpart) };
-  $self->setdefault;
-  $self->{'Hash'}{$_} = $newhash->{$_}
-    foreach grep { defined($newhash->{$_}) && length($newhash->{$_}) }
-                 keys %$newhash;
-
-  foreach my $field ( grep !defined($self->{'Hash'}{$_}), $self->fields ) { 
-    $self->{'Hash'}{$field}='';
-  }
-
-  $self->_rebless if $self->can('_rebless');
-
-  $self->{'modified'} = 0;
-
-  $self->_cache($self->{'Hash'}, shift) if $self->can('_cache') && @_;
-
-  $self;
-}
-
 sub virtual_fields {
 
   # This restricts the fields based on part_svc_column and the svcpart of 
@@ -134,11 +100,8 @@ If I<jobnum> is set to an array reference, the jobnums of any export jobs will
 be added to the referenced array.
 
 If I<child_objects> is set to an array reference of FS::tablename objects (for
-example, FS::acct_snarf objects), they will have their svcnum field set and
-will be inserted after this record, but before any exports are run.  Each
-element of the array can also optionally be a two-element array reference
-containing the child object and the name of an alternate field to be filled in
-with the newly-inserted svcnum, for example C<[ $svc_forward, 'srcsvc' ]>
+example, FS::acct_snarf objects), they will have their svcnum fieldsset and
+will be inserted after this record, but before any exports are run.
 
 If I<depend_jobnum> is set (to a scalar jobnum or an array reference of
 jobnums), all provisioning jobs will have a dependancy on the supplied
@@ -209,15 +172,8 @@ sub insert {
   }
 
   foreach my $object ( @$objects ) {
-    my($field, $obj);
-    if ( ref($object) eq 'ARRAY' ) {
-      ($obj, $field) = @$object;
-    } else {
-      $obj = $object;
-      $field = 'svcnum';
-    }
-    $obj->$field($self->svcnum);
-    $error = $obj->insert;
+    $object->svcnum($self->svcnum);
+    $error = $object->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c1851d3..ec0e1d5 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1,12 +1,12 @@
 package FS::svc_acct;
 
 use strict;
-use vars qw( @ISA $DEBUG $me $conf $skip_fuzzyfiles
+use vars qw( @ISA $DEBUG $me $conf
              $dir_prefix @shells $usernamemin
              $usernamemax $passwordmin $passwordmax
              $username_ampersand $username_letter $username_letterfirst
              $username_noperiod $username_nounderscore $username_nodash
-             $username_uppercase $username_percent
+             $username_uppercase
              $password_noampersand $password_noexclamation
              $welcome_template $welcome_from $welcome_subject $welcome_mimetype
              $smtpmachine
@@ -15,8 +15,7 @@ use vars qw( @ISA $DEBUG $me $conf $skip_fuzzyfiles
              @saltset @pw_set );
 use Carp;
 use Fcntl qw(:flock);
-use Date::Format;
-use Crypt::PasswdMD5 1.2;
+use Crypt::PasswdMD5;
 use FS::UID qw( datasrc );
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs fields dbh dbdef );
@@ -38,6 +37,7 @@ use FS::svc_www;
 @ISA = qw( FS::svc_Common );
 
 $DEBUG = 0;
+#$DEBUG = 1;
 $me = '[FS::svc_acct]';
 
 #ask FS::UID to run this stuff for us later
@@ -56,7 +56,6 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
   $username_nodash = $conf->exists('username-nodash');
   $username_uppercase = $conf->exists('username-uppercase');
   $username_ampersand = $conf->exists('username-ampersand');
-  $username_percent = $conf->exists('username-percent');
   $password_noampersand = $conf->exists('password-noexclamation');
   $password_noexclamation = $conf->exists('password-noexclamation');
   $dirhash = $conf->config('dirhash') || 0;
@@ -168,9 +167,7 @@ FS::svc_Common.  The following fields are currently supported:
 
 =item domsvc - svcnum from svc_domain
 
-=item radius_I<Radius_Attribute> - I<Radius-Attribute> (reply)
-
-=item rc_I<Radius_Attribute> - I<Radius-Attribute> (check)
+=item radius_I<Radius_Attribute> - I<Radius-Attribute>
 
 =back
 
@@ -200,10 +197,7 @@ contain an arrayref of group names.  See L<FS::radius_usergroup>.
 The additional field I<child_objects> can optionally be defined; if so it
 should contain an arrayref of FS::tablename objects.  They will have their
 svcnum fields set and will be inserted after this record, but before any
-exports are run.  Each element of the array can also optionally be a
-two-element array reference containing the child object and the name of an
-alternate field to be filled in with the newly-inserted svcnum, for example
-C<[ $svc_forward, 'srcsvc' ]>
+exports are run.
 
 Currently available options are: I<depend_jobnum>
 
@@ -277,12 +271,15 @@ sub insert {
     }
   }
 
-  unless ( $skip_fuzzyfiles ) {
-    $error = $self->queue_fuzzyfiles_update;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "updating fuzzy search cache: $error";
-    }
+  #false laziness with sub replace (and cust_main)
+  my $queue = new FS::queue {
+    'svcnum' => $self->svcnum,
+    'job'    => 'FS::svc_acct::append_fuzzyfiles'
+  };
+  $error = $queue->insert($self->username);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "queueing job (transaction rolled back): $error";
   }
 
   my $cust_pkg = $self->cust_svc->cust_pkg;
@@ -299,7 +296,7 @@ sub insert {
     #welcome email
     my $to = '';
     if ( $welcome_template && $cust_pkg ) {
-      my $to = join(', ', grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list );
+      my $to = join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list );
       if ( $to ) {
         my $wqueue = new FS::queue {
           'svcnum' => $self->svcnum,
@@ -464,18 +461,15 @@ sub replace {
 
   return "can't modify system account" if $old->_check_system;
 
+  return "Username in use"
+    if $old->username ne $new->username &&
+      qsearchs( 'svc_acct', { 'username' => $new->username,
+                               'domsvc'   => $new->domsvc,
+                             } );
   {
     #no warnings 'numeric';  #alas, a 5.006-ism
     local($^W) = 0;
-
-    foreach my $xid (qw( uid gid )) {
-
-      return "Can't change $xid!"
-        if ! $conf->exists("svc_acct-edit_$xid")
-           && $old->$xid() != $new->$xid()
-           && $new->cust_svc->part_svc->part_svc_column($xid)->columnflag ne 'F'
-    }
-
+    return "Can't change uid!" if $old->uid != $new->uid;
   }
 
   #change homdir when we change username
@@ -497,10 +491,8 @@ sub replace {
   return $error if $error;
 
   $old->usergroup( [ $old->radius_groups ] );
-  if ( $DEBUG ) {
-    warn $old->email. " old groups: ". join(' ',@{$old->usergroup}). "\n";
-    warn $new->email. "new groups: ". join(' ',@{$new->usergroup}). "\n";
-  }
+  warn "old groups: ". join(' ',@{$old->usergroup}). "\n" if $DEBUG;
+  warn "new groups: ". join(' ',@{$new->usergroup}). "\n" if $DEBUG;
   if ( $new->usergroup ) {
     #(sorta) false laziness with FS::part_export::sqlradius::_export_replace
     my @newgroups = @{$new->usergroup};
@@ -549,11 +541,16 @@ sub replace {
     return $error if $error;
   }
 
-  if ( $new->username ne $old->username && ! $skip_fuzzyfiles ) {
-    $error = $new->queue_fuzzyfiles_update;
+  if ( $new->username ne $old->username ) {
+    #false laziness with sub insert (and cust_main)
+    my $queue = new FS::queue {
+      'svcnum' => $new->svcnum,
+      'job'    => 'FS::svc_acct::append_fuzzyfiles'
+    };
+    $error = $queue->insert($new->username);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return "updating fuzzy search cache: $error";
+      return "queueing job (transaction rolled back): $error";
     }
   }
 
@@ -561,42 +558,6 @@ sub replace {
   ''; #no error
 }
 
-=item queue_fuzzyfiles_update
-
-Used by insert & replace to update the fuzzy search cache
-
-=cut
-
-sub queue_fuzzyfiles_update {
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $queue = new FS::queue {
-    'svcnum' => $self->svcnum,
-    'job'    => 'FS::svc_acct::append_fuzzyfiles'
-  };
-  my $error = $queue->insert($self->username);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "queueing job (transaction rolled back): $error";
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-
 =item suspend
 
 Suspends this account by calling export-specific suspend hooks.  If there is
@@ -699,11 +660,11 @@ sub check {
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
   if ( $username_uppercase ) {
-    $recref->{username} =~ /^([a-z0-9_\-\.\&\%]{$usernamemin,$ulen})$/i
+    $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/i
       or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
     $recref->{username} = $1;
   } else {
-    $recref->{username} =~ /^([a-z0-9_\-\.\&\%]{$usernamemin,$ulen})$/
+    $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/
       or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
     $recref->{username} = $1;
   }
@@ -731,9 +692,6 @@ sub check {
   if ( $password_noexclamation ) {
     $recref->{_password} =~ /\!/ and return gettext('illegal_password');
   }
-  unless ( $username_percent ) {
-    $recref->{username} =~ /\%/ and return gettext('illegal_username');
-  }
 
   $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
   $recref->{popnum} = $1;
@@ -755,28 +713,6 @@ sub check {
       if $recref->{uid} == 0
          && $recref->{username} !~ /^(root|toor|smtp)$/;
 
-    unless ( $recref->{username} eq 'sync' ) {
-      if ( grep $_ eq $recref->{shell}, @shells ) {
-        $recref->{shell} = (grep $_ eq $recref->{shell}, @shells)[0];
-      } else {
-        return "Illegal shell \`". $self->shell. "\'; ".
-               $conf->dir. "/shells contains: @shells";
-      }
-    } else {
-      $recref->{shell} = '/bin/sync';
-    }
-
-  } else {
-    $recref->{gid} ne '' ? 
-      return "Can't have gid without uid" : ( $recref->{gid}='' );
-    #$recref->{dir} ne '' ? 
-    #  return "Can't have directory without uid" : ( $recref->{dir}='' );
-    $recref->{shell} ne '' ? 
-      return "Can't have shell without uid" : ( $recref->{shell}='' );
-  }
-
-  unless ( $part_svc->part_svc_column('dir')->columnflag eq 'F' ) {
-
     $recref->{dir} =~ /^([\/\w\-\.\&]*)$/
       or return "Illegal directory: ". $recref->{dir};
     $recref->{dir} = $1;
@@ -799,6 +735,24 @@ sub check {
     ;
     }
 
+    unless ( $recref->{username} eq 'sync' ) {
+      if ( grep $_ eq $recref->{shell}, @shells ) {
+        $recref->{shell} = (grep $_ eq $recref->{shell}, @shells)[0];
+      } else {
+        return "Illegal shell \`". $self->shell. "\'; ".
+               $conf->dir. "/shells contains: @shells";
+      }
+    } else {
+      $recref->{shell} = '/bin/sync';
+    }
+
+  } else {
+    $recref->{gid} ne '' ? 
+      return "Can't have gid without uid" : ( $recref->{gid}='' );
+    $recref->{dir} ne '' ? 
+      return "Can't have directory without uid" : ( $recref->{dir}='' );
+    $recref->{shell} ne '' ? 
+      return "Can't have shell without uid" : ( $recref->{shell}='' );
   }
 
   #  $error = $self->ut_textn('finger');
@@ -908,12 +862,13 @@ sub _check_duplicate {
     or die dbh->errstr;
   warn "$me acquired svc_acct table lock for duplicate search" if $DEBUG;
 
-  my $part_svc = qsearchs('part_svc', { 'svcpart' => $self->svcpart } );
+  my $svcpart = $self->svcpart;
+  my $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
   unless ( $part_svc ) {
     return 'unknown svcpart '. $self->svcpart;
   }
 
-  my $global_unique = $conf->config('global_unique-username') || 'none';
+  my $global_unique = $conf->config('global_unique-username');
 
   my @dup_user = grep { !$self->svcnum || $_->svcnum != $self->svcnum }
                  qsearch( 'svc_acct', { 'username' => $self->username } );
@@ -929,7 +884,7 @@ sub _check_duplicate {
   my @dup_uid;
   if ( $part_svc->part_svc_column('uid')->columnflag ne 'F'
        && $self->username !~ /^(toor|(hyla)?fax)$/          ) {
-    @dup_uid = grep { !$self->svcnum || $_->svcnum != $self->svcnum }
+    @dup_uid = grep { $svcpart != $_->svcpart }
                qsearch( 'svc_acct', { 'uid' => $self->uid } );
   } else {
     @dup_uid = ();
@@ -990,8 +945,8 @@ sub _check_duplicate {
       my $dup_svcpart = $dup_uid->cust_svc->svcpart;
       if ( exists($conflict_user_svcpart{$dup_svcpart})
            || exists($conflict_userdomain_svcpart{$dup_svcpart}) ) {
-        return "duplicate uid: conflicts with svcnum ". $dup_uid->svcnum.
-               " via exportnum ". $conflict_user_svcpart{$dup_svcpart}
+        return "duplicate uid: conflicts with svcnum". $dup_uid->svcnum.
+               "via exportnum ". $conflict_user_svcpart{$dup_svcpart}
                                  || $conflict_userdomain_svcpart{$dup_svcpart};
       }
     }
@@ -1026,10 +981,6 @@ expected to change in the future.
 
 sub radius_reply { 
   my $self = shift;
-
-  return %{ $self->{'radius_reply'} }
-    if exists $self->{'radius_reply'};
-
   my %reply =
     map {
       /^(radius_(.*))$/;
@@ -1037,15 +988,9 @@ sub radius_reply {
       #$attrib =~ s/_/\-/g;
       ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
     } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
-
   if ( $self->slipip && $self->slipip ne '0e0' ) {
     $reply{$radius_ip} = $self->slipip;
   }
-
-  if ( $self->seconds !~ /^$/ ) {
-    $reply{'Session-Timeout'} = $self->seconds;
-  }
-
   %reply;
 }
 
@@ -1062,63 +1007,16 @@ expected to change in the future.
 
 sub radius_check {
   my $self = shift;
-
-  return %{ $self->{'radius_check'} }
-    if exists $self->{'radius_check'};
-
-  my %check = 
+  my $password = $self->_password;
+  my $pw_attrib = length($password) <= 12 ? $radius_password : 'Crypt-Password';
+  ( $pw_attrib => $password,
     map {
       /^(rc_(.*))$/;
       my($column, $attrib) = ($1, $2);
       #$attrib =~ s/_/\-/g;
       ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
-    } grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
-
-  my $password = $self->_password;
-  my $pw_attrib = length($password) <= 12 ? $radius_password : 'Crypt-Password';  $check{$pw_attrib} = $password;
-
-  my $cust_pkg = $self->cust_svc->cust_pkg;
-  if ( $cust_pkg && $cust_pkg->part_pkg->is_prepaid && $cust_pkg->bill ) {
-    $check{'Expiration'} = time2str('%B %e %Y %T', $cust_pkg->bill ); #http://lists.cistron.nl/pipermail/freeradius-users/2005-January/040184.html
-  }
-
-  %check;
-
-}
-
-=item snapshot
-
-This method instructs the object to "snapshot" or freeze RADIUS check and
-reply attributes to the current values.
-
-=cut
-
-#bah, my english is too broken this morning
-#Of note is the "Expiration" attribute, which, for accounts in prepaid packages, is typically defined on-the-fly as the associated packages cust_pkg.bill.  (This is used by
-#the FS::cust_pkg's replace method to trigger the correct export updates when
-#package dates change)
-
-sub snapshot {
-  my $self = shift;
-
-  $self->{$_} = { $self->$_() }
-    foreach qw( radius_reply radius_check );
-
-}
-
-=item forget_snapshot
-
-This methos instructs the object to forget any previously snapshotted
-RADIUS check and reply attributes.
-
-=cut
-
-sub forget_snapshot {
-  my $self = shift;
-
-  delete $self->{$_}
-    foreach qw( radius_reply radius_check );
-
+    } grep { /^rc_/ && $self->getfield($_) } fields( $self->table )
+  );
 }
 
 =item domain
@@ -1130,7 +1028,7 @@ Returns the domain associated with this account.
 sub domain {
   my $self = shift;
   die "svc_acct.domsvc is null for svcnum ". $self->svcnum unless $self->domsvc;
-  my $svc_domain = $self->svc_domain(@_)
+  my $svc_domain = $self->svc_domain
     or die "no svc_domain.svcnum for svc_acct.domsvc ". $self->domsvc;
   $svc_domain->domain;
 }
@@ -1155,7 +1053,10 @@ Returns the FS::cust_svc record for this account (see L<FS::cust_svc>).
 
 =cut
 
-#inherited from svc_Common
+sub cust_svc {
+  my $self = shift;
+  qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
+}
 
 =item email
 
@@ -1165,7 +1066,7 @@ Returns an email address associated with the account.
 
 sub email {
   my $self = shift;
-  $self->username. '@'. $self->domain(@_);
+  $self->username. '@'. $self->domain;
 }
 
 =item acct_snarf
@@ -1184,93 +1085,6 @@ sub acct_snarf {
   qsearch('acct_snarf', { 'svcnum' => $self->svcnum } );
 }
 
-=item decrement_seconds SECONDS
-
-Decrements the I<seconds> field of this record by the given amount.  If there
-is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub decrement_seconds {
-  shift->_op_seconds('-', @_);
-}
-
-=item increment_seconds SECONDS
-
-Increments the I<seconds> field of this record by the given amount.  If there
-is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub increment_seconds {
-  shift->_op_seconds('+', @_);
-}
-
-
-my %op2action = (
-  '-' => 'suspend',
-  '+' => 'unsuspend',
-);
-my %op2condition = (
-  '-' => sub { my($self, $seconds) = @_;
-               $self->seconds - $seconds <= 0;
-             },
-  '+' => sub { my($self, $seconds) = @_;
-               $self->seconds + $seconds > 0;
-             },
-);
-
-sub _op_seconds {
-  my( $self, $op, $seconds ) = @_;
-  warn "$me _op_seconds called for svcnum ". $self->svcnum.
-       ' ('. $self->email. "): $op $seconds\n"
-    if $DEBUG;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $sql = "UPDATE svc_acct SET seconds = ".
-            " CASE WHEN seconds IS NULL THEN 0 ELSE seconds END ". #$seconds||0
-            " $op ? WHERE svcnum = ?";
-  warn "$me $sql\n"
-    if $DEBUG;
-
-  my $sth = $dbh->prepare( $sql )
-    or die "Error preparing $sql: ". $dbh->errstr;
-  my $rv = $sth->execute($seconds, $self->svcnum);
-  die "Error executing $sql: ". $sth->errstr
-    unless defined($rv);
-  die "Can't update seconds for svcnum". $self->svcnum
-    if $rv == 0;
-
-  my $action = $op2action{$op};
-
-  if ( $conf->exists("svc_acct-usage_$action")
-       && &{$op2condition{$op}}($self, $seconds)    ) {
-    #my $error = $self->$action();
-    my $error = $self->cust_svc->cust_pkg->$action();
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "Error ${action}ing: $error";
-    }
-  }
-
-  warn "$me update sucessful; committing\n"
-    if $DEBUG;
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-
 =item seconds_since TIMESTAMP
 
 Returns the number of seconds this account has been online since TIMESTAMP,
@@ -1329,16 +1143,16 @@ sub attribute_since_sqlradacct {
   $self->cust_svc->attribute_since_sqlradacct(@_);
 }
 
-=item get_session_history TIMESTAMP_START TIMESTAMP_END
+=item get_session_history_sqlradacct TIMESTAMP_START TIMESTAMP_END
 
 Returns an array of hash references of this customers login history for the
 given time range.  (document this better)
 
 =cut
 
-sub get_session_history {
+sub get_session_history_sqlradacct {
   my $self = shift;
-  $self->cust_svc->get_session_history(@_);
+  $self->cust_svc->get_session_history_sqlradacct(@_);
 }
 
 =item radius_groups
@@ -1424,43 +1238,25 @@ sub check_password {
 
 }
 
-=item crypt_password [ DEFAULT_ENCRYPTION_TYPE ]
+=item crypt_password
 
 Returns an encrypted password, either by passing through an encrypted password
 in the database or by encrypting a plaintext password from the database.
 
-The optional DEFAULT_ENCRYPTION_TYPE parameter can be set to I<crypt> (classic
-UNIX DES crypt), I<md5> (md5 crypt supported by most modern Linux and BSD
-distrubtions), or (eventually) I<blowfish> (blowfish hashing supported by
-OpenBSD, SuSE, other Linux distibutions with pam_unix2, etc.).  The default
-encryption type is only used if the password is not already encrypted in the
-database.
-
 =cut
 
 sub crypt_password {
   my $self = shift;
+  #false laziness w/shellcommands.pm
   #eventually should check a "password-encoding" field
   if ( length($self->_password) == 13
-       || $self->_password =~ /^\$(1|2a?)\$/
-       || $self->_password =~ /^(\*|NP|\*LK\*|!!?)$/
-     )
-  {
+       || $self->_password =~ /^\$(1|2a?)\$/ ) {
     $self->_password;
   } else {
-    my $encryption = ( scalar(@_) && $_[0] ) ? shift : 'crypt';
-    if ( $encryption eq 'crypt' ) {
-      crypt(
-        $self->_password,
-        $saltset[int(rand(64))].$saltset[int(rand(64))]
-      );
-    } elsif ( $encryption eq 'md5' ) {
-      unix_md5_crypt( $self->_password );
-    } elsif ( $encryption eq 'blowfish' ) {
-      die "unknown encryption method $encryption";
-    } else {
-      die "unknown encryption method $encryption";
-    }
+    crypt(
+      $self->_password,
+      $saltset[int(rand(64))].$saltset[int(rand(64))]
+    );
   }
 }
 
@@ -1619,7 +1415,7 @@ sub radius_usergroup_selector {
 END
 
   foreach my $group ( @all_groups ) {
-    $html .= qq(<OPTION VALUE="$group");
+    $html .= '<OPTION';
     if ( $sel_groups{$group} ) {
       $html .= ' SELECTED';
       $sel_groups{$group} = 0;
@@ -1627,7 +1423,7 @@ END
     $html .= ">$group</OPTION>\n";
   }
   foreach my $group ( grep { $sel_groups{$_} } keys %sel_groups ) {
-    $html .= qq(<OPTION VALUE="$group" SELECTED>$group</OPTION>\n);
+    $html .= "<OPTION SELECTED>$group</OPTION>\n";
   };
   $html .= '</SELECT>';
 
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 6d54357..2642146 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -369,7 +369,6 @@ sub domain_record {
     MX => 3,
     CNAME => 4,
     A => 5,
-    TXT => 6,
   );
 
   sort { $order{$a->rectype} <=> $order{$b->rectype} }
diff --git a/FS/FS/svc_forward.pm b/FS/FS/svc_forward.pm
index 12b556f..b8d55fe 100644
--- a/FS/FS/svc_forward.pm
+++ b/FS/FS/svc_forward.pm
@@ -249,15 +249,15 @@ sub check {
   #         || ! $self->dstsvc;
 
   if ( $self->src ) {
-    $self->src =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/
-       or return "Illegal src: ". $self->src;
+    $self->src =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)?$/
+       or return "Illegal src: ". $self->dst;
     $self->src("$1$2");
   } else {
     $self->src('');
   }
 
   if ( $self->dst ) {
-    $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)$/
+    $self->dst =~ /^([\w\.\-\&]*)(\@([\w\-]+\.)+\w+)?$/
        or return "Illegal dst: ". $self->dst;
     $self->dst("$1$2");
   } else {
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index 12d7e92..6c276a1 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -204,7 +204,7 @@ sub check {
   my $error =
     $self->ut_numbern('svcnum')
 #    || $self->ut_number('recnum')
-    || $self->ut_numbern('usersvc')
+    || $self->ut_number('usersvc')
   ;
   return $error if $error;
 
@@ -238,10 +238,8 @@ sub check {
     return "Illegal recnum: ". $self->recnum;
   }
 
-  if ( $self->usersvc ) {
-    return "Unknown usersvc0 (svc_acct.svcnum): ". $self->usersvc
-      unless qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
-  }
+  return "Unknown usersvc (svc_acct.svcnum): ". $self->usersvc
+    unless qsearchs('svc_acct', { 'svcnum' => $self->usersvc } );
 
   $self->SUPER::check;
 
diff --git a/FS/FS/type_pkgs.pm b/FS/FS/type_pkgs.pm
index bf34e7c..07ad2bc 100644
--- a/FS/FS/type_pkgs.pm
+++ b/FS/FS/type_pkgs.pm
@@ -35,8 +35,6 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item typepkgnum - primary key
-
 =item typenum - Agent type, see L<FS::agent_type>
 
 =item pkgpart - Billing item definition, see L<FS::part_pkg>
@@ -82,8 +80,7 @@ sub check {
   my $self = shift;
 
   my $error = 
-       $self->ut_numbern('typepkgnum')
-    || $self->ut_number('typenum')
+    $self->ut_number('typenum')
     || $self->ut_number('pkgpart')
   ;
   return $error if $error;
diff --git a/FS/MANIFEST b/FS/MANIFEST
index e7d9dea..dabc08c 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -28,19 +28,20 @@ FS.pm
 FS/CGI.pm
 FS/InitHandler.pm
 FS/ClientAPI.pm
-FS/ClientAPI_SessionCache.pm
 FS/ClientAPI/passwd.pm
 FS/ClientAPI/MyAccount.pm
 FS/Conf.pm
 FS/ConfItem.pm
-FS/Daemon.pm
 FS/Misc.pm
 FS/Record.pm
 FS/Report.pm
 FS/Report/Table.pm
 FS/Report/Table/Monthly.pm
 FS/SearchCache.pm
-FS/UI/Web.pm
+FS/UI/Base.pm
+FS/UI/CGI.pm
+FS/UI/Gtk.pm
+FS/UI/agent.pm
 FS/UID.pm
 FS/Msgcat.pm
 FS/acct_snarf.pm
@@ -52,7 +53,6 @@ FS/cust_bill_pkg_detail.pm
 FS/cust_credit.pm
 FS/cust_credit_bill.pm
 FS/cust_main.pm
-FS/cust_main_Mixin.pm
 FS/cust_main_county.pm
 FS/cust_main_invoice.pm
 FS/cust_pay.pm
@@ -64,15 +64,6 @@ FS/cust_pkg.pm
 FS/cust_refund.pm
 FS/cust_credit_refund.pm
 FS/cust_svc.pm
-FS/h_Common.pm
-FS/h_cust_svc.pm
-FS/h_domain_record.pm
-FS/h_svc_acct.pm
-FS/h_svc_broadband.pm
-FS/h_svc_domain.pm
-FS/h_svc_external.pm
-FS/h_svc_forward.pm
-FS/h_svc_www.pm
 FS/part_bill_event.pm
 FS/export_svc.pm
 FS/part_export.pm
@@ -92,8 +83,6 @@ FS/part_export/http.pm
 FS/part_export/infostreet.pm
 FS/part_export/ldap.pm
 FS/part_export/null.pm
-FS/part_export/radiator.pm
-FS/part_export/router.pm
 FS/part_export/shellcommands.pm
 FS/part_export/shellcommands_withdomain.pm
 FS/part_export/sqlmail.pm
@@ -128,8 +117,6 @@ FS/rate.pm
 FS/rate_detail.pm
 FS/rate_region.pm
 FS/rate_prefix.pm
-FS/reg_code.pm
-FS/reg_code_pkg.pm
 FS/svc_Common.pm
 FS/svc_acct.pm
 FS/svc_acct_pop.pm
@@ -152,17 +139,13 @@ FS/queue_arg.pm
 FS/queue_depend.pm
 FS/msgcat.pm
 FS/cust_tax_exempt.pm
-FS/clientapi_session.pm
-FS/clientapi_session_field.pm
 t/agent.t
 t/agent_type.t
 t/CGI.t
 t/InitHandler.t
 t/ClientAPI.t
-t/ClientAPI_SessionCache.t
 t/Conf.t
 t/ConfItem.t
-t/Daemon.t
 t/Misc.t
 t/Record.t
 t/Report.t
@@ -180,7 +163,6 @@ t/cust_credit.t
 t/cust_credit_bill.t
 t/cust_credit_refund.t
 t/cust_main.t
-t/cust_main_Mixin.t
 t/cust_main_county.t
 t/cust_main_invoice.t
 t/cust_pay.t
@@ -189,16 +171,6 @@ t/cust_pay_refund.t
 t/cust_pkg.t
 t/cust_refund.t
 t/cust_svc.t
-t/h_cust_svc.t
-t/h_Common.t
-t/h_cust_svc.t
-t/h_domain_record.t
-t/h_svc_acct.t
-t/h_svc_broadband.t
-t/h_svc_domain.t
-t/h_svc_external.t
-t/h_svc_forward.t
-t/h_svc_www.t
 t/cust_tax_exempt.t
 t/domain_record.t
 t/nas.t
@@ -223,7 +195,6 @@ t/part_export-ldap.t
 t/part_export-null.t
 t/part_export-passwdfile.t
 t/part_export-postfix.t
-t/part_export-radiator.t
 t/part_export-router.t
 t/part_export-shellcommands.t
 t/part_export-shellcommands_withdomain.t
@@ -260,8 +231,6 @@ t/rate_detail.t
 t/rate_region.t
 t/rate_prefix.t
 t/radius_usergroup.t
-t/reg_code.t
-t/reg_code_pkg.t
 t/session.t
 t/svc_acct.t
 t/svc_acct_pop.t
@@ -277,18 +246,3 @@ t/queue_arg.t
 t/queue_depend.t
 t/msgcat.t
 t/raddb.t
-t/clientapi_session.t
-t/clientapi_session_field.t
-FS/payment_gateway.pm
-t/payment_gateway.t
-FS/payment_gateway_option.pm
-t/payment_gateway_option.t
-FS/option_Common.pm
-t/option_Common.t
-FS/agent_payment_gateway.pm
-t/agent_payment_gateway.t
-FS/banned_pay.pm
-t/banned_pay.t
-FS/cancel_reason.pm
-t/cancel_reason.t
-bin/freeside-prepaidd
diff --git a/FS/bin/freeside-addoutsource b/FS/bin/freeside-addoutsource
index db4e7a3..5cec17f 100644
--- a/FS/bin/freeside-addoutsource
+++ b/FS/bin/freeside-addoutsource
@@ -4,21 +4,21 @@ domain=$1
 
 createdb $domain && \
 \
-mkdir /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain && \
+mkdir /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
 \
-chown freeside /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain && \
+chown freeside /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
 \
-cp /home/ivan/freeside/conf/[a-z]* /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain && \
+cp /home/ivan/freeside/conf/[a-z]* /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain && \
 \
-touch /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain/secrets && \
+touch /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets && \
 \
-chown freeside /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain/secrets && \
+chown freeside /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets && \
 \
-chmod 600 /usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain/secrets && \
+chmod 600 /usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets && \
 \
-echo -e "DBI:Pg:dbname=$domain\nfreeside\n" >/usr/local/etc/freeside/conf.DBI:Pg:dbname=$domain/secrets && \
+echo -e "DBI:Pg:host=localhost;dbname=$domain\nfreeside\n" >/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=$domain/secrets && \
 \
-mkdir /usr/local/etc/freeside/counters.DBI:Pg:dbname=$domain && \
-mkdir /usr/local/etc/freeside/cache.DBI:Pg:dbname=$domain && \
-mkdir /usr/local/etc/freeside/export.DBI:Pg:dbname=$domain
+mkdir /usr/local/etc/freeside/counters.DBI:Pg:host=localhost\;dbname=$domain && \
+mkdir /usr/local/etc/freeside/cache.DBI:Pg:host=localhost\;dbname=$domain && \
+mkdir /usr/local/etc/freeside/export.DBI:Pg:host=localhost\;dbname=$domain
 
diff --git a/FS/bin/freeside-addoutsourceuser b/FS/bin/freeside-addoutsourceuser
index cad07f1..abb515b 100644
--- a/FS/bin/freeside-addoutsourceuser
+++ b/FS/bin/freeside-addoutsourceuser
@@ -5,11 +5,11 @@ domain=$2
 password=$3
 
 freeside-adduser -h /usr/local/etc/freeside/htpasswd \
-                 -s conf.DBI:Pg:dbname=$domain/secrets \
+                 -s conf.DBI:Pg:host=localhost\;dbname=$domain/secrets \
                  -b \
                  $username $password 2>/dev/null
 
-[ -e /usr/local/etc/freeside/dbdef.DBI:Pg:dbname=$domain ] \
+[ -e /usr/local/etc/freeside/dbdef.DBI:Pg:host=localhost\;dbname=$domain ] \
  || ( freeside-setup -s $username 2>/dev/null; \
       /home/ivan/freeside/bin/populate-msgcat $username 2>/dev/null )
 
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 603da12..ae71112 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -5,78 +5,31 @@ use Fcntl qw(:flock);
 use Date::Parse;
 use Getopt::Std;
 use FS::UID qw(adminsuidsetup driver_name dbh datasrc);
-use FS::Record qw(qsearch qsearchs dbdef);
+use FS::Record qw(qsearch qsearchs);
 use FS::Conf;
 use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_d $opt_v $opt_p $opt_a $opt_s $opt_y);
-getopts("p:a:d:vsy:");
+use vars qw($opt_d $opt_v $opt_p $opt_s $opt_y);
+getopts("p:d:vsy:");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
 
 $FS::cust_main::DEBUG = 1 if $opt_v;
 
-my %search = ();
-$search{'payby'}    = $opt_p if $opt_p;
-$search{'agentnum'} = $opt_a if $opt_a;
+my %search;
+$search{'payby'} = $opt_p if $opt_p;
+
+my @cust_main = @ARGV
+  ? map { qsearchs('cust_main', { custnum => $_, %search } ) } @ARGV
+  : qsearch('cust_main', \%search )
+;
 
 #we're at now now (and later).
 my($time)= $opt_d ? str2time($opt_d) : $^T;
 $time += $opt_y * 86400 if $opt_y;
 
-# select * from cust_main where
-my $where_pkg = <<"END";
-  0 < ( select count(*) from cust_pkg
-          where cust_main.custnum = cust_pkg.custnum
-            and ( cancel is null or cancel = 0 )
-            and (    setup is null or setup =  0
-                  or bill  is null or bill  <= $time 
-                  or ( expire is not null and expire <= $^T )
-                )
-      )
-END
-
-# or
-my $where_bill_event = <<"END";
-  0 < ( select count(*) from cust_bill
-          where cust_main.custnum = cust_bill.custnum
-            and 0 < charged
-                    - coalesce(
-                                ( select sum(amount) from cust_bill_pay
-                                    where cust_bill.invnum = cust_bill_pay.invnum )
-                                ,0
-                              )
-                    - coalesce(
-                                ( select sum(amount) from cust_credit_bill
-                                    where cust_bill.invnum = cust_credit_bill.invnum )
-                                ,0
-                              )
-            and 0 < ( select count(*) from part_bill_event
-                        where payby = cust_main.payby
-                          and ( disabled is null or disabled = '' )
-                          and seconds <= $time - cust_bill._date
-                          and 0 = ( select count(*) from cust_bill_event
-                                     where cust_bill.invnum = cust_bill_event.invnum
-                                       and part_bill_event.eventpart = cust_bill_event.eventpart
-                                       and status = 'done'
-                                  )
-
-                    )
-      )
-END
-
-my $extra_sql = ( scalar(%search) ? ' AND ' : ' WHERE ' ). "( $where_pkg OR $where_bill_event )";
-
-my @cust_main;
-if ( @ARGV ) {
-  @cust_main = map { qsearchs('cust_main', { custnum => $_, %search } ) } @ARGV
-} else {
-  @cust_main = qsearch('cust_main', \%search, '', $extra_sql );
-}
-;
-
 my($cust_main,%saw);
 foreach $cust_main ( @cust_main ) {
 
@@ -89,19 +42,6 @@ foreach $cust_main ( @cust_main ) {
          $cust_main->custnum. ": $error"
       if $error;
   }
-  # $^T not $time because -d is for pre-printing invoices
-  foreach my $cust_pkg (
-    grep { $_->part_pkg->is_prepaid
-           && $_->bill && $_->bill < $^T && ! $_->susp
-         }
-         $cust_main->ncancelled_pkgs
-  ) {
-    my $error = $cust_pkg->suspend;
-    warn "Error suspending package ". $cust_pkg->pkgnum.
-         " for custnum ". $cust_main->custnum.
-         ": $error"
-      if $error;
-  }
 
   my $error = $cust_main->bill( 'time'    => $time,
                                 'resetup' => $opt_s, );
@@ -117,10 +57,8 @@ foreach $cust_main ( @cust_main ) {
 
 if ( driver_name eq 'Pg' ) {
   dbh->{AutoCommit} = 1; #so we can vacuum
-  foreach my $table ( dbdef->tables ) {
-    my $sth = dbh->prepare("VACUUM ANALYZE $table") or die dbh->errstr;
-    $sth->execute or die $sth->errstr;
-  }
+  my $sth = dbh->prepare('vacuum analyze') or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
 }
 
 my $conf = new FS::Conf;
@@ -172,7 +110,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -s ] [ -v ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -194,8 +132,6 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -p: Only process customers with the specified payby (I<CARD>, I<DCRD>, I<CHEK>, I<DCHK>, I<BILL>, I<COMP>, I<LECB>)
 
-  -a: Only process customers with the specified agentnum
-
   -s: re-charge setup fees
 
   -v: enable debugging
diff --git a/FS/bin/freeside-prepaidd b/FS/bin/freeside-prepaidd
deleted file mode 100644
index e51a563..0000000
--- a/FS/bin/freeside-prepaidd
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use FS::Daemon qw(daemonize1 drop_root logfile daemonize2 sigint sigterm);
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch); # qsearchs);
-use FS::cust_pkg;
-
-my $user = shift or die &usage;
-
-#daemonize1('freeside-sprepaidd', $user); #keep unique pid files w/multi installs
-daemonize1('freeside-prepaidd');
-
-drop_root();
-
-adminsuidsetup($user);
-
-logfile( "/usr/local/etc/freeside/prepaidd-log.". $FS::UID::datasrc );
-
-daemonize2();
-
-#--
-
-while (1) {
-
-  foreach my $cust_pkg ( 
-    qsearch( {
-      'select'    => 'cust_pkg.*, part_pkg.plan',
-      'table'     => 'cust_pkg',
-      'addl_from' => 'LEFT JOIN part_pkg USING ( pkgpart )',
-      #'hashref'   => { 'plan' => 'prepaid' },#should check part_pkg::is_prepaid
-      #'extra_sql' => "AND bill < ". time.
-      'hashref'   => {},
-      'extra_sql' => "WHERE plan = 'prepaid' AND bill < ". time.
-                     " AND bill IS NOT NULL".
-                     " AND ( susp   IS NULL OR susp   = 0)".
-                     " AND ( cancel IS NULL OR cancel = 0)"
-    } )
-  ) {
-    my $error = $cust_pkg->suspend;
-    warn "Error suspended package ". $cust_pkg->pkgnum.
-         " for custnum ". $cust_pkg->custnum.
-         ": $error\n"
-      if $error;
-  }
-
-  die "exiting" if sigterm() || sigint();
-  sleep 5;
-
-}
-
-#--
-
-sub usage { 
-  die "Usage:\n\n  freeside-prepaidd user\n";
-}
-
-=head1 NAME
-
-freeside-prepaidd - Real-time daemon for prepaid packages
-
-=head1 SYNOPSIS
-
-  freeside-prepaidd
-
-=head1 DESCRIPTION
-
-Runs continuously and suspendes any prepaid customer packages which have
-passed their renewal date (next bill date).
-
-=head1 SEE ALSO
-
-=cut
-
-1;
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 3a0a9b4..e14ddad 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -1,11 +1,13 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw( $DEBUG $kids $max_kids %kids );
-use POSIX qw(:sys_wait_h);
+use vars qw( $log_file $sigterm $sigint $kids $max_kids %kids );
+use subs qw( _die _logmsg );
+use Fcntl qw(:flock);
+use POSIX qw(:sys_wait_h setsid);
+use Date::Format;
 use IO::File;
 use FS::UID qw(adminsuidsetup forksuidsetup driver_name dbh myconnect);
-use FS::Daemon qw(daemonize1 drop_root logfile daemonize2 sigint sigterm);
 use FS::Record qw(qsearch qsearchs);
 use FS::queue;
 use FS::queue_depend;
@@ -16,24 +18,40 @@ use FS::svc_acct;
 use Net::SSH 0.07;
 use FS::part_export;
 
-$DEBUG = 0;
-
 $max_kids = '10'; #guess it should be a config file...
 $kids = 0;
 
 my $user = shift or die &usage;
 
-warn "starting daemonization (forking)\n" if $DEBUG;
-#daemonize1('freeside-queued',$user); #to keep pid files unique w/multi installs
-daemonize1('freeside-queued');
+#my $pid_file = "/var/run/freeside-queued.$user.pid";
+my $pid_file = "/var/run/freeside-queued.pid";
+
+&daemonize1;
+
+#sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
+#$SIG{CHLD} =  \&REAPER;
 
-warn "dropping privledges\n" if $DEBUG;
-drop_root();
+$sigterm = 0;
+$sigint = 0;
+$SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
+$SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
+my $freeside_gid = scalar(getgrnam('freeside'))
+  or die "can't setgid to freeside group\n";
+$) = $freeside_gid;
+$( = $freeside_gid;
+#if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
+($(,$)) = ($),$();
+$) = $freeside_gid;
+
+$> = $FS::UID::freeside_uid;
+$< = $FS::UID::freeside_uid;
+#freebsd is sofa king broken, won't setuid()
+($<,$>) = ($>,$<);
+$> = $FS::UID::freeside_uid;
 
 $ENV{HOME} = (getpwuid($>))[7]; #for ssh
 
-warn "connecting to database\n" if $DEBUG;
 $@ = 'not connected';
 while ( $@ ) {
   eval { adminsuidsetup $user; };
@@ -44,12 +62,14 @@ while ( $@ ) {
   }
 }
 
-logfile( "/usr/local/etc/freeside/queuelog.". $FS::UID::datasrc );
+$log_file = "/usr/local/etc/freeside/queuelog.". $FS::UID::datasrc;
+
+&daemonize2;
 
-warn "completing daemonization (detaching))\n" if $DEBUG;
-daemonize2();
+$SIG{__DIE__} = \&_die;
+$SIG{__WARN__} = \&_logmsg;
 
-#--
+warn "freeside-queued starting\n";
 
 my $warnkids=0;
 while (1) {
@@ -67,7 +87,7 @@ while (1) {
   unless ( dbh && dbh->ping ) {
     warn "WARNING: connection to database lost, reconnecting...\n";
 
-    eval { $FS::UID::dbh = myconnect; };
+    eval { myconnect; };
 
     unless ( !$@ && dbh && dbh->ping ) {
       warn "WARNING: still no connection to database, sleeping for retry...\n";
@@ -142,7 +162,6 @@ while (1) {
   #} 
 
   my @args = $ljob->args;
-  splice @args, 0, 1, $ljob if $args[0] eq '_JOB';
 
   defined( my $pid = fork ) or do {
     warn "WARNING: can't fork: $!\n";
@@ -165,12 +184,8 @@ while (1) {
 
     forksuidsetup($user);
 
-    #auto-use classes...
-    #if ( $ljob->job =~ /(FS::part_export::\w+)::/ ) {
-    if (    $ljob->job =~ /(FS::part_export::\w+)::/
-         || $ljob->job =~ /(FS::\w+)::/
-       )
-    {
+    #auto-use export classes...
+    if ( $ljob->job =~ /(FS::part_export::\w+)::/ ) {
       my $class = $1;
       eval "use $class;";
       if ( $@ ) {
@@ -186,7 +201,7 @@ while (1) {
     }
 
     my $eval = "&". $ljob->job. '(@args);';
-    warn 'running "&'. $ljob->job. '('. join(', ', @args). ")\n" if $DEBUG;
+    warn "running $eval";
     eval $eval; #throw away return value?  suppose so
     if ( $@ ) {
       warn "job $eval failed";
@@ -205,11 +220,11 @@ while (1) {
   }
 
 } continue {
-  if ( sigterm() ) {
+  if ( $sigterm ) {
     warn "received TERM signal; exiting\n";
     exit;
   }
-  if ( sigint() ) {
+  if ( $sigint ) {
     warn "received INT signal; exiting\n";
     exit;
   }
@@ -219,6 +234,48 @@ sub usage {
   die "Usage:\n\n  freeside-queued user\n";
 }
 
+sub _die {
+  my $msg = shift;
+  unlink $pid_file if -e $pid_file;
+  _logmsg($msg);
+}
+
+sub _logmsg {
+  chomp( my $msg = shift );
+  my $log = new IO::File ">>$log_file";
+  flock($log, LOCK_EX);
+  seek($log, 0, 2);
+  print $log "[". time2str("%a %b %e %T %Y",time). "] [$$] $msg\n";
+  flock($log, LOCK_UN);
+  close $log;
+}
+
+sub daemonize1 {
+
+  chdir "/" or die "Can't chdir to /: $!";
+  open STDIN, '/dev/null'   or die "Can't read /dev/null: $!";
+  defined(my $pid = fork) or die "Can't fork: $!";
+  if ( $pid ) {
+    print "freeside-queued started with pid $pid\n"; #logging to $log_file\n";
+    exit unless $pid_file;
+    my $pidfh = new IO::File ">$pid_file" or exit;
+    print $pidfh "$pid\n";
+    exit;
+  }
+  #open STDOUT, '>/dev/null'
+  #                          or die "Can't write to /dev/null: $!";
+  #setsid                  or die "Can't start a new session: $!";
+  #open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+
+}
+
+sub daemonize2 {
+  open STDOUT, '>/dev/null'
+                            or die "Can't write to /dev/null: $!";
+  setsid                  or die "Can't start a new session: $!";
+  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+}
+
 sub reap_kids {
   foreach my $pid ( keys %kids ) {
     my $kid = waitpid($pid, WNOHANG);
diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index c73349a..c045893 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -1,16 +1,23 @@
 #!/usr/bin/perl -w
+#
+# freeside-selfservice-server
+
+# alas, much false laziness with freeside-queued and fs_signup_server.  at
+# least it is slated to replace fs_{signup,passwd,mailadmin}_server
+# should probably generalize the version in here, or better yet use
+# Proc::Daemon or somesuch
 
 use strict;
-use vars qw( $Debug %kids $kids $max_kids $ssh_pid $keepalives );
-use subs qw( lock_write unlock_write myshutdown usage );
+use vars qw( $Debug %kids $kids $max_kids $shutdown $log_file $ssh_pid
+             $keepalives );
+use subs qw( lock_write unlock_write );
 use Fcntl qw(:flock);
-use POSIX qw(:sys_wait_h);
+use POSIX qw(:sys_wait_h setsid);
 use IO::Handle;
 use IO::Select;
 use IO::File;
 use Storable 2.09 qw(nstore_fd fd_retrieve);
 use Net::SSH qw(sshopen2);
-use FS::Daemon qw(daemonize1 drop_root logfile daemonize2 sigint sigterm);
 use FS::UID qw(adminsuidsetup forksuidsetup);
 use FS::ClientAPI;
 
@@ -21,6 +28,7 @@ use FS::cust_pkg;
 $Debug = 1; # 2 will turn on more logging
             # 3 will log packet contents, including passwords
 
+$shutdown = 0;
 $max_kids = '10'; #?
 $keepalives = 0; #let clientd turn it on, so we don't barf on old ones
 $kids = 0;
@@ -29,31 +37,12 @@ my $user = shift or die &usage;
 my $machine = shift or die &usage;
 my $tag = scalar(@ARGV) ? shift : '';
 
-my $lock_file = "/usr/local/etc/freeside/selfservice.$machine.writelock";
-
-
-# to keep pid files unique w/multi machines (and installs!)
 # $FS::UID::datasrc not posible
-daemonize1("freeside-selfservice-server","$user.$machine");
-
-#false laziness w/Daemon::drop_root
-my $freeside_gid = scalar(getgrnam('freeside'))
-  or die "can't find freeside group\n";
-
-open(LOCKFILE,">$lock_file") or die "can't open $lock_file: $!";
-chown $FS::UID::freeside_uid, $freeside_gid, $lock_file;
-
-drop_root();
-
-$ENV{HOME} = (getpwuid($>))[7]; #for ssh
+my $pid_file = "/var/run/freeside-selfservice-server.$user.$machine.pid";
 
-adminsuidsetup $user;
-
-#logfile("/usr/local/etc/freeside/selfservice.". $FS::UID::datasrc); #MACHINE
-logfile("/usr/local/etc/freeside/selfservice.$machine.log");
-
-daemonize2();
+my $lock_file = "/usr/local/etc/freeside/selfservice.$machine.writelock";
 
+&init($user);
 
 my $conf = new FS::Conf;
 
@@ -80,7 +69,7 @@ while (1) {
     $undisp = 1;
     my @handles = $s->can_read(5);
     unless ( @handles ) {
-      myshutdown() if sigint() || sigterm();
+      &shutdown if $shutdown;
       if ( $keepalives && $keepalive_count++ > 10 ) {
         $keepalive_count = 0;
         lock_write;
@@ -161,7 +150,7 @@ while (1) {
 
   }
 
-  myshutdown if sigint() || sigterm();
+  &shutdown if $shutdown;
   warn "connection lost, reconnecting\n" if $Debug;
   sleep 3;
 
@@ -183,7 +172,70 @@ sub reap_kids {
   #warn "done reaping\n";
 }
 
-sub myshutdown {
+sub init {
+  my $user = shift;
+
+  chdir "/" or die "Can't chdir to /: $!";
+  open STDIN, '/dev/null' or die "Can't read /dev/null: $!";
+  defined(my $pid = fork) or die "Can't fork: $!";
+  if ( $pid ) {
+    print "freeside-selfservice-server to $machine started with pid $pid\n"; #logging to $log_file
+    exit unless $pid_file;
+    my $pidfh = new IO::File ">$pid_file" or exit;
+    print $pidfh "$pid\n";
+    exit;
+  }
+
+#  sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
+#  #sub REAPER { my $pid = wait; $kids--; $SIG{CHLD} = \&REAPER; }
+#  $SIG{CHLD} =  \&REAPER;
+
+  $shutdown = 0;
+  $SIG{HUP} = sub { warn "SIGHUP received; shutting down\n"; $shutdown++; };
+  $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $shutdown++; };
+  $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $shutdown++; };
+  $SIG{QUIT} = sub { warn "SIGQUIT received; shutting down\n"; $shutdown++; };
+  $SIG{PIPE} = sub { warn "SIGPIPE received; shutting down\n"; $shutdown++; };
+
+  #false laziness w/freeside-queued
+  my $freeside_gid = scalar(getgrnam('freeside'))
+    or die "can't setgid to freeside group\n";
+
+  open(LOCKFILE,">$lock_file") or die "can't open $lock_file: $!";
+  chown $FS::UID::freeside_uid, $freeside_gid, $lock_file;
+
+  $) = $freeside_gid;
+  $( = $freeside_gid;
+  #if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
+  ($(,$)) = ($),$();
+  $) = $freeside_gid;
+
+  $> = $FS::UID::freeside_uid;
+  $< = $FS::UID::freeside_uid;
+  #freebsd is sofa king broken, won't setuid()
+  ($<,$>) = ($>,$<);
+  $> = $FS::UID::freeside_uid;
+  #eslaf
+
+  $ENV{HOME} = (getpwuid($>))[7]; #for ssh
+  adminsuidsetup $user;
+
+  #$log_file = "/usr/local/etc/freeside/selfservice.". $FS::UID::datasrc; #MACHINE NAME
+  $log_file = "/usr/local/etc/freeside/selfservice.$machine.log";
+
+  open STDOUT, '>/dev/null'
+                            or die "Can't write to /dev/null: $!";
+  setsid                  or die "Can't start a new session: $!";
+  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+
+  $SIG{__DIE__} = \&_die;
+  $SIG{__WARN__} = \&_logmsg;
+
+  warn "freeside-selfservice-server starting\n";
+
+}
+
+sub shutdown {
   &reap_kids;
   my $wait = 12; #wait up to 1 minute
   while ( $kids > 0 && $wait-- ) {
@@ -196,6 +248,27 @@ sub myshutdown {
   die "exiting";
 }
 
+sub _die {
+  my $msg = shift;
+  unlink $pid_file if -e $pid_file;
+  _logmsg($msg);
+}
+
+sub _logmsg {
+  chomp( my $msg = shift );
+  _do_logmsg( "[server] [". scalar(localtime). "] [$$] $msg\n" );
+}
+
+sub _do_logmsg {
+  chomp( my $msg = shift );
+  my $log = new IO::File ">>$log_file";
+  flock($log, LOCK_EX);
+  seek($log, 0, 2);
+  print $log "$msg\n";
+  flock($log, LOCK_UN);
+  close $log;
+}
+
 sub lock_write {
   warn "locking $lock_file mutex for write to write stream\n" if $Debug > 1;
 
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index a16e517..c867a72 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -1,24 +1,29 @@
 #!/usr/bin/perl -Tw
 
 #to delay loading dbdef until we're ready
-BEGIN { $FS::Schema::setup_hack = 1; }
+BEGIN { $FS::Record::setup_hack = 1; }
 
 use strict;
 use vars qw($opt_s);
 use Getopt::Std;
 use Locale::Country;
 use Locale::SubCountry;
+use DBI;
+use DBIx::DBSchema 0.21;
+use DBIx::DBSchema::Table;
+use DBIx::DBSchema::Column;
+use DBIx::DBSchema::ColGroup::Unique;
+use DBIx::DBSchema::ColGroup::Index;
 use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
-use FS::Schema qw( dbdef_dist reload_dbdef );
 use FS::Record;
 use FS::cust_main_county;
-#use FS::raddb;
+use FS::raddb;
 use FS::part_bill_event;
 
 die "Not running uid freeside!" unless checkeuid();
 
-#my %attrib2db =
-#  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
+my %attrib2db =
+  map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
 
 getopts("s");
 my $user = shift or die &usage;
@@ -70,25 +75,154 @@ my $username_len = 32; #usernamemax config file
 #  $x =~ /^y/i;
 #}
 
-#my @check_attributes = (); #add later
-#my @attributes = (); #add later
-#my $ship = $opt_s;
+my @check_attributes = (); #add later
+my @attributes = (); #add later
+my $ship = $opt_s;
+
+###
+
+my($char_d) = 80; #default maxlength for text fields
+
+#my(@date_type)  = ( 'timestamp', '', ''     );
+my(@date_type)  = ( 'int', 'NULL', ''     );
+my(@perl_type) = ( 'text', 'NULL', ''  ); 
+my @money_type = ( 'decimal',   '', '10,2' );
 
 ###
 # create a dbdef object from the old data structure
 ###
 
-my $dbdef = dbdef_dist;
+my(%tables)=&tables_hash_hack;
+
+#turn it into objects
+my($dbdef) = new DBIx::DBSchema ( map {  
+  my(@columns);
+  while (@{$tables{$_}{'columns'}}) {
+    my($name,$type,$null,$length)=splice @{$tables{$_}{'columns'}}, 0, 4;
+    push @columns, new DBIx::DBSchema::Column ( $name,$type,$null,$length );
+  }
+  DBIx::DBSchema::Table->new(
+    $_,
+    $tables{$_}{'primary_key'},
+    DBIx::DBSchema::ColGroup::Unique->new($tables{$_}{'unique'}),
+    DBIx::DBSchema::ColGroup::Index->new($tables{$_}{'index'}),
+    @columns,
+  );
+} (keys %tables) );
+
+my $cust_main = $dbdef->table('cust_main');
+unless ($ship) { #remove ship_ from cust_main
+  $cust_main->delcolumn($_) foreach ( grep /^ship_/, $cust_main->columns );
+} else { #add indices
+  push @{$cust_main->index->lol_ref},
+    map { [ "ship_$_" ] } qw( last company daytime night fax );
+}
+
+#add radius attributes to svc_acct
+
+my($svc_acct)=$dbdef->table('svc_acct');
+
+my($attribute);
+foreach $attribute (@attributes) {
+  $svc_acct->addcolumn ( new DBIx::DBSchema::Column (
+    'radius_'. $attribute,
+    'varchar',
+    'NULL',
+    $char_d,
+  ));
+}
+
+foreach $attribute (@check_attributes) {
+  $svc_acct->addcolumn( new DBIx::DBSchema::Column (
+    'rc_'. $attribute,
+    'varchar',
+    'NULL',
+    $char_d,
+  ));
+}
+
+#create history tables (false laziness w/create-history-tables)
+foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
+  my $tableobj = $dbdef->table($table)
+    or die "unknown table $table";
+
+  die "unique->lol_ref undefined for $table"
+    unless defined $tableobj->unique->lol_ref;
+  die "index->lol_ref undefined for $table"
+    unless defined $tableobj->index->lol_ref;
+
+  my $h_tableobj = DBIx::DBSchema::Table->new( {
+    name        => "h_$table",
+    primary_key => 'historynum',
+    unique      => DBIx::DBSchema::ColGroup::Unique->new( [] ),
+    'index'     => DBIx::DBSchema::ColGroup::Index->new( [
+                     @{$tableobj->unique->lol_ref},
+                     @{$tableobj->index->lol_ref}
+                   ] ),
+    columns     => [
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'historynum',
+                       'type'    => 'serial',
+                       'null'    => 'NOT NULL',
+                       'length'  => '',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_date',
+                       'type'    => 'int',
+                       'null'    => 'NULL',
+                       'length'  => '',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_user',
+                       'type'    => 'varchar',
+                       'null'    => 'NOT NULL',
+                       'length'  => '80',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_action',
+                       'type'    => 'varchar',
+                       'null'    => 'NOT NULL',
+                       'length'  => '80',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     map {
+                       my $column = $tableobj->column($_);
+
+                       #clone so as to not disturb the original
+                       $column = DBIx::DBSchema::Column->new( {
+                         map { $_ => $column->$_() }
+                           qw( name type null length default local )
+                       } );
+
+                       $column->type('int')
+                         if $column->type eq 'serial';
+                       #$column->default('')
+                       #  if $column->default =~ /^nextval\(/i;
+                       #( my $local = $column->local ) =~ s/AUTO_INCREMENT//i;
+                       #$column->local($local);
+                       $column;
+                     } $tableobj->columns
+                   ],
+  } );
+  $dbdef->addtable($h_tableobj);
+}
 
 #important
 $dbdef->save($dbdef_file);
-&FS::Schema::reload_dbdef($dbdef_file);
+&FS::Record::reload_dbdef($dbdef_file);
 
 ###
 # create 'em
 ###
 
-my $dbh = adminsuidsetup $user;
+my($dbh)=adminsuidsetup $user;
 
 #create tables
 $|=1;
@@ -98,12 +232,6 @@ foreach my $statement ( $dbdef->sql($dbh) ) {
     or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
 }
 
-#now go back and reverse engineer the db
-#so we pick up the correct column DEFAULTs for #oidless inserts
-dbdef_create($dbh, $dbdef_file);
-delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
-reload_dbdef($dbdef_file);
-
 #cust_main_county
 foreach my $country ( sort map uc($_), all_country_codes ) {
 
@@ -168,15 +296,923 @@ $dbh->disconnect or die $dbh->errstr;
 
 #print "Freeside database initialized sucessfully\n";
 
-sub dbdef_create { # reverse engineer the schema from the DB and save to file
-  my( $dbh, $file ) = @_;
-  my $dbdef = new_native DBIx::DBSchema $dbh;
-  $dbdef->save($file);
-}
-
 sub usage {
-  die "Usage:\n  freeside-setup user\n"; 
+  die "Usage:\n  freeside-setup [ -s ] user\n"; 
 }
 
-1;
+###
+# Now it becomes an object.  much better.
+###
+sub tables_hash_hack {
+
+  #note that s/(date|change)/_$1/; to avoid keyword conflict.
+  #put a kludge in FS::Record to catch this or? (pry need some date-handling
+  #stuff anyway also)
+
+  my(%tables)=( #yech.}
+
+    'agent' => {
+      'columns' => [
+        'agentnum', 'serial',            '',     '',
+        'agent',    'varchar',           '',     $char_d,
+        'typenum',  'int',            '',     '',
+        'freq',     'int',       'NULL', '',
+        'prog',     @perl_type,
+        'disabled',     'char', 'NULL', 1,
+        'username', 'varchar',       'NULL',     $char_d,
+        '_password','varchar',       'NULL',     $char_d,
+      ],
+      'primary_key' => 'agentnum',
+      'unique' => [],
+      'index' => [ ['typenum'], ['disabled'] ],
+    },
+
+    'agent_type' => {
+      'columns' => [
+        'typenum',   'serial',  '', '',
+        'atype',     'varchar', '', $char_d,
+      ],
+      'primary_key' => 'typenum',
+      'unique' => [],
+      'index' => [],
+    },
+
+    'type_pkgs' => {
+      'columns' => [
+        'typenum',   'int',  '', '',
+        'pkgpart',   'int',  '', '',
+      ],
+      'primary_key' => '',
+      'unique' => [ ['typenum', 'pkgpart'] ],
+      'index' => [ ['typenum'] ],
+    },
+
+    'cust_bill' => {
+      'columns' => [
+        'invnum',    'serial',  '', '',
+        'custnum',   'int',  '', '',
+        '_date',     @date_type,
+        'charged',   @money_type,
+        'printed',   'int',  '', '',
+        'closed',    'char', 'NULL', 1,
+      ],
+      'primary_key' => 'invnum',
+      'unique' => [],
+      'index' => [ ['custnum'], ['_date'] ],
+    },
+
+    'cust_bill_event' => {
+      'columns' => [
+        'eventnum',    'serial',  '', '',
+        'invnum',   'int',  '', '',
+        'eventpart',   'int',  '', '',
+        '_date',     @date_type,
+        'status', 'varchar', '', $char_d,
+        'statustext', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'eventnum',
+      #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
+      'unique' => [],
+      'index' => [ ['invnum'], ['status'] ],
+    },
+
+    'part_bill_event' => {
+      'columns' => [
+        'eventpart',    'serial',  '', '',
+        'payby',       'char',  '', 4,
+        'event',       'varchar',           '',     $char_d,
+        'eventcode',    @perl_type,
+        'seconds',     'int', 'NULL', '',
+        'weight',      'int', '', '',
+        'plan',       'varchar', 'NULL', $char_d,
+        'plandata',   'text', 'NULL', '',
+        'disabled',     'char', 'NULL', 1,
+      ],
+      'primary_key' => 'eventpart',
+      'unique' => [],
+      'index' => [ ['payby'], ['disabled'], ],
+    },
+
+    'cust_bill_pkg' => {
+      'columns' => [
+        'pkgnum',  'int', '', '',
+        'invnum',  'int', '', '',
+        'setup',   @money_type,
+        'recur',   @money_type,
+        'sdate',   @date_type,
+        'edate',   @date_type,
+        'itemdesc', 'varchar', 'NULL', $char_d,
+      ],
+      'primary_key' => '',
+      'unique' => [],
+      'index' => [ ['invnum'] ],
+    },
+
+    'cust_bill_pkg_detail' => {
+      'columns' => [
+        'detailnum', 'serial', '', '',
+        'pkgnum',  'int', '', '',
+        'invnum',  'int', '', '',
+        'detail',  'varchar', '', $char_d,
+      ],
+      'primary_key' => 'detailnum',
+      'unique' => [],
+      'index' => [ [ 'pkgnum', 'invnum' ] ],
+    },
+
+    'cust_credit' => {
+      'columns' => [
+        'crednum',  'serial', '', '',
+        'custnum',  'int', '', '',
+        '_date',    @date_type,
+        'amount',   @money_type,
+        'otaker',   'varchar', '', 32,
+        'reason',   'text', 'NULL', '',
+        'closed',    'char', 'NULL', 1,
+      ],
+      'primary_key' => 'crednum',
+      'unique' => [],
+      'index' => [ ['custnum'] ],
+    },
+
+    'cust_credit_bill' => {
+      'columns' => [
+        'creditbillnum', 'serial', '', '',
+        'crednum',  'int', '', '',
+        'invnum',  'int', '', '',
+        '_date',    @date_type,
+        'amount',   @money_type,
+      ],
+      'primary_key' => 'creditbillnum',
+      'unique' => [],
+      'index' => [ ['crednum'], ['invnum'] ],
+    },
+
+    'cust_main' => {
+      'columns' => [
+        'custnum',  'serial',  '',     '',
+        'agentnum', 'int',  '',     '',
+#        'titlenum', 'int',  'NULL',   '',
+        'last',     'varchar', '',     $char_d,
+#        'middle',   'varchar', 'NULL', $char_d,
+        'first',    'varchar', '',     $char_d,
+        'ss',       'varchar', 'NULL', 11,
+        'company',  'varchar', 'NULL', $char_d,
+        'address1', 'varchar', '',     $char_d,
+        'address2', 'varchar', 'NULL', $char_d,
+        'city',     'varchar', '',     $char_d,
+        'county',   'varchar', 'NULL', $char_d,
+        'state',    'varchar', 'NULL', $char_d,
+        'zip',      'varchar', 'NULL', 10,
+        'country',  'char', '',     2,
+        'daytime',  'varchar', 'NULL', 20,
+        'night',    'varchar', 'NULL', 20,
+        'fax',      'varchar', 'NULL', 12,
+        'ship_last',     'varchar', 'NULL', $char_d,
+#        'ship_middle',   'varchar', 'NULL', $char_d,
+        'ship_first',    'varchar', 'NULL', $char_d,
+        'ship_company',  'varchar', 'NULL', $char_d,
+        'ship_address1', 'varchar', 'NULL', $char_d,
+        'ship_address2', 'varchar', 'NULL', $char_d,
+        'ship_city',     'varchar', 'NULL', $char_d,
+        'ship_county',   'varchar', 'NULL', $char_d,
+        'ship_state',    'varchar', 'NULL', $char_d,
+        'ship_zip',      'varchar', 'NULL', 10,
+        'ship_country',  'char', 'NULL', 2,
+        'ship_daytime',  'varchar', 'NULL', 20,
+        'ship_night',    'varchar', 'NULL', 20,
+        'ship_fax',      'varchar', 'NULL', 12,
+        'payby',    'char', '',     4,
+        'payinfo',  'varchar', 'NULL', $char_d,
+        'paycvv',   'varchar', 'NULL', 4,
+        #'paydate',  @date_type,
+        'paydate',  'varchar', 'NULL', 10,
+        'payname',  'varchar', 'NULL', $char_d,
+        'tax',      'char', 'NULL', 1,
+        'otaker',   'varchar', '',    32,
+        'refnum',   'int',  '',     '',
+        'referral_custnum', 'int',  'NULL', '',
+        'comments', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'custnum',
+      'unique' => [],
+      #'index' => [ ['last'], ['company'] ],
+      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ],
+                   [ 'daytime' ], [ 'night' ], [ 'fax' ], [ 'refnum' ],
+                 ],
+    },
+
+    'cust_main_invoice' => {
+      'columns' => [
+        'destnum',  'serial',  '',     '',
+        'custnum',  'int',  '',     '',
+        'dest',     'varchar', '',  $char_d,
+      ],
+      'primary_key' => 'destnum',
+      'unique' => [],
+      'index' => [ ['custnum'], ],
+    },
+
+    'cust_main_county' => { #county+state+country are checked off the
+                            #cust_main_county for validation and to provide
+                            # a tax rate.
+      'columns' => [
+        'taxnum',   'serial',   '',    '',
+        'state',    'varchar',  'NULL',    $char_d,
+        'county',   'varchar',  'NULL',    $char_d,
+        'country',  'char',  '', 2, 
+        'taxclass',   'varchar', 'NULL', $char_d,
+        'exempt_amount', @money_type,
+        'tax',      'real',  '',    '', #tax %
+        'taxname',  'varchar',  'NULL',    $char_d,
+        'setuptax',  'char', 'NULL', 1, # Y = setup tax exempt
+        'recurtax',  'char', 'NULL', 1, # Y = recur tax exempt
+      ],
+      'primary_key' => 'taxnum',
+      'unique' => [],
+  #    'unique' => [ ['taxnum'], ['state', 'county'] ],
+      'index' => [],
+    },
+
+    'cust_pay' => {
+      'columns' => [
+        'paynum',   'serial',    '',   '',
+        #now cust_bill_pay #'invnum',   'int',    '',   '',
+        'custnum',  'int',    '',   '',
+        'paid',     @money_type,
+        '_date',    @date_type,
+        'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
+                                         # payment type table.
+        'payinfo',  'varchar',   'NULL', $char_d,  #see cust_main above
+        'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
+        'closed',    'char', 'NULL', 1,
+      ],
+      'primary_key' => 'paynum',
+      'unique' => [],
+      'index' => [ [ 'custnum' ], [ 'paybatch' ], [ 'payby' ], [ '_date' ] ],
+    },
+
+    'cust_pay_void' => {
+      'columns' => [
+        'paynum',    'int',    '',   '',
+        'custnum',   'int',    '',   '',
+        'paid',      @money_type,
+        '_date',     @date_type,
+        'payby',     'char',   '',     4, # CARD/BILL/COMP, should be index into
+                                          # payment type table.
+        'payinfo',   'varchar',   'NULL', $char_d,  #see cust_main above
+        'paybatch',  'varchar',   'NULL', $char_d, #for auditing purposes.
+        'closed',    'char', 'NULL', 1,
+        'void_date', @date_type,
+        'reason',    'varchar',   'NULL', $char_d,
+        'otaker',   'varchar', '', 32,
+      ],
+      'primary_key' => 'paynum',
+      'unique' => [],
+      'index' => [ [ 'custnum' ] ],
+    },
+
+    'cust_bill_pay' => {
+      'columns' => [
+        'billpaynum', 'serial',     '',   '',
+        'invnum',  'int',     '',   '',
+        'paynum',  'int',     '',   '',
+        'amount',  @money_type,
+        '_date',   @date_type
+      ],
+      'primary_key' => 'billpaynum',
+      'unique' => [],
+      'index' => [ [ 'paynum' ], [ 'invnum' ] ],
+    },
+
+    'cust_pay_batch' => { #what's this used for again?  list of customers
+                          #in current CARD batch? (necessarily CARD?)
+      'columns' => [
+        'paybatchnum',   'serial',    '',   '',
+        'invnum',   'int',    '',   '',
+        'custnum',   'int',    '',   '',
+        'last',     'varchar', '',     $char_d,
+        'first',    'varchar', '',     $char_d,
+        'address1', 'varchar', '',     $char_d,
+        'address2', 'varchar', 'NULL', $char_d,
+        'city',     'varchar', '',     $char_d,
+        'state',    'varchar', 'NULL', $char_d,
+        'zip',      'varchar', 'NULL', 10,
+        'country',  'char', '',     2,
+#        'trancode', 'int', '', '',
+        'cardnum',  'varchar', '',     16,
+        #'exp',      @date_type,
+        'exp',      'varchar', '',     11,
+        'payname',  'varchar', 'NULL', $char_d,
+        'amount',   @money_type,
+      ],
+      'primary_key' => 'paybatchnum',
+      'unique' => [],
+      'index' => [ ['invnum'], ['custnum'] ],
+    },
+
+    'cust_pkg' => {
+      'columns' => [
+        'pkgnum',    'serial',    '',   '',
+        'custnum',   'int',    '',   '',
+        'pkgpart',   'int',    '',   '',
+        'otaker',    'varchar', '', 32,
+        'setup',     @date_type,
+        'bill',      @date_type,
+        'last_bill', @date_type,
+        'susp',      @date_type,
+        'cancel',    @date_type,
+        'expire',    @date_type,
+        'manual_flag', 'char', 'NULL', 1,
+      ],
+      'primary_key' => 'pkgnum',
+      'unique' => [],
+      'index' => [ ['custnum'] ],
+    },
+
+    'cust_refund' => {
+      'columns' => [
+        'refundnum',    'serial',    '',   '',
+        #now cust_credit_refund #'crednum',      'int',    '',   '',
+        'custnum',  'int',    '',   '',
+        '_date',        @date_type,
+        'refund',       @money_type,
+        'otaker',       'varchar',   '',   32,
+        'reason',       'varchar',   '',   $char_d,
+        'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
+                                             # into payment type table.
+        'payinfo',      'varchar',   'NULL', $char_d,  #see cust_main above
+        'paybatch',     'varchar',   'NULL', $char_d,
+        'closed',    'char', 'NULL', 1,
+      ],
+      'primary_key' => 'refundnum',
+      'unique' => [],
+      'index' => [],
+    },
+
+    'cust_credit_refund' => {
+      'columns' => [
+        'creditrefundnum', 'serial',     '',   '',
+        'crednum',  'int',     '',   '',
+        'refundnum',  'int',     '',   '',
+        'amount',  @money_type,
+        '_date',   @date_type
+      ],
+      'primary_key' => 'creditrefundnum',
+      'unique' => [],
+      'index' => [ [ 'crednum', 'refundnum' ] ],
+    },
+
+
+    'cust_svc' => {
+      'columns' => [
+        'svcnum',    'serial',    '',   '',
+        'pkgnum',    'int',    'NULL',   '',
+        'svcpart',   'int',    '',   '',
+      ],
+      'primary_key' => 'svcnum',
+      'unique' => [],
+      'index' => [ ['svcnum'], ['pkgnum'], ['svcpart'] ],
+    },
+
+    'part_pkg' => {
+      'columns' => [
+        'pkgpart',    'serial',    '',   '',
+        'pkg',        'varchar',   '',   $char_d,
+        'comment',    'varchar',   '',   $char_d,
+        'promo_code', 'varchar', 'NULL', $char_d,
+        'setup',      @perl_type,
+        'freq',       'varchar',   '',   $char_d,  #billing frequency
+        'recur',      @perl_type,
+        'setuptax',  'char', 'NULL', 1,
+        'recurtax',  'char', 'NULL', 1,
+        'plan',       'varchar', 'NULL', $char_d,
+        'plandata',   'text', 'NULL', '',
+        'disabled',   'char', 'NULL', 1,
+        'taxclass',   'varchar', 'NULL', $char_d,
+      ],
+      'primary_key' => 'pkgpart',
+      'unique' => [],
+      'index' => [ [ 'promo_code' ], [ 'disabled' ] ],
+    },
+
+#    'part_title' => {
+#      'columns' => [
+#        'titlenum',   'int',    '',   '',
+#        'title',      'varchar',   '',   $char_d,
+#      ],
+#      'primary_key' => 'titlenum',
+#      'unique' => [ [] ],
+#      'index' => [ [] ],
+#    },
+
+    'pkg_svc' => {
+      'columns' => [
+        'pkgpart',    'int',    '',   '',
+        'svcpart',    'int',    '',   '',
+        'quantity',   'int',    '',   '',
+        'primary_svc','char', 'NULL',  1,
+      ],
+      'primary_key' => '',
+      'unique' => [ ['pkgpart', 'svcpart'] ],
+      'index' => [ ['pkgpart'] ],
+    },
+
+    'part_referral' => {
+      'columns' => [
+        'refnum',   'serial',    '',   '',
+        'referral', 'varchar',   '',   $char_d,
+        'disabled',     'char', 'NULL', 1,
+      ],
+      'primary_key' => 'refnum',
+      'unique' => [],
+      'index' => [ ['disabled'] ],
+    },
+
+    'part_svc' => {
+      'columns' => [
+        'svcpart',    'serial',    '',   '',
+        'svc',        'varchar',   '',   $char_d,
+        'svcdb',      'varchar',   '',   $char_d,
+        'disabled',   'char',  'NULL',   1,
+      ],
+      'primary_key' => 'svcpart',
+      'unique' => [],
+      'index' => [ [ 'disabled' ] ],
+    },
+
+    'part_svc_column' => {
+      'columns' => [
+        'columnnum',   'serial',         '', '',
+        'svcpart',     'int',         '', '',
+        'columnname',  'varchar',     '', 64,
+        'columnvalue', 'varchar', 'NULL', $char_d,
+        'columnflag',  'char',    'NULL', 1, 
+      ],
+      'primary_key' => 'columnnum',
+      'unique' => [ [ 'svcpart', 'columnname' ] ],
+      'index' => [ [ 'svcpart' ] ],
+    },
+
+    #(this should be renamed to part_pop)
+    'svc_acct_pop' => {
+      'columns' => [
+        'popnum',    'serial',    '',   '',
+        'city',      'varchar',   '',   $char_d,
+        'state',     'varchar',   '',   $char_d,
+        'ac',        'char',   '',   3,
+        'exch',      'char',   '',   3,
+        'loc',       'char',   'NULL',   4, #NULL for legacy purposes
+      ],
+      'primary_key' => 'popnum',
+      'unique' => [],
+      'index' => [ [ 'state' ] ],
+    },
+
+    'part_pop_local' => {
+      'columns' => [
+        'localnum',  'serial',     '',     '',
+        'popnum',    'int',     '',     '',
+        'city',      'varchar', 'NULL', $char_d,
+        'state',     'char',    'NULL', 2,
+        'npa',       'char',    '',     3,
+        'nxx',       'char',    '',     3,
+      ],
+      'primary_key' => 'localnum',
+      'unique' => [],
+      'index' => [ [ 'npa', 'nxx' ], [ 'popnum' ] ],
+    },
+
+    'svc_acct' => {
+      'columns' => [
+        'svcnum',    'int',    '',   '',
+        'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
+        '_password', 'varchar',   '',   72, #13 for encryped pw's plus ' *SUSPENDED* (md5 passwords can be 34, blowfish 60)
+        'sec_phrase', 'varchar',  'NULL',   $char_d,
+        'popnum',    'int',    'NULL',   '',
+        'uid',       'int', 'NULL',   '',
+        'gid',       'int', 'NULL',   '',
+        'finger',    'varchar',   'NULL',   $char_d,
+        'dir',       'varchar',   'NULL',   $char_d,
+        'shell',     'varchar',   'NULL',   $char_d,
+        'quota',     'varchar',   'NULL',   $char_d,
+        'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
+        'seconds',   'int', 'NULL',   '', #uhhhh
+        'domsvc',    'int', '',   '',
+      ],
+      'primary_key' => 'svcnum',
+      #'unique' => [ [ 'username', 'domsvc' ] ],
+      'unique' => [],
+      'index' => [ ['username'], ['domsvc'] ],
+    },
+
+    #'svc_charge' => {
+    #  'columns' => [
+    #    'svcnum',    'int',    '',   '',
+    #    'amount',    @money_type,
+    #  ],
+    #  'primary_key' => 'svcnum',
+    #  'unique' => [ [] ],
+    #  'index' => [ [] ],
+    #},
+
+    'svc_domain' => {
+      'columns' => [
+        'svcnum',    'int',    '',   '',
+        'domain',    'varchar',    '',   $char_d,
+        'catchall',  'int', 'NULL',    '',
+      ],
+      'primary_key' => 'svcnum',
+      'unique' => [ ['domain'] ],
+      'index' => [],
+    },
+
+    'domain_record' => {
+      'columns' => [
+        'recnum',    'serial',     '',  '',
+        'svcnum',    'int',     '',  '',
+        #'reczone',   'varchar', '',  $char_d,
+        'reczone',   'varchar', '',  255,
+        'recaf',     'char',    '',  2,
+        'rectype',   'varchar',    '',  5,
+        #'recdata',   'varchar', '',  $char_d,
+        'recdata',   'varchar', '',  255,
+      ],
+      'primary_key' => 'recnum',
+      'unique'      => [],
+      'index'       => [ ['svcnum'] ],
+    },
+
+    'svc_forward' => {
+      'columns' => [
+        'svcnum',   'int',            '',   '',
+        'srcsvc',   'int',        'NULL',   '',
+        'src',      'varchar',    'NULL',  255,
+        'dstsvc',   'int',        'NULL',   '',
+        'dst',      'varchar',    'NULL',  255,
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [],
+      'index'       => [ ['srcsvc'], ['dstsvc'] ],
+    },
+
+    'svc_www' => {
+      'columns' => [
+        'svcnum',   'int',    '',  '',
+        'recnum',   'int',    '',  '',
+        'usersvc',  'int',    '',  '',
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    #'svc_wo' => {
+    #  'columns' => [
+    #    'svcnum',    'int',    '',   '',
+    #    'svcnum',    'int',    '',   '',
+    #    'svcnum',    'int',    '',   '',
+    #    'worker',    'varchar',   '',   $char_d,
+    #    '_date',     @date_type,
+    #  ],
+    #  'primary_key' => 'svcnum',
+    #  'unique' => [ [] ],
+    #  'index' => [ [] ],
+    #},
+
+    'prepay_credit' => {
+      'columns' => [
+        'prepaynum',   'serial',     '',   '',
+        'identifier',  'varchar', '', $char_d,
+        'amount',      @money_type,
+        'seconds',     'int',     'NULL', '',
+      ],
+      'primary_key' => 'prepaynum',
+      'unique'      => [ ['identifier'] ],
+      'index'       => [],
+    },
+
+    'port' => {
+      'columns' => [
+        'portnum',  'serial',     '',   '',
+        'ip',       'varchar', 'NULL', 15,
+        'nasport',  'int',     'NULL', '',
+        'nasnum',   'int',     '',   '',
+      ],
+      'primary_key' => 'portnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'nas' => {
+      'columns' => [
+        'nasnum',   'serial',     '',    '',
+        'nas',      'varchar', '',    $char_d,
+        'nasip',    'varchar', '',    15,
+        'nasfqdn',  'varchar', '',    $char_d,
+        'last',     'int',     '',    '',
+      ],
+      'primary_key' => 'nasnum',
+      'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
+      'index'       => [ [ 'last' ] ],
+    },
+
+    'session' => {
+      'columns' => [
+        'sessionnum', 'serial',       '',   '',
+        'portnum',    'int',       '',   '',
+        'svcnum',     'int',       '',   '',
+        'login',      @date_type,
+        'logout',     @date_type,
+      ],
+      'primary_key' => 'sessionnum',
+      'unique'      => [],
+      'index'       => [ [ 'portnum' ] ],
+    },
+
+    'queue' => {
+      'columns' => [
+        'jobnum', 'serial', '', '',
+        'job', 'text', '', '',
+        '_date', 'int', '', '',
+        'status', 'varchar', '', $char_d,
+        'statustext', 'text', 'NULL', '',
+        'svcnum', 'int', 'NULL', '',
+      ],
+      'primary_key' => 'jobnum',
+      'unique'      => [],
+      'index'       => [ [ 'svcnum' ], [ 'status' ] ],
+    },
+
+    'queue_arg' => {
+      'columns' => [
+        'argnum', 'serial', '', '',
+        'jobnum', 'int', '', '',
+        'arg', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'argnum',
+      'unique'      => [],
+      'index'       => [ [ 'jobnum' ] ],
+    },
+
+    'queue_depend' => {
+      'columns' => [
+        'dependnum', 'serial', '', '',
+        'jobnum', 'int', '', '',
+        'depend_jobnum', 'int', '', '',
+      ],
+      'primary_key' => 'dependnum',
+      'unique'      => [],
+      'index'       => [ [ 'jobnum' ], [ 'depend_jobnum' ] ],
+    },
+
+    'export_svc' => {
+      'columns' => [
+        'exportsvcnum' => 'serial', '', '',
+        'exportnum'    => 'int', '', '',
+        'svcpart'      => 'int', '', '',
+      ],
+      'primary_key' => 'exportsvcnum',
+      'unique'      => [ [ 'exportnum', 'svcpart' ] ],
+      'index'       => [ [ 'exportnum' ], [ 'svcpart' ] ],
+    },
+
+    'part_export' => {
+      'columns' => [
+        'exportnum', 'serial', '', '',
+        #'svcpart',   'int', '', '',
+        'machine', 'varchar', '', $char_d,
+        'exporttype', 'varchar', '', $char_d,
+        'nodomain',     'char', 'NULL', 1,
+      ],
+      'primary_key' => 'exportnum',
+      'unique'      => [],
+      'index'       => [ [ 'machine' ], [ 'exporttype' ] ],
+    },
+
+    'part_export_option' => {
+      'columns' => [
+        'optionnum', 'serial', '', '',
+        'exportnum', 'int', '', '',
+        'optionname', 'varchar', '', $char_d,
+        'optionvalue', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'optionnum',
+      'unique'      => [],
+      'index'       => [ [ 'exportnum' ], [ 'optionname' ] ],
+    },
+
+    'radius_usergroup' => {
+      'columns' => [
+        'usergroupnum', 'serial', '', '',
+        'svcnum',       'int', '', '',
+        'groupname',    'varchar', '', $char_d,
+      ],
+      'primary_key' => 'usergroupnum',
+      'unique'      => [],
+      'index'       => [ [ 'svcnum' ], [ 'groupname' ] ],
+    },
+
+    'msgcat' => {
+      'columns' => [
+        'msgnum', 'serial', '', '',
+        'msgcode', 'varchar', '', $char_d,
+        'locale', 'varchar', '', 16,
+        'msg', 'text', '', '',
+      ],
+      'primary_key' => 'msgnum',
+      'unique'      => [ [ 'msgcode', 'locale' ] ],
+      'index'       => [],
+    },
+
+    'cust_tax_exempt' => {
+      'columns' => [
+        'exemptnum', 'serial', '', '',
+        'custnum',   'int', '', '',
+        'taxnum',    'int', '', '',
+        'year',      'int', '', '',
+        'month',     'int', '', '',
+        'amount',   @money_type,
+      ],
+      'primary_key' => 'exemptnum',
+      'unique'      => [ [ 'custnum', 'taxnum', 'year', 'month' ] ],
+      'index'       => [],
+    },
+
+    'router' => {
+      'columns' => [
+        'routernum', 'serial', '', '',
+        'routername', 'varchar', '', $char_d,
+        'svcnum', 'int', 'NULL', '',
+      ],
+      'primary_key' => 'routernum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'part_svc_router' => {
+      'columns' => [
+        'svcpart', 'int', '', '',
+	'routernum', 'int', '', '',
+      ],
+      'primary_key' => '',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'addr_block' => {
+      'columns' => [
+        'blocknum', 'serial', '', '',
+	'routernum', 'int', '', '',
+        'ip_gateway', 'varchar', '', 15,
+        'ip_netmask', 'int', '', '',
+      ],
+      'primary_key' => 'blocknum',
+      'unique'      => [ [ 'blocknum', 'routernum' ] ],
+      'index'       => [],
+    },
+
+    'svc_broadband' => {
+      'columns' => [
+        'svcnum', 'int', '', '',
+        'blocknum', 'int', '', '',
+        'speed_up', 'int', '', '',
+        'speed_down', 'int', '', '',
+        'ip_addr', 'varchar', '', 15,
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'part_virtual_field' => {
+      'columns' => [
+        'vfieldpart', 'int', '', '',
+        'dbtable', 'varchar', '', 32,
+        'name', 'varchar', '', 32,
+        'check_block', 'text', 'NULL', '',
+        'length', 'int', 'NULL', '',
+        'list_source', 'text', 'NULL', '',
+        'label', 'varchar', 'NULL', 80,
+      ],
+      'primary_key' => 'vfieldpart',
+      'unique' => [],
+      'index' => [],
+    },
+
+    'virtual_field' => {
+      'columns' => [
+        'recnum', 'int', '', '',
+        'vfieldpart', 'int', '', '',
+        'value', 'varchar', '', 128,
+      ],
+      'primary_key' => '',
+      'unique' => [ [ 'vfieldpart', 'recnum' ] ],
+      'index' => [],
+    },
+
+    'acct_snarf' => {
+      'columns' => [
+        'snarfnum',  'int', '', '',
+        'svcnum',    'int', '', '',
+        'machine',   'varchar', '', 255,
+        'protocol',  'varchar', '', $char_d,
+        'username',  'varchar', '', $char_d,
+        '_password', 'varchar', '', $char_d,
+      ],
+      'primary_key' => 'snarfnum',
+      'unique' => [],
+      'index'  => [ [ 'svcnum' ] ],
+    },
+
+    'svc_external' => {
+      'columns' => [
+        'svcnum', 'int', '', '',
+        'id',     'int', 'NULL', '',
+        'title',  'varchar', 'NULL', $char_d,
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'cust_pay_refund' => {
+      'columns' => [
+        'payrefundnum', 'serial', '', '',
+        'paynum',  'int', '', '',
+        'refundnum',  'int', '', '',
+        '_date',    @date_type,
+        'amount',   @money_type,
+      ],
+      'primary_key' => 'payrefundnum',
+      'unique' => [],
+      'index' => [ ['paynum'], ['refundnum'] ],
+    },
+
+    'part_pkg_option' => {
+      'columns' => [
+        'optionnum', 'serial', '', '',
+        'pkgpart', 'int', '', '',
+        'optionname', 'varchar', '', $char_d,
+        'optionvalue', 'text', 'NULL', '',
+      ],
+      'primary_key' => 'optionnum',
+      'unique'      => [],
+      'index'       => [ [ 'pkgpart' ], [ 'optionname' ] ],
+    },
+
+    'rate' => {
+      'columns' => [
+        'ratenum',  'serial', '', '',
+        'ratename', 'varchar', '', $char_d,
+      ],
+      'primary_key' => 'ratenum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'rate_detail' => {
+      'columns' => [
+        'ratenum',         'int',     '', '',
+        'orig_regionnum',  'int', 'NULL', '',
+        'dest_regionnum',  'int',     '', '',
+        'min_included',    'int',     '', '',
+        'min_charge',      @money_type,
+        'sec_granularity', 'int',     '', '',
+        #time period (link to table of periods)?
+      ],
+      'primary_key' => '',
+      'unique'      => [ [ 'ratenum', 'orig_regionnum', 'dest_regionnum' ] ],
+      'index'       => [],
+    },
+
+    'rate_region' => {
+      'columns' => [
+        'regionnum',   'serial',      '', '',
+        'regionname',  'varchar',     '', $char_d,
+      ],
+      'primary_key' => 'regionnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'rate_prefix' => {
+      'columns' => [
+        'prefixnum',   'serial',    '', '',
+        'regionnum',   'int',       '', '',,
+        'countrycode', 'varchar',     '', 3,
+        'npa',         'varchar', 'NULL', 6,
+        'nxx',         'varchar', 'NULL', 3,
+      ],
+      'primary_key' => 'prefixnum',
+      'unique'      => [],
+      'index'       => [ [ 'countrycode' ], [ 'regionnum' ] ],
+    },
+
+
+  );
+
+  %tables;
+
+}
 
diff --git a/FS/bin/freeside-sqlradius-radacctd b/FS/bin/freeside-sqlradius-radacctd
index e98eaa0..4e8d57c 100644
--- a/FS/bin/freeside-sqlradius-radacctd
+++ b/FS/bin/freeside-sqlradius-radacctd
@@ -1,122 +1,159 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -Tw
 
 use strict;
-use vars qw( @part_export );
-use subs qw(myshutdown);
-use POSIX qw(:sys_wait_h);
-#use IO::File;
-use FS::Daemon qw(daemonize1 drop_root logfile daemonize2 sigint sigterm);
-use FS::UID qw(adminsuidsetup); #forksuidsetup driver_name dbh myconnect);
-use FS::Record qw(qsearch); # qsearchs);
-use FS::part_export;
+use vars qw( $log_file $sigterm $sigint );
+use subs qw( _die _logmsg );
+use Fcntl qw(:flock);
+use POSIX qw(setsid);
+use Date::Format;
+use IO::File;
+use FS::UID qw(adminsuidsetup);
+#use FS::Record qw(qsearch qsearchs);
+#use FS::part_export;
 #use FS::svc_acct;
 #use FS::cust_svc;
 
+#lots of false laziness w/freeside-queued
+
 my $user = shift or die &usage;
 
-#daemonize1('freeside-sqlradius-radacctd', $user); #keep unique pid files w/multi installs
-daemonize1('freeside-sqlradius-radacctd');
+#my $pid_file = "/var/run/freeside-sqlradius-radacctd.$user.pid";
+my $pid_file = "/var/run/freeside-sqlradius-radacctd.pid";
 
-drop_root();
+&daemonize1;
 
-#$ENV{HOME} = (getpwuid($>))[7]; #for ssh
+#sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
+#$SIG{CHLD} =  \&REAPER;
 
-adminsuidsetup $user;
+$sigterm = 0;
+$sigint = 0;
+$SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
+$SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
-logfile( "/usr/local/etc/freeside/sqlradius-radacctd-log.". $FS::UID::datasrc );
+my $freeside_gid = scalar(getgrnam('freeside'))
+  or die "can't setgid to freeside group\n";
+$) = $freeside_gid;
+$( = $freeside_gid;
+#if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
+($(,$)) = ($),$();
+$) = $freeside_gid;
 
-daemonize2();
+$> = $FS::UID::freeside_uid;
+$< = $FS::UID::freeside_uid;
+#freebsd is sofa king broken, won't setuid()
+($<,$>) = ($>,$<);
+$> = $FS::UID::freeside_uid;
 
-#--
+#$ENV{HOME} = (getpwuid($>))[7]; #for ssh
+adminsuidsetup $user;
 
-#don't just look for ->can('usage_sessions'), we're sqlradius-specific
-# (radiator is supposed to be setup with a radacct table)
+$log_file= "/usr/local/etc/freeside/sqlradius-radacctd-log.". $FS::UID::datasrc;
 
-@part_export =
-  qsearch('part_export', { 'exporttype' => 'sqlradius' } );
-push @part_export,
-  qsearch('part_export', { 'exporttype' => 'sqlradius_withdomain' } );
-push @part_export,
-  qsearch('part_export', { 'exporttype' => 'radiator' } );
+&daemonize2;
 
-@part_export = grep { ! $_->option('ignore_accounting') } @part_export;
+$SIG{__DIE__} = \&_die;
+$SIG{__WARN__} = \&_logmsg;
 
-die "no sqlradius, sqlradius_withdomain or radiator exports without".
-    " ignore_accounting"
-  unless @part_export;
+warn "freeside-sqlradius-radacctd starting\n";
+
+#eslaf
+
+#my $machine = shift or die &usage; #would need to be up higher for real
+my @exports = qsearch('part_export', { 'exporttype' => 'sqlradius' } );
 
 while (1) {
 
-  #fork off one kid per export (machine)
-  # _>{'_radacct_kid'} is an evil kludge
-  foreach my $part_export ( grep ! $_->{'_radacct_kid'}, @part_export ) {
- 
-    defined( my $pid = fork ) or do {
-      warn "WARNING: can't fork to spawn child for ". $part_export->machine;
+  my %seen = ();
+  foreach my $export ( @exports ) {
+    next if $seen{$export->option('datasrc')}++;
+    my $dbh = DBI->connect(
+      map { $export->option($_) } qw( datasrc username password )
+    ) or do {
+      warn "can't connect to ". $export->option('datasrc'). ": ". $DBI::errstr;
       next;
-    };
-
-    if ( $pid ) {
-      $part_export->{'_radacct_kid'} = $pid;
-      warn "child $pid spawned for ". $part_export->machine;
-    } else { #kid time
+    }
 
-      adminsuidsetup($user); #get our own db handle
+    # find old radacct position
+    #$lastid = 0;
 
-      until ( sigint || sigterm ) {
-        $part_export->update_svc_acct();
-        sleep 1;
-      }
+    # get new radacct records
+    my $sth = $dbh->prepare('SELECT * FROM radacct WHERE radacctid > ?') or do {
+      warn "can't select in radacct table from ". $export->option('datasrc').
+           ": ". $dbh->errstr;
+      next;
+    };
 
-      warn "child for ". $part_export->machine. " done";
-      exit;
+    while ( my $radacct = $sth->fetchrow_arrayref({}) ) {
 
-    } #eo kid
+      my $session = new FS::session {
+        portnum =>
+        svcnum  => 
+        login   =>
+        #logout  =>
+      };
 
-  }
+    }
 
-  #reap up any kids that died...
-  &reap_kids;
+    # look for updated radacct records & replace them
 
-  myshutdown() if sigterm() || sigint();
+  }
 
   sleep 5;
+
 }
 
-#-- 
+#more false laziness w/freeside-queued
 
-sub myshutdown {
-  &reap_kids;
+sub usage {
+  die "Usage:\n\n  freeside-sqlradius-radacctd user\n";
+}
 
-  #kill all the kids
-  kill 'TERM', $_ foreach grep $_, map $_->{'_radacct_kid'}, @part_export;
+sub _die {
+  my $msg = shift;
+  unlink $pid_file if -e $pid_file;
+  _logmsg($msg);
+}
 
-  my $wait = 12; #wait up to 1 minute
-  while ( ( grep $_->{'_radacct_kid'}, @part_export ) && $wait-- ) {
-    warn "waiting for children to terminate";
-    sleep 5;
-    &reap_kids;
-  }
-  warn "abandoning children" if grep $_->{'_radacct_kid'}, @part_export;
-  die "exiting";
+sub _logmsg {
+  chomp( my $msg = shift );
+  my $log = new IO::File ">>$log_file";
+  flock($log, LOCK_EX);
+  seek($log, 0, 2);
+  print $log "[". time2str("%a %b %e %T %Y",time). "] [$$] $msg\n";
+  flock($log, LOCK_UN);
+  close $log;
 }
 
-sub reap_kids {
-  #warn "reaping kids\n";
-  foreach my $part_export ( grep $_->{'_radacct_kid'}, @part_export ) {
-    my $pid = $part_export->{'_radacct_kid'};
-    my $kid = waitpid($pid, WNOHANG);
-    if ( $kid > 0 ) {
-      $part_export->{'_radacct_kid'} = '';
-    }
+sub daemonize1 {
+
+  chdir "/" or die "Can't chdir to /: $!";
+  open STDIN, '/dev/null'   or die "Can't read /dev/null: $!";
+  defined(my $pid = fork) or die "Can't fork: $!";
+  if ( $pid ) {
+    print "freeside-sqlradius-radacctd started with pid $pid\n";
+          #logging to $log_file\n";
+    exit unless $pid_file;
+    my $pidfh = new IO::File ">$pid_file" or exit;
+    print $pidfh "$pid\n";
+    exit;
   }
-  #warn "done reaping\n";
+  #open STDOUT, '>/dev/null'
+  #                          or die "Can't write to /dev/null: $!";
+  #setsid                  or die "Can't start a new session: $!";
+  #open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+
 }
 
-sub usage {
-  die "Usage:\n\n  freeside-sqlradius-radacctd user\n";
+sub daemonize2 {
+  open STDOUT, '>/dev/null'
+                            or die "Can't write to /dev/null: $!";
+  setsid                  or die "Can't start a new session: $!";
+  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
 }
 
+
+#eslaf
+
 =head1 NAME
 
 freeside-sqlradius-radacctd - Real-time radacct import daemon
@@ -127,24 +164,17 @@ freeside-sqlradius-radacctd - Real-time radacct import daemon
 
 =head1 DESCRIPTION
 
-Imports records from an the SQL radacct tables of all sqlradius, 
-sqlradius_withdomain and radiator exports (except those with the
-ignore_accounting flag) and updates the svc_acct.seconds for each account.
-Runs as a daemon and updates the database in real-time.
-
-B<username> is a username added by freeside-adduser.
-
-=head1 RADIUS DATABASE CHANGES
+Imports records from an SQL radacct table in real-time into the session
+monitor.
 
-ALTER TABLE radacct ADD COLUMN FreesideStatus varchar(32) NULL;
+This enables per-minute or per-hour charges as well as the
+"View active NAS ports" function.
 
-If you want to ignore the existing accountg records, also do:
-
-UPDATE radacct SET FreesideStatus = 'done' WHERE FreesideStatus IS NULL;
+B<username> is a username added by freeside-adduser.
 
 =head1 SEE ALSO
 
-=cut
+session.html from the base documentation.
 
-1;
+=cut
 
diff --git a/FS/bin/freeside-sqlradius-reset b/FS/bin/freeside-sqlradius-reset
index 2ac5012..11cbe9e 100755
--- a/FS/bin/freeside-sqlradius-reset
+++ b/FS/bin/freeside-sqlradius-reset
@@ -48,9 +48,6 @@ foreach my $export ( @exports ) {
 
   foreach my $svc_acct ( @svc_acct ) {
 
-    $svc_acct->check; #set any fixed usergroup so it'll export even if all
-                      #svc_acct records don't have the group yet
-
     #false laziness with FS::svc_acct::insert (like it matters)
     my $error = $export->export_insert($svc_acct);
     die $error if $error;
diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
deleted file mode 100755
index 419384c..0000000
--- a/FS/bin/freeside-upgrade
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use vars qw($DEBUG $DRY_RUN);
-use Term::ReadKey;
-use DBIx::DBSchema 0.27;
-use FS::UID qw(adminsuidsetup checkeuid datasrc );  #getsecrets);
-use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
-
-
-$DEBUG = 1;
-$DRY_RUN = 0;
-
-
-die "Not running uid freeside!" unless checkeuid();
-
-my $user = shift or die &usage;
-my $dbh = adminsuidsetup($user);
-
-#needs to match FS::Schema...
-my $dbdef_file = "/usr/local/etc/freeside/dbdef.". datasrc;
-
-dbdef_create($dbh, $dbdef_file);
-
-delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
-reload_dbdef($dbdef_file);
-
-
-foreach my $table ( dbdef_dist->tables ) {
-
-  if ( dbdef->table($table) ) {
-
-    warn "$table exists\n" if $DEBUG > 1;
-
-    foreach my $column ( dbdef_dist->table($table)->columns ) {
-      if ( dbdef->table($table)->column($column) )  {
-        warn "  $table.$column exists\n" if $DEBUG > 2;
-      } else {
-
-        if ( $DEBUG ) {
-          print STDERR "column $table.$column does not exist.  create?";
-          next unless yesno();
-        }
-
-        foreach my $statement (
-          dbdef_dist->table($table)->column($column)->sql_add_column( $dbh )
-        ) {
-          warn "$statement\n" if $DEBUG || $DRY_RUN;
-          unless ( $DRY_RUN ) {
-            $dbh->do( $statement)
-              or die "CREATE error: ". $dbh->errstr. "\nexecuting: $statement";
-          }
-        }
-
-      }
-
-    }
-
-    #should eventually check & create missing indices
-
-    #should eventually drop columns not in dbdef_dist...
-
-  } else {
-
-    if ( $DEBUG ) {
-      print STDERR "table $table does not exist.  create?";
-      next unless yesno();
-    }
-
-    foreach my $statement (
-      dbdef_dist->table($table)->sql_create_table( $dbh )
-    ) {
-      warn "$statement\n" if $DEBUG || $DRY_RUN;
-      unless ( $DRY_RUN ) {
-        $dbh->do( $statement)
-          or die "CREATE error: ". $dbh->errstr. "\nexecuting: $statement";
-      }
-    }
-
-  }
-
-}
-
-# should eventually drop tables not in dbdef_dist too i guess...
-
-$dbh->commit or die $dbh->errstr;
-
-dbdef_create($dbh, $dbdef_file);
-
-$dbh->disconnect or die $dbh->errstr;
-
-###
-
-my $all = 0;
-sub yesno {
-  print STDERR ' [yes/no/all] ';
-  if ( $all ) {
-    warn "yes\n";
-    return 1;
-  } else {
-    while ( 1 ) {
-      ReadMode 4;
-      my $x = lc(ReadKey);
-      ReadMode 0;
-      if ( $x eq 'n' ) {
-        warn "no\n"; 
-        return 0;
-      } elsif ( $x eq 'y' ) {
-        warn "yes\n"; 
-        return 1;
-      } elsif ( $x eq 'a' ) {
-        warn "yes\n"; 
-        $all = 1;
-        return 1;
-      }
-    }
-  }
-}
-
-sub dbdef_create { # reverse engineer the schema from the DB and save to file
-  my( $dbh, $file ) = @_;
-  my $dbdef = new_native DBIx::DBSchema $dbh;
-  $dbdef->save($file);
-}
-
-sub usage {
-  die "Usage:\n  freeside-upgrade user\n"; 
-}
-
-1;
-
diff --git a/FS/t/ClientAPI_SessionCache.t b/FS/t/ClientAPI_SessionCache.t
deleted file mode 100644
index 605803e..0000000
--- a/FS/t/ClientAPI_SessionCache.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::ClientAPI_SessionCache;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/Daemon.t b/FS/t/Daemon.t
deleted file mode 100644
index 24893fd..0000000
--- a/FS/t/Daemon.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::Daemon;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/agent_payment_gateway.t b/FS/t/agent_payment_gateway.t
deleted file mode 100644
index af78a9a..0000000
--- a/FS/t/agent_payment_gateway.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::agent_payment_gateway;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/banned_pay.t b/FS/t/banned_pay.t
deleted file mode 100644
index bef1ff2..0000000
--- a/FS/t/banned_pay.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::banned_pay;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cancel_reason.t b/FS/t/cancel_reason.t
deleted file mode 100644
index a5948f6..0000000
--- a/FS/t/cancel_reason.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cancel_reason;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/clientapi_session.t b/FS/t/clientapi_session.t
deleted file mode 100644
index a6414c3..0000000
--- a/FS/t/clientapi_session.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::clientapi_session;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/clientapi_session_field.t b/FS/t/clientapi_session_field.t
deleted file mode 100644
index a9d4fa9..0000000
--- a/FS/t/clientapi_session_field.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::clientapi_session_field;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/cust_main_Mixin.t b/FS/t/cust_main_Mixin.t
deleted file mode 100644
index c8b9291..0000000
--- a/FS/t/cust_main_Mixin.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cust_main_Mixin;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/h_Common.t b/FS/t/h_Common.t
deleted file mode 100644
index 174bb99..0000000
--- a/FS/t/h_Common.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::h_Common;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/h_cust_svc.t b/FS/t/h_cust_svc.t
deleted file mode 100644
index a7dabbe..0000000
--- a/FS/t/h_cust_svc.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::h_cust_svc;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/h_domain_record.t b/FS/t/h_domain_record.t
deleted file mode 100644
index f48e72e..0000000
--- a/FS/t/h_domain_record.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::h_domain_record;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/h_svc_acct.t b/FS/t/h_svc_acct.t
deleted file mode 100644
index 9c94d08..0000000
--- a/FS/t/h_svc_acct.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::h_svc_acct;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/h_svc_broadband.t b/FS/t/h_svc_broadband.t
deleted file mode 100644
index b8e5c7c..0000000
--- a/FS/t/h_svc_broadband.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::h_svc_broadband;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/h_svc_domain.t b/FS/t/h_svc_domain.t
deleted file mode 100644
index 87d2a09..0000000
--- a/FS/t/h_svc_domain.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::h_svc_domain;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/h_svc_external.t b/FS/t/h_svc_external.t
deleted file mode 100644
index 5248f87..0000000
--- a/FS/t/h_svc_external.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::h_svc_external;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/h_svc_forward.t b/FS/t/h_svc_forward.t
deleted file mode 100644
index 64731d5..0000000
--- a/FS/t/h_svc_forward.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::h_svc_forward;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/h_svc_www.t b/FS/t/h_svc_www.t
deleted file mode 100644
index 07558ce..0000000
--- a/FS/t/h_svc_www.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::h_svc_www;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/option_Common.t b/FS/t/option_Common.t
deleted file mode 100644
index ad26141..0000000
--- a/FS/t/option_Common.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::option_Common;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/part_export-radiator.t b/FS/t/part_export-radiator.t
deleted file mode 100644
index 546e9de..0000000
--- a/FS/t/part_export-radiator.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::part_export::radiator;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/payment_gateway.t b/FS/t/payment_gateway.t
deleted file mode 100644
index 4bcc781..0000000
--- a/FS/t/payment_gateway.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::payment_gateway;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/payment_gateway_option.t b/FS/t/payment_gateway_option.t
deleted file mode 100644
index 19e6451..0000000
--- a/FS/t/payment_gateway_option.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::payment_gateway_option;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/reg_code.t b/FS/t/reg_code.t
deleted file mode 100644
index 4b95990..0000000
--- a/FS/t/reg_code.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::reg_code;
-$loaded=1;
-print "ok 1\n";
diff --git a/FS/t/reg_code_pkg.t b/FS/t/reg_code_pkg.t
deleted file mode 100644
index 7f89ffa..0000000
--- a/FS/t/reg_code_pkg.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::reg_code_pkg;
-$loaded=1;
-print "ok 1\n";
diff --git a/Makefile b/Makefile
index 2c5abf9..d706013 100644
--- a/Makefile
+++ b/Makefile
@@ -41,23 +41,17 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #not necessary (freebsd)
 #INIT_INSTALL = /usr/bin/true
 
-#deb
-HTTPD_RESTART = /etc/init.d/apache reload
-#suse
-#HTTPD_RESTART = /etc/init.d/apache restart
+#deb, suse
+HTTPD_RESTART = /etc/init.d/apache restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
-#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop || true; sleep 10; /usr/local/etc/rc.d/apache.sh start
+#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 10; /usr/local/etc/rc.d/apache.sh start
 #openbsd
 #HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 10; /usr/sbin/httpd -u -DSSL
 #apache
 #HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl
 
-#(an include directory, not a file - "Include /etc/apache/conf.d" in httpd.conf)
-#deb (3.1+), 
-APACHE_CONF = /etc/apache/conf.d
-
 FREESIDE_RESTART = ${INIT_FILE} restart
 
 #deb, redhat, fedora, mandrake, suse, others?
@@ -69,6 +63,9 @@ INSTALLGROUP = root
 
 QUEUED_USER=fs_queue
 
+#eventually this shouldn't be needed
+FREESIDE_PATH = `pwd`
+
 SELFSERVICE_USER = fs_selfservice
 #never run on the same machine in production!!!
 SELFSERVICE_MACHINES = localhost
@@ -81,12 +78,11 @@ SELFSERVICE_INSTALL_USER = ivan
 SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd
 #SELFSERVICE_INSTALL_USERADD = "/usr/sbin/pw useradd"
 
-#RT_ENABLED = 0
-RT_ENABLED = 1
+RT_ENABLED = 0
+#RT_ENABLED = 1
 RT_DOMAIN = example.com
-RT_TIMEZONE = US/Pacific
-#RT_TIMEZONE = US/Eastern
-FREESIDE_URL = "http://localhost/freeside/"
+RT_TIMEZONE = US/Pacific;
+#RT_TIMEZONE = US/Eastern;
 
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
@@ -98,32 +94,17 @@ FREESIDE_CONF = /usr/local/etc/freeside
 #rt/config.layout.in
 RT_PATH = /opt/rt3
 
-#only used for dev kludge now, not a big deal
-FREESIDE_PATH = `pwd`
-PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.7/
-
-VERSION=1.5.8cvs
-TAG=freeside_1_5_8
+VERSION=1.5.0pre6
+TAG=freeside_1_5_0pre6
 
 help:
-	@echo "supported targets:"
-	@echo "                   create-database create-config"
+	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
+	@echo "                   htmlman"
+	@echo "                   perl-modules install-perl-modules"
 	@echo "                   install deploy"
+	@echo "                   create-database"
 	@echo "                   configure-rt create-rt"
-	@echo "                   clean help"
-	@echo
-	@echo "                   install-docs install-perl-modules"
-	@echo "                   install-init install-apache"
-	@echo "                   install-rt"
-	@echo "                   install-selfservice update-selfservice"
-	@echo
-	@echo "                   dev dev-docs dev-perl-modules"
-	@echo
-	@echo "                   aspdocs masondocs alldocs docs"
-	@echo "                   htmlman forcehtmlman"
-	@echo "                   perl-modules"
-	#@echo
-	#@echo "                   upload-docs release update-webdemo"
+	@echo "                   clean"
 
 aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
 	rm -rf aspdocs
@@ -180,18 +161,6 @@ install-docs: docs
 	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 
-dev-docs: docs
-	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
-	ln -s ${FREESIDE_PATH}/masondocs ${FREESIDE_DOCUMENT_ROOT}
-	cp htetc/handler.pl ${MASON_HANDLER}
-	perl -p -i -e "\
-	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
-	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
-	  s'###use Module::Refresh;###'use Module::Refresh;'; \
-	  s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \
-	" ${MASON_HANDLER} || true
-
-
 perl-modules:
 	cd FS; \
 	[ -e Makefile ] || perl Makefile.PL; \
@@ -201,49 +170,28 @@ perl-modules:
 	" blib/lib/FS.pm
 
 install-perl-modules: perl-modules
-	[ -L ${PERL_INC_DEV_KLUDGE}/FS ] \
-	  && rm ${PERL_INC_DEV_KLUDGE}/FS \
-	  && mv ${PERL_INC_DEV_KLUDGE}/FS.old ${PERL_INC_DEV_KLUDGE}/FS \
-	  || true
 	cd FS; \
 	make install UNINST=1
 
-dev-perl-modules:
-	[ -d ${PERL_INC_DEV_KLUDGE}/FS -a ! -L ${PERL_INC_DEV_KLUDGE}/FS ] \
-	  && mv ${PERL_INC_DEV_KLUDGE}/FS ${PERL_INC_DEV_KLUDGE}/FS.old \
-	  || true
-
-	rm -rf ${PERL_INC_DEV_KLUDGE}/FS
-	ln -sf ${FREESIDE_PATH}/FS/FS ${PERL_INC_DEV_KLUDGE}/FS
-
 install-init:
 	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
 	install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
 	perl -p -i -e "\
 	  s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
+	  s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
 	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
 	  s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
 	" ${INIT_FILE}
 	${INIT_INSTALL}
 
-install-apache:
-	[ -d ${APACHE_CONF} ] && \
-	  ( install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \
-	    ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
-	    perl -p -i -e "\
-	      s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
-	    " ${APACHE_CONF}/freeside-*.conf \
-	  ) || true
-
 install-selfservice:
-	[ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
+	[ -e ~freeside/.ssh/id_dsa.pub ] || su -c 'ssh-keygen -t dsa' - freeside
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
 	  scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	  scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 600 ~freeside/.ssh/" ;\
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -D -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
 	   ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\
 	done
 
@@ -254,14 +202,12 @@ update-selfservice:
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	done
 
-install: install-perl-modules install-docs install-init install-apache install-rt
+install: install-perl-modules install-docs install-init install-rt
 
 deploy: install
 	${HTTPD_RESTART}
 	${FREESIDE_RESTART}
 
-dev: dev-perl-modules dev-docs
-
 create-database:
 	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
 
@@ -327,7 +273,6 @@ create-rt: configure-rt
 	perl -p -i -e "\
 	  s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
 	  s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
-	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
 	" ${RT_PATH}/etc/RT_SiteConfig.pm
 
 install-rt:
@@ -341,8 +286,8 @@ clean:
 #these are probably only useful if you're me...
 
 upload-docs: forcehtmlman
-	ssh 420.am rm -rf /var/www/www.sisd.com/freeside/docs
-	scp -pr httemplate/docs 420.am:/var/www/www.sisd.com/freeside/docs
+	ssh pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/docs
+	scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/docs
 
 release: upload-docs
 	cd /home/ivan/freeside
@@ -353,11 +298,11 @@ release: upload-docs
 	cvs export -r ${TAG} -d freeside-${VERSION} freeside
 	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
 
-	scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/www.sisd.com/freeside/
+	scp freeside-${VERSION}.tar.gz ivan@pouncequick.420.am:/var/www/sisd.420.am/freeside/
 	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
 update-webdemo:
-	ssh ivan@420.am '( cd freeside; cvs update -d -P )'
-	#ssh root@420.am '( cd /home/ivan/freeside; make clean; make deploy )'
-	ssh root@420.am '( cd /home/ivan/freeside; make deploy )'
+	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
+	#ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make clean; make deploy )'
+	ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make deploy )'
 
diff --git a/README b/README
index 25689e9..1030b38 100644
--- a/README
+++ b/README
@@ -1,7 +1,6 @@
 Freeside
 
-Copyright (C) 2005 Freeside Internet Services, Inc.
-Copyright (C) 2000-2005 Ivan Kohler
+Copyright (C) 2000,2001,2002,2003 Ivan Kohler
 Copyright (C) 1999 Silicon Interactive Software Design
 All rights reserved
 
@@ -30,16 +29,15 @@ The Freeside home page is at `http://www.sisd.com/freeside'.
 The documentation is in `httemplate/docs'.
 
 A mailing list for users is available.  Send a blank message to
-<freeside-users-subscribe@sisd.com> to subscribe.
+<ivan-freeside-subscribe@sisd.com> to subscribe.
 
 A mailing list for developers is available.  It is intended to be lower volume
 and higher SNR than the users list.  Send a blank message to
-<freeside-devel-subscribe@sisd.com> to subscribe.
+<ivan-freeside-devel-subscribe@sisd.com> to subscribe.
 
-Commercial installation, customization and support services as well as
-preconfigured appliances are available from Ivan Kohler <ivan@sisd.com>.
-Requests for free support sent to me directly will be ignored.  Please
-subscribe to the the user mailing list to request free support!
+Commercial support is available from Ivan Kohler <ivan@sisd.com>.  Requests for
+free support sent to me directly will be ignored.  Please subscribe to the the
+user mailing list to request free support!
 
 Ivan Kohler <ivan-freeside_readme@420.am>
 
diff --git a/README.1.5.0pre7 b/README.1.5.0pre7
new file mode 100644
index 0000000..dda49a7
--- /dev/null
+++ b/README.1.5.0pre7
@@ -0,0 +1,75 @@
+CREATE TABLE rate (
+    ratenum serial NOT NULL,
+    ratename varchar(80) NOT NULL,
+    PRIMARY KEY (ratenum)
+);
+
+CREATE TABLE rate_detail (
+    ratenum int NOT NULL,
+    orig_regionnum int NULL,
+    dest_regionnum int NOT NULL,
+    min_included int NOT NULL,
+    min_charge decimal(10,2) NOT NULL,
+    sec_granularity int NOT NULL
+);
+CREATE UNIQUE INDEX rate_detail1 ON rate_detail ( ratenum, orig_regionnum, dest_regionnum );
+
+CREATE TABLE rate_region (
+    regionnum serial NOT NULL,
+    regionname varchar(80) NOT NULL,
+    PRIMARY KEY (regionnum)
+);
+
+CREATE TABLE rate_prefix (
+    prefixnum serial NOT NULL,
+    regionnum int NOT NULL, 
+    countrycode varchar(3) NOT NULL,
+    npa varchar(6) NULL,
+    nxx varchar(3) NULL,
+    PRIMARY KEY (prefixnum)
+);
+CREATE INDEX rate_prefix1 ON rate_prefix ( countrycode );
+CREATE INDEX rate_prefix2 ON rate_prefix ( regionnum );
+
+ALTER TABLE part_pkg ADD promo_code varchar(80) NULL;
+ALTER TABLE h_part_pkg ADD promo_code varchar(80) NULL;
+CREATE INDEX part_pkg2 ON part_pkg ( promo_code );
+CREATE INDEX h_part_pkg2 ON h_part_pkg ( promo_code );
+
+ALTER TABLE cust_main ALTER COLUMN zip DROP NOT NULL;
+ALTER TABLE h_cust_main ALTER COLUMN zip DROP NOT NULL;
+
+Installs w/integrated RT:
+  CREATE SEQUENCE attributes_id_seq;
+
+  CREATE TABLE Attributes (
+    id INTEGER DEFAULT nextval('attributes_id_seq'),
+    Name varchar(255) NOT NULL  ,
+    Description varchar(255) NULL  ,
+    Content text,
+    ContentType varchar(16),
+    ObjectType varchar(64),
+    ObjectId integer, -- foreign key to anything
+    Creator integer NOT NULL DEFAULT 0  ,
+    Created TIMESTAMP NULL  ,
+    LastUpdatedBy integer NOT NULL DEFAULT 0  ,
+    LastUpdated TIMESTAMP NULL  ,
+    PRIMARY KEY (id)
+  
+  );
+  
+  CREATE INDEX Attributes1 on Attributes(Name);
+  CREATE INDEX Attributes2 on Attributes(ObjectType, ObjectId);
+
+
+dbdef-create username
+create-history-tables username rate rate_detail rate_region rate_prefix
+dbdef-create username
+
+
+afterwords (for installs w/integrated RT):
+make configure-rt
+make deploy
+/opt/rt3/sbin/rt-setup-database --action insert --datadir etc/upgrade/3.1.15
+/opt/rt3/sbin/rt-setup-database --action insert --datadir etc/upgrade/3.1.17
+
diff --git a/README.1.5.7 b/README.1.5.7
deleted file mode 100644
index e890f01..0000000
--- a/README.1.5.7
+++ /dev/null
@@ -1,199 +0,0 @@
-NOTE: Version numbering has been simplified.  1.5.7 is the version after
-1.5.0pre6.  It is still a development version - releases with odd numbered 
-middle parts (NN in x.NN.x) are development versions, like Perl or Linux.
-
-install DBIx::DBSchema 0.26
-
-CREATE TABLE rate (
-    ratenum serial NOT NULL,
-    ratename varchar(80) NOT NULL,
-    PRIMARY KEY (ratenum)
-);
-
-CREATE TABLE rate_detail (
-    ratedetailnum serial NOT NULL,
-    ratenum int NOT NULL,
-    orig_regionnum int NULL,
-    dest_regionnum int NOT NULL,
-    min_included int NOT NULL,
-    min_charge decimal(10,2) NOT NULL,
-    sec_granularity int NOT NULL
-);
-CREATE UNIQUE INDEX rate_detail1 ON rate_detail ( ratenum, orig_regionnum, dest_regionnum );
-
-CREATE TABLE rate_region (
-    regionnum serial NOT NULL,
-    regionname varchar(80) NOT NULL,
-    PRIMARY KEY (regionnum)
-);
-
-CREATE TABLE rate_prefix (
-    prefixnum serial NOT NULL,
-    regionnum int NOT NULL, 
-    countrycode varchar(3) NOT NULL,
-    npa varchar(6) NULL,
-    nxx varchar(3) NULL,
-    PRIMARY KEY (prefixnum)
-);
-CREATE INDEX rate_prefix1 ON rate_prefix ( countrycode );
-CREATE INDEX rate_prefix2 ON rate_prefix ( regionnum );
-
-CREATE TABLE reg_code (
-    codenum serial NOT NULL,
-    code varchar(80) NOT NULL,
-    agentnum int NOT NULL,
-    PRIMARY KEY (codenum)
-);
-CREATE UNIQUE INDEX reg_code1 ON reg_code ( agentnum, code );
-CREATE INDEX reg_code2 ON reg_code ( agentnum );
-
-CREATE TABLE reg_code_pkg (
-    codepkgnum serial,
-    codenum int NOT NULL,
-    pkgpart int NOT NULL,
-    PRIMARY KEY (codepkgnum)
-);
-CREATE UNIQUE INDEX reg_code_pkg1 ON reg_code_pkg ( codenum, pkgpart );
-CREATE INDEX reg_code_pkg2 ON reg_code_pkg ( codenum );
-
-CREATE TABLE clientapi_session (
-    sessionnum serial NOT NULL,
-    sessionid varchar(80) NOT NULL,
-    namespace varchar(80) NOT NULL,
-    PRIMARY KEY (sessionnum)
-);
-CREATE UNIQUE INDEX clientapi_session1 ON clientapi_session ( sessionid, namespace );
-
-CREATE TABLE clientapi_session_field (
-    fieldnum serial NOT NULL,
-    sessionnum int NOT NULL,
-    fieldname varchar(80) NOT NULL,
-    fieldvalue text NULL,
-    PRIMARY KEY (fieldnum)
-);
-CREATE UNIQUE INDEX clientapi_session_field1 ON clientapi_session_field ( sessionnum, fieldname );
-
-ALTER TABLE part_pkg ADD promo_code varchar(80) NULL;
-ALTER TABLE h_part_pkg ADD promo_code varchar(80) NULL;
-CREATE INDEX part_pkg2 ON part_pkg ( promo_code );
-CREATE INDEX h_part_pkg2 ON h_part_pkg ( promo_code );
-
-ALTER TABLE cust_main ALTER COLUMN zip DROP NOT NULL;
-ALTER TABLE h_cust_main ALTER COLUMN zip DROP NOT NULL;
-
-ALTER TABLE prepay_credit ADD agentnum integer NULL;
-ALTER TABLE h_prepay_credit ADD agentnum integer NULL;
-
-On current (7.3? definitely 7.4+) Pg:
-
-  ALTER TABLE type_pkgs ADD typepkgnum int;
-  ALTER TABLE type_pkgs ALTER COLUMN typepkgnum SET DEFAULT nextval('public.type_pkgs_typepkgnum_seq'::text);
-  CREATE SEQUENCE type_pkgs_typepkgnum_seq;
-  UPDATE type_pkgs SET typepkgnum = nextval('public.type_pkgs_typepkgnum_seq'::text) WHERE typepkgnum IS NULL;
-  ALTER TABLE type_pkgs ALTER typepkgnum SET NOT NULL;
-  ALTER TABLE type_pkgs ADD PRIMARY KEY (typepkgnum);
-  ALTER TABLE h_type_pkgs ADD typepkgnum int;
-
-  ALTER TABLE cust_bill_pkg ADD billpkgnum int;
-  ALTER TABLE cust_bill_pkg ALTER COLUMN billpkgnum SET DEFAULT nextval('public.cust_bill_pkg_billpkgnum_seq'::text);
-  CREATE SEQUENCE cust_bill_pkg_billpkgnum_seq;
-  UPDATE cust_bill_pkg SET billpkgnum = nextval('public.cust_bill_pkg_billpkgnum_seq'::text) WHERE billpkgnum IS NULL;
-  ALTER TABLE cust_bill_pkg ALTER billpkgnum SET NOT NULL;
-  ALTER TABLE cust_bill_pkg ADD PRIMARY KEY (billpkgnum);
-  ALTER TABLE h_cust_bill_pkg ADD billpkgnum int;
-  
-  ALTER TABLE pkg_svc ADD pkgsvcnum int;
-  ALTER TABLE pkg_svc ALTER COLUMN pkgsvcnum SET DEFAULT nextval('public.pkg_svc_pkgsvcnum_seq'::text);
-  CREATE SEQUENCE pkg_svc_pkgsvcnum_seq;
-  UPDATE pkg_svc SET pkgsvcnum = nextval('public.pkg_svc_pkgsvcnum_seq'::text) WHERE pkgsvcnum IS NULL;
-  ALTER TABLE pkg_svc ALTER pkgsvcnum SET NOT NULL;
-  ALTER TABLE pkg_svc ADD PRIMARY KEY (pkgsvcnum);
-  ALTER TABLE h_pkg_svc ADD pkgsvcnum int;
-  
-  ALTER TABLE part_svc_router ADD svcrouternum int;
-  ALTER TABLE part_svc_router ALTER COLUMN svcrouternum SET DEFAULT nextval('public.part_svc_router_svcrouternum_seq'::text);
-  CREATE SEQUENCE part_svc_router_svcrouternum_seq;
-  UPDATE part_svc_router SET svcrouternum = nextval('public.part_svc_router_svcrouternum_seq'::text) WHERE svcrouternum IS NULL;
-  ALTER TABLE part_svc_router ALTER svcrouternum SET NOT NULL;
-  ALTER TABLE part_svc_router ADD PRIMARY KEY (svcrouternum);
-  ALTER TABLE h_part_svc_router ADD svcrouternum int;
-
-Or on very old Pg (7.2 and earlier (eek), 7.3?):
-
-  ALTER TABLE type_pkgs ADD typepkgnum int;
-  ALTER TABLE type_pkgs ALTER COLUMN typepkgnum SET DEFAULT nextval('type_pkgs_typepkgnum_seq'::text);
-  CREATE SEQUENCE type_pkgs_typepkgnum_seq;
-  UPDATE type_pkgs SET typepkgnum = nextval('type_pkgs_typepkgnum_seq'::text) WHERE typepkgnum IS NULL;
-  UPDATE pg_attribute SET attnotnull = TRUE WHERE attname = 'typepkgnum' AND attrelid = ( SELECT oid FROM pg_class WHERE relname = 'type_pkgs');
-  ALTER TABLE type_pkgs ADD PRIMARY KEY (typepkgnum);
-  ALTER TABLE h_type_pkgs ADD typepkgnum int;
-
-  ALTER TABLE cust_bill_pkg ADD billpkgnum int;
-  ALTER TABLE cust_bill_pkg ALTER COLUMN billpkgnum SET DEFAULT nextval('cust_bill_pkg_billpkgnum_seq'::text);
-  CREATE SEQUENCE cust_bill_pkg_billpkgnum_seq;
-  UPDATE cust_bill_pkg SET billpkgnum = nextval('cust_bill_pkg_billpkgnum_seq'::text) WHERE billpkgnum IS NULL;
-  UPDATE pg_attribute SET attnotnull = TRUE WHERE attname = 'billpkgnum' AND attrelid = ( SELECT oid FROM pg_class WHERE relname = 'cust_bill_pkg');
-  ALTER TABLE cust_bill_pkg ADD PRIMARY KEY (billpkgnum);
-  ALTER TABLE h_cust_bill_pkg ADD billpkgnum int;
-  
-  ALTER TABLE pkg_svc ADD pkgsvcnum int;
-  ALTER TABLE pkg_svc ALTER COLUMN pkgsvcnum SET DEFAULT nextval('pkg_svc_pkgsvcnum_seq'::text);
-  CREATE SEQUENCE pkg_svc_pkgsvcnum_seq;
-  UPDATE pkg_svc SET pkgsvcnum = nextval('pkg_svc_pkgsvcnum_seq'::text) WHERE pkgsvcnum IS NULL;
-  UPDATE pg_attribute SET attnotnull = TRUE WHERE attname = 'pkgsvcnum' AND attrelid = ( SELECT oid FROM pg_class WHERE relname = 'pkg_svc');
-  ALTER TABLE pkg_svc ADD PRIMARY KEY (pkgsvcnum);
-  ALTER TABLE h_pkg_svc ADD pkgsvcnum int;
-  
-  ALTER TABLE part_svc_router ADD svcrouternum int;
-  ALTER TABLE part_svc_router ALTER COLUMN svcrouternum SET DEFAULT nextval('part_svc_router_svcrouternum_seq'::text);
-  CREATE SEQUENCE part_svc_router_svcrouternum_seq;
-  UPDATE part_svc_router SET svcrouternum = nextval('part_svc_router_svcrouternum_seq'::text) WHERE svcrouternum IS NULL;
-  UPDATE pg_attribute SET attnotnull = TRUE WHERE attname = 'svcrouternum' AND attrelid = ( SELECT oid FROM pg_class WHERE relname = 'part_svc_router');
-  ALTER TABLE part_svc_router ADD PRIMARY KEY (svcrouternum);
-  ALTER TABLE h_part_svc_router ADD svcrouternum int;
-
-Installs w/integrated RT:
-  CREATE SEQUENCE attributes_id_seq;
-
-  CREATE TABLE Attributes (
-    id INTEGER DEFAULT nextval('attributes_id_seq'),
-    Name varchar(255) NOT NULL  ,
-    Description varchar(255) NULL  ,
-    Content text,
-    ContentType varchar(16),
-    ObjectType varchar(64),
-    ObjectId integer, -- foreign key to anything
-    Creator integer NOT NULL DEFAULT 0  ,
-    Created TIMESTAMP NULL  ,
-    LastUpdatedBy integer NOT NULL DEFAULT 0  ,
-    LastUpdated TIMESTAMP NULL  ,
-    PRIMARY KEY (id)
-  
-  );
-  
-  CREATE INDEX Attributes1 on Attributes(Name);
-  CREATE INDEX Attributes2 on Attributes(ObjectType, ObjectId);
-
-  Add these lines to /opt/rt3/etc/RT_SiteConfig.pm (before the "1;"):
-    $RT::URI::freeside::IntegrationType = 'Internal';
-    $RT::URI::freeside::URL = 'http://path/to/your/freeside/';
-    Set($DatabaseHost   , '');
-
-(End of Installs w/integrated RT)
-
-
-(make sure you have upgraded DBIx::DBSchema to 0.26)
-dbdef-create username 
-create-history-tables username rate rate_detail rate_region rate_prefix reg_code reg_code_pkg
-dbdef-create username
-
-install Text::CSV_XS, Spreadsheet::WriteExcel, IO-stringy (IO::Scalar),
-Frontier::RPC (Frontier::RPC2), MIME::Entity (MIME-tools) and IPC::Run3
-
-afterwords (for installs w/integrated RT):
-install HTML::Scrubber, Text::Quoted and Tree::Simple
-make configure-rt
-make deploy
-/opt/rt3/sbin/rt-setup-database --action insert --datadir etc/upgrade/3.1.15
-/opt/rt3/sbin/rt-setup-database --action insert --datadir etc/upgrade/3.1.17
-
diff --git a/README.1.5.7.lastbit b/README.1.5.7.lastbit
deleted file mode 100644
index ad29e4c..0000000
--- a/README.1.5.7.lastbit
+++ /dev/null
@@ -1,64 +0,0 @@
-this is ONLY for people upgrading from CVS snapshots after march 12th who
-have most of the changes in README.1.5.7 already.
-
-if you're upgrading from 1.5.0pre6, see README.1.5.7 instead.
-
-if you're upgrading from 1.4.x, see httemplate/docs/upgrade10.html instead.
-
-
-ALTER TABLE rate_detail ADD COLUMN ratedetailnum int;
-ALTER TABLE rate_detail ALTER COLUMN ratedetailnum SET DEFAULT nextval('public.rate_detail_ratedetailnum_seq'::text);
-CREATE SEQUENCE rate_detail_ratedetailnum_seq;
-UPDATE rate_detail SET ratedetailnum = nextval('public.rate_detail_ratedetailnum_seq'::text) WHERE ratedetailnum IS NULL;
-ALTER TABLE rate_detail ALTER ratedetailnum SET NOT NULL;
-ALTER TABLE rate_detail ADD PRIMARY KEY (ratedetailnum);
-ALTER TABLE h_rate_detail ADD COLUMN ratedetailnum int;
-
-ALTER TABLE type_pkgs ADD typepkgnum int;
-ALTER TABLE type_pkgs ALTER COLUMN typepkgnum SET DEFAULT nextval('public.type_pkgs_typepkgnum_seq'::text);
-CREATE SEQUENCE type_pkgs_typepkgnum_seq;
-UPDATE type_pkgs SET typepkgnum = nextval('public.type_pkgs_typepkgnum_seq'::text) WHERE typepkgnum IS NULL;
-ALTER TABLE type_pkgs ALTER typepkgnum SET NOT NULL;
-ALTER TABLE type_pkgs ADD PRIMARY KEY (typepkgnum);
-ALTER TABLE h_type_pkgs ADD typepkgnum int;
-
-ALTER TABLE cust_bill_pkg ADD billpkgnum int;
-ALTER TABLE cust_bill_pkg ALTER COLUMN billpkgnum SET DEFAULT nextval('public.cust_bill_pkg_billpkgnum_seq'::text);
-CREATE SEQUENCE cust_bill_pkg_billpkgnum_seq;
-UPDATE cust_bill_pkg SET billpkgnum = nextval('public.cust_bill_pkg_billpkgnum_seq'::text) WHERE billpkgnum IS NULL;
-ALTER TABLE cust_bill_pkg ALTER billpkgnum SET NOT NULL;
-ALTER TABLE cust_bill_pkg ADD PRIMARY KEY (billpkgnum);
-ALTER TABLE h_cust_bill_pkg ADD billpkgnum int;
-
-ALTER TABLE pkg_svc ADD pkgsvcnum int;
-ALTER TABLE pkg_svc ALTER COLUMN pkgsvcnum SET DEFAULT nextval('public.pkg_svc_pkgsvcnum_seq'::text);
-CREATE SEQUENCE pkg_svc_pkgsvcnum_seq;
-UPDATE pkg_svc SET pkgsvcnum = nextval('public.pkg_svc_pkgsvcnum_seq'::text) WHERE pkgsvcnum IS NULL;
-ALTER TABLE pkg_svc ALTER pkgsvcnum SET NOT NULL;
-ALTER TABLE pkg_svc ADD PRIMARY KEY (pkgsvcnum);
-ALTER TABLE h_pkg_svc ADD pkgsvcnum int;
-
-ALTER TABLE part_svc_router ADD svcrouternum int;
-ALTER TABLE part_svc_router ALTER COLUMN svcrouternum SET DEFAULT nextval('public.part_svc_router_svcrouternum_seq'::text);
-CREATE SEQUENCE part_svc_router_svcrouternum_seq;
-UPDATE part_svc_router SET svcrouternum = nextval('public.part_svc_router_svcrouternum_seq'::text) WHERE svcrouternum IS NULL;
-ALTER TABLE part_svc_router ALTER svcrouternum SET NOT NULL;
-ALTER TABLE part_svc_router ADD PRIMARY KEY (svcrouternum);
-ALTER TABLE h_part_svc_router ADD svcrouternum int;
-
-ALTER TABLE reg_code_pkg ADD codepkgnum int;
-ALTER TABLE reg_code_pkg ALTER COLUMN codepkgnum SET DEFAULT nextval('public.reg_code_pkg_codepkgnum_seq'::text);
-CREATE SEQUENCE reg_code_pkg_codepkgnum_seq;
-UPDATE reg_code_pkg SET codepkgnum = nextval('public.reg_code_pkg_codepkgnum_seq'::text) WHERE codepkgnum IS NULL;
-ALTER TABLE reg_code_pkg ALTER codepkgnum SET NOT NULL;
-ALTER TABLE reg_code_pkg ADD PRIMARY KEY (codepkgnum);
-ALTER TABLE h_reg_code_pkg ADD codepkgnum int;
-
-ALTER TABLE virtual_field ADD vfieldnum int;
-ALTER TABLE virtual_field ALTER COLUMN vfieldnum SET DEFAULT nextval('public.virtual_field_vfieldnum_seq'::text);
-CREATE SEQUENCE virtual_field_vfieldnum_seq;
-UPDATE virtual_field SET vfieldnum = nextval('public.virtual_field_vfieldnum_seq'::text) WHERE vfieldnum IS NULL;
-ALTER TABLE virtual_field ALTER vfieldnum SET NOT NULL;
-ALTER TABLE virtual_field ADD PRIMARY KEY (vfieldnum);
--- ALTER TABLE h_virtual_field ADD vfieldnum int;
-
diff --git a/README.1.5.8 b/README.1.5.8
deleted file mode 100644
index cf41454..0000000
--- a/README.1.5.8
+++ /dev/null
@@ -1,56 +0,0 @@
-
-install JSON
-install Term::ReadKey
-
-install DBIx::DBSchema 0.27 (or later)
-  (if you are running Pg version 7.2.x or earlier, install at least
-   DBIx::DBSchema 0.29)
-install HTML::Widgets:SelectLayers 0.05 (or later)
-install Business::CreditCard 0.28 (or later)
-
-make install-perl-modules
-run "freeside-upgrade username" to uprade your database schema
-
-(if freeside-upgrade hangs, try stopping Apache, all Freeside processes, and
- anything else connected to your database, especially on older Pg versions)
-
-Optional:
-CREATE INDEX cust_pkg2 ON cust_pkg ( pkgpart );
-
-CREATE INDEX cust_bill_pkg2 ON cust_bill_pkg ( pkgnum );
-CREATE INDEX cust_main9 ON cust_main ( county );
-CREATE INDEX cust_main10 ON cust_main ( state );
-CREATE INDEX cust_main11 ON cust_main ( country );
-CREATE INDEX cust_main_county1 ON cust_main_county ( county );
-CREATE INDEX cust_main_county2 ON cust_main_county ( state );
-CREATE INDEX cust_main_county3 ON cust_main_county ( country );
-
-Optional for better VoIP performance:
-CREATE INDEX rate_detail2 ON rate_detail ( ratenum, dest_regionnum );
-
------
-
-Installs w/integrated RT:
-  Install Module::Versions::Report
-
-  chmod a+r /opt/rt3/etc/RT*Config.pm
-  cd rt
-  su freeside
-
-  /opt/rt3/sbin/rt-setup-database --action schema --datadir etc/upgrade/3.3.0
-  /opt/rt3/sbin/rt-setup-database --action acl --datadir etc/upgrade/3.3.0
-  /opt/rt3/sbin/rt-setup-database --action insert --datadir etc/upgrade/3.3.0
-
-  /opt/rt3/sbin/rt-setup-database --action schema --datadir etc/upgrade/3.3.11
-  /opt/rt3/sbin/rt-setup-database --action acl --datadir etc/upgrade/3.3.11
-  /opt/rt3/sbin/rt-setup-database --action insert --datadir etc/upgrade/3.3.11
-
-  run "dbdef-create username"
-
-  make configure-rt
-
-------
-
-make install-docs
- (or "make deploy" if you've got everything setup in the Makefile)
-
diff --git a/SCHEMA_CHANGE b/SCHEMA_CHANGE
index 26ebeea..4e5dcab 100644
--- a/SCHEMA_CHANGE
+++ b/SCHEMA_CHANGE
@@ -1,16 +1,7 @@
-primarily:
-- edit FS/FS/Schema.pm
-
-if the changes are something other than table and/or column additions:
-- httemplate/docs/upgrade10.html
-- README.1.5.X
-
-for new tables:
-- run bin/generate-table-module tablename
-- edit the resulting FS/FS/table.pm
-
-docs:
-- sorta neglected: FS/FS.pm
-- somehwat neglected: httemplate/docs/schema.html
-- really neglected: httemplate/docs/schema.dia
+FS/bin/freeside-setup
+httemplate/docs/upgrade10.html
+README.1.5.0preX
+httemplate/docs/schema.html
+for new tables: edit FS/FS.pm, add a new FS/FS/table_name.pm
+                and FS/t/table_name.t, edit FS/MANIFEST
 
diff --git a/bin/add-history-records.pl b/bin/add-history-records.pl
deleted file mode 100755
index fbf9d09..0000000
--- a/bin/add-history-records.pl
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/perl
-
-die "This is broken.  Don't use it!\n";
-
-use strict;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearchs qsearch);
-
-use Data::Dumper;
-
-my @tables = qw(svc_acct svc_broadband svc_domain svc_external svc_forward svc_www cust_svc domain_record);
-#my @tables = qw(svc_www);
-
-my $user = shift or die &usage;
-my $dbh = adminsuidsetup($user);
-
-my $dbdef = FS::Record::dbdef;
-
-foreach my $table (@tables) {
-
-  my $h_table = 'h_' . $table;
-  my $cnt = 0;
-  my $t_cnt = 0;
-
-  eval "use FS::${table}";
-  die $@ if $@;
-  eval "use FS::${h_table}";
-  die $@ if $@;
-
-  print "Adding history records for ${table}...\n";
-
-  my $dbdef_table = $dbdef->table($table);
-  my $pkey = $dbdef_table->primary_key;
-
-  foreach my $rec (qsearch($table, {})) {
-
-    #my $h_rec = qsearchs(
-    #  $h_table,
-    #  { $pkey => $rec->getfield($pkey) },
-    #  eval "FS::${h_table}->sql_h_searchs(time)",
-    #);
-
-    my $h_rec = qsearchs(
-      $h_table,
-      { $pkey => $rec->getfield($pkey) },
-      "DISTINCT ON ( $pkey ) *",
-      "AND history_action = 'insert' ORDER BY $pkey ASC, history_date DESC",
-      '',
-      'AS maintable',
-    );
-
-    unless ($h_rec) {
-      my $h_insert_rec = $rec->_h_statement('insert', 1);
-      #print $h_insert_rec . "\n";
-      $dbh->do($h_insert_rec);
-      die $dbh->errstr if $dbh->err;
-      $dbh->commit or die $dbh->errstr;
-      $cnt++;
-    }
-
-
-  $t_cnt++;
-
-  }
-
-  print "History records inserted into $h_table: $cnt\n";
-  print "               Total records in $table: $t_cnt\n";
-
-  print "\n";
-
-}
-
-foreach my $table (@tables) {
-
-  my $h_table = 'h_' . $table;
-  my $cnt = 0;
-
-  eval "use FS::${table}";
-  die $@ if $@;
-  eval "use FS::${h_table}";
-  die $@ if $@;
-
-  print "Adding insert records for unmatched delete records on ${table}...\n";
-
-  my $dbdef_table = $dbdef->table($table);
-  my $pkey = $dbdef_table->primary_key;
-
-  #SELECT * FROM h_svc_www
-  #DISTINCT ON ( $pkey ) ?
-  my $where = "
-  WHERE ${pkey} in (
-    SELECT ${h_table}1.${pkey}
-      FROM ${h_table} as ${h_table}1
-      WHERE (
-        SELECT count(${h_table}2.${pkey})
-	  FROM ${h_table} as ${h_table}2
-	  WHERE ${h_table}2.${pkey} = ${h_table}1.${pkey}
-	    AND ${h_table}2.history_action = 'delete'
-      ) > 0
-      AND (
-        SELECT count(${h_table}3.${pkey})
-	  FROM ${h_table} as ${h_table}3
-	  WHERE ${h_table}3.${pkey} = ${h_table}1.${pkey}
-	    AND ( ${h_table}3.history_action = 'insert'
-	    OR ${h_table}3.history_action = 'replace_new' )
-      ) = 0
-      GROUP BY ${h_table}1.${pkey})";
-
-
-  my @h_recs = qsearch(
-    $h_table, { },
-    "DISTINCT ON ( $pkey ) *",
-    $where,
-    '',
-    ''
-  );
-
-  foreach my $h_rec (@h_recs) {
-    #print "Adding insert record for deleted record with pkey='" . $h_rec->getfield($pkey) . "'...\n";
-    my $class = 'FS::' . $table;
-    my $rec = $class->new({ $h_rec->hash });
-    my $h_insert_rec = $rec->_h_statement('insert', 1);
-    #print $h_insert_rec . "\n";
-    $dbh->do($h_insert_rec);
-    die $dbh->errstr if $dbh->err;
-    $dbh->commit or die $dbh->errstr;
-    $cnt++;
-  }
-
-  print "History records inserted into $h_table: $cnt\n";
-
-}
-
-
-
-sub usage {
-  die "Usage:\n  add-history-records.pl user\n";
-}
-
diff --git a/bin/backup-dvd b/bin/backup-dvd
deleted file mode 100644
index d0314b4..0000000
--- a/bin/backup-dvd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-database="freeside"
-DEVICE="/dev/hda"
-
-su freeside -c "pg_dump $database" >/var/backups/$database.sql
-
-DATE=$(date +%Y-%m-%d)
-
-#NOTE: These two paths must end in a / in
-#order to correctly build up the other paths
-#BACKUP_DIR="/backup/directory/"
-BACKUP_DIR="/backup/"
-	#TEMP_BACKUP_FILES_DIR="/backup/temp/"
-
-BACKUP_FILE=$BACKUP_DIR"backup-"$DATE".tar.bz2"
-	#DATABASE_FILE=$TEMP_BACKUP_FILES_DIR"foo-"$DATE".sql"
-
-	#These directories shouldn't end in a / although
-	#I don't think it will cause any problems if
-	#they do. There should be a space at the end though
-	#to ensure the database file gets concatenated correctly.
-	#SOURCE="/a/location /other/locations " $DATABASE_FILE
-
-#echo Removing old backup directories
-rm -rf $BACKUP_DIR
-	#rm -rf $TEMP_BACKUP_FILES_DIR
-
-#echo Creating new backup directories
-mkdir $BACKUP_DIR
-	#mkdir $TEMP_BACKUP_FILES_DIR
-
-	#echo Creating database backup
-	#pg_dump -U username -f $DATABASE_FILE databaseName
-
-#echo Backing up $SOURCE to file $BACKUP_FILE
-#tar -cvpl -f $BACKUP_FILE --anchored --exclude /backup /
-tar -cjpl -f $BACKUP_FILE --anchored --exclude /backup /
-
-	##This is not necessary and possibly harmful for DVD+RW media
-	#echo Quick blanking media
-	#dvd+rw-format -blank /dev/hdc
-
-#echo Burning backup
-growisofs -dvd-compat -Z $DEVICE -quiet -r -J $BACKUP_FILE
diff --git a/bin/billco-upload b/bin/billco-upload
deleted file mode 100644
index ce4a43d..0000000
--- a/bin/billco-upload
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-AGENTNUMS="1 2 3"
-
-date=`date +"%Y%m%d"`
-dir="/usr/local/etc/freeside/export.DBI:Pg:dbname=freeside/cust_bill"
-cd "$dir"
-
-for AGENTNUM in $AGENTNUMS; do
-
-  for a in header detail; do
-    mv agentnum$AGENTNUM-$a.csv agentnum$AGENTNUM-$date-$a.csv
-  done
-
-  zip agentnum$AGENTNUM-$date.zip agentnum$AGENTNUM-$date-header.csv agentnum$AGENTNUM-$date-detail.csv
-
-  echo $dir/agentnum$AGENTNUM-$date.zip
-
-done
-
diff --git a/bin/bind.export b/bin/bind.export
index 286e43a..d0b9379 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -43,12 +43,10 @@ foreach my $export ( @exports ) {
   open(NAMED_CONF,">$prefix/named.conf")
     or die "can't open $prefix/named.conf: $!";
 
-  if ( -e "$prefix/named.conf.HEADER" ) {
-    open(CONF_HEADER,"<$prefix/named.conf.HEADER")
-      or die "can't open $prefix/named.conf.HEADER: $!";
-    while (<CONF_HEADER>) { print NAMED_CONF $_; }
-    close CONF_HEADER;
-  }
+  open(CONF_HEADER,"<$prefix/named.conf.HEADER")
+    or die "can't open $prefix/named.conf.HEADER: $!";
+  while (<CONF_HEADER>) { print NAMED_CONF $_; }
+  close CONF_HEADER;
 
   my $zonepath = $export->option('zonepath');
   $zonepath =~ s/\/$//;
@@ -147,12 +145,10 @@ foreach my $sexport ( @sexports ) { #false laziness with above
   open(NAMED_CONF,">$prefix/named.conf")
     or die "can't open $prefix/named.conf: $!";
 
-  if ( -e "$prefix/named.conf.HEADER" ) {
-    open(CONF_HEADER,"<$prefix/named.conf.HEADER")
-      or die "can't open $prefix/named.conf.HEADER: $!";
-    while (<CONF_HEADER>) { print NAMED_CONF $_; }
-    close CONF_HEADER;
-  }
+  open(CONF_HEADER,"<$prefix/named.conf.HEADER")
+    or die "can't open $prefix/named.conf.HEADER: $!";
+  while (<CONF_HEADER>) { print NAMED_CONF $_; }
+  close CONF_HEADER;
 
   my $masters = $sexport->option('master');
 
diff --git a/bin/bind.import b/bin/bind.import
index 1cdf567..41313fb 100755
--- a/bin/bind.import
+++ b/bin/bind.import
@@ -1,33 +1,22 @@
 #!/usr/bin/perl -w
 #
-# REQUIRED:
-# -p: part number for domains
-#
-# -n: named.conf file (or an include file with zones you want to import),
-#     for example root@ns.isp.com:/var/named/named.conf
-#
-# OPTIONAL:
-# -d: dry-run, debug: don't insert any records, just dump debugging output
 # -s: import slave zones as master.  useful if you need to recreate your
 #     primary nameserver from a secondary
-# -c dir: override patch for downloading zone files (for example, when
-#         downloading zone files from chrooted bind)
+# -c chroot_dir: import data from chrooted bind (corrects the path for
+#                downloading zone files
 #
 # need to manually put header in
 #  /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
-# (or, nowadays, better just to include the file freeside exports)
 
 use strict;
-
-use vars qw($domain_svcpart);
-
+use vars qw( %d_part_svc );
 use Getopt::Std;
-use Data::Dumper;
+use Term::Query qw(query);
 #use BIND::Conf_Parser;
 #use DNS::ZoneParse 0.81;
 
-use Net::SCP qw(scp iscp);
-
+#use Net::SCP qw(iscp);
+use Net::SCP qw(scp);
 use FS::UID qw(adminsuidsetup datasrc);
 use FS::Record qw(qsearch); #qsearchs);
 #use FS::svc_acct_sm;
@@ -36,8 +25,8 @@ use FS::domain_record;
 #use FS::svc_acct;
 #use FS::part_svc;
 
-use vars qw($opt_p $opt_n $opt_s $opt_c $opt_d);
-getopts("p:n:sc:d");
+use vars qw($opt_s $opt_c);
+getopts("sc:");
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -49,19 +38,42 @@ use vars qw($spooldir);
 $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/bind";
 mkdir $spooldir unless -d $spooldir;
 
-$domain_svcpart = $opt_p;
-
-my $named_conf = $opt_n;
+%d_part_svc =
+  map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});
 
+print "\n\n",
+      ( join "\n", map "$_: ".$d_part_svc{$_}->svc, sort keys %d_part_svc ),
+      "\n\n";
+use vars qw($domain_svcpart);
+$^W=0; #Term::Query isn't -w-safe
+$domain_svcpart =
+  query "Enter part number for domains: ", 'irk', [ keys %d_part_svc ];
+$^W=1;
+
+print "\n\n", <<END;
+Enter the location and name of your primary named.conf file, for example
+"ns.isp.com:/var/named/named.conf"
+END
+my($named_conf)=&getvalue(":");
+  
 use vars qw($named_machine $prefix);
 $named_machine = (split(/:/, $named_conf))[0];
-my $pnamed_machine = $named_machine;
-$pnamed_machine =~ s/^[\w\-]+\@//;
-$prefix = "$spooldir/$pnamed_machine";
+$prefix = "$spooldir/$named_machine";
 mkdir $prefix unless -d $prefix;
 
-#iscp("$named_conf","$prefix/named.conf.import");
-scp("$named_conf","$prefix/named.conf.import");
+#iscp("root\@$named_conf","$prefix/named.conf.import");
+scp("root\@$named_conf","$prefix/named.conf.import");
+
+
+sub getvalue {
+  my $prompt = shift;
+  $^W=0; # Term::Query isn't -w-safe
+  my $return = query $prompt, '';
+  $^W=1;
+  $return;
+}
+
+print "\n\n";
 
 ##
 
@@ -75,7 +87,7 @@ print "\nBIND import completed.\n";
 ##
 
 sub usage {
-  die "Usage:\n\n  bind.import -p partnum -n \"user\@machine:/path/to/named.conf\" [ -s ] [ -c chroot_dir ] [ -f ] user\n";
+  die "Usage:\n\n  bind.import user\n";
 }
 
 ########
@@ -85,13 +97,11 @@ BEGIN {
   use BIND::Conf_Parser;
   use vars qw(@ISA $named_dir);
   @ISA = qw(BIND::Conf_Parser);
-
-  $named_dir = 'COULD_NOT_FIND_NAMED_DIRECTORY_TRY_SETTING_-C_OPTION';
+  
   sub handle_option {
     my($self, $option, $argument) = @_;
     return unless $option eq "directory";
     $named_dir = $argument;
-    #warn "found named dir: $named_dir\n";
   }
   
   sub handle_zone {
@@ -120,25 +130,20 @@ BEGIN {
 
     if ( $type eq 'slave' && !$main::opt_s ) {
 
-      if ( $main::opt_d ) {
-
-        use Data::Dumper;
-        print "$name: ". Dumper($options);
-
-      } else {
-
-        foreach my $master ( @{ $options->{masters} } ) {
-          my $domain_record = new FS::domain_record( {
-            'svcnum'  => $domain->svcnum,
-            'reczone' => '@',
-            'recaf'   => 'IN',
-            'rectype' => '_mstr',
-            'recdata' => $master,
-          } );
-          my $error = $domain_record->insert;
-          die $error if $error;
-        }
-
+      #use Data::Dumper;
+      #print Dumper($options);
+      #exit;
+
+      foreach my $master ( @{ $options->{masters} } ) {
+        my $domain_record = new FS::domain_record( {
+          'svcnum'  => $domain->svcnum,
+          'reczone' => '@',
+          'recaf'   => 'IN',
+          'rectype' => '_mstr',
+          'recdata' => $master,
+        } );
+        my $error = $domain_record->insert;
+        die $error if $error;
       }
 
     } elsif ( $type eq 'master' || ( $type eq 'slave' && $main::opt_s ) ) {
@@ -148,79 +153,54 @@ BEGIN {
       use File::Basename;
       my $basefile = basename($file);
       my $sourcefile = $file;
-      if ( $main::opt_c ) {
-        $sourcefile = "$main::opt_c/$sourcefile" if $main::opt_c;
-      } else {
-        $sourcefile = "$named_dir/$sourcefile" unless $file =~ /^\//;
-      }
+      $sourcefile = "$named_dir/$sourcefile" unless $file =~ /^\//;
+      $sourcefile = "$main::opt_c/$sourcefile" if $main::opt_c;
 
       use Net::SCP qw(iscp scp);
-      #iscp("$main::named_machine:$sourcefile",
-      #     "$main::prefix/$basefile.import");
-      scp("$main::named_machine:$sourcefile",
-          "$main::prefix/$basefile.import");
+      scp("root\@$main::named_machine:$sourcefile",
+           "$main::prefix/$basefile.import");
     
       use DNS::ZoneParse 0.84;
       my $zone = DNS::ZoneParse->new("$main::prefix/$basefile.import");
     
       my $dump = $zone->dump;
-
-      if ( $main::opt_d ) {
-
-        use Data::Dumper;
-        print "$name: ". Dumper($dump);
-
-      } else {
+  
+      #use Data::Dumper;
+      #print "$name: ". Dumper($dump);
+      #exit;
     
-        foreach my $rectype ( keys %$dump ) {
-          if ( $rectype =~ /^SOA$/i ) {
-            my $rec = $dump->{$rectype};
-            $rec->{email} =~ s/\@/\./;
+      foreach my $rectype ( keys %$dump ) {
+        if ( $rectype =~ /^SOA$/i ) {
+          my $rec = $dump->{$rectype};
+          my $domain_record = new FS::domain_record( {
+            'svcnum'  => $domain->svcnum,
+            'reczone' => $rec->{origin},
+            'recaf'   => 'IN',
+            'rectype' => $rectype,
+            'recdata' =>
+              $rec->{primary}. ' '. $rec->{email}. ' ( '.
+             join(' ', map $rec->{$_},
+                           qw( serial refresh retry expire minimumTTL ) ).
+             ' )',
+          } );
+          my $error = $domain_record->insert;
+          die $error if $error;
+       } else {
+          #die $dump->{$rectype};
+          foreach my $rec ( @{ $dump->{$rectype} } ) {
             my $domain_record = new FS::domain_record( {
               'svcnum'  => $domain->svcnum,
-              'reczone' => $rec->{origin},
-              'recaf'   => 'IN',
+              'reczone' => $rec->{name},
+              'recaf'   => $rec->{class},
               'rectype' => $rectype,
-              'recdata' =>
-                $rec->{primary}. ' '. $rec->{email}. ' ( '.
-               join(' ', map $rec->{$_},
-                             qw( serial refresh retry expire minimumTTL ) ).
-               ' )',
+              'recdata' => ( $rectype =~ /^MX$/i
+                               ? $rec->{priority}. ' '. $rec->{host}
+                               : $rec->{host}                      ),
             } );
             my $error = $domain_record->insert;
             die $error if $error;
-         } else {
-            #die $dump->{$rectype};
-
-            my $datasub;
-            if ( $rectype =~ /^MX$/i ) {
-              $datasub = sub { $_[0]->{priority}. ' '. $_[0]->{host}; };
-            } elsif ( $rectype =~ /^TXT$/i ) {
-              $datasub = sub { $_[0]->{text}; };
-            } else {
-              $datasub = sub { $_[0]->{host}; };
-            }
-
-            foreach my $rec ( @{ $dump->{$rectype} } ) {
-              my $domain_record = new FS::domain_record( {
-                'svcnum'  => $domain->svcnum,
-                'reczone' => $rec->{name},
-                'recaf'   => $rec->{class} || 'IN',
-                'rectype' => $rectype,
-                'recdata' => &{$datasub}($rec),
-              } );
-              my $error = $domain_record->insert;
-              if ( $error ) {
-                warn "$error inserting ".
-                     $rec->{name}. ' . '. $domain->domain. "\n";
-                warn Dumper($rec);
-                #system('cat',"$main::prefix/$basefile.import");
-                die;
-              }
-            }
           }
         }
-
       }
 
     #} else {
diff --git a/bin/dbdef-create b/bin/dbdef-create
index fea02c8..a449d67 100755
--- a/bin/dbdef-create
+++ b/bin/dbdef-create
@@ -2,7 +2,7 @@
 
 use strict;
 use DBI;
-use DBIx::DBSchema 0.26;
+use DBIx::DBSchema 0.22;
 use FS::UID qw(adminsuidsetup datasrc driver_name);
 
 my $user = shift or die &usage;
diff --git a/bin/fix-sequences b/bin/fix-sequences
index dc4abd7..2ff89d3 100755
--- a/bin/fix-sequences
+++ b/bin/fix-sequences
@@ -4,7 +4,7 @@
 
 use strict;
 use DBI;
-use DBIx::DBSchema 0.26;
+use DBIx::DBSchema 0.21;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
diff --git a/bin/generate-raddb b/bin/generate-raddb
index af21c05..f946b05 100755
--- a/bin/generate-raddb
+++ b/bin/generate-raddb
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 
 # usage: generate-raddb radius-server/raddb/dictionary* >raddb.pm
-#  i.e.: generate-raddb ~/freeradius/freeradius-1.0.5/share/dictionary* ~/wirelessoceans/dictionary.ip3networks ~/wtxs/dictionary.mot.canopy >raddb.pm.new
+#  i.e.: generate-raddb ~/src/freeradius-0.2/raddb/dictionary* >FS/raddb.pm
+
 print <<END;
 package FS::raddb;
 use vars qw(%attrib);
@@ -28,24 +29,17 @@ while (<>) {
   #print "$2\n";
 }
 
-foreach ( sort keys %hash ) {
+foreach ( keys %hash ) {
 #  print "$_\n" if length($_)>24;
 #  print substr($_,0,24),"\n" if length($_)>24; 
 #  $max = length($_) if length($_)>$max;
 # have to fudge things since everything >24 is *not* unique
 
   #print "  '". substr($_,0,24). "' => '$hash{$_}',\n";
-  print "  '$_' ". ( " " x (24-length($_) ) ). "=> '$hash{$_}',\n";
+  print "  '$_' => '$hash{$_}',\n";
 }
 
 print <<END;
-
-  #NETC.NET.AU (RADIATOR?)
-  'authentication_type'      => 'Authentication-Type',
-
-  #wtxs (dunno)
-  #'radius_operator'          => 'Radius-Operator',
-
 );
 
 1;
diff --git a/bin/generate-table-module b/bin/generate-table-module
deleted file mode 100755
index fcc3f1d..0000000
--- a/bin/generate-table-module
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/perl
-
-use FS::Schema qw( dbdef_dist );
-
-my $table = shift;
-
-###
-# add a new FS/FS/table.pm
-###
-
-my %ut = ( #just guesses
-  'int'     => 'number',
-  'number'  => 'float',
-  'varchar' => 'text',
-  'text'    => 'text',
-);
-
-my $dbdef_table = dbdef_dist->table($table)
-  or die "define table in Schema.pm first";
-my $primary_key = $dbdef_table->primary_key;
-
-open(SRC,"<eg/table_template.pm") or die $!;
--e "FS/FS/$table.pm" and die "FS/FS/$table.pm already exists!";
-open(DEST,">FS/FS/$table.pm") or die $!;
-
-while (my $line = <SRC>) {
-
-  $line =~ s/table_name/$table/g;
-
-  if ( $line =~ /^=item\s+field\s+-\s+description\s*$/ ) {
-
-    foreach my $column ( $dbdef_table->columns ) {
-      print DEST "=item $column - ";
-      print DEST "primary key"
-        if $column eq $primary_key;
-      print DEST "\n\n";
-    }
-    next;
-
-  } elsif ( $line=~ /^(\s*)\$self->ut_numbern\('primary_key'\)\s*/ ) {
-
-    print DEST "$1\$self->ut_numbern('$primary_key')\n"
-      if $primary_key;
-    next;
-
-  } elsif (
-    $line =~ /^(\s*)\|\|\s+\$self->ut_number\('validate_other_fields'\)\s*/
-  ) {
-
-    foreach my $column ( grep { $_ ne $primary_key } $dbdef_table->columns ) {
-      my $ut = $ut{$dbdef_table->column($column)->type};
-      $ut .= 'n' if $dbdef_table->column($column)->null;
-      print DEST "$1|| \$self->ut_$ut('$column')\n";
-    }
-    next;
-
-  }
-
-  print DEST $line;
-}
-
-close SRC;
-close DEST;
-
-###
-# add FS/t/table.t
-###
-
-open(TEST,">FS/t/$table.t") or die $!;
-print TEST <<ENDTEST;
-BEGIN { \$| = 1; print "1..1\\n" }
-END {print "not ok 1\\n" unless \$loaded;}
-use FS::$table;
-\$loaded=1;
-print "ok 1\\n";
-ENDTEST
-close TEST;
-
-###
-# add them to MANIFEST
-###
-
-system('cvs edit FS/MANIFEST');
-
-open(MANIFEST,">>FS/MANIFEST") or die $!;
-print MANIFEST "FS/$table.pm\n",
-               "t/$table.t\n";
-close MANIFEST;
-
diff --git a/bin/masonize b/bin/masonize
index 509ef3e..169ba71 100755
--- a/bin/masonize
+++ b/bin/masonize
@@ -52,7 +52,7 @@ foreach $file ( split(/\n/, `find . -depth -print`) ) {
         $mode = 'html';
         next;
       }
-      die "unterminated <%= ??? (in  $file):";
+      die 'unterminated <%= ???';
 
     } elsif ( $mode eq 'perlc' ) {
 
diff --git a/bin/pg-readonly b/bin/pg-readonly
deleted file mode 100644
index ad69fbd..0000000
--- a/bin/pg-readonly
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/perl
-#
-# hack to update/add read-only permissions for a user on the db
-#
-# usage: pg-readonly freesideuser readonlyuser
-
-use strict;
-use DBI;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(dbdef);
-
-my $user = shift or die &usage;
-my $rouser = shift or die &usage;
-
-my $dbh = adminsuidsetup $user;
-
-foreach my $table ( dbdef->tables ) {
-  $dbh->do("GRANT SELECT ON $table TO $rouser");
-  $dbh->commit();
-  if ( my $pkey = dbdef->table($table)->primary_key ) {
-    $dbh->do("GRANT SELECT ON ${table}_${pkey}_seq TO $rouser");
-    $dbh->commit();
-  }
-}
diff --git a/bin/postfix.export b/bin/postfix.export
index 61380da..dbb08ce 100755
--- a/bin/postfix.export
+++ b/bin/postfix.export
@@ -40,7 +40,7 @@ foreach my $export ( @exports ) {
     my $srcsvc_acct = $svc_forward->srcsvc_acct;
     if ( $srcsvc_acct ) {
       ( $username, $domain ) = ( $srcsvc_acct->username, $srcsvc_acct->domain );
-    } elsif ( $svc_forward->src =~ /^([^@]*)\@([^@]+)$/ ) {
+    } elsif ( $svc_forward->src =~ /([^@]*)\@([^@]+)$/ ) {
       ( $username, $domain ) = ( $1, $2 );
     } else {
       die "bad svc_forward record?  svcnum ". $svc_forward->svcnum. "\n";
diff --git a/bin/print-schema b/bin/print-schema
deleted file mode 100755
index 886e325..0000000
--- a/bin/print-schema
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl
-
-use DBIx::DBSchema;
-
-$l = load DBIx::DBSchema "/usr/local/etc/freeside/dbdef.DBI:Pg:dbname=freeside";
-
-print $l->pretty_print, "\n";
diff --git a/bin/rate.import b/bin/rate.import
index fdd756d..29b5239 100755
--- a/bin/rate.import
+++ b/bin/rate.import
@@ -59,25 +59,15 @@ while ( my $row = $sth->fetchrow_hashref ) {
     $prefix = $2;
   }
 
-  my @rate_prefix = ();
-  if ( $prefix =~ /\d/ ) {
-
-    @rate_prefix = map { 
-                         #warn $row->{'Country'}. ": $prefixprefix$_\n";
-                         new FS::rate_prefix {
-                           'countrycode' => $row->{'Code'},
-                           'npa'         => $prefixprefix.$_,
-                         };
-                       }
-                       split(/\s*[;,]\s*/, $prefix);
-
-  } else {
-    @rate_prefix = ( new FS::rate_prefix {
-                       'countycode' => $row->{'Code'},
-                       'npa'        => '',
-                     };
-                   );
-  }
+  my @rate_prefix = map { 
+                          #warn $row->{'Country'}. ": $prefixprefix$_\n";
+                          new FS::rate_prefix {
+                            'countrycode' => $row->{'Code'},
+                            'npa'         => $prefixprefix.$_,
+                          };
+                        }
+                        split(/\s*[;,]\s*/, $prefix);
+
 
   my $dest_detail = new FS::rate_detail {
                                           'ratenum'         => $ratenum,
diff --git a/bin/rt-drop-tables b/bin/rt-drop-tables
deleted file mode 100755
index b027542..0000000
--- a/bin/rt-drop-tables
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/perl
-
-my @tables = qw(
-Attachments 
-Queues 
-Links 
-Principals 
-Groups 
-ScripConditions 
-Transactions 
-Scrips 
-ACL 
-GroupMembers 
-CachedGroupMembers 
-Users 
-Tickets 
-ScripActions 
-Templates 
-TicketCustomFieldValues 
-CustomFields 
-CustomFieldValues 
-sessions 
-);
-
-foreach my $table ( @tables ) {
-  print "drop table $table;\n";
-  print "drop sequence ${table}_id_seq;\n";
-}
-
diff --git a/bin/slony-setup b/bin/slony-setup
deleted file mode 100755
index b384bb9..0000000
--- a/bin/slony-setup
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/perl
-#
-# hack to update/add read-only permissions for a user on the db
-#
-# usage: pg-readonly freesideuser readonlyuser
-
-use strict;
-use DBI;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(dbdef);
-
-my $user = shift or die &usage;
-adminsuidsetup($user);
-
-#---
-
-#su postgres -c 'createlang plpgsql freeside'
-
-#---
-
-my $MASTERHOST = '172.21.0.204';
-my $SLAVEHOST = '172.21.0.205';
-#my $REPLICATIONUSER='pgsql';
-my $REPLICATIONUSER='postgres';
-
-#drop set ( id = 1, origin = 1);
-
-print <<END;
-cluster name = freeside;
-node 1 admin conninfo = 'dbname=freeside host=$MASTERHOST user=$REPLICATIONUSER';
-node 2 admin conninfo = 'dbname=freeside host=$SLAVEHOST user=$REPLICATIONUSER';
-init cluster ( id=1, comment = 'Master Node');
-create set (id=1, origin=1, comment='All freeside tables');
-
-END
-
-my $id = 1;
-
-foreach my $table ( dbdef->tables ) {
-  #next if $table =~ /^sql_/i;
-  print "set add table (set id=1, origin=1, id=". $id++. ", fully qualified name = 'public.$table' );\n";
-
-}
-
-print <<END;
-store node (id=2, comment = 'Slave node');
-store path (server = 1, client = 2, conninfo='dbname=freeside host=$MASTERHOST user=$REPLICATIONUSER');
-store path (server = 2, client = 1, conninfo='dbname=freeside host=$SLAVEHOST user=$REPLICATIONUSER');
-store listen (origin=1, provider = 1, receiver =2);
-store listen (origin=2, provider = 2, receiver =1);
-END
-
-
diff --git a/bin/svc_broadband.renumber b/bin/svc_broadband.renumber
deleted file mode 100755
index 980fa00..0000000
--- a/bin/svc_broadband.renumber
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_Common;
-use FS::part_svc_router;
-use FS::svc_broadband;
-use FS::router;
-use FS::addr_block;
-
-$FS::svc_Common::noexport_hack = 1;  #Disable exports!
-
-my $user = shift if $ARGV[0] or die &usage;
-adminsuidsetup($user);
-
-my $remapfile = shift if $ARGV[0] or die &usage;
-my $old_blocknum = shift if $ARGV[0] or die &usage;
-my $new_blocknum = shift if $ARGV[0] or die &usage;
-my $old_svcnum = shift if $ARGV[0];
-
-my %ipmap;
-
-open(REMAP, "<$remapfile") or die $!;
-while (<REMAP>) {
-  next unless (/^([0-9\.]+)\s+([0-9\.]+)$/);
-  my ($old_ip, $new_ip) = ($1, $2);
-  $ipmap{$old_ip} = $new_ip;
-}
-close(REMAP);
-
-my @svcs;
-if ($old_svcnum) {
-  @svcs = ( qsearchs('svc_broadband', { svcnum => $old_svcnum,
-                                        blocknum => $old_blocknum }) );
-} else {
-  @svcs = qsearch('svc_broadband', { blocknum => $old_blocknum });
-}
-
-foreach my $old_sb (@svcs) {
-
-  my $old_ip = $old_sb->ip_addr;
-  my $new_ip = $ipmap{$old_ip};
-  print "Renumbering ${old_ip} (${old_blocknum}) => ${new_ip} (${new_blocknum})...\n";
-
-
-  my $new_sb = new FS::svc_broadband
-    { $old_sb->hash,
-      ip_addr => $new_ip,
-      blocknum => $new_blocknum,
-      svcpart => $old_sb->cust_svc->svcpart,
-    };
-
-  my $error = $new_sb->replace($old_sb);
-  die $error if $error;
-
-}
-
-
-
-exit(0);
-
-sub usage {
-
-  my $usage = <<EOT;
-Usage:
-  svc_broadband.renumber user remapfile old_blocknum new_blocknum [ svcnum ]
-
-remapfile format:
-old_ip_address	new_ip_address
-...
-
-Example remapfile:
-10.0.0.5	192.168.0.5
-10.0.0.20	192.168.0.20
-10.0.0.32	192.168.0.3
-
-Warning: This assumes your routers have already been reconfigured with the
-         new addresses.  Exports will not be run!
-
-EOT
-
-}
diff --git a/conf/invoice_html b/conf/invoice_html
deleted file mode 100644
index 32e5362..0000000
--- a/conf/invoice_html
+++ /dev/null
@@ -1,131 +0,0 @@
-<STYLE TYPE="text/css">
-.invoice { font-family: sans-serif; font-size: 10pt }
-.invoice_header { font-size: 10pt }
-.invoice_headerright TH { border-top: 2px solid #000000; border-bottom: 2px solid #000000 }
-.invoice_headerright TD { font-size: 10pt; empty-cells: show }
-.invoice_longtable table { cellspacing: none }
-.invoice_longtable TH { border-top: 2px solid #000000; border-bottom: 1px solid #000000; padding-left: none; padding-right: none; font-size: 10pt }
-.invoice_desc TD { border-top: 2px solid #000000; font-weight: bold; font-size: 10pt }
-.invoice_extdesc TD { font-size: 8pt }
-.invoice_totaldesc TD { font-size: 10pt; empty-cells: show }
-</STYLE>
-
-<table class="invoice" bgcolor="#ffffff" WIDTH=768 CELLSPACING=8><tr><td>
-
-  <table class="invoice_header" width="100%">
-    <tr>
-     <td><img src="<%= $cid ? "cid:$cid" : "cust_bill-logo.cgi?$template" %>"></td>
-     <td align="left"><%= $returnaddress %></td>
-      <td align="right">
-        <table CLASS="invoice_headerright" cellspacing=0>
-          <tr>
-            <td align="right">
-              Invoice&nbsp;date<BR>
-              <B><%= $date %></B>
-            </td>
-            <td>
-            </td>
-            <td align="left">
-              Invoice&nbsp;number<BR>
-              <B><%= $invnum %></B>
-            </td>
-          </tr>
-          <tr>
-            <th>&nbsp;</th>
-            <th colspan=1 align="center">
-              <FONT SIZE="+3">I</FONT><FONT SIZE="+2">NVOICE</FONT>
-            </th>
-            <th>&nbsp;</th>
-          </tr>
-        </table>
-      </td>
-    </tr>
-
-    <tr>
-      <td>
-      </td>
-      <td align="left">
-        <b><%= $payname %></b><BR>
-        <%= join('<BR>', grep length($_), $company,
-                                          $address1,
-                                          $address2,
-                                          "$city,&nbsp;$state&nbsp;&nbsp;$zip",
-                                          $country,
-                )
-        %>
-      </td>
-      <td align="right">
-        Terms: <%= $terms %><BR>
-        <%= $po_line %>
-      </td>
-    </tr>
-
-  </table>
-
-  <p><b><font size="+1">C</font><font size="+0">HARGES</font></b>
-  <p>
-  <table class="invoice_longtable" CELLSPACING=0 WIDTH="100%">
-    <tr>
-      <th align="center">Ref</th>
-      <th align="left">Description</th>
-      <th align="right">Amount</th>
-    </tr>
-    <%=
-
-      foreach my $line ( @detail_items ) {
-        $OUT .=
-          '<tr class="invoice_desc">'.
-            '<td align="center">'. $line->{'ref'}. '</td>'.
-            '<td align="left">'. $line->{'description'}. '</td>'.
-            '<td align="right">'. $line->{'amount'}. '</td>'.
-          '</tr>'
-        ;
-        foreach my $ext_desc ( @{$line->{'ext_description'} } ) {
-          $OUT .=
-            '<tr class="invoice_extdesc">'.
-              '<td></td>'.
-              '<td align="left">-&nbsp;'. $ext_desc. '</td>'.
-              '<td></td>'.
-            '</tr>'
-        }
-      }
-
-      my $style = 'border-top: 3px solid #000000;';
-      my $linenum = 0;
-
-      foreach my $line ( @total_items ) {
-
-        $style .= 'border-bottom: 3px solid #000000;'
-          if ++$linenum == scalar(@total_items);
-
-        $OUT .=
-          '<tr class="invoice_totaldesc">'.
-            qq(<td style="$style">&nbsp;</td>).
-            qq(<td align="left" style="$style">).
-              $line->{'total_item'}. '</td>'.
-            qq(<td align="right" style="$style">).
-              $line->{'total_amount'}. '</td>'.
-          '</tr>'
-        ;
-
-        $style='';
-
-      }
-
-    %>
-  </table>
-  <br><br>
-
-<!--  <p><b><font size="+1">N</font><font size="+0">OTES</font></b>
-
-  <ol>
-    <li>Please make your check payable to <b>Ivan Kohler</b>
-    <li>If you have any questions please email or telephone.
-  </ol>
--->
-<%= $notes %>
-
-  <hr NOSHADE SIZE=2 COLOR="#000000">
-  <p align="center"><%= $footer %>
-
-</td></tr></table>
diff --git a/conf/invoice_latex b/conf/invoice_latex
index d1b471a..195f8fb 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -5,7 +5,7 @@
 %% Asplen Management Ltd

 %% www.asplen.co.uk

 %%

-%% Modified for Freeside by Kristian Hoffman

+%% Modified for Freeside by Ivan Kohler

 %%

 %% Changes

 %% 	0.1	4/12/00	Created

@@ -14,7 +14,7 @@
 %%	1.2	16/10/02	Invoice number added

 %%	1.3	2/12/02	Logo graphic added

 %%	1.4	7/2/03	Multipage headers/footers added

-%%      n/a     forked for Freeside; checked into CVS

+%%      n/a     10/12/03 forked for Freeside; checked into CVS

 %%

 

 \documentclass[letterpaper]{article}

@@ -22,107 +22,30 @@
 \usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage}

 \usepackage{graphicx}			% required for logo graphic

 

-\addtolength{\voffset}{-0.0cm}		% top margin to top of header

-\addtolength{\hoffset}{-0.6cm}		% left margin on page

-\addtolength{\topmargin}{-1.25cm}	% top margin to top of header

-\setlength{\headheight}{2.0cm} 		% height of header

-\setlength{\headsep}{1.0cm}		% between header and text

-\setlength{\footskip}{1.0cm}		% bottom of footer from bottom of text

+\addtolength{\voffset}{-0.0in}	% top margin to top of header

+\addtolength{\hoffset}{-0.60in}	%left margin on page

+\addtolength{\topmargin}{-0.6in}	% top margin to top of header

+\setlength{\headheight}{1in} 		% height of header

+\setlength{\headsep}{0.5in}    	% between header and text

+\addtolength{\textheight}{-0.4in} 	% height of main text

 

-%\addtolength{\textwidth}{2.1in}    	% width of text

-\setlength{\textwidth}{19.5cm}

-\setlength{\textheight}{19.5cm}

-\setlength{\oddsidemargin}{-0.9cm} 	% odd page left margin

-\setlength{\evensidemargin}{-0.9cm} 	% even page left margin

+\addtolength{\textheight}{-0.5in} 	% height of main text

+\setlength{\footskip}{0.5in}		% bottom of footer from bottom of text

+

+\addtolength{\textwidth}{2.1in}    	% width of text

+\setlength{\oddsidemargin}{0in} 	% odd page left margin

+\setlength{\evensidemargin}{0in} 	% even page left margin

 

 \renewcommand{\headrulewidth}{0pt}

 \renewcommand{\footrulewidth}{1pt}

 

-% Adjust the inset of the mailing address

-\newcommand{\addressinset}[1][]{\hspace{1.0cm}}

-

-% Adjust the inset of the return address and logo

-\newcommand{\returninset}[1][]{\hspace{-0.25cm}}

+						% New command for address lines i.e. skip them if blank

 

-% New command for address lines i.e. skip them if blank

 \newcommand{\addressline}[1]{\ifthenelse{\equal{#1}{}}{}{#1\newline}}

-

-% Inserts dollar symbol

-\newcommand{\dollar}[1][]{\symbol{36}}

-

-% Remove plain style header/footer

-\fancypagestyle{plain}{

-  \fancyhead{}

-}

-\fancyhf{}

-

-% Define fancy header/footer for first and subsequent pages

-\fancyfoot[C]{

-  \ifthenelse{\equal{\thepage}{1}}

-  { % First page

-    \small{

-[@-- $footer --@]

-    }

-  }

-  { % ... pages

-    \small{

-[@-- $smallfooter --@]

-    }

-  }

-}

-

-\fancyfoot[R]{

-  \ifthenelse{\equal{\thepage}{1}}

-  { % First page

-  }

-  { % ... pages

-    \small{\thepage\ of \pageref{LastPage}}

-  }

-}

-

-\fancyhead[L]{

-  \ifthenelse{\equal{\thepage}{1}}

-  { % First page

-    \returninset

-    \makebox{

-      \begin{tabular}{ll}

-        \includegraphics{[@-- $conf_dir --@]/logo.eps} &

-        \begin{minipage}[b]{5.5cm}

-[@-- $returnaddress --@]

-        \end{minipage}

-      \end{tabular}

-    }

-  }

-  { % ... pages

-    %\includegraphics{[@-- $conf_dir --@]/logo.eps}	% Uncomment if you want the logo on all pages.

-  }

-}

-

-\fancyhead[R]{

-  \ifthenelse{\equal{\thepage}{1}}

-  { % First page

-    \begin{tabular}{rcl}

-    Invoice date & & Invoice number \\

-    \vspace{0.2cm}

-    \textbf{[@-- $date --@]} & & \textbf{[@-- $invnum --@]} \\\hline

-    \rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}} & \\

-    \vspace{-0.2cm}

-     & & \\\hline

-    \end{tabular}

-  }

-  { % ... pages

-    \small{

-      \begin{tabular}{ll}

-      Invoice date & Invoice number\\

-      \textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]}\\

-      \end{tabular}

-    }

-  }

-}

+\newcommand{\dollar}[1][]{\symbol{36}} % Inserts dollar symbol

 

 \pagestyle{fancy}

 

-

 %% Font options are:

 %%	bch	Bitsream Charter

 %% 	put	Utopia

@@ -131,114 +54,102 @@
 %%	ptm	Times

 %%	pcr	Courier

 

-\renewcommand{\familydefault}{phv}

-

-

-% Commands for freeside description...

-\newcommand{\FSdesc}[3]{

-  \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &

-  \textbf{#2} &

-  \multicolumn{1}{r}{\textbf{\dollar #3}}\\

-}

-% ...extended description...

-\newcommand{\FSextdesc}[1]{

-  \multicolumn{1}{l}{\rule{0pt}{1.0ex}} &

-  \multicolumn{2}{l}{\small{~-~#1}}\\

-}

-% ...and total line items.

-\newcommand{\FStotaldesc}[2]{

-  & \multicolumn{1}{l}{#1} & #2\\

-}

-

+\renewcommand{\familydefault}{phv}		

 

 \begin{document}

 %

 %%	Headers and footers defined for the first page

+\fancyfoot[CO,CE]{\small{

+\begin{tabular}{c}

+$footer

+\end{tabular}}}

 %

 %%	The LH Heading comprising logo

 %%	UNCOMMENT the following FOUR lines and change the path if necssary to provide a logo

+\fancyhead[LO,LE]{

+\begin{tabular}{l}

+\includegraphics{/usr/local/etc/freeside/conf.DBI:Pg:dbname=freeside/logo.eps}

+\end{tabular}}

 %

 %%	The Heading comprising isue date, customer ref & INVOICE name

+\fancyhead[RO,RE]{

+\begin{tabular}{rcl}

+Invoice date & & Invoice number \\

+\vspace{0.2cm}

+\textbf{$date} & & \textbf{$invnum} \\\hline

+\rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}}& \\

+\vspace{-0.2cm}

+ & & \\\hline

+\end{tabular}}

 %

 %%	Header & footer changes for subsequent pages

 %

+\afterpage{ \fancyfoot[RO,RE]{\small{\thepage\ of \pageref{LastPage}}} }

+\afterpage{ \fancyfoot[CO,CE]{\small{$smallfooter}} }

+\afterpage{ \fancyhead[LO,LE]{\small{}} }

+\afterpage{ \fancyhead[RO,RE]{\small{

+\begin{tabular}{ll}

+Invoice date & Invoice number\\

+\textbf{$date} & \textbf{$invnum}\\

+\end{tabular}}} }

 %

 %

-\begin{tabular}{ll}

-\addressinset \rule{0cm}{0cm} &

 \makebox{

-\begin{minipage}[t]{5.0cm}

-\vspace{0.25cm}

-\textbf{[@-- $payname --@]}\\

-\addressline{[@-- $company --@]}

-\addressline{[@-- $address1 --@]}

-\addressline{[@-- $address2 --@]}

-\addressline{[@-- $city --@], [@-- $state --@]~~[@-- $zip --@]}

-\addressline{[@-- $country --@]}

+\begin{minipage}[t]{2.9in}

+\vspace{0.20in}

+\textbf{$payname}\\

+\addressline{$company}

+\addressline{$address1}

+\addressline{$address2}

+\addressline{$city, $state  $zip}

+\addressline{$country}

 \end{minipage}}

-\end{tabular}

 \hfill

 \makebox{

-\begin{minipage}[t]{6.4cm}

+\begin{minipage}[t]{2.5in}

 \begin{flushright}

-Terms: [@-- $terms --@]\\

-[@-- $po_line --@]\\

+Terms: $terms\\

+$po_line\\

 \end{flushright}

 \end{minipage}}

-\vspace{1.5cm}

+\vspace{0.5cm}

 %

 \section*{\textsc{Charges}}

-\begin{longtable}{clr}

+\begin{longtable}{|c|l|c|r|r|}

 \hline

 \rule{0pt}{2.5ex}

 \makebox[1.4cm]{\textbf{Ref}} & 

-\makebox[12.8cm][l]{\textbf{Description}} & 

+\makebox[7.9cm][l]{\textbf{Description}} & 

+\makebox[1.3cm][c]{\textbf{Quantity}} & 

+\makebox[2.5cm][r]{\textbf{Unit Price}} & 

 \makebox[2.5cm][r]{\textbf{Amount}} \\

 \hline

 \endfirsthead

-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\

+\multicolumn{5}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\

 \hline

 \rule{0pt}{2.5ex}

 \makebox[1.4cm]{\textbf{Ref}} & 

-\makebox[12.8cm][l]{\textbf{Description}} & 

+\makebox[7.9cm][l]{\textbf{Description}} & 

+\makebox[1.3cm][c]{\textbf{Quantity}} & 

+\makebox[2.5cm][r]{\textbf{Unit Price}} & 

 \makebox[2.5cm][r]{\textbf{Amount}} \\

 \hline

 \endhead

-\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued on next page...}\\

+\multicolumn{5}{r}{\rule{0pt}{2.5ex}/cont...}\\

 \endfoot

-\hline

-[@--

-

-  foreach my $line (@total_items) {

-    $OUT .= '\FStotaldesc{' . $line->{'total_item'} . '}' .

-            '{' . $line->{'total_amount'} . '}' . "\n";

-  }

-

---@]

+%%TotalDetails

+ & \multicolumn{3}{l}{$total_item}    & $total_amount\\

+%%EndTotalDetails

 \hline

 \endlastfoot

-[@--

-

-  foreach my $line (@detail_items) {

-    my $ext_description = $line->{'ext_description'};

-

-    # Don't break-up small packages.

-    my $rowbreak = @$ext_description < 5 ? '*' : '';

-

-    $OUT .= "\\hline\n";

-    $OUT .= '\FSdesc{' . $line->{'ref'} . '}{' . $line->{'description'} . '}' .

-            '{' . $line->{'amount'} . "}${rowbreak}\n";

-

-    foreach my $ext_desc (@$ext_description) {

-      $ext_desc = substr($ext_desc, 0, 80) . '...'

-        if (length($ext_desc) > 80);

-      $OUT .= '\FSextdesc{' . $ext_desc . '}' . "${rowbreak}\n";

-    }

-

-  }

-

---@]

+%%Detail

+\rule{0pt}{2.5ex}$ref & 

+\begin{tabular}{l}

+$description\tabularnewline

+\end{tabular}

+& $quantity & \dollar $amount & \dollar $amount\\\hline

+%%EndDetail

 \end{longtable}

 \vfill

-[@-- $notes --@]

+$notes

 \end{document}

diff --git a/conf/invoice_latex.diff b/conf/invoice_latex.diff
deleted file mode 100644
index b66a522..0000000
--- a/conf/invoice_latex.diff
+++ /dev/null
@@ -1,138 +0,0 @@
---- invoice_latex.old	2005-04-14 01:52:02.000000000 -0700
-+++ invoice_latex	2005-04-14 02:33:26.000000000 -0700
-@@ -5,7 +5,7 @@
- %% Asplen Management Ltd

- %% www.asplen.co.uk

- %%

--%% Modified for Freeside by Ivan Kohler

-+%% Modified for Freeside by Ivan Kohler and Kristian Hoffman

- %%

- %% Changes

- %% 	0.1	4/12/00	Created

-@@ -61,7 +61,7 @@
- %%	Headers and footers defined for the first page

- \fancyfoot[CO,CE]{\small{

- \begin{tabular}{c}

--$footer

-+[@-- $footer --@]

- \end{tabular}}}

- %

- %%	The LH Heading comprising logo

-@@ -76,7 +76,7 @@
- \begin{tabular}{rcl}

- Invoice date & & Invoice number \\

- \vspace{0.2cm}

--\textbf{$date} & & \textbf{$invnum} \\\hline

-+\textbf{[@-- $date --@]} & & \textbf{[@-- $invnum --@]} \\\hline

- \rule{0pt}{5ex} &~~ \huge{\textsc{Invoice}}& \\

- \vspace{-0.2cm}

-  & & \\\hline

-@@ -85,71 +85,76 @@
- %%	Header & footer changes for subsequent pages

- %

- \afterpage{ \fancyfoot[RO,RE]{\small{\thepage\ of \pageref{LastPage}}} }

--\afterpage{ \fancyfoot[CO,CE]{\small{$smallfooter}} }

-+\afterpage{ \fancyfoot[CO,CE]{\small{[@-- $smallfooter --@]}} }

- \afterpage{ \fancyhead[LO,LE]{\small{}} }

- \afterpage{ \fancyhead[RO,RE]{\small{

- \begin{tabular}{ll}

- Invoice date & Invoice number\\

--\textbf{$date} & \textbf{$invnum}\\

-+\textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]}\\

- \end{tabular}}} }

- %

- %

- \makebox{

- \begin{minipage}[t]{2.9in}

- \vspace{0.20in}

--\textbf{$payname}\\

--\addressline{$company}

--\addressline{$address1}

--\addressline{$address2}

--\addressline{$city, $state  $zip}

--\addressline{$country}

-+\textbf{[@-- $payname --@]}\\

-+\addressline{[@-- $company --@]}

-+\addressline{[@-- $address1 --@]}

-+\addressline{[@-- $address2 --@]}

-+\addressline{[@-- $city --@], [@-- $state --@]  [@-- $zip --@]}

-+\addressline{[@-- $country --@]}

- \end{minipage}}

- \hfill

- \makebox{

- \begin{minipage}[t]{2.5in}

- \begin{flushright}

--Terms: $terms\\

--$po_line\\

-+Terms: [@-- $terms --@]\\

-+[@-- $po_line --@]\\

- \end{flushright}

- \end{minipage}}

- \vspace{0.5cm}

- %

- \section*{\textsc{Charges}}

--\begin{longtable}{|c|l|c|r|r|}

-+\begin{longtable}{|c|l|r|}

- \hline

- \rule{0pt}{2.5ex}

- \makebox[1.4cm]{\textbf{Ref}} & 

--\makebox[7.9cm][l]{\textbf{Description}} & 

--\makebox[1.3cm][c]{\textbf{Quantity}} & 

--\makebox[2.5cm][r]{\textbf{Unit Price}} & 

--\makebox[2.5cm][r]{\textbf{Amount}} \\

-+\makebox[13cm][l]{\textbf{Description}} & 

-+\makebox[2cm][r]{\textbf{Amount}} \\

- \hline

- \endfirsthead

--\multicolumn{5}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\

-+\multicolumn{3}{r}{\rule{0pt}{2.5ex}Continued from previous page}\\

- \hline

- \rule{0pt}{2.5ex}

- \makebox[1.4cm]{\textbf{Ref}} & 

--\makebox[7.9cm][l]{\textbf{Description}} & 

--\makebox[1.3cm][c]{\textbf{Quantity}} & 

--\makebox[2.5cm][r]{\textbf{Unit Price}} & 

--\makebox[2.5cm][r]{\textbf{Amount}} \\

-+\makebox[13cm][l]{\textbf{Description}} & 

-+\makebox[2cm][r]{\textbf{Amount}} \\

- \hline

- \endhead

--\multicolumn{5}{r}{\rule{0pt}{2.5ex}/cont...}\\

-+\multicolumn{3}{r}{\rule{0pt}{2.5ex}/cont...}\\

- \endfoot

--%%TotalDetails

-- & \multicolumn{3}{l}{$total_item}    & $total_amount\\

--%%EndTotalDetails

-+[@--

-+

-+  foreach my $line (@total_items) {

-+    $OUT .= ' & \multicolumn{1}{l}{' . $line->{'total_item'} . '} & ' .

-+            $line->{'total_amount'} . '\\\\' . "\n";

-+  }

-+

-+--@]

- \hline

- \endlastfoot

--%%Detail

--\rule{0pt}{2.5ex}$ref & 

--\begin{tabular}{l}

--$description\tabularnewline

--\end{tabular}

--& $quantity & \dollar $amount & \dollar $amount\\\hline

--%%EndDetail

-+[@--

-+

-+  foreach my $line (@detail_items) {

-+    $OUT .= '\rule{0pt}{2.5ex}' . $line->{'ref'} . ' &' . "\n".

-+            '\begin{tabular}{l}' . "\n".

-+            $line->{'description'} . '\tabularnewline' . "\n".

-+            '\end{tabular}' . "\n".

-+            '& \dollar ' . $line->{'amount'} . '\\\\\\hline' . "\n";

-+  }

-+

-+--@]

- \end{longtable}

- \vfill

--$notes

-+[@-- $notes --@]

- \end{document}

diff --git a/conf/invoice_latexfooter b/conf/invoice_latexfooter
index 527c356..ee5d7e9 100644
--- a/conf/invoice_latexfooter
+++ b/conf/invoice_latexfooter
@@ -1 +1,5 @@
-Ivan Kohler~~~Freeside - open-source billing
+Ivan Kohler\\
+12345 Test Lane\\
+Truckee, CA~~96161\\
+ivan@sisd.com~~~~+1 415 462 1624\\
+Freeside - open-source billing - http://www.sisd.com/freeside\\
diff --git a/conf/invoice_latexreturnaddress b/conf/invoice_latexreturnaddress
deleted file mode 100644
index 95067e2..0000000
--- a/conf/invoice_latexreturnaddress
+++ /dev/null
@@ -1,3 +0,0 @@
-Ivan Kohler\\*
-12345 Test Lane\\*
-Truckee, CA~~96161
diff --git a/conf/logo.eps b/conf/logo.eps
index ff25dd4..8091b03 100644
--- a/conf/logo.eps
+++ b/conf/logo.eps
@@ -1,16 +1,10 @@
 %!PS-Adobe-2.0 EPSF-2.0
+%%BoundingBox: 261 345 419 447
 %%HiResBoundingBox: 261.500000 345.500000 418.500000 446.500000
 %%Creator: xpdf/pdftops 3.00
 %%LanguageLevel: 2
 %%DocumentMedia: plain 612 792 0 () ()
-%%BoundingBox: 19 0 70 33
 %%EndComments
-%%BeginProcSet: epsffit 1 0
-gsave
--65.000 -111.618 translate
-0.324 0.324 scale
-%%EndProcSet
-
 % EPSF created by ps2eps 1.54
 %%BeginProlog
 save
@@ -13507,4 +13501,3 @@ countdictstack
 exch sub { end } repeat
 restore
 %%EOF
-grestore
diff --git a/conf/logo.png b/conf/logo.png
deleted file mode 100644
index 1e415e6..0000000
--- a/conf/logo.png
+++ /dev/null
diff --git a/eg/export_template.pm b/eg/export_template.pm
index 2830ce3..2c199db 100644
--- a/eg/export_template.pm
+++ b/eg/export_template.pm
@@ -56,24 +56,6 @@ sub _export_delete {
   ref($err_or_queue) ? '' : $err_or_queue;
 }
 
-#these two are optional
-# fallback for svc_acct will change and restore password
-sub _export_suspend {
-  my( $self, $svc_something ) = (shift, shift);
-  $err_or_queue = $self->myexport_queue( $svc_something->svcnum,
-    'suspend', $svc_something->username );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-sub _export_unsuspend {
-  my( $self, $svc_something ) = (shift, shift);
-  $err_or_queue = $self->myexport_queue( $svc_something->svcnum,
-    'unsuspend', $svc_something->username );
-  ref($err_or_queue) ? '' : $err_or_queue;
-}
-
-###
-
 #a good idea to queue anything that could fail or take any time
 sub myexport_queue {
   my( $self, $svcnum, $method ) = (shift, shift, shift);
@@ -97,10 +79,3 @@ sub myexport_delete { #subroutine, not method
   #do things with $username
 }
 
-sub myexport_suspend { #subroutine, not method
-}
-
-sub myexport_unsuspend { #subroutine, not method
-}
-
-
diff --git a/eg/xmlrpc-example.pl b/eg/xmlrpc-example.pl
deleted file mode 100755
index 7a2a0a6..0000000
--- a/eg/xmlrpc-example.pl
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use Frontier::Client;
-use Data::Dumper;
-
-my $server = new Frontier::Client (
-	url => 'http://user:pass@freesidehost/misc/xmlrpc.cgi',
-);
-
-#my $method = 'cust_main.smart_search';
-#my @args = (search => '1');
-
-my $method = 'Record.qsearch';
-my @args = (cust_main => { });
-
-my $result = $server->call($method, @args);
-
-if (ref($result) eq 'ARRAY') {
-  print "Result:\n";
-  print Dumper(@$result);
-}
-
diff --git a/fs_selfservice/DEPLOY b/fs_selfservice/DEPLOY
index 6341278..7420df7 100755
--- a/fs_selfservice/DEPLOY
+++ b/fs_selfservice/DEPLOY
@@ -1,27 +1,20 @@
 #!/bin/sh
 
-#this is a quick hack for my dev machine.  do not use it.
-# see the "make install-selfservice" and "make update-selfservice" makefile
-# targets to properly install this stuff.
+kill `cat /var/run/freeside-selfservice-server.fs_selfservice.pid`
 
-#kill `cat /var/run/freeside-selfservice-server.fs_selfservice.pid`
+( cd ..; make deploy; cd fs_selfservice )
 
 cd FS-SelfService
 perl Makefile.PL && make && make install
-cd ..
-
-( cd ..; make deploy; cd fs_selfservice )
 
 cp /home/ivan/freeside/fs_selfservice/FS-SelfService/cgi/* /var/www/MyAccount
-chown freeside /var/www/MyAccount/*.cgi
-chmod 755 /var/www/MyAccount/*.cgi
+chown freeside /var/www/MyAccount/selfservice.cgi /var/www/MyAccount/agent.cgi
+chmod 755 /var/www/MyAccount/selfservice.cgi /var/www/MyAccount/agent.cgi
 ln -s /var/www/MyAccount/selfservice.cgi /var/www/MyAccount/index.cgi || true
 
-	#cp /home/ivan/freeside/fs_signup/FS-SignupClient/cgi/* /var/www/signup/
-	##mv /var/www/signup/signup-snarf.html /var/www/signup/signup.html #!!!!!
-	##mv /var/www/signup/signup-billaddress.html /var/www/signup/signup.html #!!!!!
-	##mv /var/www/signup/signup-freeoption.html /var/www/signup/signup.html #!!!!!
-	#chown freeside /var/www/signup/signup.cgi
-	#chmod 755 /var/www/signup/signup.cgi
-	#ln -s /var/www/signup/signup.cgi /var/www/signup/index.cgi || true
+cp /home/ivan/freeside/fs_signup/FS-SignupClient/cgi/* /var/www/signup/
+#mv /var/www/signup/signup-snarf.html /var/www/signup/signup.html #!!!!!
+chown freeside /var/www/signup/signup.cgi
+chmod 755 /var/www/signup/signup.cgi
+ln -s /var/www/signup/signup.cgi /var/www/signup/index.cgi || true
 
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index bfce128..6e3ca3b 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -1,7 +1,7 @@
 package FS::SelfService;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT_OK $dir $socket %autoload $tag);
+use vars qw($VERSION @ISA @EXPORT_OK $socket %autoload $tag);
 use Exporter;
 use Socket;
 use FileHandle;
@@ -13,8 +13,7 @@ $VERSION = '0.03';
 
 @ISA = qw( Exporter );
 
-$dir = "/usr/local/freeside";
-$socket =  "$dir/selfservice_socket";
+$socket =  "/usr/local/freeside/selfservice_socket";
 $socket .= '.'.$tag if defined $tag && length($tag);
 
 #maybe should ask ClientAPI for this list
@@ -31,7 +30,6 @@ $socket .= '.'.$tag if defined $tag && length($tag);
   'cancel'               => 'MyAccount/cancel',        #add to ss cgi!
   'payment_info'         => 'MyAccount/payment_info',
   'process_payment'      => 'MyAccount/process_payment',
-  'process_prepay'       => 'MyAccount/process_prepay',
   'list_pkgs'            => 'MyAccount/list_pkgs',     #add to ss cgi!
   'order_pkg'            => 'MyAccount/order_pkg',     #add to ss cgi!
   'cancel_pkg'           => 'MyAccount/cancel_pkg',    #add to ss cgi!
@@ -59,11 +57,6 @@ $ENV{'BASH_ENV'} = '';
 my $freeside_uid = scalar(getpwnam('freeside'));
 die "not running as the freeside user\n" if $> != $freeside_uid;
 
--e $dir or die "FATAL: $dir doesn't exist!";
--d $dir or die "FATAL: $dir isn't a directory!";
--r $dir or die "FATAL: Can't read $dir as freeside user!";
--x $dir or die "FATAL: $dir not searchable (executable) as freeside user!";
-
 foreach my $autoload ( keys %autoload ) {
 
   my $eval =
@@ -88,7 +81,7 @@ foreach my $autoload ( keys %autoload ) {
 sub simple_packet {
   my $packet = shift;
   socket(SOCK, PF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
-  connect(SOCK, sockaddr_un($socket)) or die "connect to $socket: $!";
+  connect(SOCK, sockaddr_un($socket)) or die "connect: $!";
   nstore_fd($packet, \*SOCK) or die "can't send packet: $!";
   SOCK->flush;
 
@@ -163,10 +156,6 @@ FS::SelfService - Freeside self-service API
                         'payby'            => $payby,
                         'payinfo'          => $payinfo,
                         'paycvv'           => $paycvv,
-                        'paystart_month'   => $paystart_month
-                        'paystart_year'    => $paystart_year,
-                        'payissue'         => $payissue,
-                        'payip'            => $payip
                         'paydate'          => $paydate,
                         'payname'          => $payname,
                         'invoicing_list'   => $invoicing_list,
@@ -1070,7 +1059,7 @@ END
 
 Note: Resellers can also use the B<signup_info> and B<new_customer> functions
 with their active session, and the B<customer_info> and B<order_pkg> functions
-with their active session and an additional I<custnum> parameter.
+with their active session and an additonal I<custnum> parameter.
 
 =over 4
 
diff --git a/fs_selfservice/FS-SelfService/cgi/agent.cgi b/fs_selfservice/FS-SelfService/cgi/agent.cgi
index 695d20e..92c76f3 100644
--- a/fs_selfservice/FS-SelfService/cgi/agent.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/agent.cgi
@@ -113,7 +113,7 @@ sub process_signup {
 
   my $error = '';
 
-  #false laziness w/signup.cgi, identical except for agentnum vs session_id
+  #some false laziness w/signup.cgi
   my $payby = $cgi->param('payby');
   if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
     #$payinfo = join('@', map { $cgi->param( $payby. "_payinfo$_" ) } (1,2) );
@@ -161,25 +161,17 @@ sub process_signup {
   unless ( $error ) {
     my $rv = new_customer ( {
       'session_id'       => $session_id,
-      map { $_ => scalar($cgi->param($_)) }
+      map { $_ => $cgi->param($_) }
         qw( last first ss company
             address1 address2 city county state zip country
             daytime night fax
-
-            ship_last ship_first ship_company
-            ship_address1 ship_address2 ship_city ship_county ship_state
-              ship_zip ship_country
-            ship_daytime ship_night ship_fax
-
             payby payinfo paycvv paydate payname invoicing_list
-            referral_custnum promo_code reg_code
             pkgpart username sec_phrase _password popnum refnum
           ),
         grep { /^snarf_/ } $cgi->param
     } );
     $error = $rv->{'error'};
   }
-  #eslaf
 
   if ( $error ) { 
     $action = 'signup';
@@ -417,8 +409,7 @@ sub do_template {
   #warn join(' / ', map { "$_=>".$fill_in->{$_} } keys %$fill_in). "\n";
 
   $cgi->delete_all();
-  $fill_in->{'selfurl'} = $cgi->self_url; #OLD
-  $fill_in->{'self_url'} = $cgi->self_url;
+  $fill_in->{'selfurl'} = $cgi->self_url;
   $fill_in->{'cgi'} = \$cgi;
 
   my $template = new Text::Template( TYPE    => 'FILE',
diff --git a/fs_selfservice/FS-SelfService/cgi/agent_delete_svc.html b/fs_selfservice/FS-SelfService/cgi/agent_delete_svc.html
index 7a2b750..e8be07e 100644
--- a/fs_selfservice/FS-SelfService/cgi/agent_delete_svc.html
+++ b/fs_selfservice/FS-SelfService/cgi/agent_delete_svc.html
@@ -1,6 +1,7 @@
 <HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
 <BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR>
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 <%= $small_custview %>
diff --git a/fs_selfservice/FS-SelfService/cgi/delete_svc.html b/fs_selfservice/FS-SelfService/cgi/delete_svc.html
index 8468deb..16054a7 100644
--- a/fs_selfservice/FS-SelfService/cgi/delete_svc.html
+++ b/fs_selfservice/FS-SelfService/cgi/delete_svc.html
@@ -1,6 +1,7 @@
 <HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
 <BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR>
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 
diff --git a/fs_selfservice/FS-SelfService/cgi/make_payment.html b/fs_selfservice/FS-SelfService/cgi/make_payment.html
index 1bbbe90..3522c08 100644
--- a/fs_selfservice/FS-SelfService/cgi/make_payment.html
+++ b/fs_selfservice/FS-SelfService/cgi/make_payment.html
@@ -1,6 +1,7 @@
 <HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
 <BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR>
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 <FONT SIZE=4>Make a payment</FONT><BR><BR>
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index 546ca11..9997d70 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -1,6 +1,7 @@
 <HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
 <BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR>
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
index f2e5e99..ba3b3f2 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
@@ -1,89 +1,13 @@
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<TABLE BORDER=0><TR>
 <TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
 
-<TABLE CELLSPACING=0 BORDER=0>
-
-<%= 
-
-my @menu = (
-{ title=>' ' },
-{ title=>'Overview', url=>'myaccount', size=>'+1', },
-{ title=>' ' },
-
-{ title=>'Purchase', size=>'+1', },
-  { title=>'Purchase additional package*', url=>'order', 'indent'=>2 },
-);
-
-if ( 1 ) { #XXXFIXME "enable selfservice prepay features" flag or something, eventually per-pkg or something really fancy
-
-  push @menu, (
-    { title=>'Recharge my account with a credit card',
-      url=>'make_payment', indent=>2 },
-    { title=>'Recharge my account with a prepaid card',
-      url=>'recharge_prepay', indent=>2 },
-  );
-
-}
-
-push @menu, (
-
-{ title=>' ' },
-
-{ title=>'Setup my services', url=>'provision', size=>'+1', },
-
-{ title=>' ' },
-
-{ title=>'Change my information', size=>'+1', },
-  { title=>'Change payment information*', url=>'change_bill', indent=>2 },
-  { title=>'Change service address*',     url=>'change_ship', indent=>2 },
-  { title=>'Change password(s)*',         url=>'hmmmFIXME',   indent=>2 },
-
-{ title=>' ' },
-
-{ title=>'Logout',   url=>'logout', size=>'+1', },
-
-);
-
-foreach my $item ( @menu ) {
-
-  $OUT .= '<TR><TD'; 
-  if ( exists $item->{'url'} && $action eq $item->{'url'} ) {
-    $OUT .= ' BGCOLOR="#eeeeee" '.
-            ' STYLE="border-top: 1px solid black;'.
-                   ' border-left: 1px solid black;'.
-                   ' border-bottom: 1px solid black"';
-  } else {
-    $OUT .= ' STYLE="border-right: 1px solid black"';
-  }
-  $OUT.='>';
-
-  $OUT .= '<FONT SIZE="'. $item->{'size'}. '">'
-    if exists $item->{'size'};
-
-  $OUT .= '&nbsp;' x $item->{'indent'}
-    if exists $item->{'indent'};
-
-  $OUT .= '<A HREF="'. $url. $item->{'url'}. '">'
-    if exists $item->{'url'} && $action ne $item->{'url'};
-
-  $item->{'title'} =~ s/ /&nbsp;/g;
-  $OUT .= $item->{'title'};
-
-  $OUT .= '</FONT>'
-    if exists $item->{'size'};
-
-  $OUT .= '</A>'
-    if exists $item->{'url'} && $action ne $item->{'url'};
-
-  $OUT .= '</TD></TR>';
-
-}
-
-%>
-
-</TABLE>
-
-<A HREF="passwd.html">(tempFIXME) Change&nbsp;password(s)</A><BR><BR>
+<A HREF="<%= $url %>myaccount">Overview</A><BR><BR>
+<!--A HREF="<%= $url %>change_bill"-->Change&nbsp;payment&nbsp;info</A>&nbsp;*<BR><BR>
+<!--A HREF="<%= $url %>change_ship"-->Change&nbsp;service&nbsp;address</A>&nbsp;*<BR><BR>
+<A HREF="<%= $url %>provision">Setup&nbsp;my&nbsp;services</A><BR><BR>
+<!--A HREF="<%= $url %>order"-->Purchase&nbsp;additional&nbsp;package</A>&nbsp;*<BR><BR>
+<!--<A HREF="<%= $url %>pw_list">Change&nbsp;password(s)</A>&nbsp;*<BR><BR>-->
+<A HREF="passwd.html">Change&nbsp;password(s)</A><BR><BR>
+<A HREF="<%= $url %>logout">Logout</A><BR><BR>
 *&nbsp;coming&nbsp;soon
 </TD>
diff --git a/fs_selfservice/FS-SelfService/cgi/payment_results.html b/fs_selfservice/FS-SelfService/cgi/payment_results.html
index de6c54d..44289de 100644
--- a/fs_selfservice/FS-SelfService/cgi/payment_results.html
+++ b/fs_selfservice/FS-SelfService/cgi/payment_results.html
@@ -1,6 +1,7 @@
 <HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
 <BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR>
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 <FONT SIZE=4>Payment results</FONT><BR><BR>
diff --git a/fs_selfservice/FS-SelfService/cgi/process_svc_acct.html b/fs_selfservice/FS-SelfService/cgi/process_svc_acct.html
index 200a80d..7052059 100644
--- a/fs_selfservice/FS-SelfService/cgi/process_svc_acct.html
+++ b/fs_selfservice/FS-SelfService/cgi/process_svc_acct.html
@@ -1,6 +1,7 @@
 <HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
 <BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR>
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 
diff --git a/fs_selfservice/FS-SelfService/cgi/process_svc_external.html b/fs_selfservice/FS-SelfService/cgi/process_svc_external.html
index 2328fa1..772cf08 100644
--- a/fs_selfservice/FS-SelfService/cgi/process_svc_external.html
+++ b/fs_selfservice/FS-SelfService/cgi/process_svc_external.html
@@ -1,6 +1,7 @@
 <HTML><HEAD><TITLE><%= $error ? 'MyAccount' : sprintf("Your serial number is %010d-$title", $id) %></TITLE></HEAD>
 <BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR>
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 
diff --git a/fs_selfservice/FS-SelfService/cgi/provision.html b/fs_selfservice/FS-SelfService/cgi/provision.html
index d31e607..6d80e89 100644
--- a/fs_selfservice/FS-SelfService/cgi/provision.html
+++ b/fs_selfservice/FS-SelfService/cgi/provision.html
@@ -1,6 +1,7 @@
 <HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
 <BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR>
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 <%= include('provision_list') %>
diff --git a/fs_selfservice/FS-SelfService/cgi/provision_list.html b/fs_selfservice/FS-SelfService/cgi/provision_list.html
index 0f68dfe..0c8e050 100644
--- a/fs_selfservice/FS-SelfService/cgi/provision_list.html
+++ b/fs_selfservice/FS-SelfService/cgi/provision_list.html
@@ -41,7 +41,7 @@ function areyousure(href, message) {
     #}
 
     unless ( $cust_svc->{'svcnum'} == $svcnum ) {
-      $OUT .= qq!(<A HREF="javascript:areyousure('${url}delete_svc;svcnum=$cust_svc->{svcnum}', 'This will permanently delete the $cust_svc->{label}[1] $cust_svc->{label}[0].  Are you sure?')">!.
+      $OUT .= qq!(<A HREF="javascript:areyousure('${url}delete_svc;svcnum=$cust_svc->{svcnum}', 'This will perminantly delete the $cust_svc->{label}[1] $cust_svc->{label}[0].  Are you sure?')">!.
               'delete</A>)';
 
     }
diff --git a/fs_selfservice/FS-SelfService/cgi/provision_svc_acct.html b/fs_selfservice/FS-SelfService/cgi/provision_svc_acct.html
index 5054074..cf35857 100644
--- a/fs_selfservice/FS-SelfService/cgi/provision_svc_acct.html
+++ b/fs_selfservice/FS-SelfService/cgi/provision_svc_acct.html
@@ -1,6 +1,7 @@
 <HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
 <BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR>
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 <%= include('svc_acct') %>
diff --git a/fs_selfservice/FS-SelfService/cgi/recharge_prepay.html b/fs_selfservice/FS-SelfService/cgi/recharge_prepay.html
deleted file mode 100644
index f858459..0000000
--- a/fs_selfservice/FS-SelfService/cgi/recharge_prepay.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
-<%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
-<FONT SIZE=4>Recharge with prepaid card</FONT><BR><BR>
-<FORM NAME="OneTrueForm" METHOD="POST" ACTION="<%=$selfurl%>" onSubmit="document.OneTrueForm.process.disabled=true">
-<INPUT TYPE="hidden" NAME="session" VALUE="<%=$session_id%>">
-<INPUT TYPE="hidden" NAME="action" VALUE="recharge_results">
-<TABLE BGCOLOR="#cccccc">
-<!--
-<TR>
-  <TD ALIGN="right">Amount&nbsp;Due</TD>
-  <TD>
-    <TABLE><TR><TD BGCOLOR="#ffffff">
-      $<%=sprintf("%.2f",$balance)%>
-    </TD></TR></TABLE>
-  </TD>
-</TR>
--->
-<TR>
-  <TD ALIGN="right">Prepaid&nbsp;card&nbsp;number</TD>
-  <TD>
-    <INPUT TYPE="text" NAME="prepaid_cardnum" SIZE=20 MAXLENGTH=19 VALUE="<%=$prepaid_cardnum%>">
-  </TD>
-</TR>
-</TABLE>
-<BR>
-<INPUT TYPE="hidden" NAME="paybatch" VALUE="<%=$paybatch%>">
-<INPUT TYPE="submit" NAME="process" VALUE="Recharge"> <!-- onClick="this.disabled=true"> -->
-</FORM>
-</TD></TR></TABLE>
-<HR>
-<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
-</BODY></HTML>
-
diff --git a/fs_selfservice/FS-SelfService/cgi/recharge_results.html b/fs_selfservice/FS-SelfService/cgi/recharge_results.html
deleted file mode 100644
index ec3ea2c..0000000
--- a/fs_selfservice/FS-SelfService/cgi/recharge_results.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
-<%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
-<FONT SIZE=4>Recharge results</FONT><BR><BR>
-<%= if ( $error ) {
-  $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error processing your prepaid card: $error</FONT>!;
-} else {
-  $OUT .= 'Prepaid card recharge sucessful!<BR><BR>';
-
-  $OUT .= '$'. sprintf('%.2f', $amount). ' added to your account.<BR><BR>'
-    if $amount;
-
-  $OUT .= $duration. ' added to your account.<BR><BR>'
-    if $seconds;
-
-  $OUT .= 'Thank you.';
-} %>
-</TD></TR></TABLE>
-<HR>
-<FONT SIZE="-2">powered by <a href="http://www.sisd.com/freeside">freeside</a></FONT>
-</BODY></HTML>
-
diff --git a/fs_selfservice/FS-SelfService/cgi/regcode.html b/fs_selfservice/FS-SelfService/cgi/regcode.html
deleted file mode 100644
index e639b9b..0000000
--- a/fs_selfservice/FS-SelfService/cgi/regcode.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<HTML><HEAD><TITLE>ISP Signup</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>ISP Signup - registration code</FONT><BR><BR>
-<SCRIPT>
-function gotoURL(object) {
-    window.location.href =  'signup.cgi?reg_code=' + object.reg_code.value;
-}
-</SCRIPT>
-<FORM>
-Enter registration code <INPUT TYPE="text" NAME="reg_code">
-<INPUT type="submit" VALUE="Signup" onClick="gotoURL(this.form)">
-
-</FORM>
-</BODY>
-</HTML>
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 034a684..0816758 100644
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -9,7 +9,6 @@ use Text::Template;
 use HTML::Entities;
 use FS::SelfService qw( login customer_info invoice
                         payment_info process_payment 
-                        process_prepay
                         list_pkgs
                         part_svc_info provision_acct provision_external
                         unprovision_svc
@@ -62,7 +61,7 @@ $session_id = $cgi->param('session');
 
 #order|pw_list XXX ???
 $cgi->param('action') =~
-    /^(myaccount|view_invoice|make_payment|payment_results|recharge_prepay|recharge_results|logout|change_bill|change_ship|provision|provision_svc|process_svc_acct|process_svc_external|delete_svc)$/
+    /^(myaccount|view_invoice|make_payment|payment_results|logout|change_bill|change_ship|provision|provision_svc|process_svc_acct|process_svc_external|delete_svc)$/
   or die "unknown action ". $cgi->param('action');
 my $action = $1;
 
@@ -80,7 +79,6 @@ if ( $result->{error} eq "Can't resume session" ) { #ick
 warn "processing template $action\n";
 do_template($action, {
   'session_id' => $session_id,
-  'action'     => $action, #so the menu knows what tab we're on...
   %{$result}
 });
 
@@ -175,22 +173,6 @@ sub payment_results {
 
 }
 
-sub recharge_prepay {
-  customer_info( 'session_id' => $session_id );
-}
-
-sub recharge_results {
-
-  my $prepaid_cardnum = $cgi->param('prepaid_cardnum');
-  $prepaid_cardnum =~ s/\W//g;
-  $prepaid_cardnum =~ /^(\w*)$/ or die "illegal prepaid card number";
-  $prepaid_cardnum = $1;
-
-  process_prepay ( 'session_id'     => $session_id,
-                   'prepaid_cardnum' => $prepaid_cardnum,
-                 );
-}
-
 sub logout {
   FS::SelfService::logout( 'session_id' => $session_id );
 }
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi
deleted file mode 100755
index d2ad0d6..0000000
--- a/fs_selfservice/FS-SelfService/cgi/signup.cgi
+++ /dev/null
@@ -1,333 +0,0 @@
-#!/usr/bin/perl -T
-#!/usr/bin/perl -Tw
-#
-# $Id: signup.cgi,v 1.2 2005-03-12 14:35:12 ivan Exp $
-
-use strict;
-use vars qw( @payby $cgi $init_data
-             $self_url $error $agentnum
-
-             $ieak_file $ieak_template
-             $signup_html $signup_template
-             $success_html $success_template
-             $decline_html $decline_template
-           );
-
-use subs qw( print_form print_okay print_decline
-             success_default decline_default
-           );
-use CGI;
-#use CGI::Carp qw(fatalsToBrowser);
-use Text::Template;
-use Business::CreditCard;
-use HTTP::BrowserDetect;
-use FS::SelfService qw( signup_info new_customer );
-
-#acceptable payment methods
-#
-#@payby = qw( CARD BILL COMP );
-#@payby = qw( CARD BILL );
-#@payby = qw( CARD );
-@payby = qw( CARD PREPAY );
-
-$ieak_file = '/usr/local/freeside/ieak.template';
-$signup_html = -e 'signup.html'
-                 ? 'signup.html'
-                 : '/usr/local/freeside/signup.html';
-$success_html = -e 'success.html'
-                  ? 'success.html'
-                  : '/usr/local/freeside/success.html';
-$decline_html = -e 'decline.html'
-                  ? 'decline.html'
-                  : '/usr/local/freeside/decline.html';
-
-
-if ( -e $ieak_file ) {
-  my $ieak_txt = Text::Template::_load_text($ieak_file)
-    or die $Text::Template::ERROR;
-  $ieak_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $ieak_txt = $1;
-  $ieak_txt =~ s/\r//g; # don't double \r on old templates
-  $ieak_txt =~ s/\n/\r\n/g;
-  $ieak_template = new Text::Template ( TYPE => 'STRING', SOURCE => $ieak_txt )
-    or die $Text::Template::ERROR;
-} else {
-  $ieak_template = '';
-}
-
-$agentnum = '';
-if ( -e $signup_html ) {
-  my $signup_txt = Text::Template::_load_text($signup_html)
-    or die $Text::Template::ERROR;
-  $signup_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $signup_txt = $1;
-  $signup_template = new Text::Template ( TYPE => 'STRING',
-                                          SOURCE => $signup_txt,
-                                          DELIMITERS => [ '<%=', '%>' ]
-                                        )
-    or die $Text::Template::ERROR;
-  if ( $signup_txt =~
-         /<\s*INPUT TYPE="?hidden"?\s+NAME="?agentnum"?\s+VALUE="?(\d+)"?\s*>/si
-  ) {
-    $agentnum = $1;
-  }
-} else {
-  #too much maintenance hassle to keep in this file
-  die "can't find ./signup.html or /usr/local/freeside/signup.html";
-  #$signup_template = new Text::Template ( TYPE => 'STRING',
-  #                                        SOURCE => &signup_default,
-  #                                        DELIMITERS => [ '<%=', '%>' ]
-  #                                      )
-  #  or die $Text::Template::ERROR;
-}
-
-if ( -e $success_html ) {
-  my $success_txt = Text::Template::_load_text($success_html)
-    or die $Text::Template::ERROR;
-  $success_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $success_txt = $1;
-  $success_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => $success_txt,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-} else {
-  $success_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => &success_default,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-}
-
-if ( -e $decline_html ) {
-  my $decline_txt = Text::Template::_load_text($decline_html)
-    or die $Text::Template::ERROR;
-  $decline_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
-  $decline_txt = $1;
-  $decline_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => $decline_txt,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-} else {
-  $decline_template = new Text::Template ( TYPE => 'STRING',
-                                           SOURCE => &decline_default,
-                                           DELIMITERS => [ '<%=', '%>' ],
-                                         )
-    or die $Text::Template::ERROR;
-}
-
-$cgi = new CGI;
-
-$init_data = signup_info( 'agentnum'   => $agentnum,
-                          'promo_code' => scalar($cgi->param('promo_code')),
-                          'reg_code'   => uc(scalar($cgi->param('reg_code'))),
-                        );
-
-if (    ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
-     || ( defined($cgi->param('action')) && $cgi->param('action') eq 'process_signup' )
-   ) {
-
-    $error = '';
-
-    $cgi->param('agentnum', $agentnum) if $agentnum;
-    $cgi->param('reg_code', uc(scalar($cgi->param('reg_code'))) );
-
-    #false laziness w/agent.cgi, identical except for agentnum
-    my $payby = $cgi->param('payby');
-    if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
-      #$payinfo = join('@', map { $cgi->param( $payby. "_payinfo$_" ) } (1,2) );
-      $cgi->param('payinfo' => $cgi->param($payby. '_payinfo1'). '@'. 
-                               $cgi->param($payby. '_payinfo2')
-                 );
-    } else {
-      $cgi->param('payinfo' => $cgi->param( $payby. '_payinfo' ) );
-    }
-    $cgi->param('paydate' => $cgi->param( $payby. '_month' ). '-'.
-                             $cgi->param( $payby. '_year' )
-               );
-    $cgi->param('payname' => $cgi->param( $payby. '_payname' ) );
-    $cgi->param('paycvv' => defined $cgi->param( $payby. '_paycvv' )
-                              ? $cgi->param( $payby. '_paycvv' )
-                              : ''
-               );
-
-    if ( $cgi->param('invoicing_list') ) {
-      $cgi->param('invoicing_list' => $cgi->param('invoicing_list'). ', POST')
-        if $cgi->param('invoicing_list_POST');
-    } else {
-      $cgi->param('invoicing_list' => 'POST' );
-    }
-
-    if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
-      $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
-      $cgi->param('_password', '');
-      $cgi->param('_password2', '');
-    }
-
-    if ( $payby =~ /^(CARD|DCRD)$/ && $cgi->param('CARD_type') ) {
-      my $payinfo = $cgi->param('payinfo');
-      $payinfo =~ s/\D//g;
-
-      $payinfo =~ /^(\d{13,16})$/
-        or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
-      $payinfo = $1;
-      validate($payinfo)
-        or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
-      cardtype($payinfo) eq $cgi->param('CARD_type')
-        or $error ||= $init_data->{msgcat}{not_a}. $cgi->param('CARD_type');
-    }
-
-    unless ( $error ) {
-      my $rv = new_customer( {
-        map { $_ => scalar($cgi->param($_)) }
-          qw( last first ss company
-              address1 address2 city county state zip country
-              daytime night fax
-
-              ship_last ship_first ship_company
-              ship_address1 ship_address2 ship_city ship_county ship_state
-                ship_zip ship_country
-              ship_daytime ship_night ship_fax
-
-              payby payinfo paycvv paydate payname invoicing_list
-              referral_custnum promo_code reg_code
-              pkgpart username sec_phrase _password popnum refnum
-              agentnum
-            ),
-          grep { /^snarf_/ } $cgi->param
-      } );
-      $error = $rv->{'error'};
-    }
-    #eslaf
-    
-    if ( $error eq '_decline' ) {
-      print_decline();
-    } elsif ( $error ) {
-      #fudge the snarf info
-      no strict 'refs';
-      ${$_} = $cgi->param($_) foreach grep { /^snarf_/ } $cgi->param;
-      print_form();
-    } else {
-      print_okay(
-        'pkgpart' => scalar($cgi->param('pkgpart')),
-      );
-    }
-
-} else {
-  $error = '';
-  print_form;
-}
-
-sub print_form {
-
-  $error = "Error: $error" if $error;
-
-  my $r = {
-    $cgi->Vars,
-    %{$init_data},
-    'error' => $error,
-  };
-
-  $r->{referral_custnum} = $r->{'ref'};
-  #$cgi->delete('ref');
-  #$cgi->delete('init_popstate');
-  $r->{self_url} = $cgi->self_url;
-
-  print $cgi->header( '-expires' => 'now' ),
-        $signup_template->fill_in( PACKAGE => 'FS::SelfService::_signupcgi',
-                                   HASH    => $r
-                                 );
-}
-
-sub print_decline {
-  print $cgi->header( '-expires' => 'now' ),
-        $decline_template->fill_in();
-}
-
-sub print_okay {
-  my %param = @_;
-  my $user_agent = new HTTP::BrowserDetect $ENV{HTTP_USER_AGENT};
-
-  $cgi->param('username') =~ /^(.+)$/
-    or die "fatal: invalid username got past FS::SelfService::new_customer";
-  my $username = $1;
-  $cgi->param('_password') =~ /^(.+)$/
-    or die "fatal: invalid password got past FS::SelfService::new_customer";
-  my $password = $1;
-  ( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/
-    or die "fatal: invalid email_name got past FS::SelfService::new_customer";
-  my $email_name = $1; #global for template
-
-  #my %pop = ();
-  my %popnum2pop = ();
-  foreach ( @{ $init_data->{'svc_acct_pop'} } ) {
-    #push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
-    $popnum2pop{$_->{popnum}} = $_;
-  }
-
-  my( $ac, $exch, $loc);
-  my $pop = $popnum2pop{$cgi->param('popnum')};
-    #or die "fatal: invalid popnum got past FS::SelfService::new_customer";
-  if ( $pop ) {
-    ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
-  } else {
-    ( $ac, $exch, $loc ) = ( '', '', ''); #presumably you're not using them.
-  }
-
-  #global for template
-  my $pkg = ( grep { $_->{'pkgpart'} eq $param{'pkgpart'} }
-                   @{ $init_data->{'part_pkg'} }
-            )[0]->{'pkg'};
-
-  if ( $ieak_template && $user_agent->windows && $user_agent->ie ) {
-    #send an IEAK config
-    print $cgi->header('application/x-Internet-signup'),
-          $ieak_template->fill_in();
-  } else { #send a simple confirmation
-    print $cgi->header( '-expires' => 'now' ),
-          $success_template->fill_in( HASH => {
-            username   => $username,
-            password   => $password,
-            _password  => $password,
-            email_name => $email_name,
-            ac         => $ac,
-            exch       => $exch,
-            loc        => $loc,
-            pkg        => $pkg,
-          });
-  }
-}
-
-sub success_default { #html to use if you don't specify a success file
-  <<'END';
-<HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
-Thanks for signing up!
-<BR><BR>
-Signup information for <%= $email_name %>:
-<BR><BR>
-Username: <%= $username %><BR>
-Password: <%= $password %><BR>
-Access number: (<%= $ac %>) / <%= $exch %> - <%= $local %><BR>
-Package: <%= $pkg %><BR>
-</BODY></HTML>
-END
-}
-
-sub decline_default { #html to use if there is a decline
-  <<'END';
-<HTML><HEAD><TITLE>Processing error</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Processing error</FONT><BR><BR>
-There has been an error processing your account.  Please contact customer
-support.
-</BODY></HTML>
-END
-}
-
-# subs for the templates...
-
-package FS::SelfService::_signupcgi;
-use HTML::Entities;
-use FS::SelfService qw(regionselector expselect popselector);
-
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html
index 2ab07b3..3532527 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.html
+++ b/fs_selfservice/FS-SelfService/cgi/signup.html
@@ -14,10 +14,10 @@
 //--></script>
 <FONT SIZE=7><%= $agent || 'ISP' %> Signup form</FONT><BR><BR>
 <FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
-<FORM NAME="OneTrueForm" ACTION="<%= $self_url %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true">
+<FORM NAME="OneTrueForm" ACTION="<%= $selfurl %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true">
 <INPUT TYPE="hidden" NAME="session" VALUE="<%= $session_id %>">
 <INPUT TYPE="hidden" NAME="action" VALUE="process_signup">
-<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="<%= $referral_custnum %>">
+<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
 <INPUT TYPE="hidden" NAME="ss" VALUE="">
 Where did you hear about our service? <SELECT NAME="refnum">
 <%=
@@ -175,14 +175,11 @@ Contact Information
 
 </TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
 <BR><BR>First package
-<INPUT TYPE="hidden" NAME="promo_code" VALUE="<%= $promo_code %>">
-<INPUT TYPE="hidden" NAME="reg_code" VALUE="<%= $reg_code %>">
 <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
 <TR>
-  <TD COLSPAN=2><SELECT NAME="pkgpart">
+  <TD COLSPAN=2><SELECT NAME="pkgpart"><OPTION VALUE="">(none)
 
   <%=
-    $OUT .= '<OPTION VALUE="">(none)' unless scalar(@part_pkg ) ==1;
     foreach my $part_pkg ( @part_pkg ) {
       $OUT .= '<OPTION VALUE="'. $part_pkg->{'pkgpart'}. '"';
       $OUT .= ' SELECTED' if $pkgpart && $part_pkg->{'pkgpart'} == $pkgpart;
diff --git a/fs_selfservice/FS-SelfService/cgi/view_invoice.html b/fs_selfservice/FS-SelfService/cgi/view_invoice.html
index 72d0619..46f7318 100644
--- a/fs_selfservice/FS-SelfService/cgi/view_invoice.html
+++ b/fs_selfservice/FS-SelfService/cgi/view_invoice.html
@@ -1,6 +1,7 @@
 <HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
 <BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<TABLE BORDER=0 CELLPADDING=4><TR>
 <%= include('myaccount_menu') %>
 <TD VALIGN="top">
 
diff --git a/fs_signup/FS-SignupClient/Changes b/fs_signup/FS-SignupClient/Changes
new file mode 100644
index 0000000..e750a82
--- /dev/null
+++ b/fs_signup/FS-SignupClient/Changes
@@ -0,0 +1,5 @@
+Revision history for Perl extension FS::SignupClient.
+
+0.01  Mon Aug 23 01:12:46 1999
+	- original version; created by h2xs 1.19
+
diff --git a/fs_signup/FS-SignupClient/MANIFEST b/fs_signup/FS-SignupClient/MANIFEST
new file mode 100644
index 0000000..365ae66
--- /dev/null
+++ b/fs_signup/FS-SignupClient/MANIFEST
@@ -0,0 +1,7 @@
+Changes
+MANIFEST
+MANIFEST.SKIP
+Makefile.PL
+SignupClient.pm
+test.pl
+cgi/signup.cgi
diff --git a/fs_signup/FS-SignupClient/MANIFEST.SKIP b/fs_signup/FS-SignupClient/MANIFEST.SKIP
new file mode 100644
index 0000000..ae335e7
--- /dev/null
+++ b/fs_signup/FS-SignupClient/MANIFEST.SKIP
@@ -0,0 +1 @@
+CVS/
diff --git a/fs_signup/FS-SignupClient/Makefile.PL b/fs_signup/FS-SignupClient/Makefile.PL
new file mode 100644
index 0000000..9850c87
--- /dev/null
+++ b/fs_signup/FS-SignupClient/Makefile.PL
@@ -0,0 +1,17 @@
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+    'NAME'	    => 'FS::SignupClient',
+    'VERSION_FROM'  => 'SignupClient.pm', # finds $VERSION
+#    'EXE_FILES'     => [ 'fs_signupd' ],
+#    'INSTALLSCRIPT' => '/usr/local/sbin',
+#    'INSTALLSITEBIN' => '/usr/local/sbin',
+    'PERM_RWX'      => '750',
+    'PREREQ_PM'     => {
+                         'Business::CreditCard' => 0,
+                         'HTTP::BrowserDetect' => 0,
+                         'Text::Template' => 0,
+                         'FS::SelfService' => 0,
+                       },
+);
diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm
new file mode 100644
index 0000000..d673030
--- /dev/null
+++ b/fs_signup/FS-SignupClient/SignupClient.pm
@@ -0,0 +1,209 @@
+package FS::SignupClient;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT_OK $init_data); # $fs_signupd_socket);
+use Exporter;
+#use Socket;
+#use FileHandle;
+#use IO::Handle;
+#use Storable qw(nstore_fd fd_retrieve);
+use FS::SelfService; # qw( new_customer signup_info );
+
+$VERSION = '0.04';
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( signup_info new_customer regionselector expselect popselector);
+
+=head1 NAME
+
+FS::SignupClient - Freeside signup client API
+
+=head1 SYNOPSIS
+
+  use FS::SignupClient qw( signup_info new_customer );
+
+  #this is the backwards-compatibility bit
+  ( $locales, $packages, $pops, $real_signup_info ) = signup_info;
+
+  #this is compatible with FS::SelfService::new_customer
+  $error = new_customer ( {
+    'first'            => $first,
+    'last'             => $last,
+    'ss'               => $ss,
+    'comapny'          => $company,
+    'address1'         => $address1,
+    'address2'         => $address2,
+    'city'             => $city,
+    'county'           => $county,
+    'state'            => $state,
+    'zip'              => $zip,
+    'country'          => $country,
+    'daytime'          => $daytime,
+    'night'            => $night,
+    'fax'              => $fax,
+    'payby'            => $payby,
+    'payinfo'          => $payinfo,
+    'paycvv'           => $paycvv,
+    'paydate'          => $paydate,
+    'payname'          => $payname,
+    'invoicing_list'   => $invoicing_list,
+    'referral_custnum' => $referral_custnum,
+    'comments'         => $comments,
+    'pkgpart'          => $pkgpart,
+    'username'         => $username,
+    '_password'        => $password,
+    'sec_phrase'       => $sec_phrase,
+    'popnum'           => $popnum,
+    'agentnum'         => $agentnum, #optional
+  } );
+
+=head1 DESCRIPTION
+
+This module provides an API for a remote signup server.
+
+It needs to be run as the freeside user.  Because of this, the program which
+calls these subroutines should be written very carefully.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item signup_info
+
+Returns three array references of hash references.
+
+The first set of hash references is of allowable locales.  Each hash reference
+has the following keys:
+  taxnum
+  state
+  county
+  country
+
+The second set of hash references is of allowable packages.  Each hash
+reference has the following keys:
+  pkgpart
+  pkg
+
+The third set of hash references is of allowable POPs (Points Of Presence).
+Each hash reference has the following keys:
+  popnum
+  city
+  state
+  ac
+  exch
+
+(Future expansion: fourth argument is the $init_data hash reference)
+
+=cut
+
+#compatibility bit
+sub signup_info {
+
+  $init_data = FS::SelfService::signup_info();
+
+  (map { $init_data->{$_} } qw( cust_main_county part_pkg svc_acct_pop ) ),
+  $init_data;
+
+}
+
+=item new_customer HASHREF
+
+Adds a customer to the remote Freeside system.  Requires a hash reference as
+a paramater with the following keys:
+  first
+  last
+  ss
+  comapny
+  address1
+  address2
+  city
+  county
+  state
+  zip
+  country
+  daytime
+  night
+  fax
+  payby
+  payinfo
+  paycvv
+  paydate
+  payname
+  invoicing_list
+  referral_custnum
+  comments
+  pkgpart
+  username
+  _password
+  sec_phrase
+  popnum
+
+Returns a scalar error message, or the empty string for success.
+
+=cut
+
+#compatibility bit
+sub new_customer { 
+  my $hash = FS::SelfService::new_customer(@_);
+  $hash->{'error'};
+}
+
+=item regionselector SELECTED_COUNTY, SELECTED_STATE, SELECTED_COUNTRY, PREFIX, ONCHANGE
+
+=cut
+
+sub regionselector {
+  my ( $selected_county, $selected_state, $selected_country,
+       $prefix, $onchange ) = @_;
+  signup_info() unless $init_data;
+  FS::SelfService::regionselector({
+    selected_county  => $selected_county,
+    selected_state   => $selected_state,
+    selected_country => $selected_country,
+    prefix           => $prefix,
+    onchange         => $onchange,
+    default_country  => $init_data->{countrydefault},
+    locales          => $init_data->{cust_main_county},
+  });
+    #default_state    => $init_data->{statedefault},
+}
+
+=item expselect PREFIX, DATE
+
+=cut
+
+sub expselect {
+  FS::SelfService::expselect(@_);
+}
+
+=item popselector 
+
+=cut
+
+sub popselector {
+  my( $popnum ) = @_;
+  signup_info() unless $init_data;
+  FS::SelfService::popselector({
+    popnum => $popnum,
+    pops   => $init_data->{svc_acct_pop},
+  });
+    #popac =>
+    #acstate =>
+}
+
+=back
+
+=head1 BUGS
+
+This is just a wrapper around FS::SelfService functions for backwards
+compatibility.  It is only necessary if you're using a signup.cgi from before
+1.5.0pre7.
+
+=head1 SEE ALSO
+
+L<fs_signupd>, L<FS::cust_main>
+
+=cut
+
+1;
+
diff --git a/fs_signup/FS-SignupClient/cgi/cvv2.html b/fs_signup/FS-SignupClient/cgi/cvv2.html
new file mode 100644
index 0000000..b178c85
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/cvv2.html
@@ -0,0 +1,25 @@
+<HTML>
+  <HEAD>
+    <TITLE>
+      CVV2 information
+    </TITLE>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+  The CVV2 number (also called CVC2 or CID) is a three- or four-digit
+  security code used to reduce credit card fraud.<BR><BR>
+  <TABLE BORDER=0 CELLSPACING=4>
+    <TR>
+      <TH>Visa / MasterCard / Discover</TH>
+      <TH>American Express</TH>
+    </TR>
+    <TR>
+      <TD>
+        <IMG BORDER=0 ALT="Visa/MasterCard/Discover" SRC="cvv2.png">
+      </TD>
+      <TD>
+        <IMG BORDER=0 ALT="American Express" SRC="cvv2_amex.png">
+      </TD>
+  </TABLE>
+    <CENTER><A HREF="javascript:close()">(close window)</A></CENTER>
+  </BODY>
+</HTML>
diff --git a/fs_signup/FS-SignupClient/cgi/cvv2.png b/fs_signup/FS-SignupClient/cgi/cvv2.png
new file mode 100644
index 0000000..4610dcb
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/cvv2.png
diff --git a/fs_signup/FS-SignupClient/cgi/cvv2_amex.png b/fs_signup/FS-SignupClient/cgi/cvv2_amex.png
new file mode 100644
index 0000000..21c36a0
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/cvv2_amex.png
diff --git a/fs_selfservice/FS-SelfService/cgi/decline.html b/fs_signup/FS-SignupClient/cgi/decline.html
index a37ba3a..a37ba3a 100644
--- a/fs_selfservice/FS-SelfService/cgi/decline.html
+++ b/fs_signup/FS-SignupClient/cgi/decline.html
diff --git a/fs_selfservice/FS-SelfService/cgi/map.gif b/fs_signup/FS-SignupClient/cgi/map.gif
index ef884d8..ef884d8 100644
--- a/fs_selfservice/FS-SelfService/cgi/map.gif
+++ b/fs_signup/FS-SignupClient/cgi/map.gif
diff --git a/fs_selfservice/FS-SelfService/cgi/promocode.html b/fs_signup/FS-SignupClient/cgi/promocode.html
index f8ee7f6..f8ee7f6 100644
--- a/fs_selfservice/FS-SelfService/cgi/promocode.html
+++ b/fs_signup/FS-SignupClient/cgi/promocode.html
diff --git a/fs_selfservice/FS-SelfService/cgi/signup-agentselect.html b/fs_signup/FS-SignupClient/cgi/signup-agentselect.html
index 7851c56..7851c56 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup-agentselect.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-agentselect.html
diff --git a/fs_selfservice/FS-SelfService/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
index 490cefa..490cefa 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup-alternate.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-alternate.html
diff --git a/fs_selfservice/FS-SelfService/cgi/signup-billaddress.html b/fs_signup/FS-SignupClient/cgi/signup-billaddress.html
index 3cf9d25..3cf9d25 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup-billaddress.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-billaddress.html
diff --git a/fs_selfservice/FS-SelfService/cgi/signup-freeoption.html b/fs_signup/FS-SignupClient/cgi/signup-freeoption.html
index 40ad03c..40ad03c 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup-freeoption.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-freeoption.html
diff --git a/fs_selfservice/FS-SelfService/cgi/signup-snarf.html b/fs_signup/FS-SignupClient/cgi/signup-snarf.html
index d167efb..d167efb 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup-snarf.html
+++ b/fs_signup/FS-SignupClient/cgi/signup-snarf.html
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi
new file mode 100755
index 0000000..f49ad32
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/signup.cgi
@@ -0,0 +1,500 @@
+#!/usr/bin/perl -T
+#!/usr/bin/perl -Tw
+#
+# $Id: signup.cgi,v 1.54 2004-12-01 18:38:22 ivan Exp $
+
+use strict;
+use vars qw( @payby $cgi $locales $packages
+             $pops %pop %popnum2pop
+             $init_data $error
+
+             $last $first $ss $company $address1
+             $address2 $city $state $county
+             $country $zip $daytime $night $fax
+
+             $ship_last $ship_first $ship_ss $ship_company $ship_address1
+             $ship_address2 $ship_city $ship_state $ship_county
+             $ship_country $ship_zip $ship_daytime $ship_night $ship_fax
+
+             $invoicing_list $payby $payinfo
+             $paycvv $paydate $payname $referral_custnum $init_popstate
+             $pkgpart $username $password $password2 $sec_phrase $popnum
+             $agentnum $refnum
+             $ieak_file $ieak_template
+             $signup_html $signup_template
+             $success_html $success_template
+             $decline_html $decline_template
+             $ac $exch $loc
+             $email_name $pkg
+             $self_url
+           );
+use subs qw( print_form print_okay print_decline
+             success_default decline_default
+           );
+use CGI;
+#use CGI::Carp qw(fatalsToBrowser);
+use Text::Template;
+use Business::CreditCard;
+use HTTP::BrowserDetect;
+use FS::SelfService qw( signup_info new_customer expselect );
+
+#acceptable payment methods
+#
+#@payby = qw( CARD BILL COMP );
+#@payby = qw( CARD BILL );
+#@payby = qw( CARD );
+@payby = qw( CARD PREPAY );
+
+$ieak_file = '/usr/local/freeside/ieak.template';
+$signup_html = -e 'signup.html'
+                 ? 'signup.html'
+                 : '/usr/local/freeside/signup.html';
+$success_html = -e 'success.html'
+                  ? 'success.html'
+                  : '/usr/local/freeside/success.html';
+$decline_html = -e 'decline.html'
+                  ? 'decline.html'
+                  : '/usr/local/freeside/decline.html';
+
+
+if ( -e $ieak_file ) {
+  my $ieak_txt = Text::Template::_load_text($ieak_file)
+    or die $Text::Template::ERROR;
+  $ieak_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+  $ieak_txt = $1;
+  $ieak_txt =~ s/\r//g; # don't double \r on old templates
+  $ieak_txt =~ s/\n/\r\n/g;
+  $ieak_template = new Text::Template ( TYPE => 'STRING', SOURCE => $ieak_txt )
+    or die $Text::Template::ERROR;
+} else {
+  $ieak_template = '';
+}
+
+$agentnum = '';
+if ( -e $signup_html ) {
+  my $signup_txt = Text::Template::_load_text($signup_html)
+    or die $Text::Template::ERROR;
+  $signup_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+  $signup_txt = $1;
+  $signup_template = new Text::Template ( TYPE => 'STRING',
+                                          SOURCE => $signup_txt,
+                                          DELIMITERS => [ '<%=', '%>' ]
+                                        )
+    or die $Text::Template::ERROR;
+  if ( $signup_txt =~
+         /<\s*INPUT TYPE="?hidden"?\s+NAME="?agentnum"?\s+VALUE="?(\d+)"?\s*>/si
+  ) {
+    $agentnum = $1;
+  }
+} else {
+  #too much maintenance hassle to keep in this file
+  die "can't find ./signup.html or /usr/local/freeside/signup.html";
+  #$signup_template = new Text::Template ( TYPE => 'STRING',
+  #                                        SOURCE => &signup_default,
+  #                                        DELIMITERS => [ '<%=', '%>' ]
+  #                                      )
+  #  or die $Text::Template::ERROR;
+}
+
+if ( -e $success_html ) {
+  my $success_txt = Text::Template::_load_text($success_html)
+    or die $Text::Template::ERROR;
+  $success_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+  $success_txt = $1;
+  $success_template = new Text::Template ( TYPE => 'STRING',
+                                           SOURCE => $success_txt,
+                                           DELIMITERS => [ '<%=', '%>' ],
+                                         )
+    or die $Text::Template::ERROR;
+} else {
+  $success_template = new Text::Template ( TYPE => 'STRING',
+                                           SOURCE => &success_default,
+                                           DELIMITERS => [ '<%=', '%>' ],
+                                         )
+    or die $Text::Template::ERROR;
+}
+
+if ( -e $decline_html ) {
+  my $decline_txt = Text::Template::_load_text($decline_html)
+    or die $Text::Template::ERROR;
+  $decline_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+  $decline_txt = $1;
+  $decline_template = new Text::Template ( TYPE => 'STRING',
+                                           SOURCE => $decline_txt,
+                                           DELIMITERS => [ '<%=', '%>' ],
+                                         )
+    or die $Text::Template::ERROR;
+} else {
+  $decline_template = new Text::Template ( TYPE => 'STRING',
+                                           SOURCE => &decline_default,
+                                           DELIMITERS => [ '<%=', '%>' ],
+                                         )
+    or die $Text::Template::ERROR;
+}
+
+$cgi = new CGI;
+
+$init_data = signup_info( 'promo_code' => $cgi->param('promo_code') );
+$error = $init_data->{'error'};
+$locales = $init_data->{'cust_main_county'};
+$packages = $init_data->{'part_pkg'};
+$pops = $init_data->{'svc_acct_pop'};
+@payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}};
+$packages = $init_data->{agentnum2part_pkg}{$agentnum} if $agentnum;
+%pop = ();
+%popnum2pop = ();
+foreach (@$pops) {
+  push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_;
+  $popnum2pop{$_->{popnum}} = $_;
+}
+
+if ( defined $cgi->param('magic') ) {
+  if ( $cgi->param('magic') eq 'process' ) {
+
+    if ( $cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) {
+      $state = $1;
+      $county = $3 || '';
+      $country = $4;
+    } elsif ( $cgi->param('state') =~ /^(\w*)$/ ) {
+      $state = $1;
+      $cgi->param('county') =~ /^([\w ]*)$/
+        or die "illegal county: ". $cgi->param('county');
+      $county = $1;
+      $cgi->param('country') =~ /^(\w+)$/
+        or die "illegal country: ". $cgi->param('country');
+      $country = $1;
+    } else {
+      die "illegal state: ". $cgi->param('state');
+    }
+    if ( $cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) {
+      $ship_state = $1;
+      $ship_county = $3 || '';
+      $ship_country = $4;
+    } elsif ( $cgi->param('ship_state') =~ /^(\w*)$/ ) {
+      $ship_state = $1;
+      $cgi->param('ship_county') =~ /^([\w ]*)$/
+        or die "illegal county: ". $cgi->param('ship_county');
+      $ship_county = $1;
+      $cgi->param('ship_country') =~ /^(\w+)$/
+        or die "illegal ship_country: ". $cgi->param('ship_country');
+      $ship_country = $1;
+    #} else {
+    #  die "illegal ship_state: ". $cgi->param('ship_state');
+    }
+
+    $payby = $cgi->param('payby');
+    if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
+      #$payinfo = join('@', map { $cgi->param( $payby. "_payinfo$_" ) } (1,2) );
+      $payinfo = $cgi->param($payby. '_payinfo1'). '@'. 
+                 $cgi->param($payby. '_payinfo2');
+    } else {
+      $payinfo = $cgi->param( $payby. '_payinfo' );
+    }
+    $paydate =
+      $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' );
+    $payname = $cgi->param( $payby. '_payname' );
+    $paycvv = defined $cgi->param( $payby. '_paycvv' )
+                ? $cgi->param( $payby. '_paycvv' )
+                : '';
+
+    if ( $invoicing_list = $cgi->param('invoicing_list') ) {
+      $invoicing_list .= ', POST' if $cgi->param('invoicing_list_POST');
+    } else {
+      $invoicing_list = 'POST';
+    }
+
+    $error = '';
+
+    $last             = $cgi->param('last');
+    $first            = $cgi->param('first');
+    $ss               = $cgi->param('ss');
+    $company          = $cgi->param('company');
+    $address1         = $cgi->param('address1');
+    $address2         = $cgi->param('address2');
+    $city             = $cgi->param('city');
+    #$county,
+    #$state,
+    $zip              = $cgi->param('zip');
+    #$country,
+    $daytime          = $cgi->param('daytime');
+    $night            = $cgi->param('night');
+    $fax              = $cgi->param('fax');
+
+    $ship_last        = $cgi->param('ship_last');
+    $ship_first       = $cgi->param('ship_first');
+    $ship_ss          = $cgi->param('ship_ss');
+    $ship_company     = $cgi->param('ship_company');
+    $ship_address1    = $cgi->param('ship_address1');
+    $ship_address2    = $cgi->param('ship_address2');
+    $ship_city        = $cgi->param('ship_city');
+    #$ship_county,
+    #$ship_state,
+    $ship_zip         = $cgi->param('ship_zip');
+    #$ship_country,
+    $ship_daytime     = $cgi->param('ship_daytime');
+    $ship_night       = $cgi->param('ship_night');
+    $ship_fax         = $cgi->param('ship_fax');
+
+    #$payby,
+    #$payinfo,
+    #$paydate,
+    #$payname,
+    #$invoicing_list,
+    $referral_custnum = $cgi->param('ref');
+    $pkgpart          = $cgi->param('pkgpart');
+    $username         = $cgi->param('username');
+    $sec_phrase       = $cgi->param('sec_phrase');
+    $password         = $cgi->param('_password');
+    $popnum           = $cgi->param('popnum');
+    #$agentnum, #         = $cgi->param('agentnum'),
+    $agentnum         ||= $cgi->param('agentnum');
+    $init_popstate    = $cgi->param('init_popstate');
+    $refnum           = $cgi->param('refnum');
+
+    if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
+      $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
+      $password  = '';
+      $password2 = '';
+    } else {
+      $password2 = $cgi->param('_password2');
+
+      if ( $payby =~ /^(CARD|DCRD)$/ && $cgi->param('CARD_type') ) {
+        $payinfo =~ s/\D//g;
+
+        $payinfo =~ /^(\d{13,16})$/
+          or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
+        $payinfo = $1;
+        validate($payinfo)
+          or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
+        cardtype($payinfo) eq $cgi->param('CARD_type')
+          or $error ||= $init_data->{msgcat}{not_a}. $cgi->param('CARD_type');
+      }
+
+      unless ( $error ) {
+
+        my $r = new_customer ( {
+          'last'             => $last,
+          'first'            => $first,
+          'ss'               => $ss,
+          'company'          => $company,
+          'address1'         => $address1,
+          'address2'         => $address2,
+          'city'             => $city,
+          'county'           => $county,
+          'state'            => $state,
+          'zip'              => $zip,
+          'country'          => $country,
+          'daytime'          => $daytime,
+          'night'            => $night,
+          'fax'              => $fax,
+          'ship_last'        => $ship_last,
+          'ship_first'       => $ship_first,
+          'ship_company'     => $ship_company,
+          'ship_address1'    => $ship_address1,
+          'ship_address2'    => $ship_address2,
+          'ship_city'        => $ship_city,
+          'ship_county'      => $ship_county,
+          'ship_state'       => $ship_state,
+          'ship_zip'         => $ship_zip,
+          'ship_country'     => $ship_country,
+          'ship_daytime'     => $ship_daytime,
+          'ship_night'       => $ship_night,
+          'ship_fax'         => $ship_fax,
+          'payby'            => $payby,
+          'payinfo'          => $payinfo,
+          'paycvv'           => $paycvv,
+          'paydate'          => $paydate,
+          'payname'          => $payname,
+          'invoicing_list'   => $invoicing_list,
+          'referral_custnum' => $referral_custnum,
+          'promo_code'       => $cgi->param('promo_code'),
+          'pkgpart'          => $pkgpart,
+          'username'         => $username,
+          'sec_phrase'       => $sec_phrase,
+          '_password'        => $password,
+          'popnum'           => $popnum,
+          'agentnum'         => $agentnum,
+          'refnum'           => $refnum,
+          map { $_ => $cgi->param($_) } grep { /^snarf_/ } $cgi->param
+        } );
+        $error ||= $r->{'error'};
+
+      }
+
+    }
+    
+    if ( $error eq '_decline' ) {
+      print_decline();
+    } elsif ( $error ) {
+      #fudge the snarf info
+      no strict 'refs';
+      ${$_} = $cgi->param($_) foreach grep { /^snarf_/ } $cgi->param;
+      print_form();
+    } else {
+      print_okay();
+    }
+
+  } else {
+    die "unrecognized magic: ". $cgi->param('magic');
+  }
+} else {
+  #$error = '';
+  $last = '';
+  $first = '';
+  $ss = '';
+  $company = '';
+  $address1 = '';
+  $address2 = '';
+  $city = '';
+  $state = $init_data->{statedefault};
+  $county = '';
+  $country = $init_data->{countrydefault};
+  $zip = '';
+  $daytime = '';
+  $night = '';
+  $fax = '';
+  $ship_last = '';
+  $ship_first = '';
+  $ship_company = '';
+  $ship_address1 = '';
+  $ship_address2 = '';
+  $ship_city = '';
+  $ship_state = $init_data->{statedefault};
+  $ship_county = '';
+  $ship_country = $init_data->{countrydefault};
+  $ship_zip = '';
+  $ship_daytime = '';
+  $ship_night = '';
+  $ship_fax = '';
+  $invoicing_list = '';
+  $payby = '';
+  $payinfo = '';
+  $paydate = '';
+  $payname = '';
+  $pkgpart = '';
+  $username = '';
+  $password = '';
+  $password2 = '';
+  $sec_phrase = '';
+  $popnum = '';
+  $referral_custnum = $cgi->param('ref') || '';
+  $init_popstate = $cgi->param('init_popstate') || '';
+  $refnum = $init_data->{'refnum'};
+  print_form;
+}
+
+sub print_form {
+
+  $cgi->delete('ref');
+  $cgi->delete('init_popstate');
+  $self_url = $cgi->self_url;
+
+  $error = "Error: $error" if $error;
+
+  print $cgi->header( '-expires' => 'now' ),
+        $signup_template->fill_in();
+
+}
+
+sub print_decline {
+  print $cgi->header( '-expires' => 'now' ),
+        $decline_template->fill_in();
+}
+
+sub print_okay {
+  my $user_agent = new HTTP::BrowserDetect $ENV{HTTP_USER_AGENT};
+
+  $cgi->param('username') =~ /^(.+)$/
+    or die "fatal: invalid username got past FS::SelfService::new_customer";
+  my $username = $1;
+  $cgi->param('_password') =~ /^(.+)$/
+    or die "fatal: invalid password got past FS::SelfService::new_customer";
+  my $password = $1;
+  ( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/
+    or die "fatal: invalid email_name got past FS::SelfService::new_customer";
+  $email_name = $1; #global for template
+
+  my $pop = $popnum2pop{$cgi->param('popnum')};
+    #or die "fatal: invalid popnum got past FS::SelfService::new_customer";
+  if ( $pop ) {
+    ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} );
+  } else {
+    ( $ac, $exch, $loc ) = ( '', '', ''); #presumably you're not using them.
+  }
+
+  #global for template
+  $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'pkg'};
+
+  if ( $ieak_template && $user_agent->windows && $user_agent->ie ) {
+    #send an IEAK config
+    print $cgi->header('application/x-Internet-signup'),
+          $ieak_template->fill_in();
+  } else { #send a simple confirmation
+    print $cgi->header( '-expires' => 'now' ),
+          $success_template->fill_in();
+  }
+}
+
+sub success_default { #html to use if you don't specify a success file
+  <<'END';
+<HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
+Thanks for signing up!
+<BR><BR>
+Signup information for <%= $email_name %>:
+<BR><BR>
+Username: <%= $username %><BR>
+Password: <%= $password %><BR>
+Access number: (<%= $ac %>) / <%= $exch %> - <%= $local %><BR>
+Package: <%= $pkg %><BR>
+</BODY></HTML>
+END
+}
+
+sub decline_default { #html to use if there is a decline
+  <<'END';
+<HTML><HEAD><TITLE>Processing error</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Processing error</FONT><BR><BR>
+There has been an error processing your account.  Please contact customer
+support.
+</BODY></HTML>
+END
+}
+
+# subs for the templates...
+
+=item regionselector SELECTED_COUNTY, SELECTED_STATE, SELECTED_COUNTRY, PREFIX, ONCHANGE
+
+=cut
+
+sub regionselector {
+  my ( $selected_county, $selected_state, $selected_country,
+       $prefix, $onchange ) = @_;
+  signup_info() unless $init_data;
+  FS::SelfService::regionselector({
+    selected_county  => $selected_county,
+    selected_state   => $selected_state,
+    selected_country => $selected_country,
+    prefix           => $prefix,
+    onchange         => $onchange,
+    default_country  => $init_data->{countrydefault},
+    locales          => $init_data->{cust_main_county},
+  });
+    #default_state    => $init_data->{statedefault},
+}
+
+=item popselector 
+
+=cut
+
+sub popselector {
+  my( $popnum ) = @_;
+  signup_info() unless $init_data;
+  FS::SelfService::popselector({
+    popnum => $popnum,
+    pops   => $init_data->{svc_acct_pop},
+  });
+    #popac =>
+    #acstate =>
+}
+
diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html
new file mode 100755
index 0000000..c0e4f73
--- /dev/null
+++ b/fs_signup/FS-SignupClient/cgi/signup.html
@@ -0,0 +1,222 @@
+<HTML><HEAD><TITLE>ISP Signup form</TITLE></HEAD>
+<BODY BGCOLOR="#e8e8e8" onUnload="myclose()">
+<script language="JavaScript"><!--
+  var mywindow = -1;
+  function myopen(filename,windowname,properties) {
+    myclose();
+    mywindow = window.open(filename,windowname,properties);
+  }
+  function myclose() {
+    if ( mywindow != -1 )
+      mywindow.close();
+    mywindow = -1
+  }
+//--></script>
+<FONT SIZE=7>ISP Signup form</FONT><BR><BR>
+<FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
+<FORM NAME="OneTrueForm" ACTION="<%= $self_url %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true">
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
+<INPUT TYPE="hidden" NAME="ref" VALUE="<%= $referral_custnum %>">
+<INPUT TYPE="hidden" NAME="ss" VALUE="">
+Where did you hear about our service? <SELECT NAME="refnum">
+<%=
+  $OUT .= '<OPTION VALUE="">' unless $refnum;
+  foreach my $part_referral ( @{$init_data->{'part_referral'}} ) {
+    $OUT .= '<OPTION VALUE="'. $part_referral->{'refnum'}. '"';
+    $OUT .= ' SELECTED' if $part_referral->{'refnum'} eq $refnum;
+    $OUT .= '>'. $part_referral->{'referral'};
+  }
+%>
+</SELECT><BR><BR>
+Contact Information
+<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Contact name<BR>(last, first)</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="last" VALUE="<%= $last %>">,
+                <INPUT TYPE="text" NAME="first" VALUE="<%= $first %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Company</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="company" SIZE=70 VALUE="<%= $company %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Address</TH>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address1" SIZE=70 VALUE="<%= $address1 %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">&nbsp;</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="address2" SIZE=70 VALUE="<%= $address2 %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
+  <TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
+  <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
+  <TD>
+    <%=
+        ($county_html, $state_html, $country_html) =
+          regionselector( $county, $state, $country );
+ 
+        "$county_html $state_html";
+    %>
+  </TD>
+  <TH><font color="#ff0000">*</font>Zip</TH>
+  <TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>
+</TR>
+<TR>
+  <TH ALIGN="right"><font color="#ff0000">*</font>Country</TH>
+  <TD><%= $country_html %></TD>
+<TR>
+  <TD ALIGN="right">Day Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="daytime" VALUE="<%= $daytime %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Night Phone</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="night" VALUE="<%= $night %>" SIZE=18></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Fax</TD>
+  <TD COLSPAN=5><INPUT TYPE="text" NAME="fax" VALUE="<%= $fax %>" SIZE=12></TD>
+</TR>
+</TABLE><font color="#ff0000">*</font> required fields<BR>
+<BR>Billing information<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR><TD>
+
+  <%=
+    $OUT .= '<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"';
+    my @invoicing_list = split(', ', $invoicing_list );
+    $OUT .= ' CHECKED'
+      if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list;
+    $OUT .= '>';
+  %>
+
+  Postal mail invoice
+</TD></TR>
+<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ ne 'POST' } split(', ', $invoicing_list ) ) %>">
+</TD></TR>
+<%= scalar(@payby) > 1 ? '<TR><TD>Billing type</TD></TR>' : '' %>
+</TABLE>
+<TABLE BGCOLOR="#c0c0c0" BORDER=1 WIDTH="100%">
+<TR>
+
+  <%=
+
+    my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
+    my %types = (
+                  'VISA' => 'VISA card',
+                  'MasterCard' => 'MasterCard',
+                  'Discover' => 'Discover card',
+                  'American Express' => 'American Express card',
+                );
+    foreach ( keys %types ) {
+      $selected = $cgi->param('CARD_type') eq $types{$_} ? 'SELECTED' : '';
+      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
+    }
+    $cardselect .= '</SELECT>';
+  
+    my %payby = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD"). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
+      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", "12-2037"). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="Accounts Payable">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR><font color="#ff0000">*</font>Exp !. expselect("COMP"),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="" MAXLENGTH=80>!,
+    );
+
+    if ( $init_data->{'cvv_enabled'} ) {
+      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
+        $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
+      }
+    }
+
+    my( $account, $aba ) = split('@', $payinfo);
+    my %paybychecked = (
+      'CARD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("CARD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+      'DCRD' => qq!Credit card<BR><font color="#ff0000">*</font>$cardselect<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR><font color="#ff0000">*</font>Exp !. expselect("DCRD", $paydate). qq!<BR><font color="#ff0000">*</font>Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
+      'CHEK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+      'DCHK' => qq!Electronic check<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account" MAXLENGTH=10><BR>${r}ABA/Routing code <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9><INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
+      'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
+      'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("BILL", $paydate). qq!<BR><font color="#ff0000">*</font>Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+      'COMP' => qq!Complimentary<BR><font color="#ff0000">*</font>Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR><font color="#ff0000">*</font>Exp !. expselect("COMP", $paydate),
+      'PREPAY' => qq!Prepaid card<BR><font color="#ff0000">*</font><INPUT TYPE="text" NAME="PREPAY_payinfo" VALUE="$payinfo" MAXLENGTH=80>!,
+    );
+
+    if ( $init_data->{'cvv_enabled'} ) {
+      foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5
+        $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
+      }
+    }
+
+    for (@payby) {
+      if ( scalar(@payby) == 1) {
+        $OUT .= '<TD VALIGN=TOP>'.
+                qq!<INPUT TYPE="hidden" NAME="payby" VALUE="$_">!.
+                "$paybychecked{$_}</TD>";
+      } else {
+        $OUT .= qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+        if ($payby eq $_) {
+          $OUT .= qq! CHECKED> $paybychecked{$_}</TD>!;
+        } else {
+          $OUT .= qq!> $payby{$_}</TD>!;
+        }
+
+      }
+    }
+  %>
+
+</TR></TABLE><font color="#ff0000">*</font> required fields for each billing type
+<BR><BR>First package
+<INPUT TYPE="hidden" NAME="promo_code" VALUE="<%= $cgi->param('promo_code') %>"><TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=0 WIDTH="100%">
+<TR>
+  <TD COLSPAN=2><SELECT NAME="pkgpart">
+
+  <%=
+    $OUT .= '<OPTION VALUE="">(none)' unless scalar(@$packages) == 1;
+    foreach my $package ( @{$packages} ) {
+      $OUT .= '<OPTION VALUE="'. $package->{'pkgpart'}. '"';
+      $OUT .= ' SELECTED'
+        if ( $pkgpart && $package->{'pkgpart'} == $pkgpart )
+           || scalar(@$packages) == 1;
+      $OUT .= '>'. $package->{'pkg'};
+    }
+  %>
+
+  </SELECT></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Username</TD>
+  <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $username %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password" VALUE="<%= $password %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Re-enter Password</TD>
+  <TD><INPUT TYPE="password" NAME="_password2" VALUE="<%= $password2 %>"></TD>
+</TR>
+<%=
+  if ( $init_data->{'security_phrase'} ) {
+    $OUT .= <<ENDOUT;
+<TR>
+  <TD ALIGN="right">Security Phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase">
+  </TD>
+</TR>
+ENDOUT
+  } else {
+    $OUT .= '<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">';
+  }
+%>
+<%=
+  if ( scalar(@$pops) ) {
+    $OUT .= '<TR><TD ALIGN="right">Access number</TD><TD>'.
+            popselector($popnum). '</TD></TR>';
+  } else {
+    $OUT .= popselector($popnum);
+  }
+%>
+</TABLE>
+<BR><BR><INPUT TYPE="submit" NAME="signup" VALUE="Signup">
+</FORM></BODY></HTML>
diff --git a/fs_selfservice/FS-SelfService/cgi/stateselect.html b/fs_signup/FS-SignupClient/cgi/stateselect.html
index ba55bff..ba55bff 100644
--- a/fs_selfservice/FS-SelfService/cgi/stateselect.html
+++ b/fs_signup/FS-SignupClient/cgi/stateselect.html
diff --git a/fs_selfservice/FS-SelfService/cgi/success.html b/fs_signup/FS-SignupClient/cgi/success.html
index 397cc6c..397cc6c 100644
--- a/fs_selfservice/FS-SelfService/cgi/success.html
+++ b/fs_signup/FS-SignupClient/cgi/success.html
diff --git a/fs_signup/FS-SignupClient/test.pl b/fs_signup/FS-SignupClient/test.pl
new file mode 100644
index 0000000..b613695
--- /dev/null
+++ b/fs_signup/FS-SignupClient/test.pl
@@ -0,0 +1,20 @@
+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl test.pl'
+
+######################### We start with some black magic to print on failure.
+
+# Change 1..1 below to 1..last_test_to_print .
+# (It may become useful if the test is moved to ./t subdirectory.)
+
+BEGIN { $| = 1; print "1..1\n"; }
+END {print "not ok 1\n" unless $loaded;}
+#blah#use FS::SignupClient;
+$loaded = 1;
+print "ok 1\n";
+
+######################### End of black magic.
+
+# Insert your test code below (better if it prints "ok 13"
+# (correspondingly "not ok 13") depending on the success of chunk 13
+# of the test code):
+
diff --git a/fs_signup/cck.template b/fs_signup/cck.template
new file mode 100644
index 0000000..f1db554
--- /dev/null
+++ b/fs_signup/cck.template
@@ -0,0 +1,14 @@
+SITE_FILE	8chrfile
+SITE_NAME	YourISP
+LOGIN	{ $username }
+PASSWORD	{ $password }
+PHONE_NUM	+1({ $ac }){ $exch }-{ $loc }
+DNS_ADDR	10.0.0.1
+DNS_ADDR2	10.0.0.2
+NNTP_HOST	news.yourisp.com
+SMTP_HOST	mail.yourisp.com
+DOMAIN_NAME	yourisp.com
+POP_SERVER	{ $username }@mail.yourisp.com
+POP_PASSWORD	{ $password }
+HOME_URL	http://www.yourisp.com
+EMAIL_ADDR	{ $username }@yourisp.com
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
new file mode 100755
index 0000000..d6eb4a8
--- /dev/null
+++ b/fs_signup/fs_signup_server
@@ -0,0 +1,289 @@
+#!/usr/bin/perl -Tw
+#
+# fs_signup_server
+#
+
+use strict;
+use vars qw($pid);
+use IO::Handle;
+use Storable qw(nstore_fd fd_retrieve);
+use Tie::RefHash;
+use Net::SSH qw(sshopen2);
+use FS::UID qw(adminsuidsetup);
+use FS::Conf;
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_main_county;
+use FS::cust_main;
+use FS::cust_bill;
+use FS::cust_pkg;
+use FS::Msgcat qw(gettext);
+
+use vars qw( $opt $Debug );
+
+$Debug = 2;
+
+my $user = shift or die &usage;
+&adminsuidsetup( $user ); 
+
+my $conf = new FS::Conf;
+
+if ($conf->exists('signup_server-quiet')) {
+    $FS::cust_bill::quiet = 1;
+    $FS::cust_pkg::quiet = 1;
+}
+
+#my @payby = qw(CARD PREPAY);
+my @payby = $conf->config('signup_server-payby');
+my $smtpmachine = $conf->config('smtpmachine');
+
+my $machine = shift or die &usage;
+
+my $agentnum = shift or die &usage;
+my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } ) or die &usage;
+my $pkgpart_href = $agent->pkgpart_hashref;
+
+my $refnum = shift or die &usage;
+
+#causing trouble for some folks
+#$SIG{CHLD} = sub { wait() };
+
+$SIG{HUP} = \&killssh;
+$SIG{INT} = \&killssh;
+$SIG{QUIT} = \&killssh;
+$SIG{TERM} = \&killssh;
+$SIG{PIPE} = \&killssh;
+sub killssh { kill 'TERM', $pid if $pid; exit; };
+
+my($fs_signupd)="/usr/local/sbin/fs_signupd";
+
+while (1) {
+  my($reader,$writer)=(new IO::Handle, new IO::Handle);
+  #seems to be broken - calling ->flush explicitly# $writer->autoflush(1);
+  warn "[fs_signup_server] Connecting to $machine...\n" if $Debug;
+  $pid = sshopen2($machine,$reader,$writer,$fs_signupd);
+
+  my @pops = qsearch('svc_acct_pop',{} );
+  my $init_data = {
+
+    #'_protocol' => 'signup',
+    #'_version' => '0.1',
+    #'_packet' => 'init'
+  
+    'cust_main_county' =>
+      [ map { $_->hashref } qsearch('cust_main_county', {}) ],
+      
+    'part_pkg' =>
+      [
+        #map { $_->hashref }
+        map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
+          grep { $_->svcpart('svc_acct') && $pkgpart_href->{ $_->pkgpart } }
+            qsearch( 'part_pkg', { 'disabled' => '' } )
+      ],
+
+    'agentnum2part_pkg' =>
+      {
+        map {
+          my $href = $_->pkgpart_hashref;
+          $_->agentnum =>
+            [
+              map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
+                grep { $_->svcpart('svc_acct') && $href->{ $_->pkgpart } }
+                  qsearch( 'part_pkg', { 'disabled' => '' } )
+            ];
+        } qsearch('agent', {} )
+      },
+
+    'svc_acct_pop' => [ map { $_->hashref } @pops ],
+
+    'security_phrase' => $conf->exists('security_phrase'),
+
+    'payby' => [ $conf->config('signup_server-payby') ],
+
+    'msgcat' => { map { $_=>gettext($_) } qw(
+      passwords_dont_match invalid_card unknown_card_type not_a
+    ) },
+
+    'statedefault' => $conf->config('statedefault') || 'CA',
+
+    'countrydefault' => $conf->config('countrydefault') || 'US',
+
+  };
+
+  warn "[fs_signup_server] Sending init data...\n" if $Debug;
+  nstore_fd($init_data, $writer) or die "can't send init data: $!";
+  $writer->flush;
+
+  warn "[fs_signup_server] Entering main loop...\n" if $Debug;
+  while (1) {
+    warn "[fs_signup_server] Reading (waiting for) signup data...\n" if $Debug;
+    my $signup_data = fd_retrieve($reader);
+
+    if ( $Debug > 1 ) {
+      warn join('',
+        map { "  $_ => ". $signup_data->{$_}. "\n" } keys %$signup_data );
+    }
+
+    warn "[fs_signup_server] Processing signup...\n" if $Debug;
+
+    my $error = '';
+
+    #things that aren't necessary in base class, but are for signup server
+      #return "Passwords don't match"
+      #  if $hashref->{'_password'} ne $hashref->{'_password2'}
+    $error ||= gettext('empty_password') unless $signup_data->{'_password'};
+    $error ||= gettext('no_access_number_selected')
+      unless $signup_data->{'popnum'} || !scalar(@pops);
+
+    #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
+    # common that are still here and library them.
+    my $cust_main = new FS::cust_main ( {
+      #'custnum'          => '',
+      'agentnum'         => $signup_data->{agentnum} || $agentnum,
+      'refnum'           => $refnum,
+
+      map { $_ => $signup_data->{$_} } qw(
+        last first ss company address1 address2 city county state zip country
+        daytime night fax payby payinfo paydate payname referral_custnum comments
+      ),
+
+    } );
+
+    $error ||= "Illegal payment type"
+      unless grep { $_ eq $signup_data->{'payby'} } @payby;
+
+    $cust_main->payinfo($cust_main->daytime)
+      if $cust_main->payby eq 'LECB' && ! $cust_main->payinfo;
+
+    my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} );
+
+    $signup_data->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
+    my $pkgpart = $1;
+
+    my $part_pkg =
+      qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
+        or $error ||= "WARNING: unknown pkgpart: $pkgpart";
+    my $svcpart = $part_pkg->svcpart('svc_acct') unless $error;
+
+    my $cust_pkg = new FS::cust_pkg ( {
+      #later#'custnum' => $custnum,
+      'pkgpart' => $signup_data->{'pkgpart'},
+    } );
+    $error ||= $cust_pkg->check;
+
+    my $svc_acct = new FS::svc_acct ( {
+      'svcpart'   => $svcpart,
+      map { $_ => $signup_data->{$_} }
+        qw( username _password sec_phrase popnum ),
+    } );
+
+    my $y = $svc_acct->setdefault; # arguably should be in new method
+    $error ||= $y unless ref($y);
+
+    $error ||= $svc_acct->check;
+
+    use Tie::RefHash;
+    tie my %hash, 'Tie::RefHash';
+    %hash = ( $cust_pkg => [ $svc_acct ] );
+    $error ||= $cust_main->insert( \%hash, \@invoicing_list ); #msgcat
+
+    if ( ! $error && $conf->exists('signup_server-realtime') ) {
+
+      warn "[fs_signup_server] Billing customer...\n" if $Debug;
+
+      my $bill_error = $cust_main->bill;
+      warn "[fs_signup_server] error billing new customer: $bill_error"
+        if $bill_error;
+
+      $cust_main->apply_payments;
+      $cust_main->apply_credits;
+
+      $bill_error = $cust_main->collect;
+      warn "[fs_signup_server] error collecting from new customer: $bill_error"
+        if $bill_error;
+
+      if ( $cust_main->balance > 0 ) {
+
+        #this makes sense.  credit is "un-doing" the invoice
+        $cust_main->credit( $cust_main->balance, 'signup server decline' );
+        $cust_main->apply_credits;
+
+        #should check list for errors...
+        #$cust_main->suspend;
+        $cust_main->cancel;
+
+        $error = '_decline';
+      }
+    }
+
+    warn "[fs_signup_server] Sending results...\n" if $Debug;
+    print $writer $error, "\n";
+
+    next if $error;
+
+    if ( $conf->config('signup_server-email') ) {
+      warn "[fs_signup_server] Sending email...\n" if $Debug;
+
+      #false laziness w/FS::cust_bill::send & FS::cust_pay::delete
+      use Mail::Header;
+      use Mail::Internet 1.44;
+      use Date::Format;
+      my $from = $conf->config('invoice_from'); #??? as good as any
+      $ENV{MAILADDRESS} = $from;
+      my $header = new Mail::Header ( [
+        "From: $from",
+        "To: ". $conf->config('signup_server-email'),
+        "Sender: $from",
+        "Reply-To: $from",
+        "Date: ". time2str("%a, %d %b %Y %X %z", time),
+        "Subject: FREESIDE NOTIFICATION: Signup Server",
+      ] );
+      my $body = [
+        "This is an automatic message from your Freeside installation\n",
+        "informing you a customer has signed up via the signup server:\n",
+        "\n",
+        'custnum     : '. $cust_main->custnum. "\n",
+        'Name        : '. $cust_main->last. ", ". $cust_main->first. "\n",
+        'Agent       : '. $cust_main->agent->agent. "\n",
+        'Package     : '. $part_pkg->pkg. ' - '. $part_pkg->comment. "\n",
+        'Signup Date : '. time2str('%C', time). "\n",
+        'Username    : '. $svc_acct->username. "\n",
+        #'Password    : '. # config file to turn this on if noment insists
+        'Day phone   : '. $cust_main->daytime. "\n",
+        'Night phone : '. $cust_main->night. "\n",
+        'Address     : '. $cust_main->address1. "\n",
+        ( $cust_main->address2
+            ? '              '. $cust_main->address2. "\n"
+            : ''                                           ),
+        '              '. $cust_main->city. ', '. $cust_main->state. '  '.
+                          $cust_main->zip. "\n",
+        ( $cust_main->country eq 'US'
+            ? ''
+            : '              '. $cust_main->country. "\n" ),
+        "\n",
+      ];
+      #if ( $cust_main->balance > 0 ) {
+      #  push @$body,
+      #    "This customer has an outstanding balance and has been suspended.\n";
+      #}
+      my $message = new Mail::Internet ( 'Header' => $header, 'Body' => $body );
+      $!=0;
+      $message->smtpsend( Host => $smtpmachine )
+        or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
+          or warn "[fs_signup_server] can't send email to ".
+                   $conf->config('signup_server-email').
+                   " via server $smtpmachine with SMTP: $!";
+      #end-of-send mail
+    }
+
+  }
+  close $writer;
+  close $reader;
+  warn "connection to $machine lost!  waiting 60 seconds...\n";
+  sleep 60;
+  warn "reconnecting...\n";
+}
+
+sub usage {
+  die "Usage:\n\n  fs_signup_server user machine agentnum refnum\n";
+}
+
diff --git a/fs_selfservice/FS-SelfService/ieak.template b/fs_signup/ieak.template
index 52edaa9..52edaa9 100755
--- a/fs_selfservice/FS-SelfService/ieak.template
+++ b/fs_signup/ieak.template
diff --git a/htetc/freeside-base.conf b/htetc/freeside-base.conf
deleted file mode 100644
index f8ebece..0000000
--- a/htetc/freeside-base.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-PerlModule HTML::Mason
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
-AuthName Freeside
-AuthType Basic
-AuthUserFile /usr/local/etc/freeside/htpasswd
-require valid-user
-<Files ~ (\.cgi|\.html)>
-AddHandler perl-script .cgi .html
-PerlHandler HTML::Mason
-</Files>
-<Perl>
-require "/usr/local/etc/freeside/handler.pl";
-</Perl>
-</Directory>
-
diff --git a/htetc/freeside-rt.conf b/htetc/freeside-rt.conf
deleted file mode 100644
index 1cb089b..0000000
--- a/htetc/freeside-rt.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/NoAuth>
-<Limit GET POST>
-allow from all
-Satisfy any   
-SetHandler perl-script
-PerlHandler HTML::Mason
-</Limit>
-</Directory>
-
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/REST/1.0/NoAuth>
-<Limit GET POST>
-allow from all
-Satisfy any   
-SetHandler perl-script
-PerlHandler HTML::Mason
-</Limit>
-</Directory>
-
-<DirectoryMatch "^%%%FREESIDE_DOCUMENT_ROOT%%%/rt/.*NoAuth/images">
-SetHandler None
-</DirectoryMatch>
-
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Ticket/Attachment> 
-SetHandler perl-script 
-PerlHandler HTML::Mason 
-</Directory>
-
-<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Search> 
-SetHandler perl-script 
-PerlHandler HTML::Mason 
-</Directory>
diff --git a/htetc/global.asa b/htetc/global.asa
index bb30608..612f6f4 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -10,32 +10,25 @@ use CGI 2.47;
 use Date::Format;
 use Date::Parse;
 use Time::Local;
-use Time::Duration;
 use Tie::IxHash;
-use URI::Escape;
 use HTML::Entities;
-use JSON;
 use IO::Handle;
 use IO::File;
-use IO::Scalar;
 use Net::Whois::Raw qw(whois);
 if ( $] < 5.006 ) {
   eval "use Net::Whois::Raw 0.32 qw(whois)";
   die $@ if $@;
 }
-use Text::CSV_XS;
-use Spreadsheet::WriteExcel;
 use Business::CreditCard;
 use String::Approx qw(amatch);
 use Chart::LinesPoints;
-use HTML::Widgets::SelectLayers 0.05;
+use HTML::Widgets::SelectLayers 0.03;
 use FS;
 use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
 use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
 use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
                small_custview myexit http_header);
-use FS::UI::Web;
 use FS::Msgcat qw(gettext geterror);
 use FS::Misc qw( send_email );
 use FS::Report::Table::Monthly;
@@ -48,7 +41,7 @@ use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_credit;
 use FS::cust_credit_bill;
-use FS::cust_main qw(smart_search);
+use FS::cust_main;
 use FS::cust_main_county;
 use FS::cust_pay;
 use FS::cust_pkg;
@@ -83,8 +76,6 @@ use FS::msgcat;
 use FS::rate;
 use FS::rate_region;
 use FS::rate_prefix;
-use FS::payment_gateway;
-use FS::agent_payment_gateway;
 
 sub Script_OnStart {
   $Response->AddHeader('Cache-control' => 'no-cache');
@@ -215,16 +206,9 @@ sub sprintAutoProfile {
 }
 
 sub include {
-  my $file = shift;
-  my $shift = 0;
-  if ( $file =~ m(^([^/].*)/[^/]+) ) {
-    unshift @{$Response->{asp}{includes_dir}}, "./$1";
-    $shift = 1;
-  }
-  $file =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/);
+  ( my $file = shift ) =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/);
   #broken in 5.005# ${$Response->TrapInclude($file, @_)};
   my $ref = $Response->TrapInclude($file, @_);
-  shift @{$Response->{asp}{includes_dir}} if $shift;
   $$ref;
 }
 
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 2f2b0af..557ec02 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -20,8 +20,6 @@ use HTML::Mason::ApacheHandler;
 
 use strict;
 
-###use Module::Refresh;###
-
 # List of modules that you want to use from components (see Admin
 # manual for details)
 #{  package HTML::Mason::Commands;
@@ -95,34 +93,27 @@ sub handler
       use Date::Format;
       use Date::Parse;
       use Time::Local;
-      use Time::Duration;
       use Tie::IxHash;
-      use URI::Escape;
       use HTML::Entities;
-      use JSON;
       use IO::Handle;
       use IO::File;
-      use IO::Scalar;
       use Net::Whois::Raw qw(whois);
       if ( $] < 5.006 ) {
         eval "use Net::Whois::Raw 0.32 qw(whois)";
         die $@ if $@;
       }
-      use Text::CSV_XS;
-      use Spreadsheet::WriteExcel;
       use Business::CreditCard;
       use String::Approx qw(amatch);
       use Chart::LinesPoints;
-      use HTML::Widgets::SelectLayers 0.05;
+      use HTML::Widgets::SelectLayers 0.03;
       use FS;
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
       use FS::Record qw(qsearch qsearchs fields dbdef);
       use FS::Conf;
       use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
                      small_custview myexit http_header);
-      use FS::UI::Web;
       use FS::Msgcat qw(gettext geterror);
-      use FS::Misc qw( send_email send_fax );
+      use FS::Misc qw( send_email );
       use FS::Report::Table::Monthly;
       use FS::TicketSystem;
 
@@ -168,9 +159,6 @@ sub handler
       use FS::rate;
       use FS::rate_region;
       use FS::rate_prefix;
-      use FS::payment_gateway;
-      use FS::agent_payment_gateway;
-      use FS::XMLRPC;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
@@ -187,7 +175,7 @@ sub handler
           use RT::GroupMembers;
           use RT::CustomFields;
           use RT::CustomFieldValues;
-          use RT::ObjectCustomFieldValues;
+          use RT::TicketCustomFieldValues;
 
           use RT::Interface::Web;
           use MIME::Entity;
@@ -273,8 +261,6 @@ sub handler
 
     } # end package HTML::Mason::Commands;
 
-    ###Module::Refresh->refresh;###
-
     $r->content_type('text/html');
     #eorar
 
diff --git a/httemplate/autohandler b/httemplate/autohandler
index a3f7eb0..2bd3adf 100644
--- a/httemplate/autohandler
+++ b/httemplate/autohandler
@@ -9,7 +9,7 @@ if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
 
   if ( lc($r->content_type) eq 'text/html' ) {
 
-    $profile = '<PRE>'. encode_entities(dbh->sprintProfile()).
+    $profile = '<PRE>'. ("\n"x4096). encode_entities(dbh->sprintProfile()).
                #"\n\n". &sprintAutoProfile(). '</PRE>';
                "\n\n".                        '</PRE>';
   } 
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 05300d0..f389342 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,3 +1,5 @@
+<!-- mason kludge -->
+
 <%
 
   my %search;
@@ -8,9 +10,8 @@
     %search = ( 'disabled' => '' );
   }
 
-  my $conf = new FS::Conf;
-
 %>
+
 <%= header('Agent Listing', menubar(
   'Main Menu'   => $p,
   'Agent Types' => $p. 'browse/agent_type.cgi',
@@ -34,14 +35,6 @@ full offerings (via their type).<BR><BR>
   <TH COLSPAN=<%= ( $cgi->param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent</TH>
   <TH>Type</TH>
   <TH>Customers</TH>
-  <TH><FONT SIZE=-1>Customer<BR>packages</FONT></TH>
-  <TH>Reports</TH>
-  <TH>Registration codes</TH>
-  <TH>Prepaid cards</TH>
-  <% if ( $conf->config('ticket_system') ) { %>
-    <TH>Ticketing</TH>
-  <% } %>
-  <TH><FONT SIZE=-1>Payment Gateway Overrides</FONT></TH>
   <TH><FONT SIZE=-1>Freq.</FONT></TH>
   <TH><FONT SIZE=-1>Prog.</FONT></TH>
 </TR>
@@ -57,8 +50,6 @@ foreach my $agent ( sort {
   my $cust_main_link = $p. 'search/cust_main.cgi?agentnum_on=1&'.
                        'agentnum='. $agent->agentnum;
 
-  my $cust_pkg_link = $p. 'search/cust_pkg.cgi?agentnum='. $agent->agentnum;
-
 %>
 
       <TR>
@@ -72,151 +63,34 @@ foreach my $agent ( sort {
         <TD><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
           <%= $agent->agent %></A></TD>
         <TD><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD>
-
         <TD>
-          <TABLE CELLSPACING=0 CELLPADDING=0>
-            <TR>
-              <TH ALIGN="right" WIDTH="40%">
-                <%= my $num_prospect = $agent->num_prospect_cust_main %>&nbsp;
-              </TH>
-              <TD>
-                <% if ( $num_prospect ) { %>
-                  <A HREF="<%= $cust_main_link %>&prospect=1"><% } %>prospects<% if ($num_prospect ) { %></A><% } %>
-              <TD>
-            </TR>
-            <TR>
-              <TH ALIGN="right" WIDTH="40%">
-                <FONT COLOR="#00CC00">
-                  <%= my $num_active = $agent->num_active_cust_main %>&nbsp;
-                </FONT>
-              </TH>
-              <TD>
-                <% if ( $num_active ) { %>
-                  <A HREF="<%= $cust_main_link %>&active=1"><% } %>active<% if ( $num_active ) { %></A><% } %>
-              </TD>
-            </TR>
-            <TR>
-              <TH ALIGN="right" WIDTH="40%">
-                <FONT COLOR="#FF9900">
-                  <%= my $num_susp = $agent->num_susp_cust_main %>&nbsp;
-                </FONT>
-              </TH>
-              <TD>
-                <% if ( $num_susp ) { %>
-                  <A HREF="<%= $cust_main_link %>&suspended=1"><% } %>suspended<% if ( $num_susp ) { %></A><% } %>
-              </TD>
-            </TR>
-            <TR>
-              <TH ALIGN="right" WIDTH="40%">
-                <FONT COLOR="#FF0000">
-                  <%= my $num_cancel = $agent->num_cancel_cust_main %>&nbsp;
-                </FONT>
-              </TH>
-              <TD>
-                <% if ( $num_cancel ) { %>
-                  <A HREF="<%= $cust_main_link %>&showcancelledcustomers=1&cancelled=1"><% } %>cancelled<% if ( $num_cancel ) { %></A><% } %>
-              </TD>
-            </TR>
-          </TABLE>
-        </TD>
 
-        <TD>
-          <TABLE CELLSPACING=0 CELLPADDING=0>
-            <TR>
-              <TH ALIGN="right" WIDTH="40%">
-                <FONT COLOR="#00CC00">
-                  <%= my $num_active_pkg = $agent->num_active_cust_pkg %>&nbsp;
-                </FONT>
-              </TH>
-              <TD>
-                <% if ( $num_active_pkg ) { %>
-                  <A HREF="<%= $cust_pkg_link %>&magic=active"><% } %>active<% if ( $num_active_pkg ) { %></A><% } %>
-              </TD>
-            </TR>
-            <TR>
-              <TH ALIGN="right" WIDTH="40%">
-                <FONT COLOR="#FF9900">
-                  <%= my $num_susp_pkg = $agent->num_susp_cust_pkg %>&nbsp;
-                </FONT>
-              </TH>
-              <TD>
-                <% if ( $num_susp_pkg ) { %>
-                  <A HREF="<%= $cust_pkg_link %>&magic=suspended"><% } %>suspended<% if ( $num_susp_pkg ) { %></A><% } %>
-              </TD>
-            </TR>
-            <TR>
-              <TH ALIGN="right" WIDTH="40%">
-                <FONT COLOR="#FF0000">
-                  <%= my $num_cancel_pkg = $agent->num_cancel_cust_pkg %>&nbsp;
-                </FONT>
-              </TH>
-              <TD>
-                <% if ( $num_cancel_pkg ) { %>
-                  <A HREF="<%= $cust_pkg_link %>&magic=cancelled"><% } %>cancelled<% if ( $num_cancel_pkg ) { %></A><% } %>
-              </TD>
-            </TR>
-          </TABLE>
+          <B>
+            <%= my $num_prospect = $agent->num_prospect_cust_main %>
+          </B>
+          <% if ( $num_prospect ) { %>
+            <A HREF="<%= $cust_main_link %>&prospect=1"><% } %>prospects<% if ($num_prospect ) { %></A><% } %>
+
+          <BR><FONT COLOR="#00CC00"><B>
+            <%= my $num_active = $agent->num_active_cust_main %>
+          </B></FONT>
+          <% if ( $num_active ) { %>
+            <A HREF="<%= $cust_main_link %>&active=1"><% } %>active<% if ( $num_active ) { %></A><% } %>
+
+          <BR><FONT COLOR="#FF9900"><B>
+            <%= my $num_susp = $agent->num_susp_cust_main %>
+          </B></FONT>
+          <% if ( $num_susp ) { %>
+            <A HREF="<%= $cust_main_link %>&suspended=1"><% } %>suspended<% if ( $num_susp ) { %></A><% } %>
+
+          <BR><FONT COLOR="#FF0000"><B>
+            <%= my $num_cancel = $agent->num_cancel_cust_main %>
+          </B></FONT>
+          <% if ( $num_cancel ) { %>
+            <A HREF="<%= $cust_main_link %>&showcancelledcustomers=1&cancelled=1"><% } %>cancelled<% if ( $num_cancel ) { %></A><% } %>
         </TD>
-
-        <TD>
-          <A HREF="<%= $p %>search/report_cust_pay.html?agentnum=<%= $agent->agentnum %>">Payments</A>
-          <BR><A HREF="<%= $p %>search/report_cust_credit.html?agentnum=<%= $agent->agentnum %>">Credits</A>
-          <BR><A HREF="<%= $p %>search/report_receivables.cgi?agentnum=<%= $agent->agentnum %>">A/R Aging</A>
-          <!--<BR><A HREF="<%= $p %>search/money_time.cgi?agentnum=<%= $agent->agentnum %>">Sales/Credits/Receipts</A>-->
-
-        </TD>
-
-        <TD>
-          <%= my $num_reg_code = $agent->num_reg_code %>
-          <% if ( $num_reg_code ) { %>
-            <A HREF="<%=$p%>search/reg_code.html?agentnum=<%= $agent->agentnum %>"><% } %>Unused<% if ( $num_reg_code ) { %></A><% } %>
-          <BR><A HREF="<%=$p%>edit/reg_code.cgi?agentnum=<%= $agent->agentnum %>">Generate codes</A>
-        </TD>
-
-        <TD>
-          <%= my $num_prepay_credit = $agent->num_prepay_credit %>
-          <% if ( $num_prepay_credit ) { %>
-            <A HREF="<%=$p%>search/prepay_credit.html?agentnum=<%= $agent->agentnum %>"><% } %>Unused<% if ( $num_prepay_credit ) { %></A><% } %>
-          <BR><A HREF="<%=$p%>edit/prepay_credit.cgi?agentnum=<%= $agent->agentnum %>">Generate cards</A>
-        </TD>
-
-        <% if ( $conf->config('ticket_system') ) { %>
-
-          <TD>
-            <% if ( $agent->ticketing_queueid ) { %>
-              Queue: <%= $agent->ticketing_queueid %>: <%= $agent->ticketing_queue %><BR>
-            <% } %>
-          </TD>
-
-        <% } %>
-
-        <TD>
-          <TABLE CELLSPACING=0 CELLPADDING=0>
-            <% foreach my $override (
-                 # sort { }  want taxclass-full stuff first?  and default cards (empty cardtype)
-                 qsearch('agent_payment_gateway', { 'agentnum' => $agent->agentnum } )
-               ) {
-            %>
-              <TR>
-                <TD> 
-                  <%= $override->cardtype || 'Default' %> to <%= $override->payment_gateway->gateway_module %> (<%= $override->payment_gateway->gateway_username %>)
-                  <%= $override->taxclass
-                        ? ' for '. $override->taxclass. ' only'
-                        : ''
-                  %>
-                  <FONT SIZE=-1><A HREF="<%=$p%>misc/delete-agent_payment_gateway.cgi?<%= 'XXXoverridenum' %>">(delete)</A></FONT>
-                </TD>
-              </TR>
-            <% } %>
-            <TR>
-              <TD><FONT SIZE=-1><A HREF="<%=$p%>edit/agent_payment_gateway.html?agentnum=<%= $agent->agentnum %>">(add override)</A></FONT></TD>
-            </TR>
-          </TABLE>
-        </TD>
-
         <TD><%= $agent->freq %></TD>
         <TD><%= $agent->prog %></TD>
-
       </TR>
 
 <% } %>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 8d5b554..48b0ab2 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -89,7 +89,8 @@ my $taxclasses = $conf->exists('enable_taxclasses');
 
 <%
 foreach my $part_pkg ( sort $sortby @part_pkg ) {
-  my @pkg_svc = $part_pkg->pkg_svc;
+  my(@pkg_svc)=grep $_->getfield('quantity'),
+    qsearch( 'pkg_svc', { 'pkgpart' => $part_pkg->pkgpart } );
   my($rowspan)=scalar(@pkg_svc);
   my $plandata;
   if ( $part_pkg->plan ) {
@@ -144,8 +145,9 @@ foreach my $part_pkg ( sort $sortby @part_pkg ) {
         <TD ROWSPAN=<%= $rowspan %>><%= $plandata %></TD>
 
 <%
+  my($pkg_svc);
   my($n)="";
-  foreach my $pkg_svc ( @pkg_svc ) {
+  foreach $pkg_svc ( @pkg_svc ) {
     my($svcpart)=$pkg_svc->getfield('svcpart');
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
     print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index a725dc0..ef0de13 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,11 +1,6 @@
+<!-- mason kludge -->
 <% 
 
-my %flag = (
-  'D' => 'Default',
-  'F' => 'Fixed',
-  ''  => '',
-);
-
 my %search;
 if ( $cgi->param('showdisabled') ) {
   %search = ();
@@ -18,13 +13,18 @@ my @part_svc =
     qsearch('part_svc', \%search );
 my $total = scalar(@part_svc);
 
-my %num_active_cust_svc = map { $_->svcpart => $_->num_cust_svc } @part_svc;
-
-if ( $cgi->param('orderby') eq 'active' ) {
+my %num_active_cust_svc = ();
+if ( $cgi->param('active') ) {
+  my $active_sth = dbh->prepare(
+    'SELECT COUNT(*) FROM cust_svc WHERE svcpart = ?'
+  ) or die dbh->errstr;
+  foreach my $part_svc ( @part_svc ) {
+    $active_sth->execute($part_svc->svcpart) or die $active_sth->errstr;
+    $num_active_cust_svc{$part_svc->svcpart} =
+      $active_sth->fetchrow_arrayref->[0];
+  }
   @part_svc = sort { $num_active_cust_svc{$b->svcpart} <=>
                      $num_active_cust_svc{$a->svcpart}     } @part_svc;
-} elsif ( $cgi->param('orderby') eq 'svc' ) { 
-  @part_svc = sort { lc($a->svc) cmp lc($b->svc) } @part_svc;
 }
 
 %>
@@ -55,23 +55,21 @@ function part_export_areyousure(href) {
       : do { $cgi->param('showdisabled', 1);
              '( <a href="'. $cgi->self_url. '">show disabled services</a> )'; }
 %>
-<% $cgi->param('showdisabled', ( 1 ^ $cgi->param('showdisabled') ) ); %>
 <%= table() %>
   <TR>
-    <TH><A HREF="<%= do { $cgi->param('orderby', 'svcpart'); $cgi->self_url } %>">#</A></TH>
-    <% if ( $cgi->param('showdisabled') ) { %>
-      <TH>Status</TH>
-    <% } %>
-    <TH><A HREF="<%= do { $cgi->param('orderby', 'svc'); $cgi->self_url; } %>">Service</A></TH>
+    <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Service</TH>
     <TH>Table</TH>
-    <TH><A HREF="<%= do { $cgi->param('orderby', 'active'); $cgi->self_url; } %>"><FONT SIZE=-1>Customer<BR>Services</FONT></A></TH>
+<% if ( $cgi->param('active') ) { %>
+    <TH><FONT SIZE=-1>Customer<BR>Services</FONT></TH>
+<% } %>
     <TH>Export</TH>
     <TH>Field</TH>
     <TH COLSPAN=2>Modifier</TH>
   </TR>
 
 <% foreach my $part_svc ( @part_svc ) {
-     my $svcdb = $part_svc->svcdb;
+     my $hashref = $part_svc->hashref;
+     my $svcdb = $hashref->{svcdb};
      my $svc_x = "FS::$svcdb"->new( { svcpart => $part_svc->svcpart } );
      my @dfields = $svc_x->fields;
      push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
@@ -80,30 +78,25 @@ function part_export_areyousure(href) {
            or $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag }
             @dfields ;
      my $rowspan = scalar(@fields) || 1;
-     my $url = "${p}edit/part_svc.cgi?". $part_svc->svcpart;
+     my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}";
 %>
 
   <TR>
     <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
-      <%= $part_svc->svcpart %></A></TD>
-<% if ( $cgi->param('showdisabled') ) { %>
+      <%= $hashref->{svcpart} %></A></TD>
+<% unless ( $cgi->param('showdisabled') ) { %>
     <TD ROWSPAN=<%= $rowspan %>>
-      <%= $part_svc->disabled
-            ? '<FONT COLOR="#FF0000"><B>Disabled</B></FONT>'
-            : '<FONT COLOR="#00CC00"><B>Enabled</B></FONT>'
-      %>
-    </TD>
+      <%= $hashref->{disabled} ? 'DISABLED' : '' %></TD>
 <% } %>
     <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>">
-      <%= $part_svc->svc %></A></TD>
+      <%= $hashref->{svc} %></A></TD>
     <TD ROWSPAN=<%= $rowspan %>>
-      <%= $svcdb %></TD>
+      <%= $hashref->{svcdb} %></TD>
+<% if ( $cgi->param('active') ) { %>
     <TD ROWSPAN=<%= $rowspan %>>
-      <FONT COLOR="#00CC00"><B><%= $num_active_cust_svc{$part_svc->svcpart} %></B></FONT>&nbsp;<A HREF="<%=$p%>search/<%= $svcdb %>.cgi?svcpart=<%= $part_svc->svcpart %>">active</A>
-      <% if ( $num_active_cust_svc{$part_svc->svcpart} ) { %>
-        <BR><FONT SIZE="-1">[ <A HREF="<%=$p%>edit/bulk-cust_svc.html?svcpart=<%= $part_svc->svcpart %>">change</A> ]</FONT>
-      <% } %>
+      <FONT COLOR="#00CC00"><B><%= $num_active_cust_svc{$hashref->{svcpart}} %></B></FONT>&nbsp;<A HREF="<%=$p%>search/<%= $hashref->{svcdb} %>.cgi?svcpart=<%= $hashref->{svcpart} %>">active</A>
     </TD>
+<% } %>
     <TD ROWSPAN=<%= $rowspan %>><%= itable() %>
 <%
 #  my @part_export =
@@ -122,11 +115,14 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export
      foreach my $field ( @fields ) {
        my $flag = $part_svc->part_svc_column($field)->columnflag;
 %>
-     <%= $n1 %>
-     <TD><%= $field %></TD>
-     <TD><%= $flag{$flag} %></TD>
-     <TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
+     <%= $n1 %><TD><%= $field %></TD><TD>
 
+<%     if ( $flag eq "D" ) { print "Default"; }
+         elsif ( $flag eq "F" ) { print "Fixed"; }
+         elsif ( not $flag ) { }
+         else { print "(Unknown!)"; }
+%>
+       </TD><TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
 <%     $n1="</TR><TR>";
      }
 %>
diff --git a/httemplate/browse/payment_gateway.html b/httemplate/browse/payment_gateway.html
deleted file mode 100644
index bb7f315..0000000
--- a/httemplate/browse/payment_gateway.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<%
-
-  my %search;
-  if ( $cgi->param('showdisabled') ) {
-    %search = ();
-  } else {
-    %search = ( 'disabled' => '' );
-  }
-
-%>
-<%= header('Payment gateways', menubar(
-  'Main Menu' => $p,
-  'Agents'    => $p. 'browse/agent.cgi',
-)) %>
-
-<A HREF="<%= $p %>edit/payment_gateway.html"><I>Add a new payment gateway</I></A><BR><BR>
-
-<%= $cgi->param('showdisabled')
-    ? do { $cgi->param('showdisabled', 0);
-           '( <a href="'. $cgi->self_url. '">hide disabled gateways</a> )'; }
-    : do { $cgi->param('showdisabled', 1);
-           '( <a href="'. $cgi->self_url. '">show disabled gateways</a> )'; }
-%>
-
-<%= table() %>
-<TR>
-  <TH COLSPAN=<%= $cgi->param('showdisabled') ? 1 : 2 %>>#</TH>
-  <TH>Gateway</TH>
-  <TH>Username</TH>
-  <TH>Password</TH>
-  <TH>Action</TH>
-  <TH>Options</TH>
-</TR>
-
-<% foreach my $payment_gateway ( qsearch( 'payment_gateway', \%search ) ) { %>
-
-  <TR>
-    <TD><%= $payment_gateway->gatewaynum %></TD>
-    <% if ( !$cgi->param('showdisabled') ) { %>
-      <TD><%= $payment_gateway->disabled ? 'DISABLED' : '' %></TD>
-    <% } %>
-    <TD><%= $payment_gateway->gateway_module %>
-      <%= !$payment_gateway->disabled 
-            ? '<FONT SIZE="-1"> <A HREF="misc/disable-payment_gateway.cgi?'. $payment_gateway->gatewaynum.'">(disable)</A></FONT>'
-            : ''
-      %>
-    </TD>
-    <TD><%= $payment_gateway->gateway_username %></TD>
-    <TD> - </TD>
-    <TD><%= $payment_gateway->gateway_action %></TD>
-    <TD>
-      <TABLE CELLSPACING=0 CELLPADDING=0>
-        <% my %options = $payment_gateway->options;
-           foreach my $option ( keys %options ) {
-        %>
-          <TR>
-            <TH><%= $option %>:</TH>
-            <TD><%= $options{$option} %></TD>
-          </TR>
-        <% } %>
-      </TABLE>
-    </TD>
-  </TR>
-
-<% } %>
-
-</TABLE>
-</BODY>
-</HTML>
-
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 0afdd48..b53c140 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,7 @@
 <!-- mason kludge -->
-<%= header("Job Queue", menubar( 'Main Menu' => $p, )) %>
-<%= joblisting({}) %>
-</BODY>
-</HTML>
+<%
+
+print header("Job Queue", menubar( 'Main Menu' => $p, )).
+      joblisting({}). '</BODY></HTML>';
+
+%>
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 8011e76..9a00067 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -36,35 +36,19 @@
         <% foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
              my $n = 0; %>
           <% if ( $type eq '' ) { %>
-            <tr>
-              <td><font color="#ff0000">no type</font></td>
-            </tr>
+            <tr><td><font color="#ff0000">no type</font></td></tr>
           <% } elsif (   $type eq 'textarea'
                       || $type eq 'editlist'
                       || $type eq 'selectmultiple' ) { %>
-            <tr>
-              <td bgcolor="#ffffff">
+            <tr><td bgcolor="#ffffff">
 <pre>
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
 </pre>
-              </td>
-            </tr>
+            </td></tr>
           <% } elsif ( $type eq 'checkbox' ) { %>
-            <tr>
-              <td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td>
-            </tr>
+            <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
           <% } elsif ( $type eq 'text' || $type eq 'select' )  { %>
-            <tr>
-              <td bgcolor="#ffffff">
-                <%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>
-              </td></tr>
-          <% } elsif ( $type eq 'select-sub' ) { %>
-            <tr>
-              <td bgcolor="#ffffff">
-                <%= $conf->config($i->key) %>: 
-                <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
-              </td>
-            </tr>
+            <tr><td bgcolor="#ffffff"><%= $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
           <% } else { %>
             <tr><td>
               <font color="#ff0000">unknown type <%= $type %></font>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index ff29d85..409869e 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -73,21 +73,6 @@ function SafeOnsubmit() {
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>
               <% } %>
             </select>
-          <% } elsif ( $type eq 'select-sub' ) { %>
-            <select name="<%= $i->key. $n %>">
-              <option value="">
-              <% my %options = &{$i->options_sub};
-                 my @options = sort { $a <=> $b } keys %options;
-                 my %saw;
-                 foreach my $value ( @options ) {
-                    local($^W)=0; next if $saw{$value}++;
-              %>
-                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) ? ' SELECTED' : '' %>><%= $value %>: <%= $options{$value} %>
-              <% } %>
-              <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! exists $options{$conf->config($i->key)} ) { %>
-                <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>: <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
-              <% } %>
-            </select>
           <% } elsif ( $type eq 'editlist' )  { %>
             <script>
               function doremove<%= $i->key. $n %>() {
diff --git a/httemplate/docs/ach.html b/httemplate/docs/ach.html
index b8a17c8..b79df78 100644
--- a/httemplate/docs/ach.html
+++ b/httemplate/docs/ach.html
@@ -4,7 +4,9 @@
       Electronic check (ACH) information
     </TITLE>
   </HEAD>
-  <BODY BGCOLOR="#ffffff">
+  <BODY BGCOLOR="#e8e8e8">
     <IMG BORDER=0 SRC="../images/ach.png">
+    <BR>
+    <CENTER><A HREF="javascript:close()">(close window)</A></CENTER>
   </BODY>
 </HTML>
diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html
index 9ce259c..50beafe 100755
--- a/httemplate/docs/admin.html
+++ b/httemplate/docs/admin.html
@@ -42,8 +42,7 @@
   sources</u> and <u>Add a new advertising source</u>.
 
   <li>Click on <u>New Customer</u> and create a new customer for your system
-  accounts with billing type <b>Complimentary</b>.  Leave the <i>First
-  package</i> dropdown set to <b>(none)</b>.
+  accounts with billing type <b>Complimentary</b>.  
 
   <li>From the Customer View screen of the newly created customer, order the
   package you defined above.
diff --git a/httemplate/docs/billing.html b/httemplate/docs/billing.html
index adaac17..a9d7508 100644
--- a/httemplate/docs/billing.html
+++ b/httemplate/docs/billing.html
@@ -13,8 +13,8 @@
     <li>Typeset (LaTeX) invoice templates
       <ul>
         <li>Install teTeX and Ghostscript (included with most distributions).
-        <li>Place your logo in EPS (Encapsulated PostScript) format with size 90pt X 36pt (<code>epsffit -c 0 0 90 33 yourlogo.eps &gt;logo.eps</code>) at <code>/usr/local/etc/freeside/conf.<i>your_datasrc</i>/logo.eps</code>.
-        <li>Edit the <b>invoice_latexreturnaddress</b>, <b>invoice_latexfooter</b>, <b>invoice_latexnotes</b>, and <b>invoice_latexsmallfooter</b> configuration options.  If you are adventurous, edit <b>invoice_latex</b> as well.
+        <li>Place your logo in EPS (Encapsulated PostScript) format at <code>/usr/local/etc/freeside/conf.<i>your_datasrc</i>/logo.eps</code>.
+        <li>Edit the <b>invoice_latexfooter</b>, <b>invoice_latexnotes</b>, and <b>invoice_latexsmallfooter</b> configuration files.  If you are adventurous, edit <b>invoice_latex</b> as well.
       </ul>
     <li>Plaintext invoice templates
       <ul>
@@ -30,13 +30,6 @@
 <!--            <li>$overdue - true if this invoice is overdue -->
           </ul>
       </ul>
-    <li>HTML invoice templates
-      <ul>
-        <li>Place your logo in PNG format at <code>/usr/local/etc/freeside/conf.<i>your_datasrc</i>/logo.png</code>.
-        <li>HTML invoices also use <a href="http://search.cpan.org/~mjd/Text-Template/lib/Text/Template.pm">Text::Template</a>.
-        <li>Edit the <b>invoice_html</b> configuration option.
-        <li>The following configuration options can be set to override the default behaviour of using the invoice_latex* data: <b>invoice_htmlreturnaddress</b>, and <b>invoice_htmlfooter</b>, <b>invoice_htmlnotes</b>.  
-      </ul>
 <!--    <li>Batch credit card processing
       <ul>
         <li>After <a href="man/bin/freeside-daily.html"><b>freeside-daily</b></a> is run, a credit card batch will be in the <a href="schema.html#cust_pay_batch">cust_pay_batch</a> table.  Export this table to your credit card batching.
diff --git a/httemplate/docs/cvv2.html b/httemplate/docs/cvv2.html
index 7670985..fe8a17f 100644
--- a/httemplate/docs/cvv2.html
+++ b/httemplate/docs/cvv2.html
@@ -20,5 +20,6 @@
         <IMG BORDER=0 ALT="American Express" SRC="../images/cvv2_amex.png">
       </TD>
   </TABLE>
+    <CENTER><A HREF="javascript:close()">(close window)</A></CENTER>
   </BODY>
 </HTML>
diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html
index 7254d76..d0151ed 100644
--- a/httemplate/docs/index.html
+++ b/httemplate/docs/index.html
@@ -7,12 +7,11 @@
 <h3>Installation and upgrades</h3>
 <ul>
   <li><a href="install.html">New Installation</a>
-  <li><a href="install-rt.html">Installing integrated RT ticketing</a>
   <li><a href="upgrade7.html">Upgrading from 1.3.0 to 1.3.1</a>
   <li><a href="upgrade8.html">Upgrading from 1.3.1 to 1.4.0</a>
   <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
   <li><a href="upgrade-1.4.2.html">Upgrading from 1.4.1 to 1.4.2</a>
-  <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2) to 1.5.7</a>
+  <li><a href="upgrade10.html">Upgrading from 1.4.1 (or 1.4.2?) to 1.5.0</a>
 </ul>
 <h3>Configuration and setup</h3>
 <ul>
diff --git a/httemplate/docs/install-rt.html b/httemplate/docs/install-rt.html
deleted file mode 100644
index da0941a..0000000
--- a/httemplate/docs/install-rt.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<head>
-  <title>Installing integrated RT ticketing</title>
-</head>
-<body>
-<h1>Installing integrated RT ticketing</h1>
-
-<p><i>Integrated ticketing is an new feature and these instructions are preliminary.  Documentation contributions are welcome.</i>
-
-<p><i>There is also support for running this integration against an external RT installation, but it is not (yet) documented.</i>
-
-<p>Perl minimum version 5.8.3 is required.  HTML::Mason is required.
-
-<p>Install the following perl modules:
-  <ul>
-    <li><a href="http://search.cpan.org/search?dist=Apache-Session">Apache::Session</a>
-    <li><a href="http://search.cpan.org/search?dist=HTML-Tree">HTML::TreeBuilder (HTML-Tree)</a>
-    <li><a href="http://search.cpan.org/search?dist=HTML-Format">HTML::FormatText (HTML-Format)</a>
-    <li><a href="http://search.cpan.org/search?dist=Test-Inline">Test::Inline</a>
-    <li><a href="http://search.cpan.org/search?dist=Class-ReturnValue">Class::ReturnValue</a>
-    <li><a href="http://search.cpan.org/search?dist=DBIx-SearchBuilder">DBIx::SearchBuilder</a>
-    <li><a href="http://search.cpan.org/search?dist=Log-Dispatch">Log::Dispatch</a>
-    <li><a href="http://search.cpan.org/search?dist=Locale-Maketext-Lexicon">Locale::Maketext::Lexicon</a>
-    <li><a href="http://search.cpan.org/search?dist=Locale-Maketext-Fuzzy">Locale::Maketext::Fuzzy</a>
-    <li><a href="http://search.cpan.org/search?dist=Text-Wrapper">Text::Wrapper</a>
-    <li><a href="http://search.cpan.org/search?dist=Time-modules">Time::ParseDate (Time-modules)</a>
-    <li><a href="http://search.cpan.org/search?dist=TermReadKey">Term::ReadKey (TermReadKey)</a>
-    <li><a href="http://search.cpan.org/search?dist=Text-Autoformat">Text::Autoformat</a>
-    <li><a href="http://search.cpan.org/search?dist=Text-Quoted">Text::Quoted</a>
-    <li><a href="http://search.cpan.org/search?dist=Regexp-Common">Regexp::Common</a>
-    <li><a href="http://search.cpan.org/search?dist=HTML-Scrubber">HTML::Scrubber</a>
-    <li><a href="http://search.cpan.org/search?dist=Tree-Simple">Tree::Simple</a>
-  </ul>
-
-<p>Create a new Unix group called 'rt'
-
-<p>Edit the top-level Makefile, set RT_ENABLED to 1 and set the RT_DOMAIN, RT_TIMEZONE, and FREESIDE_URL variables.
-
-<p><pre>make configure-rt
-make create-rt
-make install-rt
-</pre>
-
-<p>Add the following to your httpd.conf:
-<pre>
-# replace /var/www/freeside with your freeside document root
-&lt;DirectoryMatch "^/var/www/freeside/rt/.*NoAuth"&gt;
-&lt;Limit GET POST&gt;
-allow from all
-Satisfy any   
-SetHandler perl-script
-PerlHandler HTML::Mason
-&lt;/Limit&gt;
-&lt;/DirectoryMatch&gt;
-# replace /var/www/freeside with your freeside document root
-&lt;DirectoryMatch "^/var/www/freeside/rt/.*NoAuth/images"&gt;
-SetHandler None
-&lt;/DirectoryMatch&gt;
-# replace /var/www/freeside with your freeside document root
-&lt;Directory /var/www/freeside/rt/Ticket/Attachment&gt; 
-SetHandler perl-script 
-PerlHandler HTML::Mason 
-&lt;/Directory&gt;
-</pre>
-
-<p>Set the <b>ticket_system</b> configuration value to <b>RT_Internal</b>.  You may also wish to set <b>ticket_system-default_queueid</b> once you have RT configured.
-
-<p>Bootstrap RT's permissions:
-  <ul>
-    <li>Click on "Ticketing Main" on the Freeside main menu to auto-create an RT login for your username
-    <li>Run <code>freeside-adduser -h /usr/local/etc/freeside/htpasswd root</code> and set a (temporary) password
-    <li>Log into your Freeside installation as the "root" user you just created, by closing your browser or using <code>https://root@yourmachone/freeside/</code> syntax.
-    <li>Click on "Ticketing Main" on the Freeside main menu.  Click on "Configuration", then "Global", and then "User Rights".  Grant the "SuperUser" right to your RT login.
-    <li>Remove the temporary "root" user from /usr/local/etc/freeside/mapsecrets and /usr/local/etc/freeside/htpasswd
-  </ul>
-
-<p>Follow the <A HREF="http://wiki.bestpractical.com/">regular RT documentation</A> to configure RT, setup the mailgate, etc.
-
-</body>
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index 1f80db1..86e2a6b 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -14,65 +14,51 @@ Before installing, you need:
   <li>Optional, enables typeset invoices: teTeX and Ghostscript (included with most distributions).
   <li>A <b>transactional</b> database engine <a href="http://search.cpan.org/search?mode=module&query=DBD%3A%3A">supported</a> by Perl's <a href="http://dbi.perl.org">DBI</a>.
     <ul>
-      <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended (v7.2 or later, 7.4 or later recommended).
-      <li> <a href="http://www.mysql.com/">MySQL</a> is <b>not currently supported</b>.  <FONT SIZE="-1"><i>Developers intersted in maintaining MySQL support are welcome to ask on the -devel mailing list; many things work, but MySQL support needs a maintainer to update it for recent (and future) changes.</i></FONT>
-      <!-- <li><a href="http://www.mysql.com/">MySQL</a> <b>MINIMUM VERSION 4.1</b> is untested but may work.   Versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.
-<!--       <li>MySQL has been reported to work.
-         MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported.  You <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>.  Set it as the default table type using the <code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
--->
+      <li><a href="http://www.postgresql.org/">PostgreSQL</a> is recommended (v7or later).
+      <li><a href="http://www.mysql.com/">MySQL</a> <b>MINIMUM VERSION 4.1</b> is untested but may work.   Versions before 4.1 do not support standard SQL subqueries and are <b>NOT SUPPORTED</b>.<!--  If you are a developer who wishes to contribute MySQL 3.x/4.0 support, see <a href="http://pouncequick.420.am/rt/Ticket/Display.html?id=438">ticket #438</a> in the bug-tracking system and ask on the -devel mailing list. -->
+<!--       <li>MySQL has been reported to work. -->
+         MySQL's default <a href="http://www.mysql.com/doc/M/y/MyISAM.html">MyISAM</a> and <a href="http://www.mysql.com/doc/I/S/ISAM.html">ISAM</a> table types are not supported.  You <b>must</b> use one of the new <a href="http://www.mysql.com/doc/T/a/Table_types.html">transaction-safe table types</a> such as <!-- <a href="http://www.mysql.com/doc/B/D/BDB.html">BDB</a> or --><a href="http://www.mysql.com/doc/I/n/InnoDB.html">InnoDB</a>.  Set it as the default table type using the <!-- <code>--default-table-type=BDB</code> or --><code>--default-table-type=InnoDB</code> <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Command-line_options">mysqld command-line option</a> or by setting <!--<code>default-table-type=BDB</code> or --><code>default-table-type=InnoDB</code> in the <a href="http://www.mysql.com/documentation/mysql/bychapter/manual_MySQL_Database_Administration.html#Option_files">my.cnf option file</a>.
     </ul>
-    <i>Note: the above only applies to the database used by the Freeside software itself. Freeside can integrate with RADIUS and other servers running MySQL <!--(any version)--> or any other DBI-supported database.</i>
   <li>Perl modules (<a href="http://search.cpan.org/~andk/CPAN/lib/CPAN.pm">CPAN</a> will query, download and build perl modules automatically)
     <ul>
-<!--      <li><a href="http://search.cpan.org/dist/Array-PrintCols">Array-PrintCols</a>
-      <li><a href="http://search.cpan.org/dist/Term-Query">Term-Query</a> (make test broken; install manually) -->
-      <li><a href="http://search.cpan.org/dist/MIME-Base64">MIME-Base64</a>
-      <li><a href="http://search.cpan.org/dist/Digest-MD5">Digest-MD5</a>
-<!--      <li><a href="http://search.cpan.org/dist/MD5">MD5</a> -->
-      <li><a href="http://search.cpan.org/dist/URI">URI</a>
-      <li><a href="http://search.cpan.org/dist/HTML-Tagset">HTML-Tagset</a>
-      <li><a href="http://search.cpan.org/dist/HTML-Parser">HTML-Parser</a>
-      <li><a href="http://search.cpan.org/dist/libnet">libnet</a>
-      <li><a href="http://search.cpan.org/dist/Locale-Codes">Locale-Codes</a>
-      <li><a href="http://search.cpan.org/dist/Net-Whois-Raw">Net-Whois-Raw</a>
-      <li><a href="http://search.cpan.org/dist/libwww-perl">libwww-perl</a>
-      <li><a href="http://search.cpan.org/dist/Business-CreditCard">Business-CreditCard</a>
-<!--      <li><a href="http://search.cpan.org/dist/Data-ShowTable">Data-ShowTable</a> -->
-      <li><a href="http://search.cpan.org/dist/MailTools">MailTools</a>
-      <li><a href="http://search.cpan.org/dist/TimeDate">TimeDate</a>
-      <li><a href="http://search.cpan.org/dist/DateManip">DateManip</a>
-      <li><a href="http://search.cpan.org/dist/File-CounterFile">File-CounterFile</a>
-      <li><a href="http://search.cpan.org/dist/FreezeThaw">FreezeThaw</a>
-      <li><a href="http://search.cpan.org/dist/String-Approx">String-Approx</a>
-      <li><a href="http://search.cpan.org/dist/Text-Template">Text-Template</a>
-      <li><a href="http://search.cpan.org/dist/DBI">DBI</a>
-      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/dist/DBD-Pg">DBD::Pg</a> for PostgreSQL<!--, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL-->)
-<!--      <li><a href="http://search.cpan.org/dist/DBIx-DataSource">DBIx-DataSource</a> -->
-      <li><a href="http://search.cpan.org/dist/DBIx-DBSchema">DBIx-DBSchema</a>
-      <li><a href="http://search.cpan.org/dist/Net-SSH">Net-SSH</a>
-      <li><a href="http://search.cpan.org/dist/String-ShellQuote">String-ShellQuote</a>
-      <li><a href="http://search.cpan.org/dist/Net-SCP">Net-SCP</a>
+<!--      <li><a href="http://search.cpan.org/search?dist=Array-PrintCols">Array-PrintCols</a>
+      <li><a href="http://search.cpan.org/search?dist=Term-Query">Term-Query</a> (make test broken; install manually) -->
+      <li><a href="http://search.cpan.org/search?dist=MIME-Base64">MIME-Base64</a>
+      <li><a href="http://search.cpan.org/search?dist=Digest-MD5">Digest-MD5</a>
+<!--      <li><a href="http://search.cpan.org/search?dist=MD5">MD5</a> -->
+      <li><a href="http://search.cpan.org/search?dist=URI">URI</a>
+      <li><a href="http://search.cpan.org/search?dist=HTML-Tagset">HTML-Tagset</a>
+      <li><a href="http://search.cpan.org/search?dist=HTML-Parser">HTML-Parser</a>
+      <li><a href="http://search.cpan.org/search?dist=libnet">libnet</a>
+      <li><a href="http://search.cpan.org/search?dist=Locale-Codes">Locale-Codes</a>
+      <li><a href="http://search.cpan.org/search?dist=Net-Whois-Raw">Net-Whois-Raw</a>
+      <li><a href="http://search.cpan.org/search?dist=libwww-perl">libwww-perl</a>
+      <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
+<!--      <li><a href="http://search.cpan.org/search?dist=Data-ShowTable">Data-ShowTable</a> -->
+      <li><a href="http://search.cpan.org/search?dist=MailTools">MailTools</a>
+      <li><a href="http://search.cpan.org/search?dist=TimeDate">TimeDate</a>
+      <li><a href="http://search.cpan.org/search?dist=DateManip">DateManip</a>
+      <li><a href="http://search.cpan.org/search?dist=File-CounterFile">File-CounterFile</a>
+      <li><a href="http://search.cpan.org/search?dist=FreezeThaw">FreezeThaw</a>
+      <li><a href="http://search.cpan.org/search?dist=String-Approx">String-Approx</a>
+      <li><a href="http://search.cpan.org/search?dist=Text-Template">Text-Template</a>
+      <li><a href="http://search.cpan.org/search?dist=DBI">DBI</a>
+      <li><a href="http://search.cpan.org/search?mode=module&query=DBD">DBD for your database engine</a> (<a href="http://search.cpan.org/search?dist=DBD-Pg">DBD::Pg</a> for PostgreSQL, <a href="http://search.cpan.org/search?dist=DBD-mysql">DBD::mysql</a> for MySQL)
+<!--      <li><a href="http://search.cpan.org/search?dist=DBIx-DataSource">DBIx-DataSource</a> -->
+      <li><a href="http://search.cpan.org/search?dist=DBIx-DBSchema">DBIx-DBSchema</a>
+      <li><a href="http://search.cpan.org/search?dist=Net-SSH">Net-SSH</a>
+      <li><a href="http://search.cpan.org/search?dist=String-ShellQuote">String-ShellQuote</a>
+      <li><a href="http://search.cpan.org/search?dist=Net-SCP">Net-SCP</a>
       <li><a href="http://www.masonhq.com/">HTML::Mason</a> (recommended, enables full functionality) or <a href="http://www.apache-asp.org/">Apache::ASP</a> (deprecated, integrated RT ticketing will not be available)
-      <li><a href="http://search.cpan.org/dist/Tie-IxHash">Tie-IxHash</a>
-      <li><a href="http://search.cpan.org/dist/Time-Duration">Time-Duration</a>
-      <li><a href="http://search.cpan.org/dist/HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
-      <li><a href="http://search.cpan.org/dist/Storable">Storable</a>
-      <li><a href="http://search.cpan.org/dist/Cache-Cache">Cache::Cache</a>
-      <li><a href="http://search.cpan.org/dist/NetAddr-IP">NetAddr-IP</a>
-      <li><a href="http://search.cpan.org/dist/Chart">Chart</a>
-      <li><a href="http://search.cpan.org/dist/Crypt-PasswdMD5">Crypt::PasswdMD5</a>
-      <li><a href="http://search.cpan.org/dist/Locale-SubCountry">Locale::SubCountry</a>
-      <li><a href="http://search.cpan.org/dist/Frontier-RPC">Frontier::RPC</a>
-      <li><a href="http://search.cpan.org/dist/Text-CSV_XS">Text::CSV_XS</a>
-      <li><a href="http://search.cpan.org/dist/Spreadsheet-WriteExcel">Spreadsheet::WriteExcel</a>
-      <li><a href="http://search.cpan.org/dist/IO-stringy">IO-stringy (IO::Scalar)</a>
-      <li><a href="http://search.cpan.org/dist/Frontier-RPC">Frontier::RPC (Frontier::RPC2)</a>
-      <li><a href="http://search.cpan.org/dist/MIME-tools">MIME::Entity (MIME-tools)</a>
-      <li><a href="http://search.cpan.org/dist/IPC-Run3">IPC::Run3</a>
-      <li><a href="http://search.cpan.org/dist/Term-ReadKey">Term::ReadKey</a>
-<!--      <li><a href="http://search.cpan.org/dist/Crypt-YAPassGen">Crypt::YAPassGen</a> -->
-      <li><a href="http://search.cpan.org/search?mode=module&query=MIME::Entity">Fax::Hylafax::Client</a> <i>(Required if using FAX invoice destinations)</i>
-      <li><a href="http://search.cpan.org/dist/ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
+      <li><a href="http://search.cpan.org/search?dist=Tie-IxHash">Tie-IxHash</a>
+      <li><a href="http://search.cpan.org/search?dist=Time-Duration">Time-Duration</a>
+      <li><a href="http://search.cpan.org/search?dist=HTML-Widgets-SelectLayers">HTML-Widgets-SelectLayers</a>
+      <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
+<!-- MyAccounts, maybe only for dev     <li><a href="http://search.cpan.org/search?dist=Cache-Cache">Cache::Cache</a> -->
+      <li><a href="http://search.cpan.org/search?dist=NetAddr-IP">NetAddr-IP</a>
+      <li><a href="http://search.cpan.org/search?dist=Chart">Chart</a>
+      <li><a href="http://search.cpan.org/search?dist=Crypt-PasswdMD5">Crypt::PasswdMD5</a>
+      <li><a href="http://search.cpan.org/search?dist=ApacheDBI">Apache::DBI</a> <i>(optional but recommended for better webinterface performance)</i>
     </ul>
 </ul>
 Install the Freeside distribution:
@@ -126,49 +112,46 @@ $ su
 </ul>
 <table>
   <tr>
-    <th>Mason (recommended)</th><th>Apache::ASP (deprecated)</th>
+    <th>Apache::ASP</th><th>Mason</th>
   </tr>
   <tr>
-
     <td valign="top"><ul>
       <li>Configure Apache:
 <font size="-1"><pre>
-PerlModule HTML::Mason
-# your freeside docuemnt root
+PerlModule Apache::ASP
+# your freeside document root
 &lt;Directory&nbsp;/var/www/freeside&gt;
 &lt;Files ~ (\.cgi|\.html)&gt;
 AddHandler perl-script .cgi .html
-PerlHandler HTML::Mason
+PerlHandler Apache::ASP
 &lt;/Files&gt;
 &lt;Perl&gt;
-require&nbsp;"/usr/local/etc/freeside/handler.pl";
+$MLDBM::RemoveTaint = 1;
 &lt;/Perl&gt;
+PerlSetVar&nbsp;Global&nbsp;/usr/local/etc/freeside/asp-global/
+PerlSetVar&nbsp;Debug&nbsp;2
+PerlSetVar&nbsp;RequestBinaryRead&nbsp;Off
+# your freeside document root
+PerlSetVar&nbsp;IncludesDir&nbsp;/var/www/freeside
 &lt;/Directory&gt;
 </pre></font>
     </ul></td>
-
     <td valign="top"><ul>
       <li>Configure Apache:
 <font size="-1"><pre>
-PerlModule Apache::ASP
-# your freeside document root
+PerlModule HTML::Mason
+# your freeside docuemnt root
 &lt;Directory&nbsp;/var/www/freeside&gt;
 &lt;Files ~ (\.cgi|\.html)&gt;
 AddHandler perl-script .cgi .html
-PerlHandler Apache::ASP
+PerlHandler HTML::Mason
 &lt;/Files&gt;
 &lt;Perl&gt;
-$MLDBM::RemoveTaint = 1;
+require&nbsp;"/usr/local/etc/freeside/handler.pl";
 &lt;/Perl&gt;
-PerlSetVar&nbsp;Global&nbsp;/usr/local/etc/freeside/asp-global/
-PerlSetVar&nbsp;Debug&nbsp;2
-PerlSetVar&nbsp;RequestBinaryRead&nbsp;Off
-# your freeside document root
-PerlSetVar&nbsp;IncludesDir&nbsp;/var/www/freeside
 &lt;/Directory&gt;
 </pre></font>
     </ul></td>
-
   </tr>
 </table>
 <ul>
@@ -186,16 +169,12 @@ require valid-user
     <ul>
       <li>First user:<font size="-1">
 <pre>$ su
-# <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -c -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
+$ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -c -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
       <li>Additional users:<font size="-1">
 <pre>$ su
-# <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
+$ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
     </ul>
   <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt>)</i>
-  <li>Create the Freeside system users:
-<pre>$ su
-# <a href="man/bin/freeside-adduser.html">freeside-adduser</a> fs_queue
-# <a href="man/bin/freeside-adduser.html">freeside-adduser</a> fs_selfservice</pre>
   <li>As the freeside UNIX user, run <tt>freeside-setup <b>username</b></tt> to create the database tables, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside
diff --git a/httemplate/docs/schema.dia b/httemplate/docs/schema.dia
index e00f59c..7465615 100644
--- a/httemplate/docs/schema.dia
+++ b/httemplate/docs/schema.dia
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index cdb59a2..c5cfd51 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -23,7 +23,6 @@
       </ul>
     <li><a name="cust_bill" href="man/FS/cust_bill.html">cust_bill</a> - Invoices.  Declarations that a customer owes you money.  The specific charges are itemized in <a href="#cust_bill_pkg">cust_bill_pkg</a>.
       <ul>
-        <li>billpkgnum - primary_key
         <li>invnum - primary key
         <li>custnum - <a href="#cust_main">customer</a>
         <li>_date
@@ -286,18 +285,6 @@
         <li>optionname - option name
         <li>optionvalue - option value
       </ul>
-    <li><a name="reg_code" href="man/FS/reg_code.html">reg_code</A> - One-time registration codes
-      <ul>
-        <li>codenum - primary key
-        <li>code
-        <li>agentnum - <a href="#agent">Agent</a>
-      </ul>
-    <li><a name="reg_code_pkg" href="man/FS/reg_code_pkg.html">reg_code_pkg</A> - Registration code link to package definitions
-      <ul>
-        <li>codepkgnum - primary key
-        <li>codenum - <a href="#reg_code">Registration code</a>
-        <li>pkgpart - <a href="#part_pkg">Package definition</a>
-      </ul>
     <li><a name="part_referral" href="man/FS/part_referral.html">part_referral</a> - Referral listing
       <ul>
         <li>refnum - primary key
@@ -323,7 +310,6 @@
       </ul>
     <li><a name="pkg_svc" href="man/FS/pkg_svc.html">pkg_svc</a>
       <ul>
-        <li>pkgsvcnum - primary key
         <li>pkgpart - <a href="#part_pkg">Package definition</a>
         <li>svcpart - <a href="#part_svc">Service definition</a>
         <li>quantity - quantity of this service that this package includes
@@ -356,13 +342,11 @@
         <li>nasport - port number on the NAS
         <li>nasnum - <a href="#nas">NAS</a>
       </ul>
-    <li><a name="prepay_credit" href="man/FS/prepay_credit.html">prepay_credit</a> - prepaid cards
+    <li><a name="prepay_credit" href="man/FS/prepay_credit.html">prepay_credit</a>
       <ul>
         <li>prepaynum - primary key
-        <li>identifier - text or numeric string of prepaid card
-        <li>amount - amount of prepayment
-        <li>seconds - prepaid time instead of (or in addition to) monetary value
-        <li>agentnum - optional agent assignment for prepaid cards
+        <li>identifier - text or numeric string used to receive this credit
+        <li>amount - amount of credit
       </ul>
     <li><a name="session" href="man/FS/session.html">session</a>
       <ul>
@@ -440,7 +424,6 @@
       </ul>
     <li><a name="type_pkgs" href="man/FS/type_pkgs.html">type_pkgs</a>
       <ul>
-        <li>typepkgnum - primary key
         <li>typenum - <a href="#agent_type">agent type</a>
         <li>pkgpart - <a href="#part_pkg">Package definition</a>
       </ul>
@@ -478,7 +461,6 @@
       </ul>
     <li><a name="rate_detail" href="man/FS/rate_detail.html">rate_detail</a> - Call rate detail
       <ul>
-        <li>ratedetailnum - primary key
         <li>ratenum - <a href="#rate">rate plan</a>
         <li>orig_regionnum - call origination <a href="#rate_region">region</a>
         <li>dest_regionnum - call destination <a href="#rate_region">region</a>
@@ -494,7 +476,7 @@
     <li><a name="rate_prefix" href="man/FS/rate_prefix.html">rate_prefix</a> - Call rate prefix
       <ul>
         <li>prefixnum - primary key
-        <li>regionnum - <a href="#rate_region">rate region</a>
+        <li>regionnum <a href="#rate_region">rate region</a>
         <li>countrycode
         <li>npa
         <li>nxx
@@ -506,18 +488,5 @@
         <li>locale - locale
         <li>msg - Message text
       </ul>
-    <li><a name="clientapi_session" href="man/FS/clientapi_session.html">clientapi_session</a> - ClientAPI session store
-      <ul>
-        <li>sessionnum - primary key
-        <li>sessionid - session ID
-        <li>namespace - session namespace
-      </ul>
-    <li><a name="clientapi_session_field" href="man/FS/clientapi_session_field.html">clientapi_session_field</a> - Client API session store data
-      <ul>
-        <li>fieldnum - primary key
-        <li>sessionnum - <a href="#session">session</a>
-        <li>fieldname
-        <li>fieldvalue
-      </ul>
   </ul>
 </body>
diff --git a/httemplate/docs/selfservice.html b/httemplate/docs/selfservice.html
index 9dc8f2a..e533ed2 100644
--- a/httemplate/docs/selfservice.html
+++ b/httemplate/docs/selfservice.html
@@ -14,38 +14,24 @@ machine, not the backend Freeside server.  On the public machine, install:
   <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
   <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
   <li><a href="http://search.cpan.org/search?dist=HTTP-BrowserDetect">HTTP::BrowserDetect</a>
-  <li><a href="http://search.cpan.org/search?dist=HTML-Parser">HTML::Parser</a>
 
   <li><a href="man/FS/SelfService.html">FS::SelfService</a> (copy the fs_selfservice/FS-SelfService directory to the external machine, then: perl Makefile.PL; make; make install)
+  <li><a href="man/FS/SignupClient.html">FS::SignupClient</a> (copy the fs_signup/FS-SignupClient directory to the external machine, then: perl Makefile.PL; make; make install)
 </ul>
 Then:
 <ul>
   <li>Set the <a href="../config/config.cgi#unclassified"><i>signup_server-default_agentnum</i></a> configuration value to a default <a href="../browse/agent.cgi">agent number</a>.
-  <li>Set the <a href="../config/config.cgi#unclassified"><i>signup_server-default_refnum</i></a> configuration value to a default <a href="../browse/part_referral.cgi">advertising source</a>.
-  <li>Set the <a href="../config/config.cgi#unclassified"><i>signup_server-payby</i></a> configuration value to the acceptable payment types for signups.
-  <li>Set the <a href="../config/config.cgi#unclassified"><i>signup_server-realtime</i></a> configuration value to run billing for signups immediately.
+  <li>Set the <a href="../config/config.cgi#unclassified"><i>signup_server-default_refnum</i></a> to a default <a href="../browse/part_referral.cgi">advertising source</a>.
   <li>Add the user `freeside' to the the external machine.
-  <li>Copy or symlink the <code>fs_selfservice/FS-SelfService/cgi/</code> directory into the web server's document space.  Optionally, customize the .html templates.  "Entry points" (useful places to link to) are:
-    <ul>
-      <li>signup.cgi - Signup
-      <li>selfservice.cgi - Customer self-service
-      <li>agent.cgi - Reseller interface
-      <li>passwd.cgi - Simple password-changing interface
-      <li>promocode.html - Promotional code pre-signup
-      <li>regcode.html - Registration code pre-signup
-      <li>stateselect.html - State selection pre-signup
-    </ul>
-  <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>), for example: <pre>
-#directory where selfservice .cgi scripts and .html templates are located
-&lt;Directory /var/www/selfservice&gt;
-AddHandler cgi-script .cgi
-Options +ExecCGI
-&lt;/Directory&gt;</pre>
+  <li>Copy or symlink the <pre>fs_selfservice/FS-SelfService/cgi/</pre> directory into the web server's document space, for customer self-service and reseller access.  Optionally, customize the .html templates.
+  <li>Copy or symlink the <pre>fs_signup/FS-SignupClient/cgi/</pre> directory into the web server's document space, for signups. Optionally, customize the .html templates.
+  <li>When linking to signup.cgi, you can include a referring custnum in the URL as follows: <code>http://public.web.server/path/signup.cgi?ref=1542</code>
+  <li>Enable CGI execution for files with the `.cgi' extension.  (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
   <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
-  <li>touch /usr/local/freeside/selfservice_socket; chown freeside /usr/local/freeside/selfservice_socket; chmod 600 /usr/local/freeside/selfservice_socket
-  <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> to run signup.cgi, selfservice.cgi, agent.cgi and passwd.cgi as the freeside user.  <b>Do not run your public web server as the freeside user!</b>
+  <li>touch /usr/local/freeside/fs_signupd_socket; chown freeside /usr/local/freeside/fs_signupd_socket; chmod 600 /usr/local/freeside/fs_signupd_socket
+  <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run signup.cgi, selfservice.cgi, agent.cgi and passwd.cgi as the freeside user.
   <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
-  <li>Run an instance of <pre>freeside-selfservice-server <i>user</i> <i>machine</i></pre> on the Freeside machine for each external machine.
+  <li>Run an instance of <pre>freeside-selfservice-server <i>user</i> <i>machine</i> <i>agentnum</i> <i>refnum</i></pre> on the Freeside machine for each external machine.
   <ul>
     <li><i>user</i> is a user from the mapsecrets file.
     <li><i>machine</i> is the name of the external machine.
@@ -55,12 +41,8 @@ Options +ExecCGI
 </ul>
 Optional:
 <ul>
-  <li>You can install the files in the <code>fs_selfservice/FS-SelfService/cgi/</code> directory multiple places in your web server's document space, and customize the .html templates differently for each.  You can set the agentnum used for each signup by editing signup.html and including a hidden field with the agentnum:
-  <pre>
-  &lt;INPUT TYPE="hidden" NAME="agentnum" VALUE="3"&gt;</pre>
-  <li>When linking to signup.cgi, you can include a referring custnum in the URL as follows: <code>http://public.web.server/path/signup.cgi?ref=1542</code>
   <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
-  (an example file is included as <b>fs_selfservice/FS-SelfService/ieak.template</b>)  See the section on <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/INS.HTM">internet settings files</a> in the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.
+  (an example file is included as <b>fs_signup/ieak.template</b>)  See the section on <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/INS.HTM">internet settings files</a> in the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.
 <!--  <li>If you create a <b>/usr/local/freeside/success.html</b> file on the external machine, it will be used as the success HTML page.  Although template substiutions are available, a regular HTML file will work fine here, unlike signup.html.  An example file is included as <b>fs_signup/FS-SignupClient/cgi/success.html</b>-->
   <li>Variable substitutions available in <b>ieak.template</b> and <b>success.html</b>:
     <ul>
diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html
index ac2c623..d818685 100644
--- a/httemplate/docs/upgrade10.html
+++ b/httemplate/docs/upgrade10.html
@@ -1,44 +1,259 @@
 <pre>
 this is incomplete
 
-NOTE: Version numbering has been simplified.  1.5.7 is the version after
-1.5.0pre6.  It is still a development version - releases with odd numbered 
-middle parts (NN in x.NN.x) are development versions, like Perl or Linux.
-
-If migrating from 1.5.7, see README.1.5.8 instead
-
-If migrating from 1.5.0pre6, see README.1.5.7 instead
-
-install DBD::Pg 1.32, 1.41 or later (not 1.40) (or, if you're using a Perl version before 5.6, you could try installing DBD::Pg 1.22 with <a href="http://420.am/~ivan/DBD-Pg-1.22-fixvercmp.patch">this patch</a> and commenting out the "use DBD::Pg 1.32" at the top of DBIx/DBSchema/DBD/Pg.pm)
-install DBIx::DBSchema 0.27 (or later)
-  (if you are running Pg version 7.2.x or earlier, install at least
-   DBIx::DBSchema 0.29)
+install DBD::Pg 1.32 (or, if you're using a Perl version before 5.6, you could try installing DBD::Pg 1.22 with <a href="http://420.am/~ivan/DBD-Pg-1.22-fixvercmp.patch">this patch</a> and commenting out the "use DBD::Pg 1.32" at the top of DBIx/DBSchema/DBD/Pg.pm)
+install DBIx::DBSchema 0.23
 install Net::SSH 0.08
-install HTML::Widgets::SelectLayers 0.05
-install Business::CreditCard 0.28
-
 - If using Apache::ASP, add PerlSetVar RequestBinaryRead Off and PerlSetVar IncludesDir /your/freeside/document/root/ to your Apache configuration and make sure you are using Apache::ASP minimum version 2.55.
 - In httpd.conf, change &lt;Files ~ \.cgi&gt; to  &lt;Files ~ (\.cgi|\.html)&gt;
 - In httpd.conf, change <b>AddHandler perl-script .cgi</b> or <b>SetHandler perl-script</b> to <b>AddHandler perl-script .cgi .html</b>
 
-install NetAddr::IP, Chart::Base, Locale::SubCountry, Text::CSV_XS, 
-Spreadsheet::WriteExcel, IO-stringy (IO::Scalar), Frontier::RPC
-(Frontier::RPC2), MIME::Entity (MIME-tools), IPC::Run3, Net::Whois::Raw,
-JSON and Term::ReadKey
-<!-- and Crypt::YAPassGen-->
+install NetAddr::IP, Chart::Base, IPC::ShareLite and Locale::SubCountry
 
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 20, 'svc_external-id', 'en_US', 'External ID' );
 INSERT INTO msgcat ( msgnum, msgcode, locale, msg ) VALUES ( 21, 'svc_external-title', 'en_US', 'Title' );
 
-DROP INDEX cust_bill_pkg1;
+CREATE TABLE cust_bill_pkg_detail (
+  detailnum serial,
+  pkgnum int NOT NULL,
+  invnum int NOT NULL,
+  detail varchar(80),
+  PRIMARY KEY (detailnum)
+);
+CREATE INDEX cust_bill_pkg_detail1 ON cust_bill_pkg_detail ( pkgnum, invnum );
 
-On recent Pg versions:
+CREATE TABLE part_virtual_field (
+  vfieldpart int NOT NULL,
+  dbtable varchar(32) NOT NULL,
+  name varchar(32) NOT NULL,
+  check_block text,
+  list_source text,
+  length integer,
+  label varchar(80),
+  PRIMARY KEY (vfieldpart)
+);
+
+CREATE TABLE virtual_field (
+  recnum integer NOT NULL,
+  vfieldpart integer NOT NULL,
+  value varchar(128) NOT NULL,
+  PRIMARY KEY (vfieldpart, recnum)
+);
+
+CREATE TABLE router (
+  routernum serial,
+  routername varchar(80),
+  svcnum int,
+  PRIMARY KEY (routernum)
+);
+
+CREATE TABLE part_svc_router (
+  svcpart int NOT NULL,
+  routernum int NOT NULL
+);
+
+CREATE TABLE addr_block (
+  blocknum serial,
+  routernum int NOT NULL,
+  ip_gateway varchar(15) NOT NULL,
+  ip_netmask int NOT NULL,
+  PRIMARY KEY (blocknum)
+);
+CREATE UNIQUE INDEX addr_block1 ON addr_block ( blocknum, routernum );
+
+CREATE TABLE svc_broadband (
+  svcnum int NOT NULL,
+  blocknum int NOT NULL,
+  speed_up int NOT NULL,
+  speed_down int NOT NULL,
+  ip_addr varchar(15),
+  PRIMARY KEY (svcnum)
+);
+
+CREATE TABLE acct_snarf (
+  snarfnum serial,
+  svcnum int NOT NULL,
+  machine varchar(255) NULL,
+  protocol varchar(80) NULL,
+  username varchar(80) NULL,
+  _password varchar(80) NULL,
+  PRIMARY KEY (snarfnum)
+);
+CREATE INDEX acct_snarf1 ON acct_snarf ( svcnum );
+
+CREATE TABLE svc_external (
+  svcnum int NOT NULL,
+  id int,
+  title varchar(80),
+  PRIMARY KEY (svcnum)
+);
+
+CREATE TABLE part_pkg_temp (
+    pkgpart serial NOT NULL,
+    pkg varchar(80) NOT NULL,
+    "comment" varchar(80) NOT NULL,
+    setup text NULL,
+    freq varchar(80) NOT NULL,
+    recur text NULL,
+    setuptax char(1) NULL,
+    recurtax char(1) NULL,
+    plan varchar(80) NULL,
+    plandata text NULL,
+    disabled char(1) NULL,
+    taxclass varchar(80) NULL,
+    PRIMARY KEY (pkgpart)
+);
+INSERT INTO part_pkg_temp SELECT * from part_pkg;
+DROP TABLE part_pkg;
+ALTER TABLE part_pkg_temp RENAME TO part_pkg;
+CREATE INDEX part_pkg1 ON part_pkg(disabled);
+
+On modern Pg:
+ALTER TABLE part_pkg DROP CONSTRAINT part_pkg_temp_pkey;
+ALTER TABLE part_pkg ADD PRIMARY KEY (pkgpart);
+select setval('public.part_pkg_temp_pkgpart_seq', ( select max(pkgpart) from part_pkg) );
+
+Or on Pg versions that don't support DROP CONSTRAINT and ADD PRIMARY KEY (tested on 7.1 and 7.2 so far):
+DROP INDEX part_pkg_temp_pkey;
+CREATE UNIQUE INDEX part_pkg_pkey ON part_pkg (pkgpart);
+probably this one?: select setval('part_pkg_temp_pkgpart_seq', ( select max(pkgpart) from part_pkg) );
+probably not this one?: select setval('part_pkg_pkgpart_seq', ( select max(pkgpart) from part_pkg) );
+
+CREATE TABLE h_part_pkg_temp (
+    historynum serial NOT NULL,
+    history_date int,
+    history_user varchar(80) NOT NULL,
+    history_action varchar(80) NOT NULL,
+    pkgpart int NOT NULL,
+    pkg varchar(80) NOT NULL,
+    "comment" varchar(80) NOT NULL,
+    setup text NULL,
+    freq varchar(80) NOT NULL,
+    recur text NULL,
+    setuptax char(1) NULL,
+    recurtax char(1) NULL,
+    plan varchar(80) NULL,
+    plandata text NULL,
+    disabled char(1) NULL,
+    taxclass varchar(80) NULL,
+    PRIMARY KEY (historynum)
+);
+INSERT INTO h_part_pkg_temp SELECT * from h_part_pkg;
+DROP TABLE h_part_pkg;
+ALTER TABLE h_part_pkg_temp RENAME TO h_part_pkg;
+CREATE INDEX h_part_pkg1 ON h_part_pkg(disabled);
+
+On modern Pg:
+ALTER TABLE h_part_pkg DROP CONSTRAINT h_part_pkg_temp_pkey;
+ALTER TABLE h_part_pkg ADD PRIMARY KEY (historynum);
+select setval('public.h_part_pkg_temp_historynum_seq', ( select max(historynum) from h_part_pkg) );
+
+Or on Pg versions that don't support DROP CONSTRAINT and ADD PRIMARY KEY (tested on 7.1 and 7.2 so far):
+DROP INDEX h_part_pkg_temp_pkey;
+CREATE UNIQUE INDEX h_part_pkg_pkey ON h_part_pkg (historynum);
+probably this one?: select setval('h_part_pkg_temp_historynum_seq', ( select max(historynum) from h_part_pkg) );
+probably not this one?: select setval('h_part_pkg_historynum_seq', ( select max(historynum) from h_part_pkg) );
+
+CREATE TABLE cust_pay_refund (
+    payrefundnum serial NOT NULL,
+    paynum int NOT NULL,
+    refundnum int NOT NULL,
+    _date int NOT NULL,
+    amount decimal(10,2) NOT NULL,
+    PRIMARY KEY (payrefundnum)
+);
+CREATE INDEX cust_pay_refund1 ON cust_pay_refund(paynum);
+CREATE INDEX cust_pay_refund2 ON cust_pay_refund(refundnum);
 
-ALTER TABLE cust_main ALTER COLUMN payinfo varchar(512) NULL;
-ALTER TABLE h_cust_main ALTER COLUMN payinfo varchar(512) NULL;
+CREATE TABLE cust_pay_void (
+  paynum int NOT NULL,
+  custnum int NOT NULL,
+  paid decimal(10,2) NOT NULL,
+  _date int,
+  payby char(4) NOT NULL,
+  payinfo varchar(80),
+  paybatch varchar(80),
+  closed char(1),
+  void_date int,
+  reason varchar(80),
+  otaker varchar(32) NOT NULL,
+  PRIMARY KEY (paynum)
+);
+CREATE INDEX cust_pay_void1 ON cust_pay_void(custnum);
 
-Or on older Pg versions that don't support altering columns directly:
-(dump database, edit & reload)
+CREATE TABLE part_pkg_option (
+  optionnum int primary key,
+  pkgpart int not null,
+  optionname varchar(80) not null,
+  optionvalue text NULL
+);
+CREATE INDEX part_pkg_option1 ON part_export_option ( pkgpart );
+CREATE INDEX part_pkg_option2 ON part_export_option ( optionname );
+
+CREATE TABLE rate (
+    ratenum serial NOT NULL,
+    reatename varchar(80) NOT NULL,
+    PRIMARY KEY (ratenum)
+);
+
+CREATE TABLE rate_detail (
+    ratenum int NOT NULL,
+    orig_regionnum int NULL,
+    dest_regionnum int NOT NULL,
+    min_included int NOT NULL,
+    min_charge decimal(10,2) NOT NULL,
+    sec_granularity int NOT NULL
+);
+CREATE UNIQUE INDEX rate_detail1 ON rate_detail ( ratenum, orig_regionnum, dest_regionnum );
+
+CREATE TABLE rate_region (
+    regionnum serial NOT NULL,
+    regionname varchar(80) NOT NULL,
+    PRIMARY KEY (regionnum)
+);
+
+CREATE TABLE rate_prefix (
+    prefixnum serial NOT NULL,
+    regionnum int NOT NULL, 
+    countrycode varchar(3) NOT NULL,
+    npa varchar(6) NULL,
+    nxx varchar(3) NULL,
+    PRIMARY KEY (prefixnum)
+);
+CREATE INDEX rate_prefix1 ON rate_prefix ( countrycode );
+CREATE INDEX rate_prefix2 ON rate_prefix ( regionnum );
+
+DROP INDEX cust_bill_pkg1;
+
+ALTER TABLE cust_bill_pkg ADD itemdesc varchar(80) NULL;
+ALTER TABLE h_cust_bill_pkg ADD itemdesc varchar(80) NULL;
+ALTER TABLE cust_main_county ADD taxname varchar(80) NULL;
+ALTER TABLE h_cust_main_county ADD taxname varchar(80) NULL;
+ALTER TABLE cust_main_county ADD setuptax char(1) NULL;
+ALTER TABLE h_cust_main_county ADD setuptax char(1) NULL;
+ALTER TABLE cust_main_county ADD recurtax char(1) NULL;
+ALTER TABLE h_cust_main_county ADD recurtax char(1) NULL;
+ALTER TABLE cust_pkg ADD last_bill int NULL;
+ALTER TABLE h_cust_pkg ADD last_bill int NULL;
+ALTER TABLE agent ADD disabled char(1) NULL;
+ALTER TABLE h_agent ADD disabled char(1) NULL;
+ALTER TABLE agent ADD username varchar(80) NULL;
+ALTER TABLE h_agent ADD username varchar(80) NULL;
+ALTER TABLE agent ADD _password varchar(80) NULL;
+ALTER TABLE h_agent ADD _password varchar(80) NULL;
+ALTER TABLE cust_main ADD paycvv varchar(4) NULL;
+ALTER TABLE h_cust_main ADD paycvv varchar(4) NULL;
+ALTER TABLE part_referral ADD disabled char(1) NULL;
+ALTER TABLE h_part_referral ADD disabled char(1) NULL;
+CREATE INDEX part_referral1 ON part_referral ( disabled );
+ALTER TABLE pkg_svc ADD primary_svc char(1) NULL;
+ALTER TABLE h_pkg_svc ADD primary_svc char(1) NULL;
+ALTER TABLE svc_forward ADD src varchar(255) NULL;
+ALTER TABLE h_svc_forward ADD src varchar(255) NULL;
+ALTER TABLE part_pkg ADD promo_code varchar(80) NULL;
+ALTER TABLE h_part_pkg ADD promo_code varchar(80) NULL;
+CREATE INDEX part_pkg2 ON part_pkg ( promo_code );
+CREATE INDEX h_part_pkg2 ON h_part_pkg ( promo_code );
 
 On recent Pg versions:
 
@@ -64,30 +279,26 @@ If you created your database with a version before 1.4.2, dump database, edit:
 - domain_record and h_domain_record: increase recdata from 80 to 255
 then reload
 
-mandatory again:
+optionally:
 
-make install-perl-modules to install the new libraries and CLI utilities
-run "freeside-upgrade username" to create the remaining new tables and columns
+  CREATE INDEX cust_main6 ON cust_main ( daytime );
+  CREATE INDEX cust_main7 ON cust_main ( night );
+  CREATE INDEX cust_main8 ON cust_main ( fax );
+  CREATE INDEX cust_main9 ON cust_main ( ship_daytime );
+  CREATE INDEX cust_main10 ON cust_main ( ship_night );
+  CREATE INDEX cust_main11 ON cust_main ( ship_fax );
+  CREATE INDEX agent2 ON agent ( disabled );
+  CREATE INDEX part_bill_event2 ON part_bill_event ( disabled );
+  CREATE INDEX cust_pay4 ON cust_pay (_date);
 
-optionally:
+  serial columns
 
-CREATE INDEX cust_main4 ON cust_main ( daytime );
-CREATE INDEX cust_main5 ON cust_main ( night );
-CREATE INDEX cust_main6 ON cust_main ( fax );
-CREATE INDEX cust_main7 ON cust_main ( refnum );
-CREATE INDEX cust_main8 ON cust_main ( county );
-CREATE INDEX cust_main9 ON cust_main ( state );
-CREATE INDEX cust_main10 ON cust_main ( country );
-CREATE INDEX cust_main11 ON cust_main ( ship_last );
-CREATE INDEX cust_main12 ON cust_main ( ship_company );
-CREATE INDEX cust_main13 ON cust_main ( ship_daytime );
-CREATE INDEX cust_main14 ON cust_main ( ship_night );
-CREATE INDEX cust_main15 ON cust_main ( ship_fax );
-CREATE INDEX agent2 ON agent ( disabled );
-CREATE INDEX part_bill_event2 ON part_bill_event ( disabled );
-CREATE INDEX cust_pay4 ON cust_pay (_date);
-CREATE INDEX part_referral1 ON part_referral ( disabled );
-CREATE INDEX part_pkg2 ON part_pkg ( promo_code );
-CREATE INDEX h_part_pkg2 ON h_part_pkg ( promo_code );
+mandatory again:
+
+dbdef-create username
+create-history-tables username cust_bill_pkg_detail router part_svc_router addr_block svc_broadband acct_snarf svc_external cust_pay_refund cust_pay_void part_pkg_option rate rate_detail rate_region rate_prefix
+dbdef-create username
+
+apache - fix <Files> sections to include .html also
 
 </pre>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 9ca7cb7..cf60a85 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -149,9 +149,7 @@ CREATE TABLE cust_bill_event (
   eventnum int primary key,
   invnum int not null,
   eventpart int not null,
-  _date int not null,
-  status varchar(80) not null, 
-  statustext text
+  _date int not null
 );
 CREATE UNIQUE INDEX cust_bill_event1 ON cust_bill_event ( eventpart, invnum );
 CREATE INDEX cust_bill_event2 ON cust_bill_event ( invnum );
diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 78dd0fa..9cbab2a 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,4 +1,6 @@
+<!-- mason kludge -->
 <%
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.8 2004-12-22 14:06:45 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -27,24 +29,20 @@ if ( $error ) {
   #$cust_pkg->$_(str2time($cgi->param($_)) foreach qw(setup bill);
   $cust_pkg->setup(str2time($cgi->param('setup')));
   $cust_pkg->bill(str2time($cgi->param('bill')));
-  $cust_pkg->last_bill(str2time($cgi->param('last_bill')));
 }
 
 #my $custnum = $cust_pkg->getfield('custnum');
-%>
-
-<%= header('Customer package - Edit dates') %>
-<%
-#, menubar(
+print header('Package Edit'); #, menubar(
 #  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
 #  'Main Menu' => popurl(2)
 #));
+
 %>
 
-<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
 
 <%
 
@@ -58,106 +56,67 @@ my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment'));
 my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill'));
 my $otaker = $cust_pkg->getfield('otaker');
 
-%>
-
-<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
-
-<% if ( $error ) { %>
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
-<% } %>
+print '<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">',      qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
 
-<%
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!
+  if $error;
 
 #my $format = "%c %z (%Z)";
 my $format = "%m/%d/%Y %T %z (%Z)";
 
-#false laziness w/view/cust_main/packages.html
-#my( $billed_or_prepaid,
-my( $last_bill_or_renewed, $next_bill_or_prepaid_until );
-unless ( $part_pkg->is_prepaid ) {
-  #$billed_or_prepaid = 'billed';
-  $last_bill_or_renewed = 'Last bill';
-  $next_bill_or_prepaid_until = 'Next bill';
-} else {
-  #$billed_or_prepaid = 'prepaid';
-  $last_bill_or_renewed = 'Renewed';
-  $next_bill_or_prepaid_until = 'Prepaid until';
-}
+print ntable("#cccccc",2),
+      '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
+      $pkgnum, '</TD></TR>',
+      '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
+      $pkg,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Comment</TD><TD BGCOLOR="#ffffff">',
+      $comment,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Order taker</TD><TD BGCOLOR="#ffffff">',
+      $otaker,  '</TD></TR>',
+      '<TR><TD ALIGN="right">Setup date</TD><TD>'.
+      '<INPUT TYPE="text" NAME="setup" SIZE=32 ID="setup_text" VALUE="',
+      ( $setup ? time2str($format, $setup) : "" ), '">'.
+      ' <IMG SRC="../images/calendar.png" ID="setup_button" STYLE="cursor: pointer" TITLE="Select date">'.
+      '</TD></TR>';
+
+print '<TR><TD ALIGN="right">Last bill date</TD><TD>',
+      '<INPUT TYPE="text" NAME="last_bill" SIZE=32 ID="last_bill_text" VALUE="',
+      ( $cust_pkg->last_bill
+        ? time2str($format, $cust_pkg->last_bill)
+        : ""                                          ),
+      '">'.
+      ' <IMG SRC="../images/calendar.png" ID="last_bill_button" STYLE="cursor: pointer" TITLE="Select date">'.
+      '</TD></TR>'
+  if $cust_pkg->dbdef_table->column('last_bill');
+
+print '<TR><TD ALIGN="right">Next bill date</TD><TD>',
+      '<INPUT TYPE="text" NAME="bill" SIZE=32 ID="bill_text" VALUE="',
+      ( $bill ? time2str($format, $bill) : "" ), '">'.
+      ' <IMG SRC="../images/calendar.png" ID="bill_button" STYLE="cursor: pointer" TITLE="Select date">'.
+      '</TD></TR>';
+
+print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
+       time2str($format, $susp), '</TD></TR>'
+  if $susp;
+
+#print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
+#       time2str("%D",$expire), '</TD></TR>'
+#  if $expire;
+print '<TR><TD ALIGN="right">Expiration date'.
+      '</TD><TD>',
+      '<INPUT TYPE="text" NAME="expire" SIZE=32 ID="expire_text" VALUE="',
+      ( $expire ? time2str($format, $expire) : "" ), '">'.
+      ' <IMG SRC="../images/calendar.png" ID="expire_button" STYLE="cursor: pointer" TITLE="Select date">'.
+      '<BR><FONT SIZE=-1>(will <b>cancel</b> this package'.
+      ' when the date is reached)</FONT>'.
+      '</TD></TR>';
+
+print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
+       time2str($format, $cancel), '</TD></TR>'
+  if $cancel;
 
 %>
-
-<%= ntable("#cccccc",2) %>
-
-  <TR>
-    <TD ALIGN="right">Package number</TD>
-    <TD BGCOLOR="#ffffff"><%= $pkgnum %></TD>
-  </TR>
-
-  <TR>
-    <TD ALIGN="right">Package</TD>
-    <TD BGCOLOR="#ffffff"><%= $pkg %></TD>
-  </TR>
-
-  <TR>
-    <TD ALIGN="right">Comment</TD>
-    <TD BGCOLOR="#ffffff"><%= $comment %></TD>
-  </TR>
-
-  <TR>
-    <TD ALIGN="right">Order taker</TD>
-    <TD BGCOLOR="#ffffff"><%= $otaker %></TD>
-  </TR>
-
-  <TR>
-    <TD ALIGN="right">Setup date</TD>
-    <TD>
-      <INPUT TYPE="text" NAME="setup" SIZE=32 ID="setup_text" VALUE="<%= ( $setup ? time2str($format, $setup) : "" ) %>">
-      <IMG SRC="../images/calendar.png" ID="setup_button" STYLE="cursor: pointer" TITLE="Select date">
-    </TD>
-  </TR>
-
-  <TR>
-    <TD ALIGN="right"><%= $last_bill_or_renewed %> date</TD>
-    <TD>
-      <INPUT TYPE="text" NAME="last_bill" SIZE=32 ID="last_bill_text" VALUE="<%= ( $cust_pkg->last_bill ? time2str($format, $cust_pkg->last_bill) : "" ) %>">
-      <IMG SRC="../images/calendar.png" ID="last_bill_button" STYLE="cursor: pointer" TITLE="Select date">
-    </TD>
-  </TR>
-
-  <TR>
-    <TD ALIGN="right"><%= $next_bill_or_prepaid_until %> date</TD>
-    <TD>
-      <INPUT TYPE="text" NAME="bill" SIZE=32 ID="bill_text" VALUE="<%= ( $bill ? time2str($format, $bill) : "" ) %>">
-      <IMG SRC="../images/calendar.png" ID="bill_button" STYLE="cursor: pointer" TITLE="Select date">
-    </TD>
-  </TR>
-
-  <% if ( $susp ) { %>
-    <TR>
-      <TD ALIGN="right">Suspension date</TD>
-      <TD BGCOLOR="#ffffff"><%= time2str($format, $susp) %></TD>
-    </TR>
-  <% } %>
-
-  <TR>
-    <TD ALIGN="right">Expiration date</TD>
-    <TD>
-      <INPUT TYPE="text" NAME="expire" SIZE=32 ID="expire_text" VALUE="<%= ( $expire ? time2str($format, $expire) : "" ) %>">
-      <IMG SRC="../images/calendar.png" ID="expire_button" STYLE="cursor: pointer" TITLE="Select date">
-      <BR><FONT SIZE=-1>(will <b>cancel</b> this package when the date is reached)</FONT>
-    </TD>
-  </TR>
-
-  <% if ( $cancel ) { %>
-    <TR>
-      <TD ALIGN="right">Cancellation date</TD>
-      <TD BGCOLOR="#ffffff"><%= time2str($format, $cancel) %></TD>
-    </TR>
-  <% } %>
-
 </TABLE>
-
 <SCRIPT TYPE="text/javascript">
 <%
   my @cal = qw( setup bill expire );
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index cb64ad8..8a1cb2a 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $agent;
@@ -15,8 +16,6 @@ if ( $cgi->param('error') ) {
 my $action = $agent->agentnum ? 'Edit' : 'Add';
 my $hashref = $agent->hashref;
 
-my $conf = new FS::Conf;
-
 %>
 
 <%= header("$action Agent", menubar(
@@ -33,74 +32,45 @@ my $conf = new FS::Conf;
 Agent #<%= $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)" %>
 
 <%= &ntable("#cccccc", 2, '') %>
-
 <TR>
   <TH ALIGN="right">Agent</TH>
   <TD><INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="<%= $hashref->{agent} %>"></TD>
 </TR>
+<TR>
+  <TH ALIGN="right">Agent type</TH>
+  <TD><SELECT NAME="typenum" SIZE=1>
 
-  <TR>
-    <TH ALIGN="right">Agent type</TH>
-    <TD><SELECT NAME="typenum" SIZE=1>
-  
-  <% foreach my $agent_type (qsearch('agent_type',{})) { %>
-    <OPTION VALUE="<%= $agent_type->typenum %>"<%= ( $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum ) ) ? ' SELECTED' : '' %>>
-    <%= $agent_type->getfield('typenum') %>: <%= $agent_type->getfield('atype') %>
-  <% } %>
-  
-  </SELECT></TD>
-  </TR>
-  
+<% foreach my $agent_type (qsearch('agent_type',{})) { %>
+  <OPTION VALUE="<%= $agent_type->typenum %>"<%= ( $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum ) ) ? ' SELECTED' : '' %>>
+  <%= $agent_type->getfield('typenum') %>: <%= $agent_type->getfield('atype') %>
+<% } %>
+
+</SELECT></TD>
+</TR>
+<% if ( dbdef->table('agent')->column('disabled') ) { %>
   <TR>
     <TD ALIGN="right">Disable</TD>
     <TD><INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>></TD>
   </TR>
-  
-  <TR>
-    <TD ALIGN="right"><!--Frequency--></TD>
-    <TD><INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>"></TD>
-  </TR>
-  
-  <TR>
-    <TD ALIGN="right"><!--Program--></TD>
-    <TD><INPUT TYPE="hidden" NAME="prog" VALUE="<%= $hashref->{prog} %>"></TD>
-  </TR>
-
-  <% if ( $conf->config('ticket_system') ) {
-    my $default_queueid = $conf->config('ticket_system-default_queueid');
-    my $default_queue = FS::TicketSystem->queue($default_queueid);
-    $default_queue = "(default) $default_queueid: $default_queue"
-      if $default_queueid;
-    my %queues = FS::TicketSystem->queues();
-    my @queueids = sort { $a <=> $b } keys %queues;
-  %>
-    <TR>
-      <TD ALIGN="right">Ticketing queue</TD>
-      <TD>
-        <SELECT NAME="ticketing_queueid">
-          <OPTION VALUE=""><%= $default_queue %>
-          <% foreach my $queueid ( @queueids ) { %>
-            <OPTION VALUE="<%= $queueid %>" <%= $agent->ticketing_queueid == $queueid ? ' SELECTED' : '' %>><%= $queueid %>: <%= $queues{$queueid} %>
-          <% } %>
-        </SELECT>
-      </TD>
-    </TR>
-  <% } %>
-  
+<% } %>
+<TR>
+  <TD ALIGN="right"><!--Frequency--></TD>
+  <TD><INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>"></TD>
+</TR>
+<TR>
+  <TD ALIGN="right"><!--Program--></TD>
+  <TD><INPUT TYPE="hidden" NAME="prog" VALUE="<%= $hashref->{prog} %>"></TD>
+</TR>
+<% if ( dbdef->table('agent')->column('username') ) { %>
   <TR>
     <TD ALIGN="right">Agent interface username</TD>
-    <TD>
-      <INPUT TYPE="text" NAME="username" VALUE="<%= $hashref->{username} %>">
-    </TD>
+    <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $hashref->{username} %>"></TD>
   </TR>
-  
   <TR>
     <TD ALIGN="right">Agent interface password</TD>
-    <TD>
-      <INPUT TYPE="text" NAME="_password" VALUE="<%= $hashref->{_password} %>">
-    </TD>
+    <TD><INPUT TYPE="text" NAME="_password" VALUE="<%= $hashref->{_password} %>"></TD>
   </TR>
-
+<% } %>
 </TABLE>
 
 <BR><INPUT TYPE="submit" VALUE="<%= $hashref->{agentnum} ? "Apply changes" : "Add agent" %>">
diff --git a/httemplate/edit/agent_payment_gateway.html b/httemplate/edit/agent_payment_gateway.html
deleted file mode 100644
index 61d29e0..0000000
--- a/httemplate/edit/agent_payment_gateway.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<%
-
-$cgi->param('agentnum') =~ /(\d+)$/ or die "illegal agentnum";
-my $agent = qsearchs('agent', { 'agentnum' => $1 } );
-die "agentnum $1 not found" unless $agent;
-
-#my @agent_payment_gateway;
-if ( $cgi->param('error') ) {
-}
-
-my $action = 'Add';
-
-%>
-
-<%= header("$action payment gateway override for ". $agent->agent,  menubar(
-  'Main Menu' => $p,
-  #'View all payment gateways' => $p. 'browse/payment_gateway.html',
-  'View all agents' => $p. 'browse/agent.html',
-)) %>
-
-<% if ( $cgi->param('error') ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
-<% } %>
-
-<FORM ACTION="<%=popurl(1)%>process/agent_payment_gateway.html" METHOD=POST>
-<INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agent->agentnum %>">
-
-Use gateway <SELECT NAME="gatewaynum">
-<% foreach my $payment_gateway (
-      qsearch('payment_gateway', { 'disabled' => '' } )
-    ) {
-%>
-  <OPTION VALUE="<%= $payment_gateway->gatewaynum %>"><%= $payment_gateway->gateway_module %> (<%= $payment_gateway->gateway_username %>)
-<% } %>
-</SELECT>
-<BR><BR>
-
-for <SELECT NAME="cardtype" MULTIPLE>
-<% foreach my $cardtype (
-  "",
-  "VISA card",
-  "MasterCard",
-  "Discover card",
-  "American Express card",
-  "Diner's Club/Carte Blanche",
-  "enRoute",
-  "JCB",
-  "BankCard",
-  "Switch",
-  "Solo",
-  'ACH',
-) { %>
-  <OPTION VALUE="<%= $cardtype %>"><%= $cardtype || '(Default fallback)' %>
-<% } %>
-</SELECT>
-<BR><BR>
-
-(optional) when invoice contains only items of taxclass <INPUT TYPE="text" NAME="taxclass">
-<BR><BR>
-
-<INPUT TYPE="submit" VALUE="Add gateway override">
-</FORM>
-</BODY>
-</HTML>
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 5addbbd..637c710 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my($agent_type);
@@ -13,63 +14,50 @@ if ( $cgi->param('error') ) {
   $agent_type = new FS::agent_type {};
 }
 my $action = $agent_type->typenum ? 'Edit' : 'Add';
+my $hashref = $agent_type->hashref;
 
-%>
-
-<%= header("$action Agent Type", menubar(
+print header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
-))
-%>
+));
 
-<% if ( $cgi->param('error') ) { %>
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
-<% } %>
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT>"
+  if $cgi->param('error');
 
-<FORM ACTION="<%= popurl(1) %>process/agent_type.cgi" METHOD=POST>
-<INPUT TYPE="hidden" NAME="typenum" VALUE="<%= $agent_type->typenum %>">
-Agent Type #<%= $agent_type->typenum || "(NEW)" %>
-<BR><BR>
+print '<FORM ACTION="', popurl(1), 'process/agent_type.cgi" METHOD=POST>',
+      qq!<INPUT TYPE="hidden" NAME="typenum" VALUE="$hashref->{typenum}">!,
+      "Agent Type #", $hashref->{typenum} ? $hashref->{typenum} : "(NEW)";
 
-Agent Type
-<INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="<%= $agent_type->atype %>">
-<BR><BR>
-
-Select which packages agents of this type may sell to customers<BR>
-
-<% foreach my $part_pkg (
-     qsearch({ 'table'     => 'part_pkg',
-               'hashref'   => { 'disabled' => '' },
-               'select'    => 'part_pkg.*',
-               'addl_from' => 'LEFT JOIN type_pkgs USING ( pkgpart )',
-               'extra_sql' => ( $agent_type->typenum
-                                  ? 'OR typenum = '. $agent_type->typenum
-                                  : ''
-                              ),
-            })
-   ) {
-%>
+print <<END;
+<BR><BR>Agent Type <INPUT TYPE="text" NAME="atype" SIZE=32 VALUE="$hashref->{atype}">
+<BR><BR>Select which packages agents of this type may sell to customers<BR>
+END
 
-  <BR>
-  <INPUT TYPE="checkbox" NAME="pkgpart<%= $part_pkg->pkgpart %>" <%=
+foreach my $part_pkg ( qsearch('part_pkg',{ 'disabled' => '' }) ) {
+  print qq!<BR><INPUT TYPE="checkbox" NAME="pkgpart!,
+        $part_pkg->getfield('pkgpart'), qq!" !,
+       # ( 'CHECKED 'x scalar(
         qsearchs('type_pkgs',{
-          'typenum' => $agent_type->typenum,
-          'pkgpart' => $part_pkg->pkgpart,
+          'typenum' => $agent_type->getfield('typenum'),
+          'pkgpart'  => $part_pkg->getfield('pkgpart'),
         })
           ? 'CHECKED '
-          : ''
-  %> VALUE="ON">
-
-  <A HREF="<%= $p %>edit/part_pkg.cgi?<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkgpart %>: 
-  <%= $part_pkg->pkg %> - <%= $part_pkg->comment %></A>
-  <%= $part_pkg->disabled =~ /^Y/i ? ' (DISABLED)' : '' %>
-
-<% } %>
-
-<BR><BR>
+          : '',
+        qq!VALUE="ON"> !,
+    qq!<A HREF="${p}edit/part_pkg.cgi?!, $part_pkg->pkgpart, 
+    '">', $part_pkg->pkgpart. ": ". $part_pkg->getfield('pkg'), '</A>',
+  ;
+}
 
-<INPUT TYPE="submit" VALUE="<%= $agent_type->typenum ? "Apply changes" : "Add agent type" %>">
+print qq!<BR><BR><INPUT TYPE="submit" VALUE="!,
+      $hashref->{typenum} ? "Apply changes" : "Add agent type",
+      qq!">!;
 
+print <<END;
     </FORM>
   </BODY>
 </HTML>
+END
+
+%>
diff --git a/httemplate/edit/bulk-cust_svc.html b/httemplate/edit/bulk-cust_svc.html
deleted file mode 100644
index 332b5b6..0000000
--- a/httemplate/edit/bulk-cust_svc.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<%= header( 'Bulk customer service change',
-            menubar(
-                     'Main Menu' => $p,
-                   ),
-          )
-%>
-
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
-
-<%= include('/elements/progress-init.html',
-              'OneTrueForm',
-              [qw( old_svcpart new_svcpart pkgpart )],
-              'process/bulk-cust_svc.cgi',
-              $p.'browse/part_svc.cgi',
-           )
-%>
-
-<FORM NAME="OneTrueForm">
-
-<%
-  $cgi->param('svcpart') =~ /^(\d+)$/
-    or die "illegal svcpart: ". $cgi->param('svcpart');
-
-  my $old_svcpart = $1;
-  my $src_part_svc = qsearchs('part_svc', { 'svcpart' => $old_svcpart } )
-    or die "unknown svcpart: $old_svcpart";
-%>
-
-<INPUT NAME="old_svcpart" TYPE="hidden" VALUE="<%= $old_svcpart %>">
-Change <!-- customer
-<B><%= $src_part_svc->svcpart %>: <%= $src_part_svc->svc %></B> services
-<BR>
--->
-
-<SELECT NAME="pkgpart">
-
-<% my $num_cust_svc = $src_part_svc->num_cust_svc; %>
-<% if ( $num_cust_svc > 1 ) { %>
-  <OPTION VALUE="">all <%= $num_cust_svc %> <%= $src_part_svc->svc %> services
-<% } else { %>
-  <OPTION VALUE="">the <%= $num_cust_svc %> <%= $src_part_svc->svc %> service
-<% } %>
-
-<%
-  my $num_unlinked = $src_part_svc->num_cust_svc(0);
-  if ( $num_unlinked ) {
-%>
-  <OPTION VALUE="0">the <%= $num_unlinked %> unlinked <%= $src_part_svc->svc %> services
-
-<% } %>
-
-<% foreach my $schwartz (
-     grep { $_->[1] }
-     map  { [ $_, $src_part_svc->num_cust_svc($_->pkgpart) ] }
-          qsearch('part_pkg', {} )
-   ) {
-     my( $part_pkg, $num_cust_svc ) = @$schwartz;
-%>
-  <OPTION VALUE="<%= $part_pkg->pkgpart %>">the <%= $num_cust_svc %>
-    <%= $src_part_svc->svc %> service<%= $num_cust_svc > 1 ? 's in' : ' in a' %>
-    <%= $part_pkg->pkg %> package<%= $num_cust_svc > 1 ? 's' : '' %>
-<% } %>
-</SELECT>
-<BR>
-
-to new service definition
-<SELECT NAME="new_svcpart">
-<% foreach my $dest_part_svc (
-     grep {    $_->svcpart != $old_svcpart
-            && $_->svcdb   eq $src_part_svc->svcdb
-          }
-          qsearch('part_svc', { 'disabled' => '' } )
-   ) {
-%>
-  <OPTION VALUE="<%= $dest_part_svc->svcpart %>"><%= $dest_part_svc->svcpart %>: <%= $dest_part_svc->svc %>
-
-<% } %>
-</SELECT>
-<BR>
-
-<BR>
-
-<SCRIPT TYPE="text/javascript">
-var confirm_change = '<P ALIGN="center"><B>Bulk customer service change - Are you sure?</B><BR><P ALIGN="CENTER" <INPUT TYPE="button" VALUE="Yes, make changes" onClick="process();">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="BUTTON" VALUE="Cancel" onClick="cClick()">';
-</SCRIPT>
-
-<INPUT TYPE="button" VALUE="Bulk change customer services" onClick="overlib(confirm_change, CAPTION, 'Confirm bulk customer service change', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' );">
-
-</FORM>
-
-</BODY>
-</HTML>
-
-
-
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 144d540..a18114c 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
   #for misplaced logic below
@@ -17,7 +18,6 @@ my $conf = new FS::Conf;
 my $error = '';
 my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart);
 my(@invoicing_list);
-my $same = '';
 if ( $cgi->param('error') ) {
   $error = $cgi->param('error');
   $cust_main = new FS::cust_main ( {
@@ -34,8 +34,6 @@ if ( $cgi->param('error') ) {
   $password = $cgi->param('_password');
   $popnum = $cgi->param('popnum');
   @invoicing_list = split( /\s*,\s*/, $cgi->param('invoicing_list') );
-  $same = $cgi->param('same');
-  $cust_main->setfield('paid' => $cgi->param('paid')) if $cgi->param('paid');
 } elsif ( $cgi->keywords ) { #editing
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
@@ -76,9 +74,9 @@ my $action = $custnum ? 'Edit' : 'Add';
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
 <% } %>
 
-<FORM NAME="topform" STYLE="margin-bottom: 0">
+<FORM ACTION="<%= popurl(1) %>process/cust_main.cgi" METHOD=POST NAME="form1" onSubmit="document.form1.submit.disabled=true">
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>">
-Customer # <%= $custnum ? "<B>$custnum</B>" : " (NEW)" %>
+ustomer # <%= $custnum ? "<B>$custnum</B>" : " (NEW)" %>
 
 <!-- agent -->
 
@@ -105,64 +103,58 @@ my $agentnum = $cust_main->agentnum || $agents[0]->agentnum; #default to first
   </SELECT>
 <% } %>
 
-<!-- referral (advertising source) -->
-
-<%
-my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
-if ( $custnum && ! $conf->exists('editreferrals') ) {
-%>
-
-  <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $refnum %>">
-
 <%
- } else {
 
-   my(@referrals) = qsearch('part_referral',{});
-   if ( scalar(@referrals) == 0 ) {
-     eidiot "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
-   } elsif ( scalar(@referrals) == 1 ) {
-     $refnum ||= $referrals[0]->refnum;
-%>
+# (referral and referring customer still need to be "template"ized)
 
-     <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $refnum %>">
-
-<% } else { %>
+#referral
 
-     <BR><BR><%=$r%>Advertising source 
-     <SELECT NAME="refnum" SIZE="1">
-       <%= $refnum ? '' : '<OPTION VALUE="">' %>
-       <% foreach my $referral (sort { $a->refnum <=> $b->refnum } @referrals) { %>
-         <OPTION VALUE="<%= $referral->refnum %>" <%= $referral->refnum == $refnum ? 'SELECTED' : '' %>><%= $referral->refnum %>: <%= $referral->referral %>
-       <% } %>
-     </SELECT>
-<% } %>
-
-<% } %>
+my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
+if ( $custnum && ! $conf->exists('editreferrals') ) {
+  print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
+} else {
+  my(@referrals) = qsearch('part_referral',{});
+  if ( scalar(@referrals) == 0 ) {
+    eidiot "You have not created any advertising sources.  You must create at least one advertising source before adding a customer.  Go to ". popurl(2). "browse/part_referral.cgi and create one or more advertising sources.";
+  } elsif ( scalar(@referrals) == 1 ) {
+    $refnum ||= $referrals[0]->refnum;
+    print qq!<INPUT TYPE="hidden" NAME="refnum" VALUE="$refnum">!;
+  } else {
+    print qq!<BR><BR>${r}Advertising source <SELECT NAME="refnum" SIZE="1">!;
+    print "<OPTION> " unless $refnum;
+    my($referral);
+    foreach $referral (sort {
+      $a->refnum <=> $b->refnum;
+    } @referrals) {
+      print "<OPTION" . " SELECTED"x($referral->refnum==$refnum),
+      ">", $referral->refnum, ": ", $referral->referral;
+    }
+    print "</SELECT>";
+  }
+}
 
-<!-- referring customer -->
+#referring customer
 
-<%
+#print qq!<BR><BR>Referring Customer: !;
 my $referring_cust_main = '';
 if ( $cust_main->referral_custnum
      and $referring_cust_main =
            qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
 ) {
-%>
-
-  <BR><BR>Referring Customer: 
-  <A HREF="<%= popurl(1) %>/cust_main.cgi?<%= $cust_main->referral_custnum %>"><%= $cust_main->referral_custnum %>: <%= $referring_cust_main->name %></A>
-  <INPUT TYPE="hidden" NAME="referral_custnum" VALUE="<%= $cust_main->referral_custnum %>">
-
-<% } elsif ( ! $conf->exists('disable_customer_referrals') ) { %>
-
-  <BR><BR>Referring customer number: 
-  <INPUT TYPE="text" NAME="referral_custnum" VALUE="">
-
-<% } else { %>
-
-  <INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">
+  print '<BR><BR>Referring Customer: <A HREF="'. popurl(1). '/cust_main.cgi?'.
+        $cust_main->referral_custnum. '">'.
+        $cust_main->referral_custnum. ': '.
+        ( $referring_cust_main->company
+          || $referring_cust_main->last. ', '. $referring_cust_main->first ).
+        '</A><INPUT TYPE="hidden" NAME="referral_custnum" VALUE="'.
+        $cust_main->referral_custnum. '">';
+} elsif ( ! $conf->exists('disable_customer_referrals') ) {
+  print '<BR><BR>Referring customer number: <INPUT TYPE="text" NAME="referral_custnum" VALUE="">';
+} else {
+  print '<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">';
+}
 
-<% } %>
+%>
 
 <!-- contact info -->
 
@@ -180,17 +172,11 @@ function bill_changed(what) {
 <% for (qw( last first company address1 address2 city zip daytime night fax )) { %>
     what.form.ship_<%=$_%>.value = what.form.<%=$_%>.value;
 <% } %>
-
     what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
-    function fix_ship_state() {
-      what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
-    }
-    ship_country_changed(what.form.ship_country, fix_ship_state );
-
-    function fix_ship_county() {
-      what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
-    }
-    ship_state_changed(what.form.ship_state, fix_ship_county );
+    ship_country_changed(what.form.ship_country);
+    what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
+    ship_state_changed(what.form.ship_state);
+    what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
   }
 }
 function samechanged(what) {
@@ -213,7 +199,7 @@ function samechanged(what) {
   my $checked = '';
   my $disabled = '';
   my $disabledselect = '';
-  unless ( $cust_main->ship_last && $same ne 'Y' ) {
+  unless ( $cust_main->ship_last && $cgi->param('same') ne 'Y' ) {
     $checked = 'CHECKED';
     $disabled = 'DISABLED style="background-color: #dddddd"';
     foreach (
@@ -232,138 +218,181 @@ Service address
 
 <% } %>
 
-<!-- billing info -->
+<%
+# billing info
+
+sub expselect {
+  my $prefix = shift;
+  my( $m, $y ) = (0, 0);
+  if ( scalar(@_) ) {
+    my $date = shift || '01-2000';
+    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+      ( $m, $y ) = ( $2, $1 );
+    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+      ( $m, $y ) = ( $1, $3 );
+    } else {
+      die "unrecognized expiration date format: $date";
+    }
+  }
 
-<%= include( 'cust_main/billing.html', $cust_main,
-               'invoicing_list' => \@invoicing_list,
-           )
-%>
+  my $return = qq!<SELECT NAME="$prefix!. qq!_month" SIZE="1">!;
+  for ( 1 .. 12 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $m;
+    $return .= ">$_";
+  }
+  $return .= qq!</SELECT>/<SELECT NAME="$prefix!. qq!_year" SIZE="1">!;
+  my @t = localtime;
+  my $thisYear = $t[5] + 1900;
+  for ( ($thisYear > $y && $y > 0 ? $y : $thisYear) .. 2037 ) {
+    $return .= "<OPTION";
+    $return .= " SELECTED" if $_ == $y;
+    $return .= ">$_";
+  }
+  $return .= "</SELECT>";
 
-<SCRIPT>
-function bottomfixup(what) {
+  $return;
+}
 
-  var topvars = new Array(
-    'custnum', 'agentnum', 'refnum', 'referral_custnum',
+my $payby_default = $conf->config('payby-default');
 
-    'last', 'first', 'ss', 'company',
-    'address1', 'address2', 'city',
-    'county', 'state', 'zip', 'country',
-    'daytime', 'night', 'fax',
+if ( $payby_default eq 'HIDE' ) {
 
-    'same',
+  $cust_main->payby('BILL') unless $cust_main->payby;
 
-    'ship_last', 'ship_first', 'ship_company',
-    'ship_address1', 'ship_address2', 'ship_city',
-    'ship_county', 'ship_state', 'ship_zip', 'ship_country',
-    'ship_daytime','ship_night', 'ship_fax',
+  foreach my $field (qw( tax payby )) {
+    print qq!<INPUT TYPE="hidden" NAME="$field" VALUE="!.
+          $cust_main->getfield($field). '">';
+  }
 
-    'select' // XXX key
-  );
+  print qq!<INPUT TYPE="hidden" NAME="invoicing_list" VALUE="!.
+        join(', ', $cust_main->invoicing_list). '">';
 
-  var layervars = new Array(
-    'payauto',
-    'payinfo', 'payinfo1', 'payinfo2',
-    'payname', 'exp_month', 'exp_year', 'paycvv',
-    'paystart_month', 'paystart_year', 'payissue',
-    'payip',
-    'paid'
-  );
+  foreach my $payby (qw( CARD DCRD CHEK DCHK LECB BILL COMP )) {
+    foreach my $field (qw( payinfo payname )) {
+      print qq!<INPUT TYPE="hidden" NAME="${payby}_$field" VALUE="!.
+            $cust_main->getfield($field). '">';
+    }
 
-  var billing_bottomvars = new Array(
-    'tax',
-    'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX'
-  );
+    #false laziness w/expselect
+    my( $m, $y );
+    my $date = $cust_main->paydate || '12-2037';
+    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+      ( $m, $y ) = ( $2, $1 );
+    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+      ( $m, $y ) = ( $1, $3 );
+    } else {
+      die "unrecognized expiration date format: $date";
+    }
 
-  for ( f=0; f < topvars.length; f++ ) {
-    var field = topvars[f];
-    copyelement( document.topform.elements[field],
-                 document.bottomform.elements[field]
-               );
-  }
+    print qq!<INPUT TYPE="hidden" NAME="${payby}_month" VALUE="$m">!.
+          qq!<INPUT TYPE="hidden" NAME="${payby}_year"  VALUE="$y">!;
 
-  var layerform = document.topform.select.options[document.topform.select.selectedIndex].value;
-  for ( f=0; f < layervars.length; f++ ) {
-    var field = layervars[f];
-    copyelement( document.forms[layerform].elements[field],
-                 document.bottomform.elements[field]
-               );
   }
 
-  for ( f=0; f < billing_bottomvars.length; f++ ) {
-    var field = billing_bottomvars[f];
-    copyelement( document.billing_bottomform.elements[field],
-                 document.bottomform.elements[field]
-               );
+} else {
+
+  print "<BR>Billing information", &itable("#cccccc"),
+        qq!<TR><TD><INPUT TYPE="checkbox" NAME="tax" VALUE="Y"!;
+  print qq! CHECKED! if $cust_main->tax eq "Y";
+  print qq!>Tax Exempt</TD></TR><TR><TD>!.
+        qq!<INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST"!;
+
+  #my @invoicing_list = $cust_main->invoicing_list;
+  print qq! CHECKED!
+    if ( ! @invoicing_list && ! $conf->exists('disablepostalinvoicedefault') )
+       || grep { $_ eq 'POST' } @invoicing_list;
+  print qq!>Postal mail invoice</TD></TR>!;
+  my $invoicing_list = join(', ', grep { $_ ne 'POST' } @invoicing_list );
+  print qq!<TR><TD>Email invoice <INPUT TYPE="text" NAME="invoicing_list" VALUE="$invoicing_list"></TD></TR>!;
+
+  print "<TR><TD>Billing type</TD></TR>",
+        "</TABLE>", '<SCRIPT>
+                       var mywindow = -1;
+                       function myopen(filename,windowname,properties) {
+                         myclose();
+                         mywindow = window.open(filename,windowname,properties);
+                       }
+                       function myclose() {
+                         if ( mywindow != -1 )
+                           mywindow.close();
+                         mywindow = -1;
+                       }
+                       var achwindow = -1;
+                       function achopen(filename,windowname,properties) {
+                         achclose();
+                         achwindow = window.open(filename,windowname,properties);
+                       }
+                       function achclose() {
+                         if ( achwindow != -1 )
+                           achwindow.close();
+                         achwindow = -1;
+                       }
+                     </SCRIPT>',
+        &table("#cccccc"), "<TR>";
+
+  my($payinfo, $payname)=(
+    $cust_main->payinfo,
+    $cust_main->payname,
+  );
+
+  my %payby = (
+    'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="">!,
+    'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD"). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE=""><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="">!,
+    'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE=""><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="">!,
+    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""><BR>${r}Exp !. expselect("COMP"),
+);
+
+  if ( $cust_main->dbdef_table->column('paycvv') ) {
+    foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs
+      $payby{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="" SIZE=4 MAXLENGTH=4>!;
+    }
   }
 
-}
+  my( $account, $aba ) = split('@', $payinfo);
 
-function copyelement(from, to) {
-  if ( from == undefined ) {
-    to.value = '';
-  } else if ( from.type == 'select-one' ) {
-    to.value = from.options[from.selectedIndex].value;
-    //alert(from + " (" + from.type + "): " + to.name + " => (" + from.selectedIndex + ") " + to.value);
-  } else if ( from.type == 'checkbox' ) {
-    if ( from.checked ) {
-      to.value = from.value;
-    } else {
-      to.value = '';
+  my %paybychecked = (
+    'CARD' => qq!Credit card (automatic)<BR>${r}<INPUT TYPE="text" NAME="CARD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("CARD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="CARD_payname" VALUE="$payname">!,
+    'DCRD' => qq!Credit card (on-demand)<BR>${r}<INPUT TYPE="text" NAME="DCRD_payinfo" VALUE="$payinfo" MAXLENGTH=19><BR>${r}Exp !. expselect("DCRD", $cust_main->paydate). qq!<BR>${r}Name on card<BR><INPUT TYPE="text" NAME="DCRD_payname" VALUE="$payname">!,
+    'CHEK' => qq!Electronic check (automatic)<BR>${r}Account number <INPUT TYPE="text" NAME="CHEK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="CHEK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="CHEK_month" VALUE="12"><INPUT TYPE="hidden" NAME="CHEK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="CHEK_payname" VALUE="$payname">!,
+    'DCHK' => qq!Electronic check (on-demand)<BR>${r}Account number <INPUT TYPE="text" NAME="DCHK_payinfo1" VALUE="$account"><BR>${r}ABA/Routing number <INPUT TYPE="text" NAME="DCHK_payinfo2" VALUE="$aba" SIZE=10 MAXLENGTH=9> (<A HREF="javascript:achopen('../docs/ach.html','ach','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=384,height=256')">help</A>)<INPUT TYPE="hidden" NAME="DCHK_month" VALUE="12"><INPUT TYPE="hidden" NAME="DCHK_year" VALUE="2037"><BR>${r}Bank name <INPUT TYPE="text" NAME="DCHK_payname" VALUE="$payname">!,
+    'LECB' => qq!Phone bill billing<BR>${r}Phone number <INPUT TYPE="text" BANE="LECB_payinfo" VALUE="$payinfo" MAXLENGTH=15 SIZE=16><INPUT TYPE="hidden" NAME="LECB_month" VALUE="12"><INPUT TYPE="hidden" NAME="LECB_year" VALUE="2037"><INPUT TYPE="hidden" NAME="LECB_payname" VALUE="">!,
+    'BILL' => qq!Billing<BR>P.O. <INPUT TYPE="text" NAME="BILL_payinfo" VALUE="$payinfo"><BR><INPUT TYPE="hidden" NAME="BILL_month" VALUE="12"><INPUT TYPE="hidden" NAME="BILL_year" VALUE="2037">Attention<BR><INPUT TYPE="text" NAME="BILL_payname" VALUE="$payname">!,
+    'COMP' => qq!Complimentary<BR>${r}Approved by<INPUT TYPE="text" NAME="COMP_payinfo" VALUE="$payinfo"><BR>${r}Exp !. expselect("COMP", $cust_main->paydate),
+);
+
+  if ( $cust_main->dbdef_table->column('paycvv') ) {
+    my $paycvv = $cust_main->paycvv;
+
+    foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 bs
+      $paybychecked{$payby} .= qq!<BR>CVV2&nbsp;(<A HREF="javascript:myopen('../docs/cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)&nbsp;<INPUT TYPE="text" NAME=${payby}_paycvv VALUE="$paycvv" SIZE=4 MAXLENGTH=4>!;
     }
-  } else {
-    if ( from.value == undefined ) {
-      to.value = '';
+  }
+
+
+  $cust_main->payby($payby_default) unless $cust_main->payby;
+  for (qw(CARD DCRD CHEK DCHK LECB BILL COMP)) {
+    print qq!<TD VALIGN=TOP><INPUT TYPE="radio" NAME="payby" VALUE="$_"!;
+    if ($cust_main->payby eq "$_") {
+      print qq! CHECKED> $paybychecked{$_}</TD>!;
     } else {
-      to.value = from.value;
+      print qq!> $payby{$_}</TD>!;
     }
   }
-  //alert(from + " (" + from.type + "): " + to.name + " => " + to.value);
-}
 
-</SCRIPT>
+  print "</TR></TABLE>$r required fields for each billing type";
 
-<FORM ACTION="<%= popurl(1) %>process/cust_main.cgi" METHOD=POST NAME="bottomform" onSubmit="document.bottomform.submit.disabled=true; bottomfixup(this.form);" STYLE="margin-top: 0; margin-bottom: 0">
-
-<% foreach my $hidden (
-     'custnum', 'agentnum', 'refnum', 'referral_custnum',
-     'last', 'first', 'ss', 'company',
-     'address1', 'address2', 'city',
-     'county', 'state', 'zip', 'country',
-     'daytime', 'night', 'fax',
-     
-     'same',
-     
-     'ship_last', 'ship_first', 'ship_company',
-     'ship_address1', 'ship_address2', 'ship_city',
-     'ship_county', 'ship_state', 'ship_zip', 'ship_country',
-     'ship_daytime','ship_night', 'ship_fax',
-     
-     'select', #XXX key
-
-     'payauto',
-     'payinfo', 'payinfo1', 'payinfo2',
-     'payname', 'exp_month', 'exp_year', 'paycvv',
-     'paystart_month', 'paystart_year', 'payissue',
-     'payip',
-     'paid',
-     
-     'tax',
-     'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX'
-   ) {
-%>
-  <INPUT TYPE="hidden" NAME="<%= $hidden %>" VALUE="">
-<% } %>
-
-<BR>Comments
-<%= &ntable("#cccccc") %>
-  <TR>
-    <TD>
-      <TEXTAREA COLS=80 ROWS=5 WRAP="HARD" NAME="comments"><%= $cust_main->comments %></TEXTAREA>
-    </TD>
-  </TR>
-</TABLE>
+}
 
-<%
+if ( defined $cust_main->dbdef_table->column('comments') ) {
+    print "<BR><BR>Comments", &itable("#cccccc"),
+          qq!<TR><TD><TEXTAREA COLS=80 ROWS=5 WRAP="HARD" NAME="comments">!,
+          $cust_main->comments, "</TEXTAREA>",
+          "</TD></TR></TABLE>";
+}
 
 unless ( $custnum ) {
   # pry the wrong place for this logic.  also pretty expensive
@@ -393,7 +422,7 @@ unless ( $custnum ) {
 
 #    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"),
 #apiabuse & undesirable wrapping
-    print "<BR>First package", &ntable("#cccccc"),
+    print "<BR><BR>First package", &itable("#cccccc"),
           qq!<TR><TD COLSPAN=2><SELECT NAME="pkgpart_svcpart">!;
 
     print qq!<OPTION VALUE="">(none)!;
@@ -421,7 +450,7 @@ unless ( $custnum ) {
 (blank to generate)</TD></TR>
 END
 
-    print '<TR><TD ALIGN="right">Access number</TD><TD>'
+    print '<TR><TD ALIGN="right">Access number</TD><TD WIDTH="100%">'
           .
           &FS::svc_acct_pop::popselector($popnum).
           '</TD></TR></TABLE>'
@@ -431,9 +460,9 @@ END
 
 my $otaker = $cust_main->otaker;
 print qq!<INPUT TYPE="hidden" NAME="otaker" VALUE="$otaker">!,
-      qq!<BR><INPUT TYPE="submit" NAME="submit" VALUE="!,
-      $custnum ?  "Apply Changes" : "Add Customer", qq!"><BR>!,
-      "</FORM></DIV></BODY></HTML>",
+      qq!<BR><INPUT NAME="submit" TYPE="submit" VALUE="!,
+      $custnum ?  "Apply Changes" : "Add Customer", qq!">!,
+      "</FORM></BODY></HTML>",
 ;
 
 %>
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
deleted file mode 100644
index 96f777b..0000000
--- a/httemplate/edit/cust_main/billing.html
+++ /dev/null
@@ -1,443 +0,0 @@
-<%
-
-my( $cust_main, %options ) = @_;
-my @invoicing_list = @{ $options{'invoicing_list'} };
-my $conf = new FS::Conf;
-my $payby_default = $conf->config('payby-default');
-
-my @payby = grep /\w/, $conf->config('payby');
-#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
-@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
-  unless @payby;
-
-if ( $payby_default eq 'HIDE' ) {
-
-  $cust_main->payby('BILL') unless $cust_main->payby;
-
-%>
-
-  <INPUT TYPE="hidden" NAME="select" VALUE="<%= $cust_main->payby %>">
-
-  </FORM>
-
-  <FORM NAME="<%= $cust_main->payby %>" STYLE="margin-top: 0; margin-bottom: 0"> <% # XXX key %>
-
-  <% foreach my $field (qw( payinfo payname paycvv paystart_month paystart_year payissue payip )) { %>
-
-    <INPUT TYPE="hidden" NAME="<%= $field %>" VALUE="<%= $cust_main->getfield($field) %>">
-
-  <% } %>
-
-  <%
-  #false laziness w/elements/select-month_year.html & view/cust_main/billing.html
-  my( $mon, $year );
-  my $date = $cust_main->paydate || '12-2037';
-  if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-    ( $mon, $year ) = ( $2, $1 );
-  } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-    ( $mon, $year ) = ( $1, $3 );
-  } else {
-    die "unrecognized expiration date format: $date";
-  }
-  %>
-
-  <INPUT TYPE="hidden" NAME="exp_month" VALUE="<%= $mon %>">
-  <INPUT TYPE="hidden" NAME="exp_year"  VALUE="<%= $year %>">
-
-  </FORM>
-
-  <FORM NAME="billing_bottomform" STYLE="margin-top: 0; margin-bottom: 0">
-
-  <INPUT TYPE="hidden" NAME="tax" VALUE="<%= $cust_main->tax %>">
-
-  <INPUT TYPE="hidden" NAME="invoicing_list" VALUE="<%= join(', ', @invoicing_list) %>">
-
-  </FORM>
-
-<% } else {
-
-  my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
-
-%>
-
-  <BR>Billing information
-  <%= &ntable("#cccccc") %>
-
-    <TR>
-      <TD ALIGN="right" WIDTH="200"><%=$r%>Billing type</TD>
-
-  <SCRIPT>
-
-    var mywindow = -1;
-    function myopen(filename,windowname,properties) {
-      myclose();
-      mywindow = window.open(filename,windowname,properties);
-    }
-    function myclose() {
-      if ( mywindow != -1 )
-        mywindow.close();
-      mywindow = -1;
-    }
-
-    var achwindow = -1;
-    function achopen(filename,windowname,properties) {
-      achclose();
-      achwindow = window.open(filename,windowname,properties);
-    }
-    function achclose() {
-      if ( achwindow != -1 )
-        achwindow.close();
-      achwindow = -1;
-    }
-
-    function card_changed(what) {
-      if (
-             what.form.payinfo.value.substring(0, 4) == '4093' 
-          || what.form.payinfo.value.substring(0, 4) == '4911' 
-          || what.form.payinfo.value.substring(0, 4) == '4936' 
-          || what.form.payinfo.value.substring(0, 6) == '564132' 
-          || what.form.payinfo.value.substring(0, 2) == '63' 
-          || what.form.payinfo.value.substring(0, 2) == '67' 
-         )
-      {
-        what.form.paystart_month.disabled = false;
-        what.form.paystart_year.disabled = false;
-        what.form.payissue.disabled = false;
-        what.form.paystart_month.style.backgroundColor = '#ffffff';
-        what.form.paystart_year.style.backgroundColor = '#ffffff';
-        what.form.payissue.style.backgroundColor = '#ffffff';
-        document.getElementById('paystart_label').style.color = '#000000';
-        document.getElementById('payissue_label').style.color = '#000000';
-      } else {
-        what.form.paystart_month.disabled = true;
-        what.form.paystart_year.disabled = true;
-        what.form.payissue.disabled = true;
-        what.form.paystart_month.style.backgroundColor = '#dddddd';
-        what.form.paystart_year.style.backgroundColor = '#dddddd';
-        what.form.payissue.style.backgroundColor = '#dddddd';
-        document.getElementById('paystart_label').style.color = '#999999';
-        document.getElementById('payissue_label').style.color = '#999999';
-      }
-      return true;
-    }
-
-  </SCRIPT>
-
-  <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
-  <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
-  <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
-  <SCRIPT TYPE="text/javascript">
-  function OLiframeContent(src, width, height, name) {
-    return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
-     +(name?' name="'+name+'" id="'+name+'"':'')+' scrolling="auto">'
-     +'<div>[iframe not supported]</div></iframe>');
-  }
-  </SCRIPT>
-
-  <%
-
-  my($payby, $payinfo, $payname)=(
-    $cust_main->payby,
-    $cust_main->payinfo,
-    $cust_main->payname,
-  );
-  my( $account, $aba ) = split('@', $payinfo);
-
-  my $disabled = 'DISABLED style="background-color: #dddddd"';
-  my $text_disabled = 'style="color: #999999"';
-  if ( $payby =~ /^(CARD|DCRD)$/ && cardtype($payinfo) =~ /^(Switch|Solo)$/ ) {
-    $disabled = 'style="background-color: #ffffff"';
-    $text_disabled = 'style="color: #000000";'
-  }
-
-  my %payby = (
-
-    'CARD' =>
-
-      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Card number </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $payinfo : '' ). qq!" MAXLENGTH=19 onChange="card_changed(this)" onKeyUp="card_changed(this)"></TD></TR>!.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Expiration </TD>!.
-          '<TD WIDTH="408">'.
-
-          include('/elements/select-month_year.html',
-                    'prefix' => 'exp',
-                    'selected_date' =>
-                      ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->paydate : '' ),
-                 ).
-
-          '</TD></TR>'.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">CVV2&nbsp;!.
-
-          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 480, 352, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)!.
-          qq!</TD>!.
-          '<TD WIDTH="408"><INPUT TYPE="text" NAME="paycvv" VALUE="'. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->paycvv : '' ). '" SIZE=4 MAXLENGTH=4>'.
-
-
-        qq!<TR><TD ALIGN="right" WIDTH="200"><SPAN ID="paystart_label" $text_disabled>Start date </SPAN></TD>!.
-          '<TD WIDTH="408">'.
-
-          include('/elements/select-month_year.html',
-                    'prefix' => 'paystart',
-                    'disabled' => $disabled,
-                    'empty_option' => 1,
-                    'start_year' => 2000,
-                    'end_year'   => (localtime())[5] + 1900,
-                    'selected_date' => (
-                      ( $payby =~ /^(CARD|DCRD)$/
-                        && cardtype($payinfo) =~ /^(Switch|Solo)$/ )
-                          ? $cust_main->paystart_month. '-'.
-                            $cust_main->paystart_year 
-                          : ''
-                    )
-                 ).
-
-        qq!<SPAN ID="payissue_label" $text_disabled> or Issue number </SPAN>!.
-          '<INPUT TYPE="text" NAME="payissue" VALUE="'. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->payissue : '' ). qq!" SIZE=3 MAXLENGTH=2 $disabled></TD></TR>!.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Exact name on card </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payname" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
-
-        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" NAME="payauto" !. ( $payby eq 'DCRD' ? '' : 'CHECKED' ). '> Charge future payments to this card automatically</TD></TR>'.
-
-      '</TABLE>',
-
-    'CHEK' => 
-
-      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Account number </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" SIZE=10 NAME="payinfo1" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $account : '' ). '"></TD></TR>'.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}ABA/Routing number </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!" SIZE=10 MAXLENGTH=9> !.
-          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)!.
-          qq!</TD></TR>!.
-
-        qq!<INPUT TYPE="hidden" NAME="exp_month" VALUE="12">!.
-        qq!<INPUT TYPE="hidden" NAME="exp_year" VALUE="2037">!.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Bank name </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payname" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
-
-        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" NAME="payauto" !. ( $payby eq 'DCHK' ? '' : 'CHECKED' ). '> Charge future payments to this electronic check automatically</TD></TR>'.
-
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-
-      '</TABLE>',
-
-    'LECB' =>  
-
-      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Phone number </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby eq 'LECB' ? $cust_main->payinfo : '' ). qq!" MAXLENGTH=15 SIZE=16></TD></TR>!.
-
-        qq!<INPUT TYPE="hidden" NAME="exp_month" VALUE="12">!.
-        qq!<INPUT TYPE="hidden" NAME="exp_year" VALUE="2037">!.
-        qq!<INPUT TYPE="hidden" NAME="payname" VALUE="">!.
-
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-
-      '</TABLE>',
-
-    'BILL' =>  
-
-      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">P.O. </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE="!. ( $payby eq 'BILL' ? $cust_main->payinfo : '' ). qq!"></TD></TR>!.
-
-        qq!<INPUT TYPE="hidden" NAME="exp_month" VALUE="12">!.
-        qq!<INPUT TYPE="hidden" NAME="exp_year" VALUE="2037">!.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">Attention </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payname" VALUE="!. ( $payby eq 'BILL' ? $cust_main->payname : '' ). qq!"></TD></TR>!.
-
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-
-      '</TABLE>',
-
-    'COMP' =>   
-
-      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Approved by </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="payinfo" VALUE=""></TD></TR>!.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Expiration </TD>!.
-          '<TD WIDTH="408">'.
-
-          include('/elements/select-month_year.html',
-                    'prefix' => 'exp',
-                    'selected_date' =>
-                      ( $payby eq 'COMP' ? $cust_main->paydate : '' ),
-                 ).
-
-          '</TD></TR>'.
-
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-
-      '</TABLE>',
-
-    'CASH' =>
-
-      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Amount </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="paid" VALUE="!. ( $payby eq 'CASH' ? $cust_main->paid : '' ). qq!"></TD></TR>!.
-
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-
-      '</TABLE>',
-
-    'WEST' =>
-
-      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Amount </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="paid" VALUE="!. ( $payby eq 'WEST' ? $cust_main->paid : '' ). qq!"></TD></TR>!.
-
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-
-      '</TABLE>',
-
-    'MCRD' =>
-
-      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
-
-        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Amount </TD>!.
-          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="paid" VALUE="!. ( $payby eq 'MCRD' ? $cust_main->paid : '' ). qq!"></TD></TR>!.
-
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-        '<TR><TD>&nbsp;</TD></TR>'.
-
-      '</TABLE>',
-
-  );
-
-
-  my %allopt = (
-    'CARD' => 'Credit card',
-    'CHEK' => 'Electronic check',
-    'LECB' => 'Phone bill billing',
-    'BILL' => 'Billing',
-    'CASH' => 'Cash', # initial payment, then billing',
-    'WEST' => 'Western Union', # initial payment, then billing',
-    'MCRD' => 'Manual credit card', # initial payment, then billing',
-    'COMP' => 'Complimentary',
-  );
-  if ( $cust_main->custnum ) { #don't offer CASH/WEST/MCRD initial payment types
-                               # when editing customer
-    delete $allopt{$_} for qw(CASH WEST MCRD);
-  }
-  
-  tie my %options, 'Tie::IxHash',
-    map  { $_ => $allopt{$_} }
-    grep { exists $allopt{$_} }
-         @payby;
-
-  my %payby2option = (
-    ( map { $_ => $_ } keys %options ),
-    'DCRD' => 'CARD',
-    'DCHK' => 'CHEK',
-  );
-
-  my $widget = new HTML::Widgets::SelectLayers(
-    'options'        => \%options,
-    #'form_name'      => 'dummy',
-    #'form_action'    => 'nothingyet',
-    #chops bottom of page in IE# 'under_position' => 'absolute',
-    'html_between'   => '</TD></TR></TABLE>',
-    'selected_layer' => $payby2option{$payby || $payby_default || $payby[0] },
-    'layer_callback' => sub { my $layer = shift; $payby{$layer}; },
-  );
-
-  %>
-
-  <TD WIDTH="408"><%= $widget->html %>
-
-  <FORM NAME="billing_bottomform" STYLE="margin-top: 0; margin-bottom: 0">
-
-  <%= &ntable("#cccccc") %>
-
-    <TR><TD>&nbsp;</TD></TR>
-
-    <TR>
-      <TD WIDTH="608" COLSPAN="2"><INPUT TYPE="checkbox" NAME="tax" VALUE="Y" <%= $cust_main->tax eq "Y" ? 'CHECKED' : '' %>> Tax Exempt</TD>
-    </TR>
-
-    <TR>
-      <TD WIDTH="608" COLSPAN="2"><INPUT TYPE="checkbox" NAME="invoicing_list_POST" VALUE="POST" <%=
-
-        ( (    ! @invoicing_list
-            && ! $conf->exists('disablepostalinvoicedefault')
-            && ! $cust_main->custnum
-          )
-          || grep { $_ eq 'POST' } @invoicing_list                     )
-
-          ? 'CHECKED'
-          : ''
-
-        %>> Postal mail invoice
-
-      </TD>
-    </TR>
-
-    <TR>
-      <TD WIDTH="608" COLSPAN="2"><INPUT TYPE="checkbox" NAME="invoicing_list_FAX" VALUE="FAX" <%=
-
-        ( grep { $_ eq 'FAX' } @invoicing_list )
-          ? 'CHECKED'
-          : ''
-
-        %>> Fax invoice
-
-      </TD>
-    </TR>
-
-    <TR>
-      <TD ALIGN="right" WIDTH="200">Email invoice </TD>
-      <TD WIDTH="408"><INPUT TYPE="text" NAME="invoicing_list" VALUE="<%= join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) %>"></TD>
-    </TR>
-
-  </TABLE>
-
-  </FORM>
-
-  <%= $r %> required fields
-
-<% } %>
-
diff --git a/httemplate/edit/cust_main/contact.html b/httemplate/edit/cust_main/contact.html
index e0cd06f..7b88ccb 100644
--- a/httemplate/edit/cust_main/contact.html
+++ b/httemplate/edit/cust_main/contact.html
@@ -14,23 +14,14 @@ $cust_main->set($pre.'state', $statedefault )
   unless $cust_main->get($pre.'state')
          || $cust_main->get($pre.'country') ne $countrydefault;
 
-#my($county_html, $state_html, $country_html) =
-#  FS::cust_main_county::regionselector( $cust_main->get($pre.'county'),
-#                                        $cust_main->get($pre.'state'),
-#                                        $cust_main->get($pre.'country'),
-#                                        $pre,
-#                                        $onchange,
-#                                        $disabled,
-#                                      );
-
-my %select_hash = (
-  'county'   => $cust_main->get($pre.'county'),
-  'state'    => $cust_main->get($pre.'state'),
-  'country'  => $cust_main->get($pre.'country'),
-  'prefix'   => $pre,
-  'onchange' => $onchange,
-  'disabled' => $disabled,
-);
+my($county_html, $state_html, $country_html) =
+  FS::cust_main_county::regionselector( $cust_main->get($pre.'county'),
+                                        $cust_main->get($pre.'state'),
+                                        $cust_main->get($pre.'country'),
+                                        $pre,
+                                        $onchange,
+                                        $disabled,
+                                      );
 
 my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
 my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
@@ -39,7 +30,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 %>
 
-<%= &ntable("#cccccc") %>
+<%= &itable("#cccccc") %>
 
 <TR>
   <TH ALIGN="right"><%=$r%>Contact&nbsp;name<BR>(last,&nbsp;first)</TH>
@@ -51,7 +42,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 <% if ( $conf->exists('show_ss') && !$pre ) { %>
   <TD ALIGN="right">SS#</TD>
   <TD><INPUT TYPE="text" NAME="ss" VALUE="<%= $cust_main->ss %>" SIZE=11></TD>
-<% } elsif ( !$pre ) { %>
+<% } else { %>
   <TD><INPUT TYPE="hidden" NAME="ss" VALUE="<%= $cust_main->ss %>"></TD>
 <% } %>
 
@@ -84,10 +75,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
     <INPUT TYPE="text" NAME="<%=$pre%>city" VALUE="<%= $cust_main->get($pre.'city') %>" onChange="<%= $onchange %>" <%=$disabled%>>
   </TD>
   <TH ALIGN="right"><%=$r%>State</TH>
-  <TD>
-    <%= include('select-county.html', %select_hash ) %>
-    <%= include('select-state.html', %select_hash ) %>
-  </TD>
+  <TD><%= $county_html. $state_html %></TD>
   <TH><%=$r%>Zip</TH>
   <TD>
     <INPUT TYPE="text" NAME="<%=$pre%>zip" VALUE="<%= $cust_main->get($pre.'zip') %>" SIZE=10 onChange="<%= $onchange %>" <%=$disabled%>>
@@ -96,7 +84,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 <TR>
   <TH ALIGN="right"><%=$r%>Country</TH>
-  <TD><%= include('select-country.html', %select_hash ) %></TD>
+  <TD><%= $country_html %></TD>
 </TR>
 
 <TR>
diff --git a/httemplate/edit/cust_main/select-country.html b/httemplate/edit/cust_main/select-country.html
deleted file mode 100644
index 014effd..0000000
--- a/httemplate/edit/cust_main/select-country.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<%
-
-  my %opt = @_;
-  foreach my $opt (qw( county state country prefix onchange disabled )) {
-    $opt{$_} = '' unless exists($opt{$_}) && defined($opt{$_});
-  }
-
-  my $conf = new FS::Conf;
-  my $countrydefault = $conf->config('countrydefault') || 'US';
-
-%>
-
-<%= include('/elements/xmlhttp.html',
-              'url'  => $p.'misc/states.cgi',
-              'subs' => [ $opt{'prefix'}. 'get_states' ],
-           )
-%>
-
-<SCRIPT TYPE="text/javascript">
-
-  function opt(what,value,text) {
-    var optionName = new Option(text, value, false, false);
-    var length = what.length;
-    what.options[length] = optionName;
-  }
-
-  function <%= $opt{'prefix'} %>country_changed(what, callback) {
-
-    country = what.options[what.selectedIndex].text;
-
-    function <%= $opt{'prefix'} %>update_states(states) {
-
-      // blank the current state list
-      for ( var i = what.form.<%= $opt{'prefix'} %>state.length; i >= 0; i-- )
-          what.form.<%= $opt{'prefix'} %>state.options[i] = null;
-
-      // add the new states
-      var statesArray = eval('(' + states + ')' );
-      for ( var s = 0; s < statesArray.length; s++ ) {
-          var stateLabel = statesArray[s];
-          if ( stateLabel == "" )
-              stateLabel = '(n/a)';
-          opt(what.form.<%= $opt{'prefix'} %>state, statesArray[s], stateLabel);
-      }
-
-      //run the callback
-      if ( callback != null ) 
-        callback();
-    }
-
-    // go get the new states
-    <%= $opt{'prefix'} %>get_states( country, <%= $opt{'prefix'} %>update_states );
-
-  }
-
-</SCRIPT>
-
-<SELECT NAME="<%= $opt{'prefix'} %>country" onChange="<%= $opt{'prefix'} %>country_changed(this); <%= $opt{'onchange'} %>" <%= $opt{'disabled'} %>>
-
-<% foreach my $country (
-     sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
-     map { $_->country }
-     qsearch( 'cust_main_county',{}, 'DISTINCT ON ( country ) *', )
-   ) {
-%>
-
-  <OPTION VALUE="<%= $country %>"<%= $country eq $opt{'country'} ? ' SELECTED' : '' %>><%= $country %>
-
-<% } %>
-
-</SELECT>
-
diff --git a/httemplate/edit/cust_main/select-county.html b/httemplate/edit/cust_main/select-county.html
deleted file mode 100644
index 3de380b..0000000
--- a/httemplate/edit/cust_main/select-county.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<%
-
-  my %opt = @_;
-  foreach my $opt (qw( county state country prefix onchange disabled )) {
-    $opt{$_} = '' unless exists($opt{$_}) && defined($opt{$_});
-  }
-
-  my $sql = "SELECT COUNT(*) FROM cust_main_county".
-            " WHERE county IS NOT NULL AND county != ''";
-  my $sth = dbh->prepare($sql) or die dbh->errstr;
-  $sth->execute or die $sth->errstr;
-  my $countyflag = $sth->fetchrow_arrayref->[0];
-
-%>
-
-<% if ( $countyflag ) { %>
-
-  <%= include('/elements/xmlhttp.html',
-                'url'  => $p.'misc/counties.cgi',
-                'subs' => [ $opt{'prefix'}. 'get_counties' ],
-             )
-%>
-  
-  <SCRIPT TYPE="text/javascript">
-  
-    function opt(what,value,text) {
-      var optionName = new Option(text, value, false, false);
-      var length = what.length;
-      what.options[length] = optionName;
-    }
-  
-    function <%= $opt{'prefix'} %>state_changed(what, callback) {
-
-      state = what.options[what.selectedIndex].text;
-      country = what.form.<%= $opt{'prefix'} %>country.options[what.form.<%= $opt{'prefix'} %>country.selectedIndex].text;
-  
-      function <%= $opt{'prefix'} %>update_counties(counties) {
-
-        // blank the current county list
-        for ( var i = what.form.<%= $opt{'prefix'} %>county.length; i >= 0; i-- )
-            what.form.<%= $opt{'prefix'} %>county.options[i] = null;
-  
-        // add the new counties
-        var countiesArray = eval('(' + counties + ')' );
-        for ( var s = 0; s < countiesArray.length; s++ ) {
-            var countyLabel = countiesArray[s];
-            if ( countyLabel == "" )
-                countyLabel = '(n/a)';
-            opt(what.form.<%= $opt{'prefix'} %>county, countiesArray[s], countyLabel);
-        }
-
-        //run the callback
-        if ( callback != null ) 
-          callback();
-      }
-  
-      // go get the new counties
-      <%= $opt{'prefix'} %>get_counties( state, country, <%= $opt{'prefix'} %>update_counties );
-  
-    }
-  
-  </SCRIPT>
-
-  <SELECT NAME="<%= $opt{'prefix'} %>county" onChange="<%= $opt{'onchange'} %>" <%= $opt{'disabled'} %>>
-
-  <% foreach my $county (
-       sort
-       map { $_->county }
-       qsearch('cust_main_county', { 'state'   => $opt{'state'},
-                                     'country' => $opt{'country'},
-                                   }
-              )
-     ) {
-  %>
-
-    <OPTION VALUE="<%= $county %>"<%= $county eq $opt{'county'} ? ' SELECTED' : '' %>><%= $county %>
-
-  <% } %>
-
-  </SELECT>
-
-<% } else { %>
-
-  <SCRIPT TYPE="text/javascript">
-    function <%= $opt{'prefix'} %>state_changed(what) {
-    }
-  </SCRIPT>
-
-  <INPUT TYPE="hidden" NAME="<%= $opt{'prefix'} %>county" VALUE="<%= $opt{'county'} %>">
-
-<% } %>
diff --git a/httemplate/edit/cust_main/select-state.html b/httemplate/edit/cust_main/select-state.html
deleted file mode 100644
index 98e685a..0000000
--- a/httemplate/edit/cust_main/select-state.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-
-  my %opt = @_;
-  foreach my $opt (qw( county state country prefix onchange disabled )) {
-    $opt{$_} = '' unless exists($opt{$_}) && defined($opt{$_});
-  }
-
-%>
-
-<SELECT NAME="<%= $opt{'prefix'} %>state" onChange="<%= $opt{'prefix'} %>state_changed(this); <%= $opt{'onchange'} %>" <%= $opt{'disabled'} %>>
-
-<% foreach my $state (
-     sort
-     map { $_->state }
-     qsearch( 'cust_main_county',
-              { 'country' => $opt{'country'} },
-              'DISTINCT ON ( state ) *',
-            )
-   ) {
-%>
-
-  <OPTION VALUE="<%= $state %>"<%= $state eq $opt{'state'} ? ' SELECTED' : '' %>><%= $state || '(n/a)' %>
-
-<% } %>
-
-</SELECT>
-
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 0370ab7..755050b 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,14 +1,8 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
 
-my %payby = (
-  'BILL' => 'Check',
-  'CASH' => 'Cash',
-  'WEST' => 'Western Union',
-  'MCRD' => 'Manual credit card',
-);
-
 my($link, $linknum, $paid, $payby, $payinfo, $quickpay, $_date); 
 if ( $cgi->param('error') ) {
   $link     = $cgi->param('link');
@@ -18,34 +12,33 @@ if ( $cgi->param('error') ) {
   $payinfo  = $cgi->param('payinfo');
   $quickpay = $cgi->param('quickpay');
   $_date    = $cgi->param('_date') ? str2time($cgi->param('_date')) : time;
-} elsif ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
-  $link     = 'custnum';
-  $linknum  = $1;
-  $paid     = '';
-  $payby    = $cgi->param('payby') || 'BILL';
-  $payinfo  = '';
-  $quickpay = $cgi->param('quickpay');
-  $_date    = time;
-} elsif ( $cgi->param('invnum') =~ /^(\d+)$/ ) {
+} elsif ($cgi->keywords) {
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/;
   $link     = 'invnum';
   $linknum  = $1;
   $paid     = '';
-  $payby    = $cgi->param('payby') || 'BILL';
+  $payby    = 'BILL';
   $payinfo  = "";
   $quickpay = '';
   $_date    = time;
+} elsif ( $cgi->param('custnum')  =~ /^(\d+)$/ ) {
+  $link     = 'custnum';
+  $linknum  = $1;
+  $paid     = '';
+  $payby    = 'BILL';
+  $payinfo  = '';
+  $quickpay = $cgi->param('quickpay');
+  $_date    = time;
 } else {
   die "illegal query ". $cgi->keywords;
 }
 
 my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 
-my $title = 'Post '. $payby{$payby}. ' payment';
-$title .= " against Invoice #$linknum" if $link eq 'invnum';
-
 %>
 
-<%=  header($title, '') %>
+<%=  header("Post payment", '') %>
 
 <% if ( $cgi->param('error') ) { %>
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
@@ -65,12 +58,49 @@ $title .= " against Invoice #$linknum" if $link eq 'invnum';
 <INPUT TYPE="hidden" NAME="quickpay" VALUE="<%= $quickpay %>">
 
 <% 
-my $money_char = $conf->config('money_char') || '$';
 my $custnum;
 if ( $link eq 'invnum' ) {
+
   my $cust_bill = qsearchs('cust_bill', { 'invnum' => $linknum } )
     or die "unknown invnum $linknum";
+  print "Invoice #<B>$linknum</B>". ntable("#cccccc",2).
+        '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
+        time2str("%D", $cust_bill->_date). '</TD></TR>'.
+        '<TR><TD ALIGN="right" VALIGN="top">Items</TD><TD BGCOLOR="#ffffff">';
+  foreach ( $cust_bill->cust_bill_pkg ) { #false laziness with FS::cust_bill
+    if ( $_->pkgnum ) {
+
+      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
+      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
+      my($pkg)=$part_pkg->pkg;
+
+      if ( $_->setup != 0 ) {
+        print "$pkg Setup<BR>"; # $money_char. sprintf("%10.2f",$_->setup);
+        print join('<BR>',
+          map { "  ". $_->[0]. ": ". $_->[1] } $cust_pkg->labels
+        ). '<BR>';
+      }
+
+      if ( $_->recur != 0 ) {
+        print
+          "$pkg (" . time2str("%x",$_->sdate) . " - " .
+                                time2str("%x",$_->edate) . ")<BR>";
+          #$money_char. sprintf("%10.2f",$_->recur)
+        print join('<BR>',
+          map { '--->'. $_->[0]. ": ". $_->[1] } $cust_pkg->labels
+        ). '<BR>';
+      }
+
+    } else { #pkgnum Tax
+      print "Tax<BR>" # $money_char. sprintf("%10.2f",$_->setup)
+        if $_->setup != 0;
+    }
+
+  }
+  print '</TD></TR></TABLE><BR><BR>';
+
   $custnum = $cust_bill->custnum;
+
 } elsif ( $link eq 'custnum' ) {
   $custnum = $linknum;
 }
@@ -100,28 +130,16 @@ Payment
 </SCRIPT>
 <TR>
   <TD ALIGN="right">Amount</TD>
-  <TD BGCOLOR="#ffffff" ALIGN="right"><%= $money_char %></TD>
-  <TD><INPUT TYPE="text" NAME="paid" VALUE="<%= $paid %>" SIZE=8 MAXLENGTH=8> by <B><%= $payby{$payby} %></B></TD>
+  <TD BGCOLOR="#ffffff" ALIGN="right">$</TD>
+  <TD><INPUT TYPE="text" NAME="paid" VALUE="<%= $paid %>" SIZE=8 MAXLENGTH=8></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Check #</TD>
+  <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<%= $payinfo %>" SIZE=10></TD>
 </TR>
-
-<% if ( $payby eq 'BILL' ) { %>
-
-  <TR>
-    <TD ALIGN="right">Check #</TD>
-    <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<%= $payinfo %>" SIZE=10></TD>
-  </TR>
-
-<% } %>
-
 <TR>
-<% if ( $link eq 'custnum' ) { %>
   <TD ALIGN="right">Auto-apply<BR>to invoices</TD>
   <TD COLSPAN=2><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>
-<% } elsif ( $link eq 'invnum' ) { %>
-  <TD ALIGN="right">Apply to</TD>
-  <TD COLSPAN=2 BGCOLOR="#ffffff">Invoice #<B><%= $linknum %></B> only</TD>
-  <INPUT TYPE="hidden" NAME="apply" VALUE="no">
-<% } %>
 </TR>
 
 </TABLE>
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index ce1c866..485d601 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -45,24 +45,23 @@ my @cust_pkg = qsearch('cust_pkg',{ 'custnum' => $custnum, 'cancel' => '' } );
 if (@cust_pkg) {
   print <<END;
 Current packages - select to remove (services are moved to a new package below)
-<TABLE>
-  <TR STYLE="background-color: #cccccc;">
-    <TH COLSPAN="2">Pkg #</TH>
-    <TH>Package description</TH>
-  </TR>
 <BR><BR>
 END
 
-  foreach (sort { $all_pkg{$a->getfield('pkgpart')} cmp $all_pkg{$b->getfield('pkgpart')} } @cust_pkg) {
+  my $count = 0 ;
+  print qq!<TABLE>! ;
+  foreach (@cust_pkg) {
+    print '<TR>' if $count == 0;
     my($pkgnum,$pkgpart)=( $_->getfield('pkgnum'), $_->getfield('pkgpart') );
-    my $checked = $remove_pkg{$pkgnum} ? ' CHECKED' : '';
-    print <<END;
-  <TR>
-    <TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"${checked}></TD>
-    <TD ALIGN="right">$pkgnum:</TD>\n
-    <TD>$all_pkg{$pkgpart} - $all_comment{$pkgpart}</TD>
-  </TR>
-END
+    print qq!<TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="$pkgnum"!;
+    print " CHECKED" if $remove_pkg{$pkgnum};
+    print qq!>$pkgnum: $all_pkg{$pkgpart} - $all_comment{$pkgpart}</TD>\n!;
+    $count ++ ;
+    if ($count == 2)
+    {
+      $count = 0 ;
+      print qq!</TR>\n! ;
+    }
   }
   print qq!</TABLE><BR><BR>!;
 }
@@ -74,37 +73,25 @@ END
 my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 my $agent = qsearchs('agent',{'agentnum'=> $cust_main->agentnum });
 
-my %agent_pkgs = map { ( $_->pkgpart , $all_pkg{$_->pkgpart} ) }
-                     qsearch('type_pkgs',{'typenum'=> $agent->typenum });
-
 my $count = 0;
 my $pkgparts = 0;
-print <<END;
-<TABLE>
-  <TR STYLE="background-color: #cccccc;">
-    <TH>Qty.</TH>
-    <TH COLSPAN="2">Package Description</TH>
-  </TR>
-END
-#foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
-foreach my $pkgpart ( sort { $agent_pkgs{$a} cmp $agent_pkgs{$b} }
-                             keys(%agent_pkgs) ) {
+print qq!<TABLE>!;
+foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
   $pkgparts++;
+  my($pkgpart)=$type_pkgs->pkgpart;
   next unless exists $pkg{$pkgpart}; #skip disabled ones
-  #print qq!<TR>! if ( $count == 0 );
+  print qq!<TR>! if ( $count == 0 );
   my $value = $cgi->param("pkg$pkgpart") || 0;
   print <<END;
-  <TR>
-    <TD><INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2"></TD>
-    <TD ALIGN="right">$pkgpart:</TD>
-    <TD>$pkg{$pkgpart} - $comment{$pkgpart}</TD>
-  </TR>
+  <TD>
+  <INPUT TYPE="text" NAME="pkg$pkgpart" VALUE="$value" SIZE="2" MAXLENGTH="2">
+  $pkgpart: $pkg{$pkgpart} - $comment{$pkgpart}</TD>\n
 END
   $count ++ ;
-  #if ( $count == 2 ) {
-  #  print qq!</TR>\n! ;
-  #  $count = 0;
-  #}
+  if ( $count == 2 ) {
+    print qq!</TR>\n! ;
+    $count = 0;
+  }
 }
 print qq!</TABLE>!;
 
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 32ca47a..99bc260 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -83,20 +83,16 @@ sub select_pkgpart {
 
 sub select_agentnum {
   my $plandata = shift;
-  #my $agentnum = $plandata->{'agentnum'};
-  my %agentnums = map { $_=>1 } split(/,\s*/, $plandata->{'agentnum'});
-  '<SELECT NAME="agentnum" MULTIPLE>'.
+  my $agentnum = $plandata->{'agentnum'};
+  '<SELECT NAME="agentnum">'.
   join("\n", map {
     '<OPTION VALUE="'. $_->agentnum. '"'.
-    ( $agentnums{$_->agentnum} ? ' SELECTED' : '' ).
+    ( $_->agentnum == $agentnum ? ' SELECTED' : '' ).
     '>'. $_->agent
   } qsearch('agent', { 'disabled' => '' } ) ).
   '</SELECT>';
 }
 
-my $conf = new FS::Conf;
-my $money_char = $conf->config('money_char') || '$';
-
 #this is pretty kludgy right here.
 tie my %events, 'Tie::IxHash',
 
@@ -113,12 +109,6 @@ tie my %events, 'Tie::IxHash',
     'code'   => '$cust_main->suspend();',
     'weight' => 10,
   },
-  'suspend' => {
-    'name'   => 'Suspend if balance (this invoice and previous) over',
-    'code'   => '$cust_bill->cust_suspend_if_balance_over( %%%balanceover%%% );',
-    'html'   => " $money_char ". '<INPUT TYPE="text" SIZE="7" NAME="balanceover" VALUE="%%%balanceover%%%">',
-    'weight' => 10,
-  },
   'suspend-if-pkgpart' => {
     'name'   => 'Suspend packages',
     'code'   => '$cust_main->suspend_if_pkgpart(%%%if_pkgpart%%%);',
@@ -197,11 +187,11 @@ tie my %events, 'Tie::IxHash',
 
   'send_agent' => {
     'name' => 'Send invoice (email/print) ',
-    'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', [ %%%agentnum%%% ], \'%%%agent_invoice_from%%%\');',
+    'code' => '$cust_bill->send(\'%%%agent_templatename%%%\', %%%agentnum%%%, \'%%%agent_invoice_from%%%\');',
     'html' => sub {
         '<TABLE BORDER=0>
           <TR>
-            <TD ALIGN="right">only for agent(s) </TD>
+            <TD ALIGN="right">only for agent </TD>
             <TD>'. &select_agentnum(@_). '</TD>
           </TR>
           <TR>
@@ -223,26 +213,13 @@ tie my %events, 'Tie::IxHash',
 
   'send_csv_ftp' => {
     'name' => 'Upload CSV invoice data to an FTP server',
-    'code' => '$cust_bill->send_csv( protocol   => \'ftp\',
-                                     server     => \'%%%ftpserver%%%\',
-                                     username   => \'%%%ftpusername%%%\',
-                                     password   => \'%%%ftppassword%%%\',
-                                     dir        => \'%%%ftpdir%%%\',
-                                     \'format\' => \'%%%ftpformat%%%\',
-                                   );',
+    'code' => '$cust_bill->send_csv( protocol => \'ftp\',
+                                     server   => \'%%%ftpserver%%%\',
+                                     username => \'%%%ftpusername%%%\',
+                                     password => \'%%%ftppassword%%%\',
+                                     dir      => \'%%%ftpdir%%%\'       );',
     'html' =>
-        '<TABLE BORDER=0>'.
-        '<TR><TD ALIGN="right">Format ("default" or "billco"): </TD>'.
-          '<TD>'.
-            '<!--'.
-            '<SELECT NAME="ftpformat">'.
-              '<OPTION VALUE="default">Default'.
-              '<OPTION VALUE="billco">Billco'.
-            '</SELECT>'.
-            '-->'.
-            '<INPUT TYPE="text" NAME="ftpformat" VALUE="%%%ftpformat%%%">'.
-          '</TD></TR>'.
-        '<TR><TD ALIGN="right">FTP server: </TD>'.
+        '<TABLE BORDER=0><TR><TD ALIGN="right">FTP server: </TD>'.
           '<TD><INPUT TYPE="text" NAME="ftpserver" VALUE="%%%ftpserver%%%">'.
           '</TD></TR>'.
         '<TR><TD ALIGN="right">FTP username: </TD><TD>'.
@@ -258,63 +235,6 @@ tie my %events, 'Tie::IxHash',
     'weight' => 50,
   },
 
-  'spool_csv' => {
-    'name' => 'Spool CSV invoice data',
-    'code' => '$cust_bill->spool_csv(
-                 \'format\' => \'%%%spoolformat%%%\',
-                 \'dest\'   => \'%%%spooldest%%%\',
-                 \'agent_spools\' => \'%%%spoolagent_spools%%%\',
-               );',
-    'html' => sub {
-       my $plandata = shift;
-
-       my $html =
-       '<TABLE BORDER=0>'.
-       '<TR><TD ALIGN="right">Format: </TD>'.
-         '<TD>'.
-           '<SELECT NAME="spoolformat">';
-
-       foreach my $option (qw( default billco )) {
-         $html .= qq(<OPTION VALUE="$option");
-         $html .= ' SELECTED' if $option eq $plandata->{'spoolformat'};
-         $html .= ">\u$option";
-       }
-
-       $html .= 
-           '</SELECT>'.
-         '</TD></TR>'.
-       '<TR><TD ALIGN="right">For destination: </TD>'.
-         '<TD>'.
-           '<SELECT NAME="spooldest">';
-
-       tie my %dest, 'Tie::IxHash', 
-         ''      => '(all)',
-         'POST'  => 'Postal Mail',
-         'EMAIL' => 'Email',
-         'FAX'   => 'Fax',
-       ;
-
-       foreach my $dest (keys %dest) {
-         $html .= qq(<OPTION VALUE="$dest");
-         $html .= ' SELECTED' if $dest eq $plandata->{'spooldest'};
-         $html .= '>'. $dest{$dest};
-       }
-
-       $html .=
-           '</SELECT>'.
-         '</TD></TR>'.
-       '<TR><TD ALIGN="right">Individual per-agent spools? </TD>'.
-         '<TD><INPUT TYPE="checkbox" NAME="spoolagent_spools" VALUE="1" '.
-           ( $plandata->{'spoolagent_spools'} ? 'CHECKED' : '' ).
-           '>'.
-         '</TD></TR>'.
-       '</TABLE>';
-
-       $html;
-    },
-    'weight' => 50,
-  },
-
   'bill' => {
     'name' => 'Generate invoices (normally only used with a <i>Late Fee</i> event)',
     'code' => '$cust_main->bill();',
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 60365f6..b3c389c 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
@@ -12,26 +13,21 @@ if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
 }
 
 my ($query) = $cgi->keywords;
-
+my $action = '';
 my $part_pkg = '';
 if ( $cgi->param('error') ) {
   $part_pkg = new FS::part_pkg ( {
     map { $_, scalar($cgi->param($_)) } fields('part_pkg')
   } );
 }
-
-my $action = '';
 my $clone_part_pkg = '';
-my $pkgpart = '';
 if ( $cgi->param('clone') ) {
-  $pkgpart = $cgi->param('clone');
   $action = 'Custom Pricing';
   $clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
   $part_pkg ||= $clone_part_pkg->clone;
-  $part_pkg->disabled('Y'); #isn't sticky on errors
+  $part_pkg->disabled('Y');
 } elsif ( $query && $query =~ /^(\d+)$/ ) {
   $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
-  $pkgpart = $part_pkg->pkgpart;
 } else {
   unless ( $part_pkg ) {
     $part_pkg = new FS::part_pkg {};
@@ -59,8 +55,21 @@ my $hashref = $part_pkg->hashref;
   <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
 <% } %>
 
+<% #print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>'; %>
+
 <FORM NAME="dummy">
 
+<%
+#if ( $cgi->param('clone') ) {
+#  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
+#}
+#if ( $cgi->param('pkgnum') ) {
+#  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
+#}
+#
+#print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
+%>
+
 <%= itable('',8,1) %><TR><TD VALIGN="top">
 
 Package information
@@ -106,31 +115,42 @@ Tax information
   <TR>
     <TD ALIGN="right">Setup fee tax exempt</TD>
     <TD>
-      <INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y" <%= $hashref->{setuptax} eq 'Y' ? ' CHECKED' : '' %>>
-    </TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">Recurring fee tax exempt</TD>
-    <TD>
-      <INPUT TYPE="checkbox" NAME="recurtax" VALUE="Y" <%= $hashref->{recurtax} eq 'Y' ? ' CHECKED' : '' %>>
-    </TD>
-  </TR>
+<%
 
-<% my $conf = new FS::Conf; %>
-<% if ( $conf->exists('enable_taxclasses') ) { %>
+print '<INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y"';
+print ' CHECKED' if $hashref->{setuptax} eq "Y";
+print '>';
 
-  <TR>
-    <TD align="right">Tax class</TD>
-    <TD>
-      <%= include('/elements/select-taxclass.html', $hashref->{taxclass} ) %>
-    </TD>
-  </TR>
+print <<END;
+</TD></TR>
+<TR><TD ALIGN="right">Recurring fee tax exempt</TD><TD>
+END
 
-<% } else { %>
+print '<INPUT TYPE="checkbox" NAME="recurtax" VALUE="Y"';
+print ' CHECKED' if $hashref->{recurtax} eq "Y";
+print '>';
 
-  <%= include('/elements/select-taxclass.html', $hashref->{taxclass} ) %>
+print '</TD></TR>';
 
-<% } %>
+my $conf = new FS::Conf;
+#false laziness w/ view/cust_main.cgi quick order
+if ( $conf->exists('enable_taxclasses') ) {
+  print '<TR><TD ALIGN="right">Tax class</TD><TD><SELECT NAME="taxclass">';
+  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+    or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
+    print qq!<OPTION VALUE="$taxclass"!;
+    print ' SELECTED' if $taxclass eq $hashref->{taxclass};
+    print qq!>$taxclass</OPTION>!;
+  }
+  print '</SELECT></TD></TR>';
+} else {
+  print
+    '<INPUT TYPE="hidden" NAME="taxclass" VALUE="'. $hashref->{taxclass}. '">';
+}
+
+%>
 
 </TABLE>
 
@@ -144,76 +164,72 @@ $thead .=  '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Primary</FONT></TH>'
   if dbdef->table('pkg_svc')->column('primary_svc');
 $thead .= '<TH BGCOLOR="#dcdcdc">Service</TH></TR>';
 
-%>
-
-<%= itable('', 4, 1) %><TR><TD VALIGN="top">
+#unless ( $cgi->param('clone') ) {
+#dunno why...
+unless ( 0 ) {
+  #print <<END, $thead;
+  print <<END, itable('', 4, 1), '<TR><TD VALIGN="top">', $thead;
 <BR><BR>Services included
-<%= $thead %>
-
-<%
-
-my $where =  "WHERE disabled IS NULL OR disabled = ''";
-if ( $pkgpart ) {
-  $where .=  "   OR 0 < ( SELECT quantity FROM pkg_svc
-                           WHERE pkg_svc.svcpart = part_svc.svcpart
-                             AND pkgpart = $pkgpart
-                        )";
+END
 }
-my @part_svc = qsearch('part_svc', {}, '', $where);
-my $q_part_pkg = $clone_part_pkg || $part_pkg;
-my %pkg_svc = map { $_->svcpart => $_ } $q_part_pkg->pkg_svc;
 
 my @fixups = ();
 my $count = 0;
 my $columns = 3;
+my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } );
 foreach my $part_svc ( @part_svc ) {
   my $svcpart = $part_svc->svcpart;
-  my $pkg_svc = $pkg_svc{$svcpart}
-             || new FS::pkg_svc ( {
-                                   'pkgpart'     => $pkgpart,
-                                   'svcpart'     => $svcpart,
-                                   'quantity'    => 0,
-                                   'primary_svc' => '',
-                                } );
+  my $pkgpart = $cgi->param('clone') || $part_pkg->pkgpart;
+  my $pkg_svc = $pkgpart && qsearchs( 'pkg_svc', {
+    'pkgpart'  => $pkgpart,
+    'svcpart'  => $svcpart,
+  } ) || new FS::pkg_svc ( {
+    'pkgpart'     => $pkgpart,
+    'svcpart'     => $svcpart,
+    'quantity'    => 0,
+    'primary_svc' => '',
+  });
+  #? #next unless $pkg_svc;
 
   push @fixups, "pkg_svc$svcpart";
 
-%>
-
-  <TR>
-    <TD>
-      <INPUT TYPE="text" NAME="pkg_svc<%= $svcpart %>" SIZE=4 MAXLENGTH=3 VALUE="<%= $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0 %>">
-    </TD>
-   
-    <TD>
-      <INPUT TYPE="radio" NAME="pkg_svc_primary" VALUE="<%= $svcpart %>" <%= $pkg_svc->primary_svc =~ /^Y/i ? ' CHECKED' : '' %>>
-    </TD>
-
-    <TD>
-      <A HREF="part_svc.cgi?<%= $part_svc->svcpart %>"><%= $part_svc->svc %></A>      <%= $part_svc->disabled =~ /^Y/i ? ' (DISABLED' : '' %>
-    </TD>
-  </TR>
-
-  <% $count++;
-     foreach ( 1 .. $columns-1 ) {
-       if ( $count == int( $_ * scalar(@part_svc) / $columns ) ) { 
-  %>
-         </TABLE></TD><TD VALIGN="top"><%= $thead %>
-
-  <%   }
-     }
-  %>
-
-<% } %>
-
-</TR></TABLE></TD></TR></TABLE>
+  #unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
+  #dunno why...
+  unless ( 0 ) {
+    print '<TR>'; # if $count == 0 ;
+    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=4 MAXLENGTH=3 VALUE="!,
+          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
+          qq!"></TD>!;
+    if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
+      print qq!<TD><INPUT TYPE="radio" NAME="pkg_svc_primary" VALUE="$svcpart"!;
+      print ' CHECKED' if $pkg_svc->primary_svc =~ /^Y/i;
+      print '></TD>';
+    }
+    print qq!<TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
+          qq!">!, $part_svc->getfield('svc'), "</A></TD></TR>";
+#    print "</TABLE></TD><TD>$thead" if ++$count == int(scalar(@part_svc) / 2);
+    $count+=1;
+    foreach ( 1 .. $columns-1 ) {
+      print "</TABLE></TD><TD VALIGN=\"top\">$thead"
+        if $count == int( $_ * scalar(@part_svc) / $columns );
+    }
+  } else {
+    print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
+          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0, qq!">\n!;
+  }
+}
 
-<% foreach my $f ( qw( clone pkgnum ) ) { %>
-  <INPUT TYPE="hidden" NAME="<%= $f %>" VALUE="<%= $cgi->param($f) %>">
-<% } %>
-<INPUT TYPE="hidden" NAME="pkgpart" VALUE="<%= $part_pkg->pkgpart %>">
+#unless ( $cgi->param('clone') ) {
+#dunno why...
+unless ( 0 ) {
+  print "</TR></TABLE></TD></TR></TABLE>";
+  #print "</TR></TABLE>";
+}
 
-<%
+foreach my $f ( qw( clone pkgnum ) ) {
+  print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
+}
+print '<INPUT TYPE="hidden" NAME="pkgpart" VALUE="'. $part_pkg->pkgpart. '">';
 
 # prolly should be in database
 tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
@@ -286,12 +302,6 @@ my $widget = new HTML::Widgets::SelectLayers(
                      ? $plandata{$field}
                      : $href->{$field}{'default'} ).
                  qq!" onChange="fchanged(this)">!;
-      } elsif ( $href->{$field}{'type'} eq 'checkbox' ) {
-        $html .= qq!<INPUT TYPE="checkbox" NAME="$field" VALUE=1 !.
-                 ( exists($plandata{$field}) && $plandata{$field}
-                   ? ' CHECKED'
-                   : ''
-                 ). '>';
       } elsif ( $href->{$field}{'type'} =~ /^select/ ) {
         $html .= '<SELECT';
         $html .= ' MULTIPLE'
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 9749fc1..befd9b2 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,7 +1,52 @@
 <%
 my $part_svc;
 my $clone = '';
-if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone
+my $error = '';
+if ( $cgi->param('magic') eq 'process' ) {
+
+  my $svcpart = $cgi->param('svcpart');
+  my $old = qsearchs('part_svc', { 'svcpart' => $svcpart }) if $svcpart;
+  
+  $cgi->param( 'svc_acct__usergroup',
+               join(',', $cgi->param('svc_acct__usergroup') ) );
+  
+  my $new = new FS::part_svc ( {
+    map {
+      $_, scalar($cgi->param($_));
+  #  } qw(svcpart svc svcdb)
+    } ( fields('part_svc'),
+        map { my $svcdb = $_;
+              my @fields = fields($svcdb);
+              push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
+              map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
+            } grep defined( $FS::Record::dbdef->table($_) ),
+                   qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
+      )
+  } );
+  
+  my %exportnums =
+    map { $_->exportnum => ( $cgi->param('exportnum'.$_->exportnum) || '') }
+        qsearch('part_export', {} );
+
+  if ( $svcpart ) {
+    $error = $new->replace($old, '1.3-COMPAT', [ 'usergroup' ], \%exportnums );
+  } else {
+    $error = $new->insert( [ 'usergroup' ], \%exportnums );
+    $svcpart = $new->getfield('svcpart');
+  }
+
+  unless ( $error ) { #no error, redirect
+    #print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
+    print $cgi->redirect("${p}browse/part_svc.cgi");
+    myexit;
+  }
+
+  $part_svc = $new; #??
+  #$part_svc = new FS::part_svc ( {
+  #  map { $_, scalar($cgi->param($_)) } fields('part_svc')
+  #} );
+
+} elsif ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone
   #$cgi->param('clone') =~ /^(\d+)$/ or die "malformed query: $query";
   $part_svc = qsearchs('part_svc', { 'svcpart'=>$1 } )
     or die "unknown svcpart: $1";
@@ -23,6 +68,7 @@ my $hashref = $part_svc->hashref;
 
            #" onLoad=\"visualize()\""
 %>
+<!-- mason kludge -->
 <%= header("$action Service Definition",
            menubar( 'Main Menu'         => $p,
                     'View all service definitions' => "${p}browse/part_svc.cgi"
@@ -30,12 +76,17 @@ my $hashref = $part_svc->hashref;
            )
 %>
 
+<% if ( $error ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $error %></FONT>
+<% } %>
+
 <FORM NAME="dummy">
 
       Service Part #<%= $part_svc->svcpart ? $part_svc->svcpart : "(NEW)" %>
 <BR><BR>
 Service  <INPUT TYPE="text" NAME="svc" VALUE="<%= $hashref->{svc} %>"><BR>
 Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
+<INPUT TYPE="hidden" NAME="magic" VALUE="process">
 <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <BR>
 Services are items you offer to your customers.
@@ -66,8 +117,8 @@ my $conf = new FS::Conf;
 my %defs = (
   'svc_acct' => {
     'dir'       => 'Home directory',
-    'uid'       => 'UID (set to fixed and blank for no UIDs)',
-    'slipip'    => 'IP address',
+    'uid'       => 'UID (set to fixed and blank for dial-only)',
+    'slipip'    => 'IP address (Set to fixed and blank to disable dialin, or, set a value to be exported to RADIUS Framed-IP-Address.  Use the special value <code>0e0</code> [zero e zero] to enable export to RADIUS without a Framed-IP-Address.)',
 #    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
     'popnum'    => {
                      desc => 'Access number',
@@ -84,7 +135,7 @@ my %defs = (
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => {
-                     desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file, set to blank for no shell tracking)',
+                     desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file)',
                      type =>'select',
                      select_list => [ $conf->config('shells') ],
                    },
@@ -97,7 +148,7 @@ my %defs = (
                      select_label => 'domain',
                    },
     'usergroup' => {
-                     desc =>'RADIUS groups',
+                     desc =>'ICRADIUS/FreeRADIUS groups',
                      type =>'radius_usergroup_selector',
                    },
   },
@@ -162,11 +213,10 @@ my %defs = (
     'form_name'      => 'dummy',
     #'form_action'    => 'process/part_svc.cgi',
     'form_action'    => 'part_svc.cgi', #self
-    'form_text'      => [ qw( svc svcpart ) ],
+    'form_text'      => [ qw( magic svc svcpart ) ],
     'form_checkbox'  => [ 'disabled' ],
     'layer_callback' => sub {
       my $layer = shift;
-      
       my $html = qq!<INPUT TYPE="hidden" NAME="svcdb" VALUE="$layer">!;
 
       my $columns = 3;
@@ -193,15 +243,19 @@ my %defs = (
 
       $html .=  table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
       #yucky kludge
-      my @fields = defined( dbdef->table($layer) )
+      my @fields = defined( $FS::Record::dbdef->table($layer) )
                       ? grep { $_ ne 'svcnum' } fields($layer)
                       : ();
       push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
       $part_svc->svcpart($clone) if $clone; #haha, undone below
       foreach my $field (@fields) {
         my $part_svc_column = $part_svc->part_svc_column($field);
-        my $value = $part_svc_column->columnvalue;
-        my $flag = $part_svc_column->columnflag;
+        my $value = $error
+                      ? $cgi->param("${layer}__${field}")
+                      : $part_svc_column->columnvalue;
+        my $flag = $error
+                     ? $cgi->param("${layer}__${field}_flag")
+                     : $part_svc_column->columnflag;
         my $def = $defs{$layer}{$field};
         my $desc = ref($def) ? $def->{desc} : $def;
         
@@ -263,20 +317,8 @@ my %defs = (
       $part_svc->svcpart('') if $clone; #undone
       $html .= "</TABLE>";
 
-      $html .= include('/elements/progress-init.html',
-                         $layer, #form name
-                         [ qw(svc svcpart disabled exportnum), @fields ],
-                         'process/part_svc.cgi',
-                         $p.'browse/part_svc.cgi',
-                         $layer,
-                      );
-      $html .= '<BR><INPUT NAME="submit" TYPE="button" VALUE="'.
-               ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '" '.
-               ' onClick="document.'. "$layer.submit.disabled=true; ".
-               "fixup(document.$layer); $layer". 'process();">';
-
-      #$html .= '<BR><INPUT TYPE="submit" VALUE="'.
-      #         ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '">';
+      $html .= '<BR><INPUT TYPE="submit" VALUE="'.
+               ($hashref->{svcpart} ? 'Apply changes' : 'Add service'). '">';
 
       $html;
 
diff --git a/httemplate/edit/payment_gateway.html b/httemplate/edit/payment_gateway.html
deleted file mode 100644
index 33cc236..0000000
--- a/httemplate/edit/payment_gateway.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<%
-
-my $payment_gateway;
-if ( $cgi->param('error') ) {
-  $payment_gateway = new FS::payment_gateway ( {
-    map { $_, scalar($cgi->param($_)) } fields('payment_gateway')
-  } );
-} elsif ( $cgi->keywords ) {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/;
-  $payment_gateway = qsearchs( 'payment_gateway', { 'gatewaynum' => $1 } );
-} else { #adding
-  $payment_gateway = new FS::payment_gateway {};
-}
-my $action = $payment_gateway->gatewaynum ? 'Edit' : 'Add';
-#my $hashref = $payment_gateway->hashref;
-
-%>
-
-<%= header("$action Payment gateway", menubar(
-  'Main Menu' => $p,
-  'View all payment gateways' => $p. 'browse/payment_gateway.html',
-)) %>
-
-<% if ( $cgi->param('error') ) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
-<% } %>
-
-<FORM ACTION="<%=popurl(1)%>process/payment_gateway.html" METHOD=POST>
-<INPUT TYPE="hidden" NAME="gatewaynum" VALUE="<%= $payment_gateway->gatewaynum %>">
-Gateway #<%= $payment_gateway->gatewaynum || "(NEW)" %>
-
-<%= ntable('#cccccc', 2, '') %>
-
-<TR>
-  <TH ALIGN="right">Gateway: </TH>
-  <TD><SELECT NAME="gateway_module" SIZE=1>
-    <% foreach my $module ( qw(
-         2CheckOut
-         AuthorizeNet
-         BankOfAmerica
-         Beanstream
-         Capstone
-         Cardstream
-         CashCow
-         CyberSource
-         eSec
-         eSelectPlus
-         Exact
-         iAuthorizer
-         IPaymentTPG
-         Jettis
-         LinkPoint
-         MerchantCommerce
-         Network1Financial
-         OCV
-         OpenECHO
-         PayConnect
-         PayflowPro
-         PaymentsGateway
-         PXPost
-         SecureHostingUPG
-         Skipjack
-         StGeorge
-         SurePay
-         TCLink
-         TransactionCentral
-         VirtualNet
-       ) ) {
-    %>
-      <OPTION VALUE="<%= $module %>"><%= $module %>
-    <% } %>
-    </SELECT>
-  </TD>
-</TR>
-
-<TR>
-  <TH ALIGN="right">Username: </TH>
-  <TD><INPUT TYPE="text" NAME="gateway_username"></TD>
-</TR>
-
-<TR>
-  <TH ALIGN="right">Password: </TH>
-  <TD><INPUT TYPE="text" NAME="gateway_password"></TD>
-</TR>
-
-<TR>
-  <TH ALIGN="right">Action: </TH>
-  <TD>
-    <SELECT NAME="gateway_action" SIZE=1>
-      <OPTION VALUE="Normal Authorization">Normal Authorization
-      <OPTION VALUE="Authorization Only">Authorization Only
-      <OPTION VALUE="Authorization Only, Post Authorization">Authorization Only, Post Authorization
-    </SELECT>
-  </TD>
-</TR>
-
-<TR>
-  <TH ALIGN="right">Options: </TH>
-  <TD><TEXTAREA ROWS="5" NAME="gateway_options"></TEXTAREA></TD>
-</TR>
-
-</TABLE>
-
-<BR><INPUT TYPE="submit" VALUE="<%= $payment_gateway->gatewaynum ? "Apply changes" : "Add gateway" %>">
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/edit/prepay_credit.cgi b/httemplate/edit/prepay_credit.cgi
deleted file mode 100644
index 9cf0fc6..0000000
--- a/httemplate/edit/prepay_credit.cgi
+++ /dev/null
@@ -1,56 +0,0 @@
-<%
-my $agent = '';
-my $agentnum = '';
-if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-  $agent = qsearchs('agent', { 'agentnum' => $agentnum=$1 } );
-}
-
-tie my %multiplier, 'Tie::IxHash',
-  1    => 'seconds',
-  60   => 'minutes',
-  3600 => 'hours',
-;
-
-$cgi->param('multiplier', '60') unless $cgi->param('multiplier');
-
-%>
-
-<%= header('Generate prepaid cards'. ($agent ? ' for '. $agent->agent : ''),
-           menubar( 'Main Menu' => $p, ))
-%>
-
-<% if ( $cgi->param('error') ) { %>
-  <FONT SIZE="+1" COLOR="#FF0000">Error: <%= $cgi->param('error') %></FONT>
-<% } %>
-
-<FORM ACTION="<%=popurl(1)%>process/prepay_credit.cgi" METHOD="POST" NAME="OneTrueForm" onSubmit="document.OneTrueForm.submit.disabled=true">
-
-Generate
-<INPUT TYPE="text" NAME="num" VALUE="<%= $cgi->param('num') || '(quantity)' %>" SIZE=10 MAXLENGTH=10 onFocus="if ( this.value == '(quantity)' ) { this.value = ''; }">
-<SELECT NAME="type">
-<% foreach (qw(alpha alphanumeric numeric)) { %>
-  <OPTION<%= $cgi->param('type') eq $_ ? ' SELECTED' : '' %>><%= $_ %>
-<% } %>
-</SELECT>
- prepaid cards
-
-<BR>for <SELECT NAME="agentnum"><OPTION>(any agent)
-<% foreach my $opt_agent ( qsearch('agent', { 'disabled' => '' } ) ) { %>
-  <OPTION VALUE="<%= $opt_agent->agentnum %>"<%= $opt_agent->agentnum == $agentnum ? ' SELECTED' : '' %>><%= $opt_agent->agent %>
-<% } %>
-</SELECT>
-
-<BR>Value: 
-$<INPUT TYPE="text" NAME="amount" SIZE=8 MAXLENGTH=7 VALUE="<%= $cgi->param('amount') %>">
-and/or
-<INPUT TYPE="text" NAME="seconds" SIZE=6 MAXLENGTH=5 VALUE="<%= $cgi->param('seconds') %>">
-<SELECT NAME="multiplier">
-<% foreach my $multiplier ( keys %multiplier ) { %>
-  <OPTION VALUE="<%= $multiplier %>"<%= $cgi->param('multiplier') eq $multiplier ? ' SELECTED' : '' %>><%= $multiplier{$multiplier} %>
-<% } %>
-</SELECT>
-<BR><BR>
-<INPUT TYPE="submit" NAME="submit" VALUE="Generate" onSubmit="this.disabled = true">
-
-</FORM></BODY></HTML>
-
diff --git a/httemplate/edit/process/agent_payment_gateway.html b/httemplate/edit/process/agent_payment_gateway.html
deleted file mode 100644
index c306bfa..0000000
--- a/httemplate/edit/process/agent_payment_gateway.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<%
-
-$cgi->param('agentnum') =~ /(\d+)$/ or die "illegal agentnum";
-my $agent = qsearchs('agent', { 'agentnum' => $1 } );
-die "agentnum $1 not found" unless $agent;
-
-#my $old
-
-my @new = map {
-                my $cardtype = $_;
-                new FS::agent_payment_gateway {
-                  ( map { $_ => scalar($cgi->param($_)) }
-                                    fields('agent_payment_gateway')
-                  ),
-                  'cardtype' => $cardtype,
-                };
-              }
-              $cgi->param('cardtype');
-
-foreach my $new (@new) {
-  my $error = $new->insert;
-  die $error if $error;
-}
-
-%><%= $cgi->redirect(popurl(3). "browse/agent.cgi") %>
diff --git a/httemplate/edit/process/bulk-cust_svc.cgi b/httemplate/edit/process/bulk-cust_svc.cgi
deleted file mode 100644
index dd9d1db..0000000
--- a/httemplate/edit/process/bulk-cust_svc.cgi
+++ /dev/null
@@ -1,3 +0,0 @@
-<%
-  my $server = new FS::UI::Web::JSRPC 'FS::part_svc::process_bulk_cust_svc', $cgi;
-%><%= $server->process %>
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index 28f892f..23e2e6c 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -14,12 +14,11 @@ my $custnum = $cust_main->custnum;
 my $new;
 if ($cgi->param('invnum') =~ /^Refund$/) {
   $new = new FS::cust_refund ( {
-    'reason'  => ( $cust_credit->reason || 'refund from credit' ),
+    'reason'  => $cust_credit->reason,
     'refund'  => $cgi->param('amount'),
     'payby'   => 'BILL',
     #'_date'   => $cgi->param('_date'),
-    #'payinfo' => 'Cash',
-    'payinfo' => 'Refund',
+    'payinfo' => 'Cash',
     'crednum' => $crednum,
   } );
 } else {
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 09a4254..a1d3698 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -8,30 +8,23 @@ $cgi->param('tax','') unless defined $cgi->param('tax');
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
 
-#my $payby = $cgi->param('payby');
-my $payby = $cgi->param('select'); # XXX key
-
-my %noauto = (
-  'CARD' => 'DCRD',
-  'CHEK' => 'DCHK',
-);
-$payby = $noauto{$payby}
-  if ! $cgi->param('payauto') && exists $noauto{$payby};
-
-$cgi->param('payby', $payby);
-
+my $payby = $cgi->param('payby');
 if ( $payby ) {
   if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
     $cgi->param('payinfo',
-      $cgi->param('payinfo1'). '@'. $cgi->param('payinfo2') );
+      $cgi->param($payby. '_payinfo1'). '@'. $cgi->param($payby. '_payinfo2') );
+  } else {
+    $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
   }
   $cgi->param('paydate',
-    $cgi->param( 'exp_month' ). '-'. $cgi->param( 'exp_year' ) );
+    $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
+  $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+  $cgi->param('paycvv', $cgi->param( $payby. '_paycvv' ) )
+    if defined $cgi->param( $payby. '_paycvv' );
 }
 
 my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
-push @invoicing_list, 'FAX' if $cgi->param('invoicing_list_FAX');
 $cgi->param('invoicing_list', join(',', @invoicing_list) );
 
 
@@ -53,9 +46,6 @@ if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) {
   );
 }
 
-$new->setfield('paid', $cgi->param('paid') )
-  if $cgi->param('paid');
-
 #perhaps this stuff should go to cust_main.pm
 my $cust_pkg = '';
 my $svc_acct = '';
@@ -121,20 +111,7 @@ if ( $new->custnum eq '' ) {
   tie my %hash, 'Tie::RefHash';
   %hash = ( $cust_pkg => [ $svc_acct ] ) if $cust_pkg;
   $error ||= $new->insert( \%hash, \@invoicing_list );
-
-  my $conf = new FS::Conf;
-  if ( $conf->exists('backend-realtime') && ! $error ) {
-
-    my $berror = $new->bill;
-    $new->apply_payments;
-    $new->apply_credits;
-    $berror ||= $new->collect;
-    warn "Warning, error billing during backend-realtime: $berror" if $berror;
-
-  }
-  
 } else { #create old record object
-
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
   $error ||= "Old record not found!" unless $old;
   if ( defined dbdef->table('cust_main')->column('paycvv')
@@ -143,7 +120,6 @@ if ( $new->custnum eq '' ) {
     $new->paycvv($old->paycvv);
   }
   $error ||= $new->replace($old, \@invoicing_list);
-  
 }
 
 if ( $error ) {
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 0d0a134..2d6b344 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -19,28 +19,22 @@ foreach (qw( setuptax recurtax disabled )) {
 
 my $new = new FS::part_pkg ( {
   map {
-    $_ => scalar($cgi->param($_));
+    $_, scalar($cgi->param($_));
   } fields('part_pkg')
 } );
 
-my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) }
+my %pkg_svc = map { $_ => $cgi->param("pkg_svc$_") }
               map { $_->svcpart }
               qsearch('part_svc', {} );
 
 my $error;
 my $custnum = '';
-if ( $cgi->param('taxclass') eq '(select)' ) {
-
-  $error = 'Must select a tax class';
-
-} elsif ( $pkgpart ) {
-
+if ( $pkgpart ) {
   $error = $new->replace( $old,
                           pkg_svc     => \%pkg_svc,
                           primary_svc => scalar($cgi->param('pkg_svc_primary')),
                         );
 } else {
-
   $error = $new->insert(  pkg_svc     => \%pkg_svc,
                           primary_svc => scalar($cgi->param('pkg_svc_primary')),
                           cust_pkg    => $cgi->param('pkgnum'),
@@ -48,7 +42,6 @@ if ( $cgi->param('taxclass') eq '(select)' ) {
                        );
   $pkgpart = $new->pkgpart;
 }
-
 if ( $error ) {
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi
deleted file mode 100755
index b92b627..0000000
--- a/httemplate/edit/process/part_svc.cgi
+++ /dev/null
@@ -1,3 +0,0 @@
-<%
-  my $server = new FS::UI::Web::JSRPC 'FS::part_svc::process', $cgi;
-%><%= $server->process %>
diff --git a/httemplate/edit/process/payment_gateway.html b/httemplate/edit/process/payment_gateway.html
deleted file mode 100644
index b9e4d47..0000000
--- a/httemplate/edit/process/payment_gateway.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-
-my $gatewaynum = $cgi->param('gatewaynum');
-
-my $old = qsearchs('payment_gateway',{'gatewaynum'=>$gatewaynum}) if $gatewaynum;
-
-my $new = new FS::payment_gateway ( {
-  map {
-    $_, scalar($cgi->param($_));
-  } fields('payment_gateway')
-} );
-
-my @options = split(/\r?\n/, $cgi->param('gateway_options') );
-pop @options
-  if scalar(@options) % 2 && $options[-1] =~ /^\s*$/;
-my %options = @options;
-
-my $error;
-if ( $gatewaynum ) {
-  $error=$new->replace($old);
-} else {
-  $error=$new->insert(\%options);
-  $gatewaynum=$new->getfield('gatewaynum');
-}
-
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "payment_gateway.html?". $cgi->query_string );
-} else { 
-  print $cgi->redirect(popurl(3). "browse/payment_gateway.html");
-}
-
-%>
diff --git a/httemplate/edit/process/prepay_credit.cgi b/httemplate/edit/process/prepay_credit.cgi
deleted file mode 100644
index 25ecbe0..0000000
--- a/httemplate/edit/process/prepay_credit.cgi
+++ /dev/null
@@ -1,51 +0,0 @@
-<%
-my $hashref = {};
-
-my $agent = '';
-if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-  $agent = qsearchs('agent', { 'agentnum' => $hashref->{agentnum}=$1 } );
-}
-
-my $error = '';
-
-my $num = 0;
-if ( $cgi->param('num') =~ /^\s*(\d+)\s*$/ ) {
-  $num = $1;
-} else {
-  $error = 'Illegal number of prepaid cards: '. $cgi->param('num');
-}
-
-$hashref->{amount} = $cgi->param('amount');
-$hashref->{seconds} = $cgi->param('seconds') * $cgi->param('multiplier');
-
-$error ||= FS::prepay_credit::generate( $num,
-                                        scalar($cgi->param('type')), 
-                                        $hashref
-                                      );
-
-unless ( ref($error) ) {
-  $cgi->param('error', $error );
-%><%=
-  $cgi->redirect(popurl(3). "edit/prepay_credit.cgi?". $cgi->query_string )
-%><% } else { %>
-
-<%= header( "$num prepaid cards generated".
-              ( $agent ? ' for '.$agent->agent : '' ),
-            menubar( 'Main menu' => popurl(3) )
-          )
-%>
-
-<FONT SIZE="+1">
-<% foreach my $card ( @$error ) { %>
-  <code><%= $card %></code>
-  -
-  <%= $hashref->{amount} ? sprintf('$%.2f', $hashref->{amount} ) : '' %>
-  <%= $hashref->{amount} && $hashref->{seconds} ? 'and' : '' %>
-  <%= $hashref->{seconds} ? duration_exact($hashref->{seconds}) : '' %>
-  <br>
-<% } %>
-
-</FONT>
-
-</BODY></HTML>
-<% } %>
diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi
index 928e3da..477f585 100644
--- a/httemplate/edit/process/quick-charge.cgi
+++ b/httemplate/edit/process/quick-charge.cgi
@@ -9,24 +9,15 @@ $cgi->param('amount') =~ /^\s*(\d+(\.\d{1,2})?)\s*$/
   or die 'illegal amount '. $cgi->param('amount');
 my $amount = $1;
 
-my( $error, $cust_main);
-if ( $cgi->param('taxclass') eq '(select)' ) {
-
-
- $error = 'Must select a tax class';
-} else {
-
-  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-    or die "unknown custnum $custnum";
-
-  $error = $cust_main->charge(
-    $amount,
-    $cgi->param('pkg'),
-    '$'. sprintf("%.2f",$amount),
-    $cgi->param('taxclass')
-  );
-
-}
+my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+  or die "unknown custnum $custnum";
+
+my $error = $cust_main->charge(
+  $amount,
+  $cgi->param('pkg'),
+  '$'. sprintf("%.2f",$amount),
+  $cgi->param('taxclass')
+);
 
 if ($error) {
 %>
diff --git a/httemplate/edit/process/rate.cgi b/httemplate/edit/process/rate.cgi
index 87c082d..04ff5f8 100755
--- a/httemplate/edit/process/rate.cgi
+++ b/httemplate/edit/process/rate.cgi
@@ -1,3 +1,37 @@
 <%
-  my $server = new FS::UI::Web::JSRPC 'FS::rate::process', $cgi;
-%><%= $server->process %>
+
+my $ratenum = $cgi->param('ratenum');
+
+my $old = qsearchs('rate', { 'ratenum' => $ratenum } ) if $ratenum;
+
+my @rate_detail = map {
+  my $regionnum = $_->regionnum;
+  new FS::rate_detail {
+    'dest_regionnum'  => $regionnum,
+    map { $_ => $cgi->param("$_$regionnum") }
+        qw( min_included min_charge sec_granularity )
+  };
+} qsearch('rate_region', {} );
+
+my $new = new FS::rate ( {
+  map {
+    $_, scalar($cgi->param($_));
+  } fields('rate')
+} );
+
+my $error;
+if ( $ratenum ) {
+  $error = $new->replace($old, 'rate_detail' => \@rate_detail );
+} else {
+  $error = $new->insert( 'rate_detail' => \@rate_detail );
+  $ratenum = $new->getfield('ratenum');
+}
+
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "rate.cgi?". $cgi->query_string );
+} else { 
+  print $cgi->redirect(popurl(3). "browse/rate.cgi");
+}
+
+%>
diff --git a/httemplate/edit/process/reg_code.cgi b/httemplate/edit/process/reg_code.cgi
deleted file mode 100644
index 4658257..0000000
--- a/httemplate/edit/process/reg_code.cgi
+++ /dev/null
@@ -1,44 +0,0 @@
-<%
-
-$cgi->param('agentnum') =~ /^(\d+)$/
-  or eidiot 'illegal agentnum '. $cgi->param('agentnum');
-my $agentnum = $1;
-my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
-
-my $error = '';
-
-my $num = 0;
-if ( $cgi->param('num') =~ /^\s*(\d+)\s*$/ ) {
-  $num = $1;
-} else {
-  $error = 'Illegal number of codes: '. $cgi->param('num');
-}
-
-my @pkgparts = 
-  map  { /^pkgpart(.*)$/; $1 }
-  grep { $cgi->param($_) }
-  grep { /^pkgpart/ }
-  $cgi->param;
-
-$error ||= $agent->generate_reg_codes($num, \@pkgparts);
-
-unless ( ref($error) ) {
-  $cgi->param('error'. $error );
-%><%=
-  $cgi->redirect(popurl(3). "edit/reg_code.cgi?". $cgi->query_string )
-%><% } else { %>
-
-<%= header("$num registration codes generated for ". $agent->agent, menubar(
-  'Main menu'       => popurl(3),
-  'View all agents' => popurl(3). 'browse/agent.cgi',
-) ) %>
-
-<PRE><FONT SIZE="+1">
-<% foreach my $code ( @$error ) { %>
-  <%= $code %>
-<% } %>
-
-</FONT></PRE>
-
-</BODY></HTML>
-<% } %>
diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
index a009ba2..4912a3a 100644
--- a/httemplate/edit/process/svc_broadband.cgi
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -1,5 +1,11 @@
 <%
 
+# If it's stupid but it works, it's not stupid.
+# -- U.S. Army
+
+local $FS::UID::AutoCommit = 0;
+my $dbh = FS::UID::dbh;
+
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my $svcnum = $1;
 
@@ -25,11 +31,14 @@ if ( $svcnum ) {
   $svcnum = $new->svcnum;
 }
 
+
 if ( $error ) {
   $cgi->param('error', $error);
   $cgi->param('ip_addr', $new->ip_addr);
+  $dbh->rollback;
   print $cgi->redirect(popurl(2). "svc_broadband.cgi?". $cgi->query_string );
 } else {
+  $dbh->commit or die $dbh->errstr;
   print $cgi->redirect(popurl(3). "view/svc_broadband.cgi?" . $svcnum );
 }
 
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 1771f01..4fdc837 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -1,7 +1,12 @@
+<!-- mason kludge -->
 <%
 
 my $rate;
-if ( $cgi->keywords ) {
+if ( $cgi->param('error') ) {
+  $rate = new FS::rate ( {
+    map { $_, scalar($cgi->param($_)) } fields('rate')
+  } );
+} elsif ( $cgi->keywords ) {
   my($query) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $rate = qsearchs( 'rate', { 'ratenum' => $1 } );
@@ -17,12 +22,12 @@ my %granularity = (
   '60' => 'minute',
 );
 
-#my $nous = <<END;
-#  WHERE 0 < ( SELECT COUNT(*) FROM rate_prefix
-#               WHERE rate_region.regionnum = rate_prefix.regionnum
-#                 AND countrycode != '1'
-#            )
-#END
+my $nous = <<END;
+  WHERE 0 < ( SELECT COUNT(*) FROM rate_prefix
+               WHERE rate_region.regionnum = rate_prefix.regionnum
+                 AND countrycode != '1'
+            )
+END
 
 %>
 
@@ -32,14 +37,12 @@ my %granularity = (
     ))
 %>
 
-<%= include('/elements/progress-init.html',
-              'OneTrueForm',
-              [ 'rate', 'min_', 'sec_' ],
-              'process/rate.cgi',
-              $p.'browse/rate.cgi',
-           )
-%>
-<FORM NAME="OneTrueForm">
+<% if ( $cgi->param('error') ) { %>
+<FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT><BR>
+<% } %>
+
+<FORM ACTION="<%=$p1%>process/rate.cgi" METHOD=POST>
+
 <INPUT TYPE="hidden" NAME="ratenum" VALUE="<%= $rate->ratenum %>">
 
 Rate plan
@@ -56,27 +59,20 @@ Rate plan
 </TR>
 
 <% foreach my $rate_region (
-     sort { lc($a->regionname) cmp lc($b->regionname) }
-     qsearch({
-               'select'    => 'DISTINCT ON ( regionnum ) rate_region.*',
-               'table'     => 'rate_region',
-               'addl_from' => 'INNER JOIN rate_prefix USING ( regionnum )',
-               'hashref'   => {},
-               'extra_sql' => "WHERE countrycode != '1'",
-                              # 'ORDER BY regionname'
-                              # ERROR: SELECT DISTINCT ON expressions must
-                              #        match initial ORDER BY expressions
-            })
+     qsearch( 'rate_region',
+              {},
+              '',
+              "$nous ORDER BY regionname",
+            )
    ) {
      my $n = $rate_region->regionnum;
      my $rate_detail =
        $rate->dest_detail($rate_region)
-       || new FS::rate_detail { 'min_included'    => 0,
+       || new FS::rate_region { 'min_included'    => 0,
                                 'min_charge'      => 0,
                                 'sec_granularity' => '60'
                               };
 %>
-
   <TR>
     <TD><A HREF="<%=$p%>edit/rate_region.cgi?<%= $rate_region->regionnum %>"><%= $rate_region->regionname %></A></TD>
     <TD><%= $rate_region->prefixes_short %></TD>
@@ -89,7 +85,6 @@ Rate plan
         <% } %>
       </SELECT>
   </TR>
-
 <% } %>
 
 <TR>
@@ -100,9 +95,9 @@ Rate plan
 
 </TABLE>
 
-<BR><INPUT NAME="submit" TYPE="button" VALUE="<%= 
+<BR><INPUT TYPE="submit" VALUE="<%= 
   $rate->ratenum ? "Apply changes" : "Add rate plan"
-%>" onClick="document.OneTrueForm.submit.disabled=true; process();">
+%>">
 
     </FORM>
   </BODY>
diff --git a/httemplate/edit/reg_code.cgi b/httemplate/edit/reg_code.cgi
deleted file mode 100644
index 899d1ec..0000000
--- a/httemplate/edit/reg_code.cgi
+++ /dev/null
@@ -1,36 +0,0 @@
-<%
-my $agentnum = $cgi->param('agentnum');
-$agentnum =~ /^(\d+)$/ or eidiot "illegal agentnum $agentnum";
-$agentnum = $1;
-my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
-
-%>
-
-<%= header('Generate registration codes for '. $agent->agent, menubar(
-      'Main Menu' => $p,
-    ))
-%>
-
-<% if ( $cgi->param('error') ) { %>
-  <FONT SIZE="+1" COLOR="#FF0000">Error: <%= $cgi->param('error') %></FONT>
-<% } %>
-
-<FORM ACTION="<%=popurl(1)%>process/reg_code.cgi" METHOD="POST" NAME="OneTrueForm" onSubmit="document.OneTrueForm.submit.disabled=true">
-<INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agent->agentnum %>">
-
-Generate
-<INPUT TYPE="text" NAME="num" VALUE="<%= $cgi->param('num') %>" SIZE=5 MAXLENGTH=4>
-registration codes for <B><%= $agent->agent %></B> allowing the following packages:
-<BR><BR>
-
-<% foreach my $part_pkg ( qsearch('part_pkg', { 'disabled' => '' } ) ) { %>
-  <INPUT TYPE="checkbox" NAME="pkgpart<%= $part_pkg->pkgpart %>">
-  <%= $part_pkg->pkg %> - <%= $part_pkg->comment %>
-  <BR>
-<% } %>
-
-<BR>
-<INPUT TYPE="submit" NAME="submit" VALUE="Generate">
-
-</FORM></BODY></HTML>
-
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index e74d84d..f1b8b80 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
@@ -5,7 +6,6 @@ my @shells = $conf->config('shells');
 
 my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct, @groups);
 if ( $cgi->param('error') ) {
-
   $svc_acct = new FS::svc_acct ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_acct')
   } );
@@ -15,9 +15,7 @@ if ( $cgi->param('error') ) {
   $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
   die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
   @groups = $cgi->param('radius_usergroup');
-
 } else {
-
   my($query) = $cgi->keywords;
   if ( $query =~ /^(\d+)$/ ) { #editing
     $svcnum=$1;
@@ -48,43 +46,35 @@ if ( $cgi->param('error') ) {
 
     $svcnum='';
 
-  }
-}
-
-my( $cust_pkg, $cust_main ) = ( '', '' );
-if ( $pkgnum ) {
-  $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
-  $cust_main = $cust_pkg->cust_main;
-}
-
-unless ( $svcnum || $cgi->param('error') ) { #adding
-
-  #set gecos
-  if ($cust_main) {
-    unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
-      $svc_acct->setfield('finger',
-        $cust_main->getfield('first') . " " . $cust_main->getfield('last')
-      );
+    #set gecos
+    my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+    if ($cust_pkg) {
+      my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
+      unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
+        $svc_acct->setfield('finger',
+          $cust_main->getfield('first') . " " . $cust_main->getfield('last')
+        );
+      }
     }
-  }
 
-  #set fixed and default fields from part_svc
-  foreach my $part_svc_column (
-    grep { $_->columnflag } $part_svc->all_part_svc_column
-  ) {
-    if ( $part_svc_column->columnname eq 'usergroup' ) {
-      @groups = split(',', $part_svc_column->columnvalue);
-    } else {
-      $svc_acct->setfield( $part_svc_column->columnname,
-                           $part_svc_column->columnvalue,
-                         );
+    #set fixed and default fields from part_svc
+    foreach my $part_svc_column (
+      grep { $_->columnflag } $part_svc->all_part_svc_column
+    ) {
+      if ( $part_svc_column->columnname eq 'usergroup' ) {
+        @groups = split(',', $part_svc_column->columnvalue);
+      } else {
+        $svc_acct->setfield( $part_svc_column->columnname,
+                             $part_svc_column->columnvalue,
+                           );
+      }
     }
-  }
 
+  }
 }
 
 #fixed radius groups always override & display
-if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) {
+if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
   @groups = split(',', $part_svc->part_svc_column('usergroup')->columnvalue);
 }
 
@@ -106,91 +96,55 @@ if ( $svc_acct->_password ) {
   $password = '';
 }
 
-my $ulen = 
-  $conf->exists('usernamemax')
-  ? $conf->config('usernamemax')
-  : dbdef->table('svc_acct')->column('username')->length;
+my $ulen = $conf->config('usernamemax')
+           || $svc_acct->dbdef_table->column('username')->length;
 my $ulen2 = $ulen+2;
 
 my $pmax = $conf->config('passwordmax') || 8;
 my $pmax2 = $pmax+2;
 
 my $p1 = popurl(1);
-
-%>
-
-<%= header("$action $svc account") %>
-
-<% if ( $cgi->param('error') ) { %>
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
-  <BR><BR>
-<% } %>
-
-<% if ( $cust_main ) { %>
-  <%= include( '/elements/small_custview.html', $cust_main, '', 1 ) %>
-  <BR>
-<% } %>
-
-<FORM NAME="OneTrueForm" ACTION="<%= $p1 %>process/svc_acct.cgi" METHOD=POST>
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%= $svcnum %>">
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
-<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $svcpart %>">
-
-Service # <%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
-
-<%= ntable("#cccccc",2) %>
-
-<TR>
-  <TD ALIGN="right">Service</TD>
-  <TD BGCOLOR="#eeeeee"><%= $part_svc->svc %></TD>
-</TR>
-
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD>
-    <INPUT TYPE="text" NAME="username" VALUE="<%= $username %>" SIZE=<%= $ulen2 %> MAXLENGTH=<%= $ulen %>>
-  </TD>
-</TR>
-
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD>
-    <INPUT TYPE="text" NAME="_password" VALUE="<%= $password %>" SIZE=<%= $pmax2 %> MAXLENGTH=<%= $pmax %>>
-    (blank to generate)
-  </TD>
+print header("$action $svc account");
+
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+      "</FONT><BR><BR>"
+  if $cgi->param('error');
+
+print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
+      'Service: <B>'. $part_svc->svc. '</B><BR><BR>'.
+      <<END;
+    <FORM NAME="OneTrueForm" ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
+      <INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">
+      <INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">
+      <INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">
+END
+
+print &ntable("#cccccc",2), <<END;
+<TR><TD ALIGN="right">Username</TD>
+<TD><INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen></TD></TR>
+<TR><TD ALIGN="right">Password</TD>
+<TD><INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=$pmax2 MAXLENGTH=$pmax>
+(blank to generate)</TD>
 </TR>
+END
 
-
-<%
 my $sec_phrase = $svc_acct->sec_phrase;
 if ( $conf->exists('security_phrase') ) {
-%>
-
-  <TR>
-    <TD ALIGN="right">Security phrase</TD>
-    <TD>
-      <INPUT TYPE="text" NAME="sec_phrase" VALUE="<%= $sec_phrase %>" SIZE=32>
-      (for forgotten passwords)
-    </TD>
+  print <<END;
+  <TR><TD ALIGN="right">Security phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase" SIZE=32>
+    (for forgotten passwords)</TD>
   </TD>
+END
+} else {
+  print qq!<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="$sec_phrase">!;
+}
 
-<% } else { %>
-
-  <INPUT TYPE="hidden" NAME="sec_phrase" VALUE="<%= $sec_phrase %>">
-
-<% } %>
-
-
-<%
 #domain
 my $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
-%>
-
-  <INPUT TYPE="hidden" NAME="domsvc" VALUE="<%= $domsvc %>">
-
-<% } else { 
-
+  print qq!<INPUT TYPE="hidden" NAME="domsvc" VALUE="$domsvc">!;
+} else { 
   my %svc_domain = ();
 
   if ( $domsvc ) {
@@ -214,6 +168,7 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
     }
   }
 
+  my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
   if ($cust_pkg && !$conf->exists('svc_acct-alldomains') ) {
     my @cust_svc =
       map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
@@ -226,221 +181,121 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   } else {
     %svc_domain = map { $_->svcnum => $_ } qsearch('svc_domain', {} );
   }
+  print qq!<TR><TD ALIGN="right">Domain</TD>!.
+        qq!<TD><SELECT NAME="domsvc" SIZE=1>\n!;
+  foreach my $svcnum (
+    sort { $svc_domain{$a}->domain cmp $svc_domain{$b}->domain }
+      keys %svc_domain
+  ) {
+    my $svc_domain = $svc_domain{$svcnum};
+    print qq!<OPTION VALUE="!. $svc_domain->svcnum. qq!"!.
+          ( $svc_domain->svcnum == $domsvc ? ' SELECTED' : '' ).
+          '>'. $svc_domain->domain. "\n" ;
+  }
+  print "</SELECT></TD></TR>";
+}
 
-%>
-
-  <TR>
-    <TD ALIGN="right">Domain</TD>
-    <TD>
-      <SELECT NAME="domsvc" SIZE=1>
-
-        <% foreach my $svcnum (
-             sort { $svc_domain{$a}->domain cmp $svc_domain{$b}->domain }
-                  keys %svc_domain
-           ) {
-             my $svc_domain = $svc_domain{$svcnum};
-        %>
-
-             <OPTION VALUE="<%= $svc_domain->svcnum %>" <%= $svc_domain->svcnum == $domsvc ? ' SELECTED' : '' %>><%= $svc_domain->domain %>
-
-       <% } %>
-      </SELECT>
-    </TD>
-  </TR>
-
-<% } %>
-
-
-<%
 #pop
 my $popnum = $svc_acct->popnum || 0;
-if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) {
-%>
-
-  <INPUT TYPE="hidden" NAME="popnum" VALUE="<%= $popnum %>">
-
-
-<% } else { %>
-
-  <TR>
-    <TD ALIGN="right">Access number</TD>
-    <TD><%= FS::svc_acct_pop::popselector($popnum) %></TD>
-  </TR>
-
-<% } %>
-
-
-<% #uid/gid %>
-<% foreach my $xid (qw( uid gid )) { %>
-
-  <%
-  if ( $part_svc->part_svc_column($xid)->columnflag eq 'F'
-       || ! $conf->exists("svc_acct-edit_$xid")
-     ) {
-  %>
-  
-    <% if ( length($svc_acct->$xid()) ) { %>
-  
-      <TR>
-        <TD ALIGN="right"><%= uc($xid) %></TD>
-          <TD BGCOLOR="#eeeeee"><%= $svc_acct->$xid() %></TD>
-        <TD>
-        </TD>
-      </TR>
-  
-    <% } %>
-  
-    <INPUT TYPE="hidden" NAME="<%= $xid %>" VALUE="<%= $svc_acct->$xid() %>">
-  
-  <% } else { %>
-  
-    <TR>
-      <TD ALIGN="right"><%= uc($xid) %></TD>
-      <TD>
-        <INPUT TYPE="text" NAME="<%= $xid %>" SIZE=8 MAXLENGTH=6 VALUE="<%= $svc_acct->$xid() %>">
-      </TD>
-    </TR>
-  
-  <% } %>
-
-<% } %>
-
-
-<%
-#finger
-if ( $part_svc->part_svc_column('uid')->columnflag eq 'F'
-     && ! $svc_acct->finger ) { 
-%>
-
-  <INPUT TYPE="hidden" NAME="finger" VALUE="">
-
-<% } else { %>
-
-  <TR>
-    <TD ALIGN="right">GECOS</TD>
-    <TD>
-      <INPUT TYPE="text" NAME="finger" VALUE="<%= $svc_acct->finger %>">
-    </TD>
-  </TR>
-
-<% } %>
+if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
+} else { 
+  print qq!<TR><TD ALIGN="right">Access number</TD>!.
+        qq!<TD>!. FS::svc_acct_pop::popselector($popnum). '</TD></TR>';
+}
 
+my($uid,$gid,$finger,$dir)=(
+  $svc_acct->uid,
+  $svc_acct->gid,
+  $svc_acct->finger,
+  $svc_acct->dir,
+);
 
-<INPUT TYPE="hidden" NAME="dir" VALUE="<%= $svc_acct->dir %>">
+print <<END;
+<INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
+<INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
+END
 
+if ( !$finger && $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
+  print '<INPUT TYPE="hidden" NAME="finger" VALUE="">';
+} else {
+  print '<TR><TD ALIGN="right">GECOS</TD>'.
+        qq!<TD><INPUT TYPE="text" NAME="finger" VALUE="$finger"></TD></TR>!;
+}
+print qq!<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">!;
 
-<%
-#shell
 my $shell = $svc_acct->shell;
-if ( $part_svc->part_svc_column('shell')->columnflag eq 'F'
+if ( $part_svc->part_svc_column('shell')->columnflag eq "F"
      || ( !$shell && $part_svc->part_svc_column('uid')->columnflag eq 'F' )
    ) {
-%>
-
-  <INPUT TYPE="hidden" NAME="shell" VALUE="<%= $shell %>">
-
-<% } else { %>
-
-  <TR>
-    <TD ALIGN="right">Shell</TD>
-    <TD>
-      <SELECT NAME="shell" SIZE=1>
-
-        <%
-           my($etc_shell);
-           foreach $etc_shell (@shells) {
-        %>
-
-          <OPTION<%= $etc_shell eq $shell ? ' SELECTED' : '' %>><%= $etc_shell %>
-
-        <% } %>
-
-      </SELECT>
-    </TD>
-  </TR>
-
-<% } %>
-
-
-<% if ( $part_svc->part_svc_column('quota')->columnflag eq 'F' ) { %>
-
-  <INPUT TYPE="hidden" NAME="quota" VALUE="<%= $svc_acct->quota %>">
-
-<% } else { %>
-
-  <TR>
-    <TD ALIGN="right">Quota:</TD>
-    <TD><INPUT TYPE="text" NAME="quota" VALUE="<%= $svc_acct->quota %>"></TD>
-  </TR>
-  
-<% } %>
-
-
-<% if ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) { %>
-
-  <INPUT TYPE="hidden" NAME="slipip" VALUE="<%= $svc_acct->slipip %>">
-
-<% } else { %>
+  print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
+} else {
+  print qq!<TR><TD ALIGN="right">Shell</TD><TD><SELECT NAME="shell" SIZE=1>!;
+  my($etc_shell);
+  foreach $etc_shell (@shells) {
+    print "<OPTION", $etc_shell eq $shell ? ' SELECTED' : '', ">",
+          $etc_shell, "\n";
+  }
+  print "</SELECT></TD></TR>";
+}
 
-  <TR>
-    <TD ALIGN="right">IP</TD>
-    <TD><INPUT TYPE="text" NAME="slipip" VALUE="<%= $svc_acct->slipip %>"></TD>
-  </TR>
+my($quota,$slipip)=(
+  $svc_acct->quota,
+  $svc_acct->slipip,
+);
 
-<% } %>
+if ( $part_svc->part_svc_column('quota')->columnflag eq "F" )
+{
+  print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
+} else {
+  print <<END;
+    <TR><TD ALIGN="right">Quota:</TD>
+        <TD> <INPUT TYPE="text" NAME="quota" VALUE="$quota" ></TD>
+    </TR>
+END
+}
 
+if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
+  print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
+} else {
+  print qq!<TR><TD ALIGN="right">IP</TD><TD><INPUT TYPE="text" NAME="slipip" VALUE="$slipip"></TD></TR>!;
+}
 
-<%
 foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
   $r =~ /^^r(adius|[cr])_(.+)$/ or next; #?
   my $a = $2;
-%>
-
-  <% if ( $part_svc->part_svc_column($r)->columnflag eq 'F' ) { %>
-
-    <INPUT TYPE="hidden" NAME="<%= $r %>" VALUE="<%= $svc_acct->getfield($r) %>">
-
-  <% } else { %>
-
-    <TR>
-      <TD ALIGN="right"><%= $FS::raddb::attrib{$a} %></TD>
-      <TD><INPUT TYPE="text" NAME="<%= $r %>" VALUE="<%= $svc_acct->getfield($r) %>"></TD>
-    </TR>
-
-  <% } %>
-
-<% } %>
-
-
-<TR>
-  <TD ALIGN="right">RADIUS groups</TD>
-
-  <% if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) { %>
-
-    <TD BGCOLOR="#eeeeee"><%= join('<BR>', @groups) %></TD>
-
-  <% } else { %>
-
-    <TD><%= FS::svc_acct::radius_usergroup_selector( \@groups ) %></TD>
-
-  <% } %>
-
-</TR>
-
-<% foreach my $field ($svc_acct->virtual_fields) { %>
-
-  <% # If the flag is X, it won't even show up in $svc_acct->virtual_fields. %>
-  <% if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) { %>
-
-    <%= $svc_acct->pvf($field)->widget('HTML', 'edit', $svc_acct->getfield($field)) %>
+  if ( $part_svc->part_svc_column($r)->columnflag eq 'F' ) {
+    print qq!<INPUT TYPE="hidden" NAME="$r" VALUE="!.
+          $svc_acct->getfield($r). '">';
+  } else {
+    print qq!<TR><TD ALIGN="right">$FS::raddb::attrib{$a}</TD><TD><INPUT TYPE="text" NAME="$r" VALUE="!.
+          $svc_acct->getfield($r). '"></TD></TR>';
+  }
+}
 
-  <% } %>
+print '<TR><TD ALIGN="right">RADIUS groups</TD>';
+if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
+  print '<TD BGCOLOR="#ffffff">'. join('<BR>', @groups);
+} else {
+  print '<TD>'. &FS::svc_acct::radius_usergroup_selector( \@groups );
+}
+print '</TD></TR>';
 
-<% } %>
+foreach my $field ($svc_acct->virtual_fields) {
+  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
+    # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
+    print $svc_acct->pvf($field)->widget('HTML', 'edit', 
+        $svc_acct->getfield($field));
+  }
+}
   
-</TABLE>
-<BR>
+#submit
+print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!; 
 
-<INPUT TYPE="submit" VALUE="Submit">
+print <<END;
+    </FORM>
+  </BODY>
+</HTML>
+END
 
-</FORM></BODY></HTML>
+%>
diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi
index 3cb7528..02fa64c 100644
--- a/httemplate/edit/svc_www.cgi
+++ b/httemplate/edit/svc_www.cgi
@@ -196,7 +196,6 @@ foreach $_ (keys %arec) {
 print "</SELECT></TD></TR>";
 
 print '<TR><TD ALIGN="right">Username</TD><TD><SELECT NAME="usersvc" SIZE=1>';
-print '<OPTION VALUE="">(none)';
 foreach $_ (keys %svc_acct) {
   print "<OPTION", ($_ eq $usersvc) ? " SELECTED" : "",
         qq! VALUE="$_">$svc_acct{$_}!;
diff --git a/httemplate/elements/jsrsClient.js b/httemplate/elements/jsrsClient.js
deleted file mode 100644
index 3a2572c..0000000
--- a/httemplate/elements/jsrsClient.js
+++ /dev/null
@@ -1,356 +0,0 @@
-//
-//  jsrsClient.js - javascript remote scripting client include
-//  
-//  Author:  Brent Ashley [jsrs@megahuge.com]
-//
-//  make asynchronous remote calls to server without client page refresh
-//
-//  see license.txt for copyright and license information
-
-/*
-see history.txt for full history
-2.0  26 Jul 2001 - added POST capability for IE/MOZ
-2.2  10 Aug 2003 - added Opera support
-2.3(beta)  10 Oct 2003 - added Konqueror support - **needs more testing**
-*/
-
-// callback pool needs global scope
-var jsrsContextPoolSize = 0;
-var jsrsContextMaxPool = 10;
-var jsrsContextPool = new Array();
-var jsrsBrowser = jsrsBrowserSniff();
-var jsrsPOST = true;
-var containerName;
-
-// constructor for context object
-function jsrsContextObj( contextID ){
-  
-  // properties
-  this.id = contextID;
-  this.busy = true;
-  this.callback = null;
-  this.container = contextCreateContainer( contextID );
-  
-  // methods
-  this.GET = contextGET;
-  this.POST = contextPOST;
-  this.getPayload = contextGetPayload;
-  this.setVisibility = contextSetVisibility;
-}
-
-//  method functions are not privately scoped 
-//  because Netscape's debugger chokes on private functions
-function contextCreateContainer( containerName ){
-  // creates hidden container to receive server data 
-  var container;
-  switch( jsrsBrowser ) {
-    case 'NS':
-      container = new Layer(100);
-      container.name = containerName;
-      container.visibility = 'hidden';
-      container.clip.width = 100;
-      container.clip.height = 100;
-      break;
-    
-    case 'IE':
-      document.body.insertAdjacentHTML( "afterBegin", '<span id="SPAN' + containerName + '"></span>' );
-      var span = document.all( "SPAN" + containerName );
-      var html = '<iframe name="' + containerName + '" src=""></iframe>';
-      span.innerHTML = html;
-      span.style.display = 'none';
-      container = window.frames[ containerName ];
-      break;
-      
-    case 'MOZ':  
-      var span = document.createElement('SPAN');
-      span.id = "SPAN" + containerName;
-      document.body.appendChild( span );
-      var iframe = document.createElement('IFRAME');
-      iframe.name = containerName;
-      iframe.id = containerName;
-      span.appendChild( iframe );
-      container = iframe;
-      break;
-
-    case 'OPR':  
-      var span = document.createElement('SPAN');
-      span.id = "SPAN" + containerName;
-      document.body.appendChild( span );
-      var iframe = document.createElement('IFRAME');
-      iframe.name = containerName;
-      iframe.id = containerName;
-      span.appendChild( iframe );
-      container = iframe;
-      break;
-
-    case 'KONQ':  
-      var span = document.createElement('SPAN');
-      span.id = "SPAN" + containerName;
-      document.body.appendChild( span );
-      var iframe = document.createElement('IFRAME');
-      iframe.name = containerName;
-      iframe.id = containerName;
-      span.appendChild( iframe );
-      container = iframe;
-
-      // Needs to be hidden for Konqueror, otherwise it'll appear on the page
-      span.style.display = none;
-      iframe.style.display = none;
-      iframe.style.visibility = hidden;
-      iframe.height = 0;
-      iframe.width = 0;
-
-      break;
-  }
-  return container;
-}
-
-function contextPOST( rsPage, func, parms ){
-
-  var d = new Date();
-  var unique = d.getTime() + '' + Math.floor(1000 * Math.random());
-  var doc = (jsrsBrowser == "IE" ) ? this.container.document : this.container.contentDocument;
-  doc.open();
-  doc.write('<html><body>');
-  doc.write('<form name="jsrsForm" method="post" target="" ');
-  doc.write(' action="' + rsPage + '?U=' + unique + '">');
-  doc.write('<input type="hidden" name="C" value="' + this.id + '">');
-
-  // func and parms are optional
-  if (func != null){
-  doc.write('<input type="hidden" name="F" value="' + func + '">');
-
-    if (parms != null){
-      if (typeof(parms) == "string"){
-        // single parameter
-        doc.write( '<input type="hidden" name="P0" '
-                 + 'value="[' + jsrsEscapeQQ(parms) + ']">');
-      } else {
-        // assume parms is array of strings
-        for( var i=0; i < parms.length; i++ ){
-          doc.write( '<input type="hidden" name="P' + i + '" '
-                   + 'value="[' + jsrsEscapeQQ(parms[i]) + ']">');
-        }
-      } // parm type
-    } // parms
-  } // func
-
-  doc.write('</form></body></html>');
-  doc.close();
-  doc.forms['jsrsForm'].submit();
-}
-
-function contextGET( rsPage, func, parms ){
-
-  // build URL to call
-  var URL = rsPage;
-
-  // always send context
-  URL += "?C=" + this.id;
-
-  // func and parms are optional
-  if (func != null){
-    URL += "&F=" + escape(func);
-
-    if (parms != null){
-      if (typeof(parms) == "string"){
-        // single parameter
-        URL += "&P0=[" + escape(parms+'') + "]";
-      } else {
-        // assume parms is array of strings
-        for( var i=0; i < parms.length; i++ ){
-          URL += "&P" + i + "=[" + escape(parms[i]+'') + "]";
-        }
-      } // parm type
-    } // parms
-  } // func
-
-  // unique string to defeat cache
-  var d = new Date();
-  URL += "&U=" + d.getTime();
- 
-  // make the call
-  switch( jsrsBrowser ) {
-    case 'NS':
-      this.container.src = URL;
-      break;
-    case 'IE':
-      this.container.document.location.replace(URL);
-      break;
-    case 'MOZ':
-      this.container.src = '';
-      this.container.src = URL; 
-      break;
-    case 'OPR':
-      this.container.src = '';
-      this.container.src = URL; 
-      break;
-    case 'KONQ':
-      this.container.src = '';
-      this.container.src = URL; 
-      break;
-  }  
-}
-
-function contextGetPayload(){
-  switch( jsrsBrowser ) {
-    case 'NS':
-      return this.container.document.forms['jsrs_Form'].elements['jsrs_Payload'].value;
-    case 'IE':
-      return this.container.document.forms['jsrs_Form']['jsrs_Payload'].value;
-    case 'MOZ':
-      return window.frames[this.container.name].document.forms['jsrs_Form']['jsrs_Payload'].value; 
-    case 'OPR':
-      var textElement = window.frames[this.container.name].document.getElementById("jsrs_Payload");
-    case 'KONQ':
-      var textElement = window.frames[this.container.name].document.getElementById("jsrs_Payload");
-      return textElement.value;
-  }  
-}
-
-function contextSetVisibility( vis ){
-  switch( jsrsBrowser ) {
-    case 'NS':
-      this.container.visibility = (vis)? 'show' : 'hidden';
-      break;
-    case 'IE':
-      document.all("SPAN" + this.id ).style.display = (vis)? '' : 'none';
-      break;
-    case 'MOZ':
-      document.getElementById("SPAN" + this.id).style.visibility = (vis)? '' : 'hidden';
-    case 'OPR':
-      document.getElementById("SPAN" + this.id).style.visibility = (vis)? '' : 'hidden';
-      this.container.width = (vis)? 250 : 0;
-      this.container.height = (vis)? 100 : 0;
-      break;
-  }  
-}
-
-// end of context constructor
-
-function jsrsGetContextID(){
-  var contextObj;
-  for (var i = 1; i <= jsrsContextPoolSize; i++){
-    contextObj = jsrsContextPool[ 'jsrs' + i ];
-    if ( !contextObj.busy ){
-      contextObj.busy = true;      
-      return contextObj.id;
-    }
-  }
-  // if we got here, there are no existing free contexts
-  if ( jsrsContextPoolSize <= jsrsContextMaxPool ){
-    // create new context
-    var contextID = "jsrs" + (jsrsContextPoolSize + 1);
-    jsrsContextPool[ contextID ] = new jsrsContextObj( contextID );
-    jsrsContextPoolSize++;
-    return contextID;
-  } else {
-    alert( "jsrs Error:  context pool full" );
-    return null;
-  }
-}
-
-function jsrsExecute( rspage, callback, func, parms, visibility ){
-  // call a server routine from client code
-  //
-  // rspage      - href to asp file
-  // callback    - function to call on return 
-  //               or null if no return needed
-  //               (passes returned string to callback)
-  // func        - sub or function name  to call
-  // parm        - string parameter to function
-  //               or array of string parameters if more than one
-  // visibility  - optional boolean to make container visible for debugging
-
-  // get context
-  var contextObj = jsrsContextPool[ jsrsGetContextID() ];
-  contextObj.callback = callback;
-
-  var vis = (visibility == null)? false : visibility;
-  contextObj.setVisibility( vis );
-
-  if ( jsrsPOST && ((jsrsBrowser == 'IE') || (jsrsBrowser == 'MOZ'))){
-    contextObj.POST( rspage, func, parms );
-  } else {
-    contextObj.GET( rspage, func, parms );
-  }  
-  
-  return contextObj.id;
-}
-
-function jsrsLoaded( contextID ){
-  // get context object and invoke callback
-  var contextObj = jsrsContextPool[ contextID ];
-  if( contextObj.callback != null){
-    contextObj.callback( jsrsUnescape( contextObj.getPayload() ), contextID );
-  }
-  // clean up and return context to pool
-  contextObj.callback = null;
-  contextObj.busy = false;
-}
-
-function jsrsError( contextID, str ){
-  alert( unescape(str) );
-  jsrsContextPool[ contextID ].busy = false
-}
-
-function jsrsEscapeQQ( thing ){
-  return thing.replace(/'"'/g, '\\"');
-}
-
-function jsrsUnescape( str ){
-  // payload has slashes escaped with whacks
-  return str.replace( /\\\//g, "/" );
-}
-
-function jsrsBrowserSniff(){
-  if (document.layers) return "NS";
-  if (document.all) {
-		// But is it really IE?
-		// convert all characters to lowercase to simplify testing
-		var agt=navigator.userAgent.toLowerCase();
-		var is_opera = (agt.indexOf("opera") != -1);
-		var is_konq = (agt.indexOf("konqueror") != -1);
-		if(is_opera) {
-			return "OPR";
-		} else {
-			if(is_konq) {
-				return "KONQ";
-			} else {
-				// Really is IE
-				return "IE";
-			}
-		}
-  }
-  if (document.getElementById) return "MOZ";
-  return "OTHER";
-}
-
-/////////////////////////////////////////////////
-//
-// user functions
-
-function jsrsArrayFromString( s, delim ){
-  // rebuild an array returned from server as string
-  // optional delimiter defaults to ~
-  var d = (delim == null)? '~' : delim;
-  return s.split(d);
-}
-
-function jsrsDebugInfo(){
-  // use for debugging by attaching to f1 (works with IE)
-  // with onHelp = "return jsrsDebugInfo();" in the body tag
-  var doc = window.open().document;
-  doc.open;
-  doc.write( 'Pool Size: ' + jsrsContextPoolSize + '<br><font face="arial" size="2"><b>' );
-  for( var i in jsrsContextPool ){
-    var contextObj = jsrsContextPool[i];
-    doc.write( '<hr>' + contextObj.id + ' : ' + (contextObj.busy ? 'busy' : 'available') + '<br>');
-    doc.write( contextObj.container.document.location.pathname + '<br>');
-    doc.write( contextObj.container.document.location.search + '<br>');
-    doc.write( '<table border="1"><tr><td>' + contextObj.container.document.body.innerHTML + '</td></tr></table>' );
-  }
-  doc.write('</table>');
-  doc.close();
-  return false;
-}
diff --git a/httemplate/elements/jsrsServer.html b/httemplate/elements/jsrsServer.html
deleted file mode 100644
index fd6dc54..0000000
--- a/httemplate/elements/jsrsServer.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<%
-  my $server = new FS::UI::Web::JSRPC '', $cgi;
-%><%= $server->process %>
diff --git a/httemplate/elements/overlibmws.js b/httemplate/elements/overlibmws.js
deleted file mode 100644
index fba1105..0000000
--- a/httemplate/elements/overlibmws.js
+++ /dev/null
@@ -1,709 +0,0 @@
-/*

- Do not remove or change this notice.

- overlibmws.js core module - Copyright Foteos Macrides 2002-2005. All rights reserved.

-   Initial: August 18, 2002 - Last Revised: February 10, 2005

- This module is subject to the same terms of usage as for Erik Bosrup's overLIB,

- though only a minority of the code and API now correspond with Erik's version.

- See the overlibmws Change History and Command Reference via:

-

-	http://www.macridesweb.com/oltest/

-

- Published under an open source license: http://www.macridesweb.com/oltest/license.html

- Give credit on sites that use overlibmws and submit changes so others can use them as well.

- You can get Erik's version via: http://www.bosrup.com/web/overlib/

-*/

-

-// PRE-INIT -- Ignore these lines, configuration is below.

-var OLloaded=0,pmCnt=1,pMtr=new Array(),OLv,OLudf,OLrefXY;

-var OLpct=new Array("83%","67%","83%","100%","117%","150%","200%","267%");

-var OLbubblePI=0,OLcrossframePI=0,OLdebugPI=0,OLdraggablePI=0,OLexclusivePI=0,OLfilterPI=0;

-var OLfunctionPI=0,OLhidePI=0,OLiframePI=0,OLovertwoPI=0,OLscrollPI=0,OLshadowPI=0;

-if(typeof OLgateOK=='undefined')var OLgateOK=1;

-OLregCmds(

- 'inarray,caparray,caption,sticky,nofollow,background,noclose,mouseoff,offdelay,right,left,'

-+'center,offsetx,offsety,fgcolor,bgcolor,cgcolor,textcolor,capcolor,closecolor,width,wrap,'

-+'wrapmax,height,border,base,status,autostatus,autostatuscap,snapx,snapy,fixx,fixy,relx,rely,'

-+'midx,midy,ref,refc,refp,refx,refy,fgbackground,bgbackground,cgbackground,padx,pady,fullhtml,'

-+'below,above,vcenter,capicon,textfont,captionfont,closefont,textsize,captionsize,closesize,'

-+'timeout,delay,hauto,vauto,nojustx,nojusty,closetext,closeclick,closetitle,fgclass,bgclass,'

-+'cgclass,capbelow,textpadding,textfontclass,captionpadding,captionfontclass,closefontclass,'

-+'label,donothing');

-

-function OLud(v){return eval('typeof ol_'+v+'=="undefined"')?1:0;}

-

-// DEFAULT CONFIGURATION -- See overlibConfig.txt for descriptions.

-if(OLud('fgcolor'))var ol_fgcolor="#CCCCFF";

-if(OLud('bgcolor'))var ol_bgcolor="#333399";

-if(OLud('cgcolor'))var ol_cgcolor="#333399";

-if(OLud('textcolor'))var ol_textcolor="#000000";

-if(OLud('capcolor'))var ol_capcolor="#FFFFFF";

-if(OLud('closecolor'))var ol_closecolor="#EEEEFF";

-if(OLud('textfont'))var ol_textfont="Verdana,Arial,Helvetica";

-if(OLud('captionfont'))var ol_captionfont="Verdana,Arial,Helvetica";

-if(OLud('closefont'))var ol_closefont="Verdana,Arial,Helvetica";

-if(OLud('textsize'))var ol_textsize=1;

-if(OLud('captionsize'))var ol_captionsize=1;

-if(OLud('closesize'))var ol_closesize=1;

-if(OLud('fgclass'))var ol_fgclass="";

-if(OLud('bgclass'))var ol_bgclass="";

-if(OLud('cgclass'))var ol_cgclass="";

-if(OLud('textpadding'))var ol_textpadding=2;

-if(OLud('textfontclass'))var ol_textfontclass="";

-if(OLud('captionpadding'))var ol_captionpadding=2;

-if(OLud('captionfontclass'))var ol_captionfontclass="";

-if(OLud('closefontclass'))var ol_closefontclass="";

-if(OLud('close'))var ol_close="Close";

-if(OLud('closeclick'))var ol_closeclick=0;

-if(OLud('closetitle'))var ol_closetitle="Click to Close";

-if(OLud('text'))var ol_text="Default Text";

-if(OLud('cap'))var ol_cap="";

-if(OLud('capbelow'))var ol_capbelow=0;

-if(OLud('background'))var ol_background="";

-if(OLud('width'))var ol_width=200;

-if(OLud('wrap'))var ol_wrap=0;

-if(OLud('wrapmax'))var ol_wrapmax=0;

-if(OLud('height'))var ol_height= -1;

-if(OLud('border'))var ol_border=1;

-if(OLud('base'))var ol_base=0;

-if(OLud('offsetx'))var ol_offsetx=10;

-if(OLud('offsety'))var ol_offsety=10;

-if(OLud('sticky'))var ol_sticky=0;

-if(OLud('nofollow'))var ol_nofollow=0;

-if(OLud('noclose'))var ol_noclose=0;

-if(OLud('mouseoff'))var ol_mouseoff=0;

-if(OLud('offdelay'))var ol_offdelay=300;

-if(OLud('hpos'))var ol_hpos=RIGHT;

-if(OLud('vpos'))var ol_vpos=BELOW;

-if(OLud('status'))var ol_status="";

-if(OLud('autostatus'))var ol_autostatus=0;

-if(OLud('snapx'))var ol_snapx=0;

-if(OLud('snapy'))var ol_snapy=0;

-if(OLud('fixx'))var ol_fixx= -1;

-if(OLud('fixy'))var ol_fixy= -1;

-if(OLud('relx'))var ol_relx=null;

-if(OLud('rely'))var ol_rely=null;

-if(OLud('midx'))var ol_midx=null;

-if(OLud('midy'))var ol_midy=null;

-if(OLud('ref'))var ol_ref="";

-if(OLud('refc'))var ol_refc='UL';

-if(OLud('refp'))var ol_refp='UL';

-if(OLud('refx'))var ol_refx=0;

-if(OLud('refy'))var ol_refy=0;

-if(OLud('fgbackground'))var ol_fgbackground="";

-if(OLud('bgbackground'))var ol_bgbackground="";

-if(OLud('cgbackground'))var ol_cgbackground="";

-if(OLud('padxl'))var ol_padxl=1;

-if(OLud('padxr'))var ol_padxr=1;

-if(OLud('padyt'))var ol_padyt=1;

-if(OLud('padyb'))var ol_padyb=1;

-if(OLud('fullhtml'))var ol_fullhtml=0;

-if(OLud('capicon'))var ol_capicon="";

-if(OLud('frame'))var ol_frame=self;

-if(OLud('timeout'))var ol_timeout=0;

-if(OLud('delay'))var ol_delay=0;

-if(OLud('hauto'))var ol_hauto=0;

-if(OLud('vauto'))var ol_vauto=0;

-if(OLud('nojustx'))var ol_nojustx=0;

-if(OLud('nojusty'))var ol_nojusty=0;

-if(OLud('label'))var ol_label="";

-// ARRAY CONFIGURATION - See overlibConfig.txt for descriptions.

-if(OLud('texts'))var ol_texts=new Array("Text 0","Text 1");

-if(OLud('caps'))var ol_caps=new Array("Caption 0","Caption 1");

-// END CONFIGURATION -- Don't change anything below, all configuration is above.

-

-// INIT -- Runtime variables.

-var o3_text="",o3_cap="",o3_sticky=0,o3_nofollow=0,o3_background="",o3_noclose=0,o3_mouseoff=0;

-var o3_offdelay=300,o3_hpos=RIGHT,o3_offsetx=10,o3_offsety=10,o3_fgcolor="",o3_bgcolor="";

-var o3_cgcolor="",o3_textcolor="",o3_capcolor="",o3_closecolor="",o3_width=200,o3_wrap=0;

-var o3_wrapmax=0,o3_height= -1,o3_border=1,o3_base=0,o3_status="",o3_autostatus=0,o3_snapx=0;

-var o3_snapy=0,o3_fixx= -1,o3_fixy= -1,o3_relx=null,o3_rely=null,o3_midx=null,o3_midy=null;

-var o3_ref="",o3_refc='UL',o3_refp='UL',o3_refx=0,o3_refy=0,o3_fgbackground="";

-var o3_bgbackground="",o3_cgbackground="",o3_padxl=0,o3_padxr=0,o3_padyt=0,o3_padyb=0;

-var o3_fullhtml=0,o3_vpos=BELOW,o3_capicon="",o3_textfont="Verdana,Arial,Helvetica";

-var o3_captionfont="Verdana,Arial,Helvetica",o3_closefont="Verdana,Arial,Helvetica";

-var o3_textsize=1,o3_captionsize=1,o3_closesize=1,o3_frame=self,o3_timeout=0,o3_delay=0;

-var o3_hauto=0,o3_vauto=0,o3_nojustx=0,o3_nojusty=0,o3_close="Close",o3_closeclick=0;

-var o3_closetitle="",o3_fgclass="",o3_bgclass="",o3_cgclass="",o3_textpadding=2;

-var o3_textfontclass="",o3_captionpadding=2,o3_captionfontclass="",o3_closefontclass="";

-var o3_capbelow=0,o3_label="",CSSOFF=DONOTHING,CSSCLASS=DONOTHING;

-var OLx=0,OLy=0,OLshowingsticky=0,OLallowmove=0,OLremovecounter=0;

-var OLdelayid=0,OLtimerid=0,OLshowid=0,OLndt=0;

-var over=null,OLfnRef="",OLhover=0;

-var OLua=navigator.userAgent.toLowerCase();

-var OLns4=(navigator.appName=='Netscape'&&parseInt(navigator.appVersion)==4);

-var OLns6=(document.getElementById)?1:0;

-var OLie4=(document.all)?1:0;

-var OLgek=(OLv=OLua.match(/gecko\/(\d{8})/i))?parseInt(OLv[1]):0;

-var OLmac=(OLua.indexOf('mac')>=0)?1:0;

-var OLsaf=(OLua.indexOf('safari')>=0)?1:0;

-var OLkon=(OLua.indexOf('konqueror')>=0)?1:0;

-var OLkht=(OLsaf||OLkon)?1:0;

-var OLopr=(OLua.indexOf('opera')>=0)?1:0;

-var OLop7=(OLopr&&document.createTextNode)?1:0;

-if(OLopr){OLns4=OLns6=0;if(!OLop7)OLie4=0;}

-var OLieM=((OLie4&&OLmac)&&!(OLkht||OLopr))?1:0;

-var OLie5=0,OLie55=0;if(OLie4&&!OLop7){

-if((OLv=OLua.match(/msie (\d\.\d+)\.*/i))&&(OLv=parseFloat(OLv[1]))>=5.0){

-OLie5=1;OLns6=0;if(OLv>=5.5)OLie55=1;}if(OLns6)OLie4=0;}

-if(OLns4)window.onresize=function(){location.reload();}

-var OLchkMh=1,OLdw;

-if(OLns4||OLie4||OLns6)OLmh();

-else{overlib=nd=cClick=OLpageDefaults=no_overlib;}

-

-/*

- PUBLIC FUNCTIONS

-*/

-// Loads defaults then args into runtime variables.

-function overlib(){

-if(!(OLloaded&&OLgateOK))return;

-if((OLexclusivePI)&&OLisExclusive(overlib.arguments))return true;

-if(OLchkMh)OLmh();

-if(OLndt&&!OLtimerid)OLndt=0;if(over)cClick();

-OLloadP1or2();OLload('close,closeclick,closetitle,noclose,mouseoff,offdelay,sticky,'

-+'closecolor,closefont,closesize,closefontclass,frame,label');OLfnRef="";OLhover=0;

-OLsetRunTimeVar();

-OLparseTokens('o3_',overlib.arguments);

-if(!(over=OLmkLyr()))return false;

-if(OLbubblePI)OLchkForBubbleEffect();

-if(OLdebugPI)OLsetDebugCanShow();

-if(OLshadowPI)OLinitShadow();

-if(OLiframePI)OLinitIfs();

-if(OLfilterPI)OLinitFilterLyr();

-if(OLexclusivePI&&o3_exclusive&&o3_exclusivestatus!="")o3_status=o3_exclusivestatus;

-else if(o3_autostatus==2&&o3_cap!="")o3_status=o3_cap;

-else if(o3_autostatus==1&&o3_text!="")o3_status=o3_text;

-if(o3_delay==0){return OLmain();

-}else{OLdelayid=setTimeout("OLmain()",o3_delay);

-if(o3_status!=""){self.status=o3_status;return true;}

-else if(!(OLop7&&event&&event.type=='mouseover'))return false;}

-}

-

-// Clears popups if appropriate

-function nd(time){

-if(!(OLloaded&&OLgateOK))return;

-if((OLexclusivePI)&&OLisExclusive())return true;

-if(time&&over&&!o3_delay){if(OLtimerid>0)clearTimeout(OLtimerid);

-OLtimerid=(OLhover&&o3_frame==self&&!OLcursorOff())?0:

-setTimeout("cClick()",(o3_timeout=OLndt=time));

-}else{if(OLremovecounter>=1)OLshowingsticky=0;if(!OLshowingsticky){

-OLallowmove=0;if(over)OLhideObject(over);}else{OLremovecounter++;}}

-return true;

-}

-

-// Close function for stickies

-function cClick(){

-if(OLloaded&&OLgateOK){OLhover=0;if(over)OLhideObject(over);OLshowingsticky=0;}

-return false;

-}

-

-// Sets page-specific defaults.

-function OLpageDefaults(){

-OLparseTokens('ol_',OLpageDefaults.arguments);

-}

-

-// For unsupported browsers.

-function no_overlib(){return false;}

-

-/*

- OVERLIB MAIN FUNCTION SET

-*/

-function OLmain(){

-o3_delay=0;

-if(o3_frame==self){if(o3_noclose)OLoptMOUSEOFF(0);else if(o3_mouseoff)OLoptMOUSEOFF(1);}

-OLdoLyr();

-OLallowmove=0;if(o3_timeout>0){

-if(OLtimerid>0)clearTimeout(OLtimerid);OLtimerid=setTimeout("cClick()",o3_timeout);}

-if(o3_ref){OLrefXY=OLgetRefXY(o3_ref);if(OLrefXY[0]==null){o3_ref="";o3_midx=0;o3_midy=0;}}

-OLdisp(o3_status);

-if(OLdraggablePI)OLcheckDrag();

-if(o3_status!="")return true;else if(!(OLop7&&event&&event.type=='mouseover'))return false;

-}

-

-// Loads defaults for primaries or secondaries

-function OLloadP1or2(){

-OLload('text,cap,capbelow,textpadding,captionpadding,border,base,status,autostatus,nofollow,'

-+'width,wrap,wrapmax,height,hpos,vpos,offsetx,offsety,snapx,snapy,relx,rely,midx,midy,ref,'

-+'refc,refp,refx,refy,fixx,fixy,nojustx,nojusty,hauto,vauto,timeout,delay,fgcolor,bgcolor,'

-+'cgcolor,textcolor,capcolor,textfont,captionfont,textsize,captionsize,fgbackground,'

-+'bgbackground,cgbackground,capicon,background,padxl,padxr,padyt,padyb,fullhtml,fgclass,'

-+'bgclass,cgclass,textfontclass,captionfontclass');

-}

-function OLload(c){var i,m=c.split(',');for(i=0;i<m.length;i++)eval('o3_'+m[i]+'=ol_'+m[i]);}

-

-// Chooses LGF 

-function OLdoLGF(){

-return (o3_background!=''||o3_fullhtml)?OLcontentBackground(o3_text,o3_background,o3_fullhtml):

-(o3_cap=="")?OLcontentSimple(o3_text):

-(o3_sticky)?OLcontentCaption(o3_text,o3_cap,o3_close):OLcontentCaption(o3_text,o3_cap,'');

-}

-

-// Makes Layer

-function OLmkLyr(id,f,z){

-id=(id||'overDiv');f=(f||o3_frame);z=(z||1000);var fd=f.document,d=OLgetRefById(id,fd);

-if(!d){if(OLns4)d=fd.layers[id]=new Layer(1024,f);else if(OLie4&&!document.getElementById){

-fd.body.insertAdjacentHTML('BeforeEnd','<div id="'+id+'"></div>');d=fd.all[id];

-}else{d=fd.createElement('div');if(d){d.id=id;fd.body.appendChild(d);}}if(!d)return null;

-if(OLns4)d.zIndex=z;else{var o=d.style;o.position='absolute';o.visibility='hidden';o.zIndex=z;}}

-return d;

-}

-

-// Creates and writes layer content

-function OLdoLyr(){

-if(o3_background==''&&!o3_fullhtml){

-if(o3_fgbackground!='')o3_fgbackground=' background="'+o3_fgbackground+'"';

-if(o3_bgbackground!='')o3_bgbackground=' background="'+o3_bgbackground+'"';

-if(o3_cgbackground!='')o3_cgbackground=' background="'+o3_cgbackground+'"';

-if(o3_fgcolor!='')o3_fgcolor=' bgcolor="'+o3_fgcolor+'"';

-if(o3_bgcolor!='')o3_bgcolor=' bgcolor="'+o3_bgcolor+'"';

-if(o3_cgcolor!='')o3_cgcolor=' bgcolor="'+o3_cgcolor+'"';

-if(o3_height>0)o3_height=' height="'+o3_height+'"';else o3_height='';}

-if(!OLns4)OLrepositionTo(over,(OLns6?20:0),0);var lyrHtml=OLdoLGF();

-if(o3_sticky){if(OLtimerid>0){clearTimeout(OLtimerid);OLtimerid=0;}

-OLshowingsticky=1;OLremovecounter=0;}

-if(o3_wrap&&!o3_fullhtml){OLlayerWrite(lyrHtml);

-o3_width=(OLns4?over.clip.width:over.offsetWidth);

-if(OLns4&&o3_wrapmax<1)o3_wrapmax=o3_frame.innerWidth-40;

-o3_wrap=0;if(o3_wrapmax>0&&o3_width>o3_wrapmax)o3_width=o3_wrapmax;lyrHtml=OLdoLGF();}

-OLlayerWrite(lyrHtml);o3_width=(OLns4?over.clip.width:over.offsetWidth);

-if(OLbubblePI)OLgenerateBubble(lyrHtml);

-}

-

-/*

- LAYER GENERATION FUNCTIONS

-*/

-// Makes simple table without caption

-function OLcontentSimple(txt){

-var t=OLbgLGF()+OLfgLGF(txt)+OLbaseLGF();

-OLsetBackground('');return t;

-}

-

-// Makes table with caption and optional close link

-function OLcontentCaption(txt,title,close){

-var closing='',closeevent='onmouseover',caption,t;

-if(o3_closeclick==1)closeevent=(o3_closetitle?'title="'+o3_closetitle+'" ':'')+'onclick';

-if(o3_capicon!='')o3_capicon='<img src="'+o3_capicon+'" /> ';

-if(close!=''){closing='<td align="right"><a href="javascript:return '+OLfnRef+'cClick();" '

-+closeevent+'="return '+OLfnRef+'cClick();"'+(o3_closefontclass?' class="'+o3_closefontclass

-+'">':'>'+OLlgfUtil(0,'','span',o3_closecolor,o3_closefont,o3_closesize))+close

-+(o3_closefontclass?'':OLlgfUtil(1,'','span'))+'</a></td>';}

-caption='<table'+OLwd(0)+' border="0" cellpadding="'+o3_captionpadding+'" cellspacing="0"'

-+(o3_cgclass?' class="'+o3_cgclass+'"':o3_cgcolor+o3_cgbackground)+'><tr><td'+OLwd(0)

-+(o3_cgclass?' class="'+o3_cgclass+'">':'>')+(o3_captionfontclass?'<div class="'

-+o3_captionfontclass+'">':'<strong>'

-+OLlgfUtil(0,'','div',o3_capcolor,o3_captionfont,o3_captionsize))+o3_capicon+title

-+OLlgfUtil(1,'','div')+(o3_captionfontclass?'':'</strong>')+'</td>'+closing+'</tr></table>';

-t=OLbgLGF()+(o3_capbelow?OLfgLGF(txt)+caption:caption+OLfgLGF(txt))+OLbaseLGF();

-OLsetBackground('');return t;

-}

-

-// For BACKGROUND and FULLHTML commands

-function OLcontentBackground(txt, image, hasfullhtml){

-var t;if(hasfullhtml){t=txt;}else{t='<table'+OLwd(1)

-+' border="0" cellpadding="0" cellspacing="0" '+'height="'+o3_height

-+'"><tr><td colspan="3" height="'+o3_padyt+'"></td></tr><tr><td width="'

-+o3_padxl+'"></td><td valign="top"'+OLwd(2)+'>'

-+OLlgfUtil(0,o3_textfontclass,'div',o3_textcolor,o3_textfont,o3_textsize)+txt+

-OLlgfUtil(1,'','div')+'</td><td width="'+o3_padxr+'"></td></tr><tr><td colspan="3" height="'

-+o3_padyb+'"></td></tr></table>';}

-OLsetBackground(image);return t;

-}

-

-// LGF utilities

-function OLbgLGF(){

-return '<table'+OLwd(1)+o3_height+' border="0" cellpadding="'+o3_border+'" cellspacing="0"'

-+(o3_bgclass?' class="'+o3_bgclass+'"':o3_bgcolor+o3_bgbackground)+'><tr><td>';

-}

-function OLfgLGF(t){

-return '<table'+OLwd(0)+o3_height+' border="0" cellpadding="'+o3_textpadding

-+'" cellspacing="0"'+(o3_fgclass?' class="'+o3_fgclass+'"':o3_fgcolor+o3_fgbackground)

-+'><tr><td valign="top"'+(o3_fgclass?' class="'+o3_fgclass+'"':'')+'>'

-+OLlgfUtil(0,o3_textfontclass,'div',o3_textcolor,o3_textfont,o3_textsize)+t

-+OLlgfUtil(1,'','div')+'</td></tr></table>';

-}

-function OLlgfUtil(end,tfc,ele,col,fac,siz){

-if(end)return ('</'+(OLns4?'font':ele)+'>');else return (tfc?'<div class="'+tfc+'">':

-('<'+(OLns4?'font color="'+col+'" face="'+OLquoteMultiNameFonts(fac)+'" size="'+siz:ele

-+' style="color:'+col+';font-family:'+OLquoteMultiNameFonts(fac)+';font-size:'+siz+';'

-+(ele=='span'?'text-decoration:underline;':''))+'">'));

-}

-function OLquoteMultiNameFonts(f){

-var i,v,pM=f.split(',');

-for(i=0;i<pM.length;i++){v=pM[i];v=v.replace(/^\s+/,'').replace(/\s+$/,'');

-if(/\s/.test(v) && !/['"]/.test(v)){v="\'"+v+"\'";pM[i]=v;}}

-return pM.join();

-}

-function OLbaseLGF(){

-return ((o3_base>0&&!o3_wrap)?('<table width="100%" border="0" cellpadding="0" cellspacing="0"'

-+(o3_bgclass?' class="'+o3_bgclass+'"':'')+'><tr><td height="'+o3_base

-+'"></td></tr></table>'):'')+'</td></tr></table>';

-}

-function OLwd(a){

-return(o3_wrap?'':' width="'+(!a?'100%':(a==1?o3_width:(o3_width-o3_padxl-o3_padxr)))+'"');

-}

-

-// Loads image into the div.

-function OLsetBackground(i){

-if(i==''){if(OLns4)over.background.src=null;

-else{if(OLns6)over.style.width='';over.style.backgroundImage='none';}

-}else{if(OLns4)over.background.src=i;

-else{if(OLns6)over.style.width=o3_width+'px';over.style.backgroundImage='url('+i+')';}}

-}

-

-/*

- HANDLING FUNCTIONS

-*/

-// Displays layer

-function OLdisp(s){

-if(OLallowmove==0){if(OLshadowPI)OLdispShadow();if(OLiframePI)OLdispIfs();OLplaceLayer();

-if(OLndt)OLshowObject(over);else OLshowid=setTimeout("OLshowObject(over)",1);

-OLallowmove=(o3_sticky||o3_nofollow)?0:1;}OLndt=0;if(s!="")self.status=s;

-}

-

-// Decides placement of layer.

-function OLplaceLayer(){

-var snp,X,Y,pgLeft,pgTop,pWd=o3_width,pHt,iWd=100,iHt=100,SB=0,LM=0,CX=0,TM=0,BM=0,CY=0;

-var o=OLfd(),nsb=(OLgek>=20010505&&!o3_frame.scrollbars.visible)?1:0;

-if(!OLkht&&o&&o.clientWidth)iWd=o.clientWidth;

-else if(o3_frame.innerWidth){SB=Math.ceil(1.4*(o3_frame.outerWidth-o3_frame.innerWidth));

-if(SB>20)SB=20;iWd=o3_frame.innerWidth;}

-pgLeft=(OLie4)?o.scrollLeft:o3_frame.pageXOffset;

-if(OLie55&&OLfilterPI&&o3_filtershadow)SB=CX=5;else

-if((OLshadowPI)&&bkdrop&&o3_shadow&&o3_shadowx){SB+=((o3_shadowx>0)?o3_shadowx:0);

-LM=((o3_shadowx<0)?Math.abs(o3_shadowx):0);CX=Math.abs(o3_shadowx);}

-if(o3_ref!=""||o3_fixx> -1||o3_relx!=null||o3_midx!=null){

-if(o3_ref!=""){

-X=OLrefXY[0];if(OLie55&&OLfilterPI&&o3_filtershadow){if(o3_refp=='UR'||o3_refp=='LR')X -= 5;}

-else if((OLshadowPI)&&bkdrop&&o3_shadow&&o3_shadowx){  

-if(o3_shadowx<0&&(o3_refp=='UL'||o3_refp=='LL'))X += o3_shadowx;

-else if(o3_shadowx>0&&(o3_refp=='UR'||o3_refp=='LR'))X -= o3_shadowx;}

-}else{if(o3_midx!=null){

-X=parseInt(pgLeft+((iWd-pWd-SB-LM)/2)+o3_midx);

-}else{if(o3_relx!=null){

-if(o3_relx>=0)X=pgLeft+o3_relx+LM;else X=pgLeft+o3_relx+iWd-pWd-SB;

-}else{

-X=o3_fixx+LM;}}}

-}else{

-if(o3_hauto){

-if(o3_hpos==LEFT&&OLx-pgLeft<iWd/2&&OLx-pWd-o3_offsetx<pgLeft+LM)o3_hpos=RIGHT;else

-if(o3_hpos==RIGHT&&OLx-pgLeft>iWd/2&&OLx+pWd+o3_offsetx>pgLeft+iWd-SB)o3_hpos=LEFT;}

-X=(o3_hpos==CENTER)?parseInt(OLx-((pWd+CX)/2)+o3_offsetx):

-(o3_hpos==LEFT)?OLx-o3_offsetx-pWd:OLx+o3_offsetx;

-if(o3_snapx>1){

-snp=X % o3_snapx;

-if(o3_hpos==LEFT){X=X-(o3_snapx+snp);}else{X=X+(o3_snapx-snp);}}}

-if(!o3_nojustx&&X+pWd>pgLeft+iWd-SB)

-X=iWd+pgLeft-pWd-SB;if(!o3_nojustx&&X-LM<pgLeft)X=pgLeft+LM;

-pgTop=OLie4?o.scrollTop:o3_frame.pageYOffset;

-if(!OLkht&&!nsb&&o&&o.clientHeight)iHt=o.clientHeight;

-else if(o3_frame.innerHeight)iHt=o3_frame.innerHeight;

-if(OLbubblePI&&o3_bubble)pHt=OLbubbleHt;else pHt=OLns4?over.clip.height:over.offsetHeight;

-if((OLshadowPI)&&bkdrop&&o3_shadow&&o3_shadowy){TM=(o3_shadowy<0)?Math.abs(o3_shadowy):0;

-if(OLie55&&OLfilterPI&&o3_filtershadow)BM=CY=5;else

-BM=(o3_shadowy>0)?o3_shadowy:0;CY=Math.abs(o3_shadowy);}

-if(o3_ref!=""||o3_fixy> -1||o3_rely!=null||o3_midy!=null){

-if(o3_ref!=""){

-Y=OLrefXY[1];if(OLie55&&OLfilterPI&&o3_filtershadow){if(o3_refp=='LL'||o3_refp=='LR')Y -= 5;}

-else if((OLshadowPI)&&bkdrop&&o3_shadow&&o3_shadowy){

-if(o3_shadowy<0&&(o3_refp=='UL'||o3_refp=='UR'))Y+=o3_shadowy;else

-if(o3_shadowy>0&&(o3_refp=='LL'||o3_refp=='LR'))Y-=o3_shadowy;}

-}else{if(o3_midy!=null){

-Y=parseInt(pgTop+((iHt-pHt-CY)/2)+o3_midy);

-}else{if(o3_rely!=null){

-if(o3_rely>=0)Y=pgTop+o3_rely+TM;else Y=pgTop+o3_rely+iHt-pHt-BM;}else{

-Y=o3_fixy+TM;}}}

-}else{

-if(o3_vauto){

-if(o3_vpos==ABOVE&&OLy-pgTop<iHt/2&&OLy-pHt-o3_offsety<pgTop)o3_vpos=BELOW;else

-if(o3_vpos==BELOW&&OLy-pgTop>iHt/2&&OLy+pHt+o3_offsety+((OLns4||OLkht)?17:0)>pgTop+iHt-BM)

-o3_vpos=ABOVE;}Y=(o3_vpos==VCENTER)?parseInt(OLy-((pHt+CY)/2)+o3_offsety):

-(o3_vpos==ABOVE)?OLy-(pHt+o3_offsety+BM):OLy+o3_offsety+TM;

-if(o3_snapy>1){

-snp=Y % o3_snapy;

-if(pHt>0&&o3_vpos==ABOVE){Y=Y-(o3_snapy+snp);}else{Y=Y+(o3_snapy-snp);}}}

-if(!o3_nojusty&&Y+pHt+BM>pgTop+iHt)Y=pgTop+iHt-pHt-BM;if(!o3_nojusty&&Y-TM<pgTop)Y=pgTop+TM;

-OLrepositionTo(over,X,Y);

-if(OLshadowPI)OLrepositionShadow(X,Y);if(OLiframePI)OLrepositionIfs(X,Y);

-if(OLns6&&o3_frame.innerHeight){iHt=o3_frame.innerHeight;OLrepositionTo(over,X,Y);}

-if(OLscrollPI)OLchkScroll(X-pgLeft,Y-pgTop);

-}

-

-// Chooses body or documentElement

-function OLfd(f){

-var fd=((f)?f:o3_frame).document,fdc=fd.compatMode,fdd=fd.documentElement;

-return (!OLop7&&fdc&&fdc!='BackCompat'&&fdd&&fdd.clientWidth)?fd.documentElement:fd.body;

-}

-

-// Gets location of REFerence object

-function OLgetRefXY(r){

-var mn=r,mr=OLgetRef(mn),o,of,rXY;

-if(!mr)return [null,null];

-o=mr;rXY=[o3_refx,o3_refy];

-if(OLns4){if(typeof mr.length!='undefined'&&mr.length>1){

-o=mr[0];rXY[0]+=mr[0].x+mr[1].pageX;rXY[1]+=mr[0].y+mr[1].pageY;

-}else{if((mr.toString().indexOf('Image')!= -1)||(mr.toString().indexOf('Anchor')!= -1)){

-rXY[0]+=mr.x;rXY[1]+=mr.y;}else{rXY[0]+=mr.pageX;rXY[1]+=mr.pageY;}}

-}else{rXY[0]+=OLpageLoc(mr,'Left');rXY[1]+=OLpageLoc(mr,'Top');}

-of=OLgetRefOffsets(o);rXY[0]+=of[0];rXY[1]+=of[1];

-return rXY;

-}

-function OLgetRef(l){var r=OLgetRefById(l);return (r)?r:OLgetRefByName(l);}

-

-// Seeks REFerence by id

-function OLgetRefById(l,d){

-var r="",j;l=(l||'overDiv');d=(d||o3_frame.document);

-if(OLie4&&d.all){return d.all[l];}else if(d.getElementById){return d.getElementById(l);

-}else if(d.layers&&d.layers.length>0){if(d.layers[l])return d.layers[l];

-for(j=0;j<d.layers.length;j++){r=OLgetRefById(l,d.layers[j].document);if(r)return r;}}

-return null;

-}

-

-// Seeks REFerence by name (for img and a)

-function OLgetRefByName(l,d){

-var r=null,j;d=(d||o3_frame.document);

-if(typeof d.images[l]!='undefined'&&d.images[l]){return d.images[l];

-}else if(typeof d.anchors[l]!='undefined'&&d.anchors[l]){return d.anchors[l];

-}else if(d.layers&&d.layers.length>0){

-for(j=0;j<d.layers.length;j++){r=OLgetRefByName(l,d.layers[j].document);

-if(r&&r.length>0)return r;else if(r)return [r,d.layers[j]];}}

-return null;

-}

-

-// Gets layer vs REFerence offsets

-function OLgetRefOffsets(o){

-var mc=o3_refc.toUpperCase(),mp=o3_refp.toUpperCase(),mW=0,mH=0,pW=0,pH=0,off=[0,0];

-pW=(OLbubblePI&&o3_bubble)?o3_width:OLns4?over.clip.width:over.offsetWidth;

-pH=(OLbubblePI&&o3_bubble)?OLbubbleHt:OLns4?over.clip.height:over.offsetHeight;

-if((!OLop7)&&o.toString().indexOf('Image')!= -1){mW=o.width;mH=o.height;

-}else if((!OLop7)&&o.toString().indexOf('Anchor')!= -1){mc=o3_refc='UL';}else{

-mW=(OLns4)?o.clip.width:o.offsetWidth;mH=(OLns4)?o.clip.height:o.offsetHeight;}

-if(mc=='UL'){off=(mp=='UR')?[-pW,0]:(mp=='LL')?[0,-pH]:(mp=='LR')?[-pW,-pH]:[0,0];

-}else if(mc=='UR'){off=(mp=='UR')?[mW-pW,0]:(mp=='LL')?[mW,-pH]:(mp=='LR')?[mW-pW,-pH]:[mW,0];

-}else if(mc=='LL'){off=(mp=='UR')?[-pW,mH]:(mp=='LL')?[0,mH-pH]:(mp=='LR')?[-pW,mH-pH]:[0,mH];

-}else if(mc=='LR'){off=(mp=='UR')?[mW-pW,mH]:(mp=='LL')?[mW,mH-pH]:(mp=='LR')?[mW-pW,mH-pH]:

-[mW,mH];}

-return off;

-}

-

-// Gets x or y location of object

-function OLpageLoc(o,t){

-var l=0;while(o.offsetParent&&o.offsetParent.tagName.toLowerCase()!='html'){

-l+=o['offset'+t];o=o.offsetParent;}l+=o['offset'+t];

-return l;

-} 

-

-// Moves layer

-function OLmouseMove(e){

-var e=(e||event);

-OLx=(e.pageX||e.clientX+OLfd().scrollLeft);OLy=(e.pageY||e.clientY+OLfd().scrollTop);

-if((OLallowmove&&over)&&(o3_frame==self||over==OLgetRefById())){

-OLplaceLayer();if(OLhidePI)OLhideUtil(0,1,1,0,0,0);}

-if(OLhover&&over&&o3_frame==self&&OLcursorOff())if(o3_offdelay<1)cClick();else

-{if(OLtimerid>0)clearTimeout(OLtimerid);OLtimerid=setTimeout("cClick()",o3_offdelay);}

-}

-

-// Capture mouse and chain other scripts.

-function OLmh(){

-var fN,f,j,k,s,mh=OLmouseMove,w=(OLns4&&window.onmousemove),re=/function[ ]*(\w*)\(/;

-OLdw=document;if(document.onmousemove||w){if(w)OLdw=window;f=OLdw.onmousemove.toString();

-fN=f.match(re);if(!fN||fN[1]=='anonymous'||fN[1]=='OLmouseMove'){OLchkMh=0;return;}

-if(fN[1])s=fN[1]+'(e)';else{j=f.indexOf('{');k=f.lastIndexOf('}')+1;s=f.substring(j,k);}

-s+=';OLmouseMove(e);';mh=new Function('e',s);}

-OLdw.onmousemove=mh;if(OLns4)OLdw.captureEvents(Event.MOUSEMOVE);

-}

-

-/*

- PARSING

-*/

-function OLparseTokens(pf,ar){

-var i,v,md= -1,par=(pf!='ol_'),e=eval,p=OLpar,q=OLparQuo,t=OLtoggle;OLudf=(par&&!ar.length?1:0);

-for(i=0;i< ar.length;i++){if(md<0){if(typeof ar[i]=='number'){OLudf=(par?1:0);i--;}

-else{switch(pf){case 'ol_':ol_text=ar[i];break;default:o3_text=ar[i];}}md=0;

-}else{

-if(ar[i]==INARRAY){OLudf=0;e(pf+'text=ol_texts['+ar[++i]+']');continue;}

-if(ar[i]==CAPARRAY){e(pf+'cap=ol_caps['+ar[++i]+']');continue;}

-if(ar[i]==CAPTION){q(ar[++i],pf+'cap');continue;}

-if(Math.abs(ar[i])==STICKY){t(ar[i],pf+'sticky');continue;}

-if(Math.abs(ar[i])==NOFOLLOW){t(ar[i],pf+'nofollow');continue;}

-if(ar[i]==BACKGROUND){q(ar[++i],pf+'background');continue;}

-if(Math.abs(ar[i])==NOCLOSE){t(ar[i],pf+'noclose');continue;}

-if(Math.abs(ar[i])==MOUSEOFF){t(ar[i],pf+'mouseoff');continue;}

-if(ar[i]==OFFDELAY){p(ar[++i],pf+'offdelay');continue;}

-if(ar[i]==RIGHT||ar[i]==LEFT||ar[i]==CENTER){p(ar[i],pf+'hpos');continue;}

-if(ar[i]==OFFSETX){p(ar[++i],pf+'offsetx');continue;}

-if(ar[i]==OFFSETY){p(ar[++i],pf+'offsety');continue;}

-if(ar[i]==FGCOLOR){q(ar[++i],pf+'fgcolor');continue;}

-if(ar[i]==BGCOLOR){q(ar[++i],pf+'bgcolor');continue;}

-if(ar[i]==CGCOLOR){q(ar[++i],pf+'cgcolor');continue;}

-if(ar[i]==TEXTCOLOR){q(ar[++i],pf+'textcolor');continue;}

-if(ar[i]==CAPCOLOR){q(ar[++i],pf+'capcolor');continue;}

-if(ar[i]==CLOSECOLOR){q(ar[++i],pf+'closecolor');continue;}

-if(ar[i]==WIDTH){p(ar[++i],pf+'width');continue;}

-if(Math.abs(ar[i])==WRAP){t(ar[i],pf+'wrap');continue;}

-if(ar[i]==WRAPMAX){p(ar[++i],pf+'wrapmax');continue;}

-if(ar[i]==HEIGHT){p(ar[++i],pf+'height');continue;}

-if(ar[i]==BORDER){p(ar[++i],pf+'border');continue;}

-if(ar[i]==BASE){p(ar[++i],pf+'base');continue;}

-if(ar[i]==STATUS){q(ar[++i],pf+'status');continue;}

-if(Math.abs(ar[i])==AUTOSTATUS){v=pf+'autostatus';

-e(v+'=('+ar[i]+'<0)?('+v+'==2?2:0):('+v+'==1?0:1)');continue;}

-if(Math.abs(ar[i])==AUTOSTATUSCAP){v=pf+'autostatus';

-e(v+'=('+ar[i]+'<0)?('+v+'==1?1:0):('+v+'==2?0:2)');continue;}

-if(ar[i]==CLOSETEXT){q(ar[++i],pf+'close');continue;}

-if(ar[i]==SNAPX){p(ar[++i],pf+'snapx');continue;}

-if(ar[i]==SNAPY){p(ar[++i],pf+'snapy');continue;}

-if(ar[i]==FIXX){p(ar[++i],pf+'fixx');continue;}

-if(ar[i]==FIXY){p(ar[++i],pf+'fixy');continue;}

-if(ar[i]==RELX){p(ar[++i],pf+'relx');continue;}

-if(ar[i]==RELY){p(ar[++i],pf+'rely');continue;}

-if(ar[i]==MIDX){p(ar[++i],pf+'midx');continue;}

-if(ar[i]==MIDY){p(ar[++i],pf+'midy');continue;}

-if(ar[i]==REF){q(ar[++i],pf+'ref');continue;}

-if(ar[i]==REFC){q(ar[++i],pf+'refc');continue;}

-if(ar[i]==REFP){q(ar[++i],pf+'refp');continue;}

-if(ar[i]==REFX){p(ar[++i],pf+'refx');continue;}

-if(ar[i]==REFY){p(ar[++i],pf+'refy');continue;}

-if(ar[i]==FGBACKGROUND){q(ar[++i],pf+'fgbackground');continue;}

-if(ar[i]==BGBACKGROUND){q(ar[++i],pf+'bgbackground');continue;}

-if(ar[i]==CGBACKGROUND){q(ar[++i],pf+'cgbackground');continue;}

-if(ar[i]==PADX){p(ar[++i],pf+'padxl');p(ar[++i],pf+'padxr');continue;}

-if(ar[i]==PADY){p(ar[++i],pf+'padyt');p(ar[++i],pf+'padyb');continue;}

-if(Math.abs(ar[i])==FULLHTML){t(ar[i],pf+'fullhtml');continue;}

-if(ar[i]==BELOW||ar[i]==ABOVE||ar[i]==VCENTER){p(ar[i],pf+'vpos');continue;}

-if(ar[i]==CAPICON){q(ar[++i],pf+'capicon');continue;}

-if(ar[i]==TEXTFONT){q(ar[++i],pf+'textfont');continue;}

-if(ar[i]==CAPTIONFONT){q(ar[++i],pf+'captionfont');continue;}

-if(ar[i]==CLOSEFONT){q(ar[++i],pf+'closefont');continue;}

-if(ar[i]==TEXTSIZE){q(ar[++i],pf+'textsize');continue;}

-if(ar[i]==CAPTIONSIZE){q(ar[++i],pf+'captionsize');continue;}

-if(ar[i]==CLOSESIZE){q(ar[++i],pf+'closesize');continue;}

-if(ar[i]==TIMEOUT){p(ar[++i],pf+'timeout');continue;}

-if(ar[i]==DELAY){p(ar[++i],pf+'delay');continue;}

-if(Math.abs(ar[i])==HAUTO){t(ar[i],pf+'hauto');continue;}

-if(Math.abs(ar[i])==VAUTO){t(ar[i],pf+'vauto');continue;}

-if(Math.abs(ar[i])==NOJUSTX){t(ar[i],pf+'nojustx');continue;}

-if(Math.abs(ar[i])==NOJUSTY){t(ar[i],pf+'nojusty');continue;}

-if(Math.abs(ar[i])==CLOSECLICK){t(ar[i],pf+'closeclick');continue;}

-if(ar[i]==CLOSETITLE){q(ar[++i],pf+'closetitle');continue;}

-if(ar[i]==FGCLASS){q(ar[++i],pf+'fgclass');continue;}

-if(ar[i]==BGCLASS){q(ar[++i],pf+'bgclass');continue;}

-if(ar[i]==CGCLASS){q(ar[++i],pf+'cgclass');continue;}

-if(ar[i]==TEXTPADDING){p(ar[++i],pf+'textpadding');continue;}

-if(ar[i]==TEXTFONTCLASS){q(ar[++i],pf+'textfontclass');continue;}

-if(ar[i]==CAPTIONPADDING){p(ar[++i],pf+'captionpadding');continue;}

-if(ar[i]==CAPTIONFONTCLASS){q(ar[++i],pf+'captionfontclass');continue;}

-if(ar[i]==CLOSEFONTCLASS){q(ar[++i],pf+'closefontclass');continue;}

-if(Math.abs(ar[i])==CAPBELOW){t(ar[i],pf+'capbelow');continue;}

-if(ar[i]==LABEL){q(ar[++i],pf+'label');continue;}

-if(ar[i]==DONOTHING){continue;}

-i=OLparseCmdLine(pf,i,ar);}}

-if((OLfunctionPI)&&OLudf&&o3_function)o3_text=o3_function();

-if(pf=='o3_')OLfontSize();

-}

-function OLpar(a,v){eval(v+'='+a);}

-function OLparQuo(a,v){eval(v+"='"+OLescSglQt(a)+"'");}

-function OLescSglQt(s){return s.toString().replace(/'/g,"\\'");}

-function OLtoggle(a,v){eval(v+'=('+v+'==0&&'+a+'>=0)?1:0');}

-function OLhasDims(s){return /[%\-a-z]+$/.test(s);}

-function OLfontSize(){

-var i;if(OLhasDims(o3_textsize)){if(OLns4)o3_textsize="2";}else

-if(!OLns4){i=parseInt(o3_textsize);o3_textsize=(i>0&&i<8)?OLpct[i]:OLpct[0];}

-if(OLhasDims(o3_captionsize)){if(OLns4)o3_captionsize="2";}else

-if(!OLns4){i=parseInt(o3_captionsize);o3_captionsize=(i>0&&i<8)?OLpct[i]:OLpct[0];}

-if(OLhasDims(o3_closesize)){if(OLns4)o3_closesize="2";}else

-if(!OLns4){i=parseInt(o3_closesize);o3_closesize=(i>0&&i<8)?OLpct[i]:OLpct[0];}

-}

-

-/*

- LAYER FUNCTIONS

-*/

-// Writes to layer

-function OLlayerWrite(t){

-t+="\n";

-if(OLns4){over.document.write(t);over.document.close();

-}else if(typeof over.innerHTML!='undefined'){if(OLieM)over.innerHTML='';over.innerHTML=t;

-}else{range=o3_frame.document.createRange();range.setStartAfter(over);

-domfrag=range.createContextualFragment(t);

-while(over.hasChildNodes()){over.removeChild(over.lastChild);}

-over.appendChild(domfrag);}

-}

-

-// Makes object visible

-function OLshowObject(o){

-OLshowid=0;o=(OLns4)?o:o.style;

-if(((OLfilterPI)&&!OLchkFilter(o))||!OLfilterPI)o.visibility="visible";

-if(OLshadowPI)OLshowShadow();if(OLiframePI)OLshowIfs();if(OLhidePI)OLhideUtil(1,1,0);

-}

-

-// Hides object

-function OLhideObject(o){

-if(OLshowid>0){clearTimeout(OLshowid);OLshowid=0;}

-if(OLtimerid>0)clearTimeout(OLtimerid);if(OLdelayid>0)clearTimeout(OLdelayid);

-OLtimerid=0;OLdelayid=0;self.status="";o3_label=ol_label;

-if(o3_frame!=self)o=OLgetRefById();

-if(o){if(o.onmouseover)o.onmouseover=null;

-if(OLscrollPI&&o==over)OLclearScroll();

-if(OLdraggablePI)OLclearDrag();

-if(OLfilterPI)OLcleanupFilter(o);if(OLshadowPI)OLhideShadow();

-var os=(OLns4)?o:o.style;os.visibility="hidden";

-if(OLhidePI&&o==over)OLhideUtil(0,0,1);if(OLiframePI)OLhideIfs(o);}

-}

-

-// Moves layer

-function OLrepositionTo(o,xL,yL){

-o=(OLns4)?o:o.style;

-o.left=(OLns4?xL:xL+'px');

-o.top=(OLns4?yL:yL+'px');

-}

-

-// Handle NOCLOSE-MOUSEOFF

-function OLoptMOUSEOFF(c){

-if(!c)o3_close="";

-over.onmouseover=function(){OLhover=1;if(OLtimerid>0){clearTimeout(OLtimerid);OLtimerid=0;}}

-}

-function OLcursorOff(){

-if(OLovertwoPI&&over==over2)return false;

-var o=(OLns4?over:over.style),pHt=OLns4?over.clip.height:over.offsetHeight;

-var left=parseInt(o.left),top=parseInt(o.top);

-var right=left+o3_width,bottom=top+((OLbubblePI&&o3_bubble)?OLbubbleHt:pHt);

-if(OLx<left||OLx>right||OLy<top||OLy>bottom)return true;

-return false;

-}

-

-/*

- REGISTRATION

-*/

-var OLcmdLine=null,OLrunTime=null;

-function OLsetRunTimeVar(){

-if(OLrunTime&&OLrunTime.length)for(var k=0;k<OLrunTime.length;k++)OLrunTime[k]();

-}

-function OLparseCmdLine(pf,i,ar){

-if(OLcmdLine&&OLcmdLine.length){for(var k=0;k<OLcmdLine.length;k++){

-var j=OLcmdLine[k](pf,i,ar);if(j>-1){i=j;break;}}}

-return i;

-}

-function OLisFunc(f){

-var r=1;

-if(typeof f=='object'){for(var i=0;i<f.length;i++){

-if(typeof f[i]=='function')continue;r=0;break;}

-}else if(typeof f!='function')r=0;

-return r;

-}

-function OLregCmds(c){

-if(typeof c!='string')return;

-var pM=c.split(',');pMtr=pMtr.concat(pM);

-for(var i=0;i<pM.length;i++)eval(pM[i].toUpperCase()+'='+pmCnt++);

-}

-function OLregRunTimeFunc(f){

-if(OLisFunc(f)){

-if(!OLrunTime)OLrunTime=new Array();

-if(typeof f=='object')OLrunTime=OLrunTime.concat(f);

-else OLrunTime[OLrunTime.length++]=f;}

-}

-function OLregCmdLineFunc(f){

-if(OLisFunc(f)){

-if(!OLcmdLine)OLcmdLine=new Array();

-if(typeof f=='object')OLcmdLine=OLcmdLine.concat(f);

-else OLcmdLine[OLcmdLine.length++]=f;}

-}

-

-OLloaded=1;

diff --git a/httemplate/elements/overlibmws_draggable.js b/httemplate/elements/overlibmws_draggable.js
deleted file mode 100644
index 14e4a60..0000000
--- a/httemplate/elements/overlibmws_draggable.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*

- overlibmws_draggable.js plug-in module - Copyright Foteos Macrides 2002=2005

-   For support of the DRAGGABLE feature.

-   Initial: August 24, 2002 - Last Revised: January 12, 2005

- See the Change History and Command Reference for overlibmws via:

-

-	http://www.macridesweb.com/oltest/

-

- Published under an open source license: http://www.macridesweb.com/oltest/license.html

-*/

-

-OLloaded=0;

-OLregCmds('draggable');

-

-// DEFAULT CONFIGURATION

-if(OLud('draggable'))var ol_draggable=0;

-// END CONFIGURATION

-

-var o3_draggable=0,o3_dragging=0,OLmMv,OLcX,OLcY,OLcbX,OLcbY;

-function OLloadDraggable(){OLload('draggable');}

-function OLparseDraggable(pf,i,ar){

-var k=i;

-if(k<ar.length){if(Math.abs(ar[k])==DRAGGABLE){OLtoggle(ar[k],pf+'draggable');return k;}}

-return -1;

-}

-

-function OLcheckDrag(){

-if(o3_draggable){if(o3_sticky&&(o3_frame==self))initDrag();else o3_draggable=0;}

-}

-function initDrag(){

-OLmMv=OLdw.onmousemove;o3_dragging=0;

-if(OLns4){document.captureEvents(Event.MOUSEDOWN|Event.CLICK);

-document.onmousedown=OLgrabEl;;document.onclick=function(e){return routeEvent(e);}}

-else{over.onmousedown=OLgrabEl;OLsetDrgCur(1);}

-}

-function OLsetDrgCur(d){if(!OLns4)over.style.cursor=(d?'move':'auto');}

-

-function OLgrabEl(e){

-var e=(e||event);

-var cKy=(OLns4?e.modifiers&Event.ALT_MASK:(!OLop7?e.altKey:e.ctrlKey));o3_dragging=1;

-if(cKy){OLsetDrgCur(0);document.onmouseup=function(){OLsetDrgCur(1);o3_dragging=0;}

-return(OLns4?routeEvent(e):true);}

-OLx=(e.pageX||e.clientX+OLfd().scrollLeft);OLy=(e.pageY||e.clientY+OLfd().scrollTop);

-if(OLie4)over.onselectstart=function(){return false;}

-if(OLns4){OLcX=OLx;OLcY=OLy;document.captureEvents(Event.MOUSEUP)}else{

-OLcX=OLx-(OLns4?over.left:parseInt(over.style.left));

-OLcY=OLy-(OLns4?over.top:parseInt(over.style.top));

-if((OLshadowPI)&&bkdrop&&o3_shadow){OLcbX=OLx-(parseInt(bkdrop.style.left));

-OLcbY=OLy-(parseInt(bkdrop.style.top));}}OLdw.onmousemove=OLmoveEl;

-document.onmouseup=function(){

-if(OLie4)over.onselectstart=null;o3_dragging=0;OLdw.onmousemove=OLmMv;}

-return(OLns4?routeEvent(e):false);

-}

-

-function OLmoveEl(e){

-var e=(e||event);

-OLx=(e.pageX||e.clientX+OLfd().scrollLeft);OLy=(e.pageY||e.clientY+OLfd().scrollTop);

-if(o3_dragging){if(OLns4){over.moveBy(OLx-OLcX,OLy-OLcY);

-if(OLshadowPI&&bkdrop&&o3_shadow)bkdrop.moveBy(OLx-OLcX,OLy-OLcY);}

-else{OLrepositionTo(over,OLx-OLcX,OLy-OLcY);

-if((OLiframePI)&&OLie55&&OLifsP1)OLrepositionTo(OLifsP1,OLx-OLcX,OLy-OLcY);

-if((OLshadowPI)&&bkdrop&&o3_shadow){OLrepositionTo(bkdrop,OLx-OLcbX,OLy-OLcbY);

-if((OLiframePI)&&OLie55&&OLifsSh)OLrepositionTo(OLifsSh,OLx-OLcbX,OLy-OLcbY);}}

-if(OLhidePI)OLhideUtil(0,1,1,0,0,0);}if(OLns4){OLcX=OLx;OLcY=OLy;}

-return false;

-}

-

-function OLclearDrag(){

-if(OLns4){document.releaseEvents(Event.MOUSEDOWN|Event.MOUSEUP|Event.CLICK);

-document.onmousedown=document.onclick=null;}else{over.onmousedown=null;OLsetDrgCur(0);}

-document.onmouseup=null;o3_dragging=0;

-}

-

-OLregRunTimeFunc(OLloadDraggable);

-OLregCmdLineFunc(OLparseDraggable);

-

-OLdraggablePI=1;

-OLloaded=1;

diff --git a/httemplate/elements/overlibmws_iframe.js b/httemplate/elements/overlibmws_iframe.js
deleted file mode 100644
index e3032f2..0000000
--- a/httemplate/elements/overlibmws_iframe.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*

- overlibmws_iframe.js plug-in module - Copyright Foteos Macrides 2003-2005

-   Masks system controls to prevent obscuring of popops for IE v5.5 or higher.

-   Initial: October 19, 2003 - Last Revised: May 15, 2005

- See the Change History and Command Reference for overlibmws via:

-

-	http://www.macridesweb.com/oltest/

-

- Published under an open source license: http://www.macridesweb.com/oltest/license.html

-*/

-

-OLloaded=0;

-

-var OLifsP1=null,OLifsSh=null,OLifsP2=null;

-

-// IFRAME SHIM SUPPORT FUNCTIONS

-function OLinitIfs(){

-if(!OLie55)return;

-if((OLovertwoPI)&&over2&&over==over2){

-var o=o3_frame.document.all['overIframeOvertwo'];

-if(!o||OLifsP2!=o){OLifsP2=null;OLgetIfsP2Ref();}return;}

-o=o3_frame.document.all['overIframe'];

-if(!o||OLifsP1!=o){OLifsP1=null;OLgetIfsRef();}

-if((OLshadowPI)&&o3_shadow){o=o3_frame.document.all['overIframeShadow'];

-if(!o||OLifsSh!=o){OLifsSh=null;OLgetIfsShRef();}}

-}

-

-function OLsetIfsRef(o,i,z){

-o.id=i;o.src='javascript:false;';o.scrolling='no';var os=o.style;

-os.position='absolute';os.top=0;os.left=0;os.width=1;os.height=1;os.visibility='hidden';

-os.zIndex=over.style.zIndex-z;os.filter='Alpha(style=0,opacity=0)';

-}

-

-function OLgetIfsRef(){

-if(OLifsP1||!OLie55)return;

-OLifsP1=o3_frame.document.createElement('iframe');

-OLsetIfsRef(OLifsP1,'overIframe',2);

-o3_frame.document.body.appendChild(OLifsP1);

-}

-

-function OLgetIfsShRef(){

-if(OLifsSh||!OLie55)return;

-OLifsSh=o3_frame.document.createElement('iframe');

-OLsetIfsRef(OLifsSh,'overIframeShadow',3);

-o3_frame.document.body.appendChild(OLifsSh);

-}

-

-function OLgetIfsP2Ref(){

-if(OLifsP2||!OLie55)return;

-OLifsP2=o3_frame.document.createElement('iframe');

-OLsetIfsRef(OLifsP2,'overIframeOvertwo',1);

-o3_frame.document.body.appendChild(OLifsP2);

-}

-

-function OLsetDispIfs(o,w,h){

-var os=o.style;

-os.width=w+'px';os.height=h+'px';os.clip='rect(0px '+w+'px '+h+'px 0px)';

-o.filters.alpha.enabled=true;

-}

-

-function OLdispIfs(){

-if(!OLie55)return;

-var wd=over.offsetWidth,ht=over.offsetHeight;

-if(OLfilterPI&&o3_filter&&o3_filtershadow){wd+=5;ht+=5;}

-if((OLovertwoPI)&&over2&&over==over2){

-if(!OLifsP2)return;

-OLsetDispIfs(OLifsP2,wd,ht);return;}

-if(!OLifsP1)return;

-OLsetDispIfs(OLifsP1,wd,ht);

-if((!OLshadowPI)||!o3_shadow||!OLifsSh)return;

-OLsetDispIfs(OLifsSh,wd,ht);

-}

-

-function OLshowIfs(){

-if(OLifsP1){OLifsP1.style.visibility="visible";

-if((OLshadowPI)&&o3_shadow&&OLifsSh)OLifsSh.style.visibility="visible";}

-}

-

-function OLhideIfs(o){

-if(!OLie55||o!=over)return;

-if(OLifsP1)OLifsP1.style.visibility="hidden";

-if((OLshadowPI)&&o3_shadow&&OLifsSh)OLifsSh.style.visibility="hidden";

-}

-

-function OLrepositionIfs(X,Y){

-if(OLie55){if((OLovertwoPI)&&over2&&over==over2){

-if(OLifsP2)OLrepositionTo(OLifsP2,X,Y);}

-else{if(OLifsP1){OLrepositionTo(OLifsP1,X,Y);if((OLshadowPI)&&o3_shadow&&OLifsSh)

-OLrepositionTo(OLifsSh,X+o3_shadowx,Y+o3_shadowy);}}}

-}

-

-OLiframePI=1;

-OLloaded=1;

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
deleted file mode 100644
index 7844f56..0000000
--- a/httemplate/elements/progress-init.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<%
-  my( $formname, $fields, $action, $url_or_message, $key ) = @_;
-  $key = '' unless defined $key;
-
-  my $url_or_message_link;
-  if ( ref($url_or_message) ) { #its a message or something
-    $url_or_message_link =
-      'message='. uri_escape( $url_or_message->{'message'} )
-  } else {
-    $url_or_message_link = "url=$url_or_message";
-  }
-%>
-
-<%= include('/elements/xmlhttp.html',
-              'method' => 'POST',
-              'url'    => $action,
-              'subs'   => [ 'start_job' ],
-           )
-%>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript">
-function OLiframeContent(src, width, height, name) {
-  return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
-   +(name?' name="'+name+'" id="'+name+'"':'')+' scrolling="auto">'
-   +'<div>[iframe not supported]</div></iframe>');
-}
-
-function <%=$key%>process () {
-
-  //alert('<%=$key%>process for form <%=$formname%>');
-
-  document.<%=$formname%>.submit.disabled=true;
-
-  overlib( 'Submitting job to server...', WIDTH, 432, HEIGHT, 136, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
-
-  var Hash = new Array();
-  var x = 0;
-  var fieldName;
-  for (var i = 0; i<document.<%=$formname%>.elements.length; i++) {
-    field  = document.<%=$formname%>.elements[i];
-    if ( <%= join(' || ', map { "(field.name.indexOf('$_') > -1)" } @$fields ) %>
-       )
-    {
-        if ( field.type == 'select-multiple' ) {
-          //alert('select-multiple ' + field.name);
-          for (var j=0; j < field.options.length; j++) {
-            if ( field.options[j].selected ) {
-              //alert(field.name + ' => ' + field.options[j].value);
-              Hash[x++] = field.name;
-              Hash[x++] = field.options[j].value;
-            }
-          }
-        } else if (    ( field.type != 'radio'  && field.type != 'checkbox' )
-                    || ( ( field.type == 'radio' || field.type == 'checkbox' )
-                         && document.<%=$formname%>.elements[i].checked
-                       )
-                  )
-        {
-          Hash[x++] = field.name;
-          Hash[x++] = field.value;
-        }
-    }
-  }
-
-  // jsrsPOST = true;
-  // jsrsExecute( '<%= $action %>', <%=$key%>myCallback, 'start_job', Hash );
-
-  //alert('start_job( ' + Hash + ', <%=$key%>myCallback )' );
-  //alert('start_job()' );
-  start_job( Hash, <%=$key%>myCallback );
-
-}
-
-function <%=$key%>myCallback( jobnum ) {
-
-  overlib( OLiframeContent('<%=$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%=$url_or_message_link%>;formname=<%=$formname%>' , 432, 136, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
-
-}
-
-</SCRIPT>
diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html
deleted file mode 100644
index 200f97d..0000000
--- a/httemplate/elements/progress-popup.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<%
-  my $jobnum = $cgi->param('jobnum');
-  my $url = $cgi->param('url');
-  my $message = $cgi->param('message');
-  my $formname = scalar($cgi->param('formname'));
-%>
-<HTML>
-  <HEAD>
-    <TITLE></TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#ccccff" onLoad="refreshStatus()">
-
-<%= include('/elements/xmlhttp.html',
-              'url'  => $p.'elements/jsrsServer.html',
-              'subs' => [ 'job_status' ],
-           )
-%>
-<SCRIPT TYPE="text/javascript" src="../elements/qlib/control.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" src="../elements/qlib/imagelist.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" src="../elements/qlib/progress.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript">
-function refreshStatus () {
-  //jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
-
-  job_status( '<%= $jobnum %>', updateStatus );
-}
-function updateStatus( status_statustext ) {
-
-  //var Array = status_statustext.split("\n");
-  var statusArray = eval('(' + status_statustext + ')');
-  var status = statusArray[0];
-  var statustext = statusArray[1];
-
-  //if ( status == 'progress' ) {
-  //IE workaround, no i have no idea why
-  if ( status.indexOf('progress') > -1 ) {
-    document.getElementById("progress_percent").innerHTML = statustext + '%';
-    bar1.set(statustext);
-    bar1.update;
-    //jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
-    job_status( '<%= $jobnum %>', updateStatus );
-  } else if ( status.indexOf('complete') > -1 ) {
-<% if ( $message ) { %>
-    document.getElementById("progress_message").innerHTML = "<%= $message %>";
-    document.getElementById("progress_bar").innerHTML = '';
-    document.getElementById("progress_percent").innerHTML = '<INPUT TYPE="button" VALUE="OK" onClick="parent.nd(1);">';
-    document.getElementById("progress_jobnum").innerHTML = '';
-    parent.document.<%=$formname%>.submit.disabled=false;
-<% } elsif ( $url ) { %>
-    window.top.location.href = '<%= $url %>';
-<% } else { %>
-    alert('job done but no url or message specified');
-<% } %>
-  } else if ( status.indexOf('error') > -1 ) {
-    document.getElementById("progress_message").innerHTML = '<FONT SIZE="+1" COLOR="#FF0000">Error: ' + statustext + '</FONT>';
-    document.getElementById("progress_bar").innerHTML = '';
-    document.getElementById("progress_percent").innerHTML = '<INPUT TYPE="button" VALUE="OK" onClick="parent.nd(1);">';
-    document.getElementById("progress_jobnum").innerHTML = '';
-    parent.document.<%=$formname%>.submit.disabled=false;
-  } else {
-    alert('XXX unknown status returned from server: ' + status);
-  }
-  
-}
-</SCRIPT>
-
-    <TABLE>
-      <TR>
-        <TD ALIGN="center" ID="progress_message">
-          Server processing job...
-        </TD>
-      </TR><TR>
-        <TD ALIGN="center" ID="progress_bar">
-          <SCRIPT TYPE="text/javascript">
-            // Create imagelist
-            SEGS = new QImageList(4, 23, "../images/progressbar-empty.png", "../images/progressbar-full.png");
-            // Create bars
-            bar1 = new QProgress(null, "bar1", SEGS, 100);
-            // bar1.set(0);
-            // bar1.update;
-          </SCRIPT>
-        </TD>
-      </TR><TR>
-        <TD ALIGN="center">
-          <DIV ID="progress_percent">%</DIV>
-        </TD>
-      </TR><TR>
-        <TD ALIGN="center" ID="progress_jobnum">
-          (progress of job #<%= $jobnum %>)
-        </TD>
-      </TR>
-    </TABLE>
-
-  </BODY>
-</HTML>
-
diff --git a/httemplate/elements/qlib/box.js b/httemplate/elements/qlib/box.js
deleted file mode 100644
index 537aac4..0000000
--- a/httemplate/elements/qlib/box.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**

- * QLIB 1.0 Box Control

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QBox(parent, name, res, x, y, width, height, body, visible, effects, opacity, zindex) {

-    this.init(parent, name);

-    if (this.res = res) {

-        this.x = x - 0;

-        this.y = y - 0;

-        this.width = width - 0;

-        this.height = (typeof(height) == "number") ? height : null;

-        this.body = body || "&nbsp;";

-        var j = QBox.arguments.length;

-        this.visible = (j > 8) ? visible : true;

-        this.effects = (j > 9) ? effects : (res.effects || 0);

-        this.opacity = (j > 10) ? opacity : (res.opacity != null ? res.opacity : 100);

-        this.zindex  = (j > 11) ? zindex : null;

-        this.create();

-    } else {

-        this.document.write("invalid resource");

-    }

-}

-QBox.prototype = new QBoxCtrl();

diff --git a/httemplate/elements/qlib/boxctrl.js b/httemplate/elements/qlib/boxctrl.js
deleted file mode 100644
index 417b204..0000000
--- a/httemplate/elements/qlib/boxctrl.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**

- * QLIB 1.0 Box Abstraction

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QBoxCtrl_content() {

-    with (this) {

-        if (res) {

-            this.cwidth = width - res.L - res.R - 8;

-            this.cheight = height && (height - res.T - res.B - 8);

-            var ec = '"><table border="0" cellspacing="0" cellpadding="0"><tr><td></td></tr></table></td>';

-            document.write('<table class="qbox" border="0" cellspacing="0" cellpadding="0" width="' +

-                (width - 8) + (height != null ? '" height="' + (height - 8) : '') + '"><tr><td width="' +

-                res.L + '" height="' + res.T + '"><img src="' + res.TL.src + '" border="0" width="' +

-                res.L + '" height="' + res.T + '"></td><td width="' + cwidth + '" height="' + res.T +

-                '" background="' + res.TC.src + ec + '<td width="' + res.R + '" height="' + res.T +

-                '"><img src="' + res.TR.src + '" border="0" width="' + res.R + '" height="' + res.T +

-                '"></td></tr><tr><td width="' + res.L + (cheight != null ? '" height="' + cheight : '') +

-                '" background="' + res.ML.src + ec + '<td width="' + cwidth + '" bgcolor="' + res.bgcolor +

-                (cheight != null ? '" height="' + cheight : '') + (res.bgtile ? '" background="' +

-                res.bgtile.src : '') + '" align="left" valign="top" class="body" unselectable="on">');

-                if (typeof(body) == "function") {

-                    this.body();

-                } else {

-                    document.write(body);

-                }

-            document.write('</td><td width="' + res.R + (cheight != null ? '" height="' + cheight : '') +

-                '" background="' + res.MR.src + ec + '</tr><tr><td width="' + res.L + '" height="' + res.B +

-                '"><img src="' + res.BL.src + '" border="0" width="' + res.L + '" height="' + res.B +

-                '"></td><td width="' + cwidth + '" height="' + res.B + '" background="' + res.BC.src + ec +

-                '<td width="' + res.R + '" height="' + res.B + '"><img src="' + res.BR.src +

-                '" border="0" width="' + res.R + '" height="' + res.B + '"></td></tr></table><br>');

-        }

-    }

-}

-

-function QBoxCtrl() {

-    this.res = false;

-    this.body = "&nbsp;";

-    this.cwidth = this.cheight = 0;

-    this.content = QBoxCtrl_content;

-}

-QBoxCtrl.prototype = new QWndCtrl();

diff --git a/httemplate/elements/qlib/boxres.js b/httemplate/elements/qlib/boxres.js
deleted file mode 100644
index 0878172..0000000
--- a/httemplate/elements/qlib/boxres.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**

- * QLIB 1.0 Box Resource

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QBoxRes(t, r, b, l, tc, tr, mr, br, bc, bl, ml, tl, bgcolor, bgtile, effects, opacity) { 

-    var args = QBoxRes.arguments.length;

-    this.T = t;

-    this.R = r;

-    this.B = b;

-    this.L = l;

-    this.TC = new Image();

-    this.TC.src = tc;

-    this.TR = new Image(r, t);

-    this.TR.src = tr;

-    this.MR = new Image();

-    this.MR.src = mr;

-    this.BR = new Image(r, b);

-    this.BR.src = br;

-    this.BC = new Image();

-    this.BC.src = bc;

-    this.BL = new Image(l, b);

-    this.BL.src = bl;

-    this.ML = new Image();

-    this.ML.src = ml;

-    this.TL = new Image(l, t);

-    this.TL.src = tl;

-    this.bgcolor = bgcolor || "#FFFFFF";

-    if (bgtile) {

-        this.bgtile = new Image();

-        this.bgtile.src = bgtile;

-    } else {

-        this.bgtile = false;

-    }

-    this.effects = (args > 13) ? effects : null;

-    this.opacity = (args > 14) ? opacity : null;

-}

diff --git a/httemplate/elements/qlib/button.js b/httemplate/elements/qlib/button.js
deleted file mode 100644
index 05247d5..0000000
--- a/httemplate/elements/qlib/button.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**

- * QLIB 1.0 Button Control

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QButton_update() {

-    with (this) {

-        image.src = ((!enabled && res.imgD) || (value ? res.imgP : res.imgN)).src;

-    }

-}

-

-function QButton_doEvent() {

-    with (this) {

-        if (enabled) {

-            if (res.style == 1) {

-                this.value = value ? 0 : 1;

-                update();

-            }

-            onClick(value, tag);

-        }

-    }

-    return false;

-}

-

-function QButton_enable(state) {

-    this.enabled = state;

-    this.update();

-}

-

-function QButton_set(value) {

-    if (this.enabled) {

-        this.value = value ? 1 : 0;

-        this.update();

-    }

-    return true;

-}

-

-function QButton(parent, name, res, tooltip) {

-    this.init(parent, name);

-    if (res) {

-        this.res = res;

-        this.tip = tooltip || "";

-        this.enabled = true;

-        this.value = 0;

-        this.set = QButton_set;

-        this.enable = QButton_enable;

-        this.update = QButton_update;

-        this.doEvent = QButton_doEvent;

-        this.onClick = QControl.event;

-        with (this) {

-            document.write('<a href="#" hidefocus="true" unselectable="on"' +

-                (tip ? ' title="' + tip + '"' : '') + ' onClick="return ' + name +

-                '.doEvent()" onMouseOver="' + (res.style == 2 ? name + '.set(1);' : '') +

-                'window.top.status=' + name + '.tip;return true" onMouseOut="' +

-                (!res.style || (res.style == 2) ? name + '.set();' : '') + 'window.top.status=\'\'"' +

-                (!res.style ? ' onMouseDown="return ' + name + '.set(1)" onMouseUp="return ' + name + '.set()"' : '') +

-                '><img class="qbutton" name="' + id + '" src="' + res.imgN.src + '" border="0" width="' +

-                res.width + '" height="' + res.height + '"></a>');

-            this.image = document.images[id] || new Image(1, 1);

-        }

-    } else {

-        this.document.write("invalid resource");

-    }

-}

-QButton.prototype = new QControl();

-QButton.NORMAL    = 0;

-QButton.CHECKBOX  = 1;

-QButton.WEB       = 2;

-QButton.SIGNAL    = 3;

diff --git a/httemplate/elements/qlib/buttonres.js b/httemplate/elements/qlib/buttonres.js
deleted file mode 100644
index 97f6dfc..0000000
--- a/httemplate/elements/qlib/buttonres.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**

- * QLIB 1.0 Button Resource

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QButtonRes(style, width, height, normal, pressed, disabled) {

-    this.style = style;

-    this.width = width;

-    this.height = height;

-    this.imgN = new Image(width, height);

-    this.imgN.src = normal;

-    this.imgP = new Image(width, height);

-    this.imgP.src = pressed;

-    if (disabled) {

-        this.imgD = new Image(width, height);

-        this.imgD.src = disabled;

-    }

-}

diff --git a/httemplate/elements/qlib/control.js b/httemplate/elements/qlib/control.js
deleted file mode 100644
index f50206e..0000000
--- a/httemplate/elements/qlib/control.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * QLIB 1.0 Base Abstract Control

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QControl_init(parent, name) {

-    this.parent = parent || self;

-    this.window = (parent && parent.window) || self;

-    this.document = (parent && parent.document) || self.document;

-    this.name = (parent && parent.name) ? (parent.name + "." + name) : ("self." + name);

-    this.id = "Q";

-    var h = this.hash(this.name);

-    for (var j=0; j<8; j++) {

-        this.id += QControl.HEXTABLE.charAt(h & 15);

-        h >>>= 4;

-    }

-}

-

-function QControl_hash(str) {

-    var h = 0;

-    if (str) {

-        for (var j=str.length-1; j>=0; j--) {

-            h ^= QControl.ANTABLE.indexOf(str.charAt(j)) + 1;

-            for (var i=0; i<3; i++) {

-                var m = (h = h<<7 | h>>>25) & 150994944;

-                h ^= m ? (m == 150994944 ? 1 : 0) : 1;

-            }

-        }

-    }

-    return h;

-}

-

-function QControl_nop() {

-}

-

-function QControl() {

-    this.init = QControl_init;

-    this.hash = QControl_hash;

-    this.window = self;

-    this.document = self.document;

-    this.tag = null;

-}

-QControl.ANTABLE  = "w5Q2KkFts3deLIPg8Nynu_JAUBZ9YxmH1XW47oDpa6lcjMRfi0CrhbGSOTvqzEV";

-QControl.HEXTABLE = "0123456789ABCDEF";

-QControl.nop = QControl_nop;

-QControl.event = QControl_nop;

diff --git a/httemplate/elements/qlib/counter.js b/httemplate/elements/qlib/counter.js
deleted file mode 100644
index 72aeddb..0000000
--- a/httemplate/elements/qlib/counter.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/**

- * QLIB 1.0 Animated Digital Counter

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QCounter_update() {

-    with (this) {

-        var v = Math.max(value, 0);

-        var mod;

-        for (var j=0; j<size; j++) {

-            mod = Math.floor(v % 10);

-            images[j].src = (v >= 1) || (!j) ? res.list[mod].src : res.list[10].src;

-            v /= 10;

-        }

-    }

-}

-

-function QCounter_count(value, step) {

-    this._cntt = false;

-    this.value += step; 

-    if ((step * (this.value - value)) >= 0) {

-        this.value = value - 0;  // convert to number

-    } else {

-        this._cntt = setTimeout(this.name + ".count(" + value + "," + step + ")", 50);

-    }

-    this.update();

-}

-         

-function QCounter_set(value) {

-    this.setval = value;

-    if (value != this.value) {

-        if (this._cntt) {

-            clearTimeout(this._cntt);

-            this._cntt = false;

-        }

-        var dv = value - this.value;

-        if (this.effect == 2) {

-            dv = dv / Math.min(10, Math.abs(dv));

-        } else if (this.effect == 3) {

-            dv = dv / Math.abs(dv);

-        }

-        this.count(value, dv);

-    }

-}

-

-function QCounter(parent, name, res, size, effect) {

-    this.init(parent, name);

-    if (res) {

-        this.res = res;

-        this.setval = this.value = 0;

-        this.size = size || 4;

-        this.effect = effect || 2;

-        this._cntt = false;

-        this.images = new Array(this.size);

-        this.set = QCounter_set;

-        this.update = QCounter_update;

-        this.count = QCounter_count;

-        with (this) {

-            document.write('<table class="qcounter" width="' + (res.width * size) + '" height="' + res.height +

-                '" border="0" cellspacing="0" cellpadding="0" unselectable="on"><tr>');

-            for (var j=(size - 1); j>=0; j--) {

-                document.write('<td width="' + res.width + '" height="' + res.height +

-                    '" unselectable="on"><img name="' + id + j + '" src="' + (j ? res.list[10].src : res.list[0].src) +

-                    '" border="0" width="' + res.width + '" height="' + res.height + '"></td>');

-                images[j] = document.images[id + j] || new Image(1, 1);

-            }

-            document.write('</tr></table>');

-        }

-    } else {

-        this.document.write("invalid resource");

-    }

-}

-QCounter.prototype = new QControl();

-QCounter.INSTANT   = 1;

-QCounter.FAST      = 2;

-QCounter.SLOW      = 3;

diff --git a/httemplate/elements/qlib/imagelist.js b/httemplate/elements/qlib/imagelist.js
deleted file mode 100644
index 9f12de0..0000000
--- a/httemplate/elements/qlib/imagelist.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**

- * QLIB 1.0 ImageList Resource

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QImageList(width, height) {

-    var len = QImageList.arguments.length - 2;

-    if (len > 0) {

-        this.list = new Array(len);

-        this.length = len;

-        this.width = width;

-        this.height = height;

-        var im;

-        for (var j=0; j<len; j++) {

-            im = new Image(width, height);

-            im.src = QImageList.arguments[j + 2];

-            this.list[j] = im;

-        }

-    }

-}
\ No newline at end of file
diff --git a/httemplate/elements/qlib/label.js b/httemplate/elements/qlib/label.js
deleted file mode 100644
index 2d8b1e7..0000000
--- a/httemplate/elements/qlib/label.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**

- * QLIB 1.0 Text Label

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QLabel_set_ie(value) {

-    this.label.innerText = (this.value = value) || "\xA0";

-}

-

-function QLabel_set_dom2(value) {

-    with (this.label) {

-        replaceChild(this.document.createTextNode((this.value = value) || "\xA0"), firstChild);

-    }

-}

-

-function QLabel_set_ns4(value) {

-    this.value = value || "";

-    with (this) {

-        document.open();

-        document.write('<div class="qlabel">' + (clickable ? '<a href="#" title="' + tooltip + '" onClick="return ' +

-            name + '.doEvent()" onMouseOut="window.top.status=\'\'" onMouseOver="window.top.status=' + name +

-            '.tooltip;return true">' + value + '</a>' : value) + '</div>');

-        document.close();

-    }

-}

-

-function QLabel_doEvent() {

-    this.onClick(this.value, this.tag);

-    return false;

-}

-

-function QLabel(parent, name, value, clickable, tooltip) {

-    this.init(parent, name);

-    this.value = value || "";

-    this.clickable = clickable || false;

-    this.tooltip = tooltip || "";

-    this.doEvent = QLabel_doEvent;

-    this.onClick = QControl.event;

-    with (this) {

-        if (document.getElementById || document.all) {

-            document.write(clickable ? '<div class="qlabel" unselectable="on"><a id="' + id + '" href="#" title="' +

-                tooltip + '" onClick="return ' + name + '.doEvent()" onMouseOver="window.top.status=' + name +

-                '.tooltip;return true" onMouseOut="window.top.status=\'\'" hidefocus="true" unselectable="on">' +

-                (value || '&nbsp;') + '</a></div>' : '<div id="' + id + '" class="qlabel" unselectable="on">' +

-                (value || '&nbsp;') + '</div>');

-            this.label = document.getElementById ? document.getElementById(id) :

-                (document.all.item ? document.all.item(id) : document.all[id]);

-            this.set = (label && (label.innerText ? QLabel_set_ie :

-                (label.replaceChild && QLabel_set_dom2))) || QControl.nop;

-        } else if (document.layers) {

-            var suffix = "";

-            for (var j=value.length; j<QLabel.TEXTQUOTA; j++) suffix += " &nbsp;";

-            document.write('<div><ilayer id="i' + id + '"><layer id="' + id + '"><div class="qlabel">' +

-                (clickable ? '<a href="#" title="' + tooltip + '" onClick="return ' + name +

-                '.doEvent()" onMouseOver="window.top.status=' + name +

-                '.tooltip;return true" onMouseOut="window.top.status=\'\'">' + value + suffix + '</a>' :

-                value + suffix) + '</div></layer></ilayer></div>');

-            this.label = (this.label = document.layers["i" + id]) && label.document.layers[id];

-            this.document = label && label.document;

-            this.set = (label && document) ? QLabel_set_ns4 : QControl.nop;

-        } else {

-            document.write("Object is not supported");

-        }

-    }

-}

-QLabel.prototype = new QControl();

-QLabel.TEXTQUOTA = 50;

diff --git a/httemplate/elements/qlib/messagebox.js b/httemplate/elements/qlib/messagebox.js
deleted file mode 100644
index 2e45839..0000000
--- a/httemplate/elements/qlib/messagebox.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**

- * QLIB 1.0 Message Box Control

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QMessageBox_alert(msg) {

-    if (typeof(msg) == "string") {

-        this.label.set(this.value = msg);

-    }

-    this.center();

-    this.focus();

-    this.show(true);

-}

-

-function QMessageBox_close() {

-    with (this.parent) {

-        if (!onClose(tag)) show(false);

-    }

-}

-

-function QMessageBox_body() {

-    with (this) {

-        document.write('<table border="0" width="' + cwidth + '"><tr><td align="left" valign="top" unselectable="on">');

-        this.label = new QLabel(this, "label", value);

-        document.write('</td></tr><tr><td height="' + (bres.height + 14) + '" align="center" valign="bottom" unselectable="on">');

-        this.button = new QButton(this, "button", bres, "Close");

-        document.write('</td></tr></table>');

-        button.onClick = QMessageBox_close;

-    }

-}

-

-function QMessageBox(parent, name, box, btn, msg, effects, opacity) {

-    this.init(parent, name);

-    if ((this.res = box) && (this.bres = btn)) {

-        this.value = typeof(msg) == "string" ? msg : "";

-        this.width = Math.max(200, Math.floor(Math.sqrt(555 * this.value.length)));

-        this.height = null;

-        this.x = this.y = 0;

-        this.visible = false;

-        this.zindex = null;

-        this.body = QMessageBox_body;

-        var j = QMessageBox.arguments.length;

-        this.effects = j > 5 ? effects : (box.effects != null ? box.effects : 0);

-        this.opacity = j > 6 ? opacity : (box.opacity != null ? box.opacity : 100);

-        this.create();

-        this.alert = QMessageBox_alert;

-        this.onClose = QControl.event;

-    } else {

-        this.document.write("invalid resource");

-    }

-}

-QMessageBox.prototype = new QBoxCtrl();

diff --git a/httemplate/elements/qlib/progress.js b/httemplate/elements/qlib/progress.js
deleted file mode 100644
index 2de077e..0000000
--- a/httemplate/elements/qlib/progress.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**

- * QLIB 1.0 Progress Control

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QProgress_update() {

-    with (this) {

-        var i = low;

-        for (var j=0; j<size; j++) {

-            images[j].src = i < value ? imgsrc1 : imgsrc0;

-            i += delta;

-        }

-    }

-}

-

-function QProgress_set(value) {

-    this.value = value - 0;

-    this.update();

-}

-

-function QProgress_setBounds(low, high) {

-    this.low = Math.min(low, high);

-    this.high = Math.max(low, high);

-    this.delta = (this.high - this.low) / this.size;

-    this.update();

-}

- 

-function QProgress(parent, name, res, size, style) {

-    this.init(parent, name);

-    if (res) {

-        this.res = res;

-        this.value = 0;

-        this.low = 0;

-        this.high = 100;

-        this.size = size || 10;

-        this.delta = 100 / this.size;

-        this.style = style || 0;

-        this.images = new Array(this.size);

-        this.imgsrc0 = res.list[0] && res.list[0].src;

-        this.imgsrc1 = res.list[1] && res.list[1].src;

-        this.set = QProgress_set;

-        this.update = QProgress_update;

-        this.setBounds = QProgress_setBounds;

-        with (this) {

-            var hor = this.style < 2;

-            var rev = this.style % 2;

-            document.write('<table class="qprogress" border="0"  cellspacing="0" cellpadding="0" unselectable="on" ' +

-                (hor ? 'width="' + (size * res.width) + '" height="' + res.height + '"><tr>' : 'width="' + res.width +

-                '" height="' + (size * res.height) + '">'));

-            for (var j=0; j<size; j++) {

-                document.write((hor ? '' : '<tr>') + '<td width="' + res.width + '" height="' + res.height +

-                    '" unselectable="on"><img name="' + id + (rev ? size - j - 1 : j) + '" src="' + res.list[0].src +

-                    '" border="0" width="' + res.width + '" height="' + res.height + '"></td>' + (hor ? '' : '</tr>'));

-            }

-            document.write((hor ? '</tr>' : '') + '</table>');

-            for (var j=0; j<size; j++) {

-                images[j] = document.images[id + j] || new Image(1, 1);

-            }

-        }

-    } else {

-        this.document.write("invalid resource");

-    }

-}

-QProgress.prototype = new QControl();

-QProgress.NORMAL    = 0;

-QProgress.REVERSE   = 1;

-QProgress.FALL      = 2;

-QProgress.RISE      = 3;

diff --git a/httemplate/elements/qlib/sound.js b/httemplate/elements/qlib/sound.js
deleted file mode 100644
index 3d1aaf6..0000000
--- a/httemplate/elements/qlib/sound.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**

- * QLIB 1.0 Preloaded Sound

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QSound_play(loop) {

-    this._out.loop = loop || 0;

-    this._out.src = this._buf.src;

-}

-

-function QSound_stop() {

-    this._out.loop = 0;

-    this._out.src = "";

-}

-

-function QSound_setVolume(volume) {

-    this._out.volume = this.volume = volume;

-}

- 

-function QSound(parent, name, src, volume) {

-    this.init(parent, name);

-    this.volume = volume || 0;

-    this.play = this.stop = this.setVolume = QControl.nop;

-    with (this) {

-        document.write('<bgsound id="' + id + '" src="" volume="' + volume + '">');

-        if (document.all && document.all.item) {

-            this._out = document.all.item(id);

-            if (_out && (typeof _out.src != "undefined") && (_out.volume === volume)) {

-                document.write('<bgsound id="b' + id + '" src="' + src + '" volume="-10000">');

-                this._buf = document.all.item("b" + id);

-                if (_buf) {

-                    this.play = QSound_play;

-                    this.stop = QSound_stop;

-                    this.setVolume = QSound_setVolume;

-

-                    _out.onreadystatechange = new Function("alert(0)");

-                }

-            }

-        }

-    }

-}

-QSound.prototype = new QControl();

diff --git a/httemplate/elements/qlib/sprite.js b/httemplate/elements/qlib/sprite.js
deleted file mode 100644
index 72a68fb..0000000
--- a/httemplate/elements/qlib/sprite.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/**

- * QLIB 1.0 Sprite Object

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QSprite_load(src) {

-    if (src) {

-        this.face = new Image(this.cwidth, this.cheight);

-        this.face.src = src;

-        this.valid = false;

-    }

-}

- 

-function QSprite_show(show) {

-    if (show && !this.valid && this.face.complete) {

-        this._img.src = this.face.src;

-        this.valid = true;

-    }

-    this._show(show);

-}

-

-function QSprite_moveTo(x, y) {

-    this.stop();

-    this._move(x, y);

-}

-

-function QSprite_slideTo(x, y) {

-    this.stop();

-    if (this.visible) {

-        this.doSlide(++this._spro, x, y);

-    } else {

-        this.moveTo(x, y);

-    }

-}

-

-function QSprite_shake() {

-    this.stop();

-    if (this.visible) {

-        this.doShake(++this._spro, 0, this.x, this.y);

-    }

-}

-

-function QSprite_stop() {

-    this._spro++;

-    if (this._sprt) {

-        clearTimeout(this._sprt);

-        this._sprt = false;

-    }

-}

-

-function QSprite_doSlide(id, x, y) {

-    if (this._spro == id) {

-        this._sprt = false;

-        var dx = Math.round(x - this.x);

-        var dy = Math.round(y - this.y);

-        if (dx || dy) {

-            if (dx) dx = dx > 0 ? Math.ceil(dx/4) : Math.floor(dx/4);

-            if (dy) dy = dy > 0 ? Math.ceil(dy/4) : Math.floor(dy/4);

-            this._move(this.x + dx, this.y + dy);

-            this._sprt = setTimeout(this.name + ".doSlide(" + id + "," + x + "," + y + ")", 30);

-        } else {

-            this._move(x, y);

-        }

-    }

-}

-

-function QSprite_doShake(id, phase, x, y) {

-    if (this._spro == id) {

-        this._sprt = false;

-        if (phase < 20) {

-            var m = 3 * Math.sin(.16 * phase);

-            this._move(x + m * Math.sin(phase), y + m * Math.cos(phase));

-            this._sprt = setTimeout(this.name + ".doShake(" + id + "," + (++phase) + "," + x + "," + y + ")", 20);

-        } else {

-            this._move(x, y);

-        }

-    }

-}

-

-function QSprite_doClick() {

-    if (!this._sprt) {

-        this.onClick(this.tag);

-    }

-    return false;

-}

-

-function QSprite(parent, name, x, y, width, height, src, visible, effects, opacity, zindex) {

-    this.init(parent, name);

-    this.x = x - 0;

-    this.y = y - 0;

-    this.width = (this.cwidth = width - 0) + 8;

-    this.height = (this.cheight = height - 0) + 8;

-    var j = QSprite.arguments.length;

-    this.visible = (j > 7) ? visible : true;

-    this.effects = (j > 8) ? effects : 0;

-    this.opacity = (j > 9) ? opacity : 100;

-    this.zindex  = (j > 10) ? zindex : null;

-    this.valid = !!src;

-    this.content = '<a href="#" title="" onclick="return false" onmousedown="return ' + this.name +

-        '.doClick()" onmouseover="window.top.status=\'\';return true" hidefocus="true" unselectable="on"><img name="' +

-        this.id + '" src="' + (src || '') + '" border="0" width="' + this.cwidth + '" height="' + this.cheight +

-        '" alt="" unselectable="on"></a>';

-    this.doClick = QSprite_doClick;

-    this.doSlide = QSprite_doSlide;

-    this.doShake = QSprite_doShake;

-    this.onClick = QControl.event;

-    this.create();

-    this.face = this._img = this.document.images[this.id] || new Image(1, 1);

-    this._spro = 0;

-    this._sprt = false;

-    this._show = this.show;

-    this._move = this.moveTo;

-    this.load = QSprite_load;

-    this.show = QSprite_show;

-    this.moveTo = QSprite_moveTo;

-    this.slideTo = QSprite_slideTo;

-    this.shake = QSprite_shake;

-    this.stop = QSprite_stop;

-}

-QSprite.prototype = new QWndCtrl();

diff --git a/httemplate/elements/qlib/window.js b/httemplate/elements/qlib/window.js
deleted file mode 100644
index 6056fda..0000000
--- a/httemplate/elements/qlib/window.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**

- * QLIB 1.0 Window Control

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QWindow(parent, name, x, y, width, height, content, visible, effects, opacity, zindex) {

-    this.init(parent, name);

-    this.x = x - 0;

-    this.y = y - 0;

-    this.width = width - 0;

-    this.height = (typeof(height) == "number") ? height : null;

-    this.content = content;

-    var j = QWindow.arguments.length;

-    this.visible = (j > 7) ? visible : true;

-    this.effects = (j > 8) ? effects : 0;

-    this.opacity = (j > 9) ? opacity : 100;

-    this.zindex  = (j > 10) ? zindex : null;

-    this.create();

-}

-QWindow.prototype = new QWndCtrl();

diff --git a/httemplate/elements/qlib/wndctrl.js b/httemplate/elements/qlib/wndctrl.js
deleted file mode 100644
index b3bde4e..0000000
--- a/httemplate/elements/qlib/wndctrl.js
+++ /dev/null
@@ -1,322 +0,0 @@
-/**

- * QLIB 1.0 Window Abstraction

- * Copyright (C) 2002 2003, Quazzle.com Serge Dolgov

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

- * http://qlib.quazzle.com

- */

-

-function QWndCtrl_center_ie4() {

-    var b = this.document.body;

-    this.moveTo(b.scrollLeft + Math.max(0, Math.floor((b.clientWidth -

-        this.width) / 2)), b.scrollTop + 100);

-}

-

-function QWndCtrl_center_moz() {

-    this.moveTo(self.pageXOffset + Math.max(0, Math.floor((self.innerWidth -

-        this.width) / 2)), self.pageYOffset + 100);

-}

-

-function QWndCtrl_setEffects_ie4(fx) {

-    this.effects = fx;

-    with (this.wnd) {

-        filters[0].enabled = (fx & 256) != 0;

-        filters[1].enabled = (fx & 512) != 0;

-        filters[2].enabled = (fx & 1024) != 0;

-        filters[4].enabled = (fx & 2048) != 0;

-    }

-}

-

-function QWndCtrl_setEffects_moz(fx) {

-    this.effects = fx;

-}

-

-function QWndCtrl_setOpacity_ie4(op) {

-    this.opacity = Math.max(0, Math.min(100, Math.floor(op - 0)));

-    this.wnd.filters[3].opacity = this.opacity;

-    this.wnd.filters[3].enabled = (this.opacity < 100);

-}

-

-function QWndCtrl_setOpacity_moz(op) {

-    this.opacity = Math.max(0, Math.min(100, Math.floor(op - 0)));

-    this.wnd.style.MozOpacity = this.opacity + "%";

-}

-

-function QWndCtrl_setSize_css(w, h) {

-    this.wnd.style.width = (this.width = Math.floor(w - 0)) + "px";

-    this.wnd.style.height = typeof(h) == "number" ? (this.height = Math.floor(h)) + "px" : "auto";

-}

-

-function QWndCtrl_setSize_ns4(w, h) {

-    this.wnd.clip.width = this.width = Math.floor(w - 0);

-    if (typeof(h) == "number") {

-        this.wnd.clip.height = this.height = Math.floor(h);

-    }

-}

-

-function QWndCtrl_focus() {

-    this.setZIndex(QWndCtrl.TOPZINDEX++);

-}

-

-function QWndCtrl_setZIndex_css(z) {

-    this.wnd.style.zIndex = this.zindex = z || 0;

-}

-

-function QWndCtrl_setZIndex_ns4(z) {

-    this.wnd.zIndex = this.zindex = z || 0;

-}

-

-function QWndCtrl_moveTo_css(x, y) {

-    this.wnd.style.left = (this.x = Math.floor(x - 0)) + "px";

-    this.wnd.style.top = (this.y = Math.floor(y - 0)) + "px";

-}

-

-function QWndCtrl_moveTo_ns4(x, y) {

-    this.wnd.moveTo(this.x = Math.floor(x - 0), this.y = Math.floor(y - 0));

-}

-

-function QWndCtrl_fxhandler() {

-    this.fxhandler = QControl.nop;

-    this.onShow(this.visible, this.tag);

-}

-

-function QWndCtrl_show_ie4(show) {

-    if (this.visible != show) {

-        var fx = false;

-        switch (show ? this.effects & 15 : (this.effects & 240) >>> 4) {

-            case 1:

-                fx = this.wnd.filters[5];

-                break;

-            case 2:

-                (fx = this.wnd.filters[6]).transition = show ? 1 : 0;

-                break;

-            case 3:

-                (fx = this.wnd.filters[6]).transition = show ? 3 : 2;

-                break;

-            case 4:

-                (fx = this.wnd.filters[6]).transition = show ? 5 : 4;

-                break;

-            case 5:

-                (fx = this.wnd.filters[6]).transition = show ? 14 : 13;

-                break;

-            case 6:

-                (fx = this.wnd.filters[6]).transition = show ? 16 : 15;

-                break;

-            case 7:

-                (fx = this.wnd.filters[6]).transition = 12;

-                break;

-            case 8:

-                (fx = this.wnd.filters[6]).transition = 8;

-                break;

-            case 9:

-                (fx = this.wnd.filters[6]).transition = 9;

-        }

-        if (fx) {

-            fx.apply();

-            this.wnd.style.visibility = (this.visible = show) ? "visible" : "hidden";

-            this.fxhandler = QWndCtrl_fxhandler;

-            fx.play(0.3);

-        } else {

-            this.wnd.style.visibility = (this.visible = show) ? "visible" : "hidden";

-            this.onShow(show, this.tag);

-        }

-    }

-}

-

-function QWndCtrl_fade_moz(op, step) {

-    this._wndt = false;

-    if (step) {

-        op += step;

-        if ((op > 0) && (op < this.opacity)) {

-            this.wnd.style.MozOpacity = op + "%";

-            this._wndt = setTimeout(this.name + ".fade(" + op + "," + step + ")", 50);

-        } else {

-            if (op <= 0) {

-                this.wnd.style.visibility = "hidden";

-                this.visible = false;

-            }

-            this.wnd.style.MozOpacity = this.opacity + "%";

-            this.onShow(this.visible, this.tag);

-        }

-    }

-}

-

-function QWndCtrl_show_moz(show) {

-    if (this.visible != show) {

-        if (this._wndt) {

-            clearTimeout(this._wndt);

-            this._wndt = false;

-        }

-        var step = show ? ((this.effects & 15) == 1) && Math.floor(this.opacity / 5) :

-            ((this.effects & 240) == 16) && -Math.floor(this.opacity / 5);

-        if (step) {

-            if (this.visible) {

-                this.fade(this.opacity - 0, step);

-            } else {

-                this.wnd.style.MozOpacity = "0%";

-                this.wnd.style.visibility = "visible";

-                this.visible = true;

-                this.fade(0, step);

-            }

-        } else {

-            this.wnd.style.visibility = (this.visible = show) ? "visible" : "hidden";

-            this.onShow(show, this.tag);

-        }

-    }

-}

-

-function QWndCtrl_show_css(show) {

-    if (this.visible != show) {

-        this.wnd.style.visibility = (this.visible = show) ? "visible" : "hidden";

-        this.onShow(show, this.tag);

-    }

-}

-

-function QWndCtrl_show_ns4(show) {

-    if (this.visible != show) {

-        this.wnd.visibility = (this.visible = show) ? "show" : "hidden";

-        this.onShow(show, this.tag);

-    }

-}

-

-function QWndCtrl_create_dom2() {

-    with (this) {

-        this.fxhandler = QControl.nop;

-        var ie4 = document.body && document.body.filters;

-        var moz = document.body && document.body.style &&

-            typeof(document.body.style.MozOpacity) == "string";

-        document.write('<div unselectable="on" id="' + id +

-            (ie4 ? '" onfilterchange="' + name + '.fxhandler()': '') +

-            '" style="position:absolute;left:' + x + 'px;top:' + y +

-            'px;width:' + width + (height != null ? 'px;height:' + height : '') +

-            'px;visibility:' + (visible ? 'visible' : 'hidden') +

-            ';overflow:hidden' + (zindex ? ';z-index:' + zindex : '') +

-            (ie4 ? ';filter:Gray(enabled=' + (effects & 256 ? '1' : '0') +

-            ') Xray(enabled=' + (effects & 512 ? '1' : '0') +

-            ') Invert(enabled=' + (effects & 1024 ? '1' : '0') +

-            ') alpha(enabled=' + (opacity < 100 ? '1' : '0') + ',opacity=' + opacity +

-            ') shadow(enabled=' + (effects & 2048 ? '1' : '0') +

-            ',direction=135) BlendTrans(enabled=0) RevealTrans(enabled=0)' : '') +

-            (moz && (opacity < 100) ? ';-moz-opacity:' + opacity + '%' : '') +

-            '"><div unselectable="on" class="qwindow">');

-        if (typeof(content) == "function") {

-            this.content();

-        } else {

-            document.write(content);

-        }

-        document.write('</div></div>');

-        if (this.wnd = document.getElementById ? document.getElementById(id) :

-            (document.all.item ? document.all.item(id) : document.all[id])) {

-            if (wnd.style) {

-                ie4 = ie4 && wnd.filters;

-                moz = moz && typeof(wnd.style.MozOpacity) == "string";

-                this.moveTo = QWndCtrl_moveTo_css;

-                this.setZIndex = QWndCtrl_setZIndex_css;

-                this.focus = QWndCtrl_focus;

-                this.setSize = QWndCtrl_setSize_css;

-                this.show = ie4 ? QWndCtrl_show_ie4 : (moz ? QWndCtrl_show_moz : QWndCtrl_show_css);

-                this.fade = moz ? QWndCtrl_fade_moz : QControl.nop;

-                this.setOpacity = ie4 ? QWndCtrl_setOpacity_ie4 : (moz ? QWndCtrl_setOpacity_moz : QControl.nop);

-                this.setEffects = ie4 ? QWndCtrl_setEffects_ie4 : (moz ? QWndCtrl_setEffects_moz : QControl.nop);

-                this.center = self.innerWidth ? QWndCtrl_center_moz :

-                    (document.body && document.body.clientWidth ? QWndCtrl_center_ie4 : QControl.nop);

-            }

-        }

-    }

-}

-

-function QWndCtrl_create_ns4(finalize) {

-    with (this) {

-        if (finalize) {

-            if (_wnde) {

-                parent.window.onload = _wnde;

-                parent.window.onload();

-            }

-            document.open();

-            document.write('<div class="qwindow">');

-            this.content();

-            document.write('</div>');

-            document.close();

-        } else {

-            document.write('<layer id="' + id + '" left="' + x + '" top="' + y +

-                '" width="' + width + '" visibility="' + (visible ? 'show' : 'hidden') +

-                (height != null ? '" height="' + height + '" clip="' + width + ',' + height : '') +

-                (zindex ? '" z-index="' + zindex : '') + (typeof(content) != "function" ?

-                '"><div class="qwindow">' + content + '</div></layer>' : '">&nbsp;</layer>'));

-            if (this.window = this.wnd = document.layers[id]) {

-                if (this.document = wnd.document) {

-                    this.show = QWndCtrl_show_ns4;

-                    this.moveTo = QWndCtrl_moveTo_ns4;

-                    this.setZIndex = QWndCtrl_setZIndex_ns4;

-                    this.focus = QWndCtrl_focus;

-                    this.center = QWndCtrl_center_moz;

-                    this.setSize = QWndCtrl_setSize_ns4;

-                    if (typeof(content) == "function") {

-                        this._wnde = parent.window.onload;

-                        parent.window.onload = new Function(name + ".create(true)");

-                    }

-                }

-            }

-        }

-    }

-}

-

-function QWndCtrl_create_na() {

-    this.document.write('Object is not supported.');

-    this.wnd = null;

-}

-

-function QWndCtrl_create() {

-    with (this) {

-        this.create = (document.getElementById || document.all) ? QWndCtrl_create_dom2 :

-            (document.layers ? QWndCtrl_create_ns4 : QWndCtrl_create_na);

-        create();

-    }

-}

-

-function QWndCtrl() {

-    this.x = this.y = 0;

-    this.width = this.height = 0;

-    this.content = "";

-    this.visible = true;

-    this.effects = 0;

-    this.opacity = 100;

-    this.zindex = null;

-    this._wndt = this._wnde = false;

-    this.create = QWndCtrl_create;

-    this.show = QControl.nop;

-    this.focus = QControl.nop;

-    this.center = QControl.nop;

-    this.moveTo = QControl.nop;

-    this.setSize = QControl.nop;

-    this.setOpacity = QControl.nop;

-    this.setEffects = QControl.nop;

-    this.setZIndex  = QControl.nop;

-    this.onShow = QControl.event;

-}

-QWndCtrl.prototype = new QControl();

-QWndCtrl.TOPZINDEX = 1000;

-QWndCtrl.GRAY      = 256;

-QWndCtrl.XRAY      = 512;

-QWndCtrl.INVERT    = 1024;

-QWndCtrl.SHADOW    = 2048;

-QWndCtrl.FADEIN    = 1;

-QWndCtrl.FADEOUT   = 16;

-QWndCtrl.BOXIN     = 2;

-QWndCtrl.BOXOUT    = 32;

-QWndCtrl.CIRCLEIN  = 3;

-QWndCtrl.CIRCLEOUT = 48;

-QWndCtrl.WIPEIN    = 4;

-QWndCtrl.WIPEOUT   = 64;

-QWndCtrl.HBARNIN   = 5;

-QWndCtrl.HBARNOUT  = 80;

-QWndCtrl.VBARNIN   = 6;

-QWndCtrl.VBARNOUT  = 96;

-QWndCtrl.DISSOLVEIN  = 7;

-QWndCtrl.DISSOLVEOUT = 112;

-QWndCtrl.HBLINDSIN   = 8;

-QWndCtrl.HBLINDSOUT  = 128;

-QWndCtrl.VBLINDSIN   = 9;

-QWndCtrl.VBLINDSOUT  = 144;

diff --git a/httemplate/elements/select-agent.html b/httemplate/elements/select-agent.html
deleted file mode 100644
index c2a5e4b..0000000
--- a/httemplate/elements/select-agent.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<%
-  my( $agentnum, %opt ) = @_;
-
-  my @agents;
-  if ( $opt{'agents'} ) {
-    @agents = @{ $opt{'agents'} };
-  } else {
-    @agents = qsearch( 'agent', { disabled=>'' } );
-  }
-
-%>
-
-<SELECT NAME="agentnum">
-
-  <OPTION VALUE="">all</OPTION>
-
-  <% foreach my $agent ( sort { $a->agent cmp $b->agent } @agents ) { %>
-
-    <OPTION VALUE="<%= $agent->agentnum %>"<%= $agentnum == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
-
-  <% } %>
-
-</SELECT>
-
diff --git a/httemplate/elements/select-month_year.html b/httemplate/elements/select-month_year.html
deleted file mode 100644
index a0ea74dd..0000000
--- a/httemplate/elements/select-month_year.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-
-  my %opt = @_;
-
-  my $prefix = $opt{'prefix'} || '';
-  my $disabled = $opt{'disabled'} || '';
-  my $empty = $opt{'empty_option'} || '';
-  my $date = $opt{'selected_date'} || '';
-  $date = '' if $date eq '-';
-  #$date ||= '01-2000' unless $empty;
-  my $start_year = $opt{'start_year'};
-  my $end_year = $opt{'end_year'} || '2037';
-
-  my( $mon, $year ) = (0, 0);
-  if ( $date ) {
-    if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-      ( $mon, $year ) = ( $2, $1 );
-    } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-      ( $mon, $year ) = ( $1, $3 );
-    } else {
-      die "unrecognized expiration date format: $date";
-    }
-  }
-
-  unless ( $start_year ) {
-    my @t = localtime;
-    $start_year = $t[5] + 1900;
-  }
-  $start_year = $year if $start_year > $year && $year > 0;
-
-%>
-
-<SELECT NAME="<%= $prefix %>_month" SIZE="1" <%= $disabled%>>
-
-<%= $empty ? '<OPTION VALUE="">' : '' %>
-
-<% for ( 1 .. 12 ) { %>
-   <OPTION<%= $_ == $mon ? ' SELECTED' : '' %> VALUE="<%= $_ %>"><%= $_ %>
-<% } %>
-
-</SELECT>/<SELECT NAME="<%= $prefix %>_year" SIZE="1" <%= $disabled%>>
-
-<%= $empty ? '<OPTION VALUE="">' : '' %>
-
-<% for ( $start_year .. $end_year ) { %>
-   <OPTION<%= $_ == $year ? ' SELECTED' : '' %> VALUE="<%= $_ %>"><%= $_ %>
-<% } %>
-
-</SELECT>
-
diff --git a/httemplate/elements/select-taxclass.html b/httemplate/elements/select-taxclass.html
deleted file mode 100644
index e5a1abb..0000000
--- a/httemplate/elements/select-taxclass.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<%
-  my $conf = new FS::Conf;
-  my $selected_taxclass = scalar(@_) ? shift : '';
-%>
-
-<% if ( $conf->exists('enable_taxclasses') ) { %>
-
-    <SELECT NAME="taxclass">
-
-      <% if ( $conf->exists('require_taxclasses') ) { %>
-
-        <OPTION VALUE="(select)">Select tax class
-
-      <% } else { %>
-
-        <OPTION VALUE="">
-
-      <% } %>
-
-      <%
-        my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-          or die dbh->errstr;
-        $sth->execute or die $sth->errstr;
-        my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref};
-        my @taxclasses = grep $_, keys %taxclasses;
-      %>
-  
-      <% foreach my $taxclass ( @taxclasses ) { %>
-  
-          <OPTION VALUE="<%= $taxclass %>"<%= $taxclass eq $selected_taxclass ? ' SELECTED' : '' %>><%= $taxclass %>
-  
-      <% } %>
-
-    </SELECT>
-
-<% } else { %>
-
-  <INPUT TYPE="hidden" NAME="taxclass" VALUE="<%= $selected_taxclass %>">
-  
-<% } %>
-  
-
diff --git a/httemplate/elements/small_custview.html b/httemplate/elements/small_custview.html
index e0c22e0..1e8ae73 100644
--- a/httemplate/elements/small_custview.html
+++ b/httemplate/elements/small_custview.html
@@ -1,2 +1,2 @@
 <% my $conf = new FS::Conf; %>
-<%= small_custview( shift, shift || scalar($conf->config('countrydefault')), @_ ) %>
+<%= small_custview( shift, shift || $conf->config('countrydefault') ) %>
diff --git a/httemplate/elements/table-grid.html b/httemplate/elements/table-grid.html
deleted file mode 100644
index 80611f5..0000000
--- a/httemplate/elements/table-grid.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<STYLE TYPE="text/css">
-.grid table { border: solid; empty-cells: show }
-.grid TH { padding-left: 3px; padding-right: 3px; border: 1px solid #dddddd; border-bottom: dashed 1px black; border-right: none }
-.grid TD { padding-left: 3px; padding-right: 3px; empty-cells: show; border: 1px solid #cccccc; border-bottom: none; border-right: none }
-</STYLE>
-
-<TABLE CLASS="grid" CELLSPACING=0 CELLPADDING=0 BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
-
diff --git a/httemplate/elements/tr-input-beginning_ending.html b/httemplate/elements/tr-input-beginning_ending.html
deleted file mode 100644
index 9fa936b..0000000
--- a/httemplate/elements/tr-input-beginning_ending.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
-
-
-<TR>
-  <TD ALIGN="right">From: </TD>
-  <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "beginning_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "beginning_button",
-    align:      "BR"
-  });
-</SCRIPT>
-</TR>
-
-<TR>
-  <TD ALIGN="right">To: </TD>
-  <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "ending_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "ending_button",
-    align:      "BR"
-  });
-</SCRIPT>
-</TR>
-
-<TR>
-  <TD></TD>
-  <TD>
-    <FONT SIZE="-1">(leave one or both dates blank for an open-ended search)</FONT>
-  </TD>
-</TR>
-
diff --git a/httemplate/elements/tr-select-agent.html b/httemplate/elements/tr-select-agent.html
deleted file mode 100644
index 2227262..0000000
--- a/httemplate/elements/tr-select-agent.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-  my( $agentnum, %opt ) = @_;
-
-  my @agents;
-  if ( $opt{'agents'} ) {
-    @agents = @{ $opt{'agents'} };
-  } else {
-    @agents = qsearch( 'agent', { disabled=>'' } );
-  }
-
-%>
-
-<% if ( scalar(@agents) == 1 ) { %>
-
-  <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agents[0]->agentnum %>">
-
-<% } else { %>
-
-  <TR>
-    <TD ALIGN="right"><%= $opt{'label'} || 'Agent: ' %></TD>
-    <TD>
-      <%= include( '/elements/select-agent.html', $agentnum,
-                     'agents' => \@agents,
-                 )
-      %>
-    </TD>
-  </TR>
-
-<% } %>
diff --git a/httemplate/elements/xmlhttp.html b/httemplate/elements/xmlhttp.html
deleted file mode 100644
index 28130e5..0000000
--- a/httemplate/elements/xmlhttp.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<%
-  my ( %opt ) = @_;
-
-  my $url = $opt{'url'};
-  my $method = exists($opt{'method'}) ? $opt{'method'} : 'GET';
-  #my @subs = @{ $opt{'subs'};
-
-  $url .= ( ($url =~ /\?/) ? '&' : '?' )
-    if $method eq 'GET';
-
-%>
-
-<SCRIPT TYPE="text/javascript">
-
-  function rs_init_object() {
-    var A;
-    try {
-      A=new ActiveXObject("Msxml2.XMLHTTP");
-    } catch (e) {
-      try {
-        A=new ActiveXObject("Microsoft.XMLHTTP");
-      } catch (oc) {
-        A=null;
-      }
-    }
-    if(!A && typeof XMLHttpRequest != "undefined")
-      A = new XMLHttpRequest();
-    if (!A)
-      alert("Can't create XMLHttpRequest object");
-    return A;
-
-  }
-
-  <% foreach my $func ( @{$opt{'subs'}} ) { 
-
-       my $furl = $url;
-       $furl =~ s/\"/\\\\\"/; #javascript escape
-
-  %>
-
-    function <%=$func%>() {
-        // count args; build URL
-        var url = "<%=$furl%>";
-        var a = <%=$func%>.arguments;
-
-        var args;
-        var len;
-        var content = 'sub=<%= uri_escape($func) %>';
-        if ( a && typeof a  == 'object'  && a[0].constructor == Array ) {
-            args = a[0];
-            len = args.length
-        } else {
-            args = a;
-            len = args.length - 1;
-        }
-        for (var i = 0; i < len; i++) 
-            content = content + "&arg=" + escape(args[i]);
-        content = content.replace( /[+]/g, '%2B'); // fix unescaped plus signs 
-
-        if ( '<%=$method%>' == 'GET' ) {
-          url = url + content;
-        }
-
-        //alert('<%=$method%> ' + url);
-
-        var xmlhttp = rs_init_object();
-        xmlhttp.open("<%=$method%>", url, true);
-
-        xmlhttp.onreadystatechange = function() {
-            if (xmlhttp.readyState != 4) 
-        	return;
-
-            if (xmlhttp.status != 200) {
-              alert(xmlhttp.status + " status connecting to " + url);
-            } else {
-              var data = xmlhttp.responseText;
-              //alert('received response: ' + data);
-              a[a.length-1](data);
-              if ( data.indexOf("<b>System error</b>") > -1 ) {
-                var w;
-                if ( w = window.open("about:blank") ) {
-                  w.document.write(data);
-                } else {
-                  // popup blocking?  should use an overlib popup instead 
-                  alert("Error popup disabled; try disabling popup blocking to see");
-                }
-              }
-            }
-        }
-
-        if ( '<%=$method%>' == 'POST' ) {
-
-          xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-          xmlhttp.send(content);
-
-        } else {
-
-          xmlhttp.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT");
-          xmlhttp.send(null);
-
-        }
-
-        //rs_debug("x_$func_name url = " + url);
-        //rs_debug("x_$func_name waiting..");
-    }
-
-  <% } %>
-
-</SCRIPT>
diff --git a/httemplate/images/cvv2.png b/httemplate/images/cvv2.png
index 48c58d5..4610dcb 100644
--- a/httemplate/images/cvv2.png
+++ b/httemplate/images/cvv2.png
diff --git a/httemplate/images/cvv2_amex.png b/httemplate/images/cvv2_amex.png
index 82d1f47..21c36a0 100644
--- a/httemplate/images/cvv2_amex.png
+++ b/httemplate/images/cvv2_amex.png
diff --git a/httemplate/images/progressbar-empty.png b/httemplate/images/progressbar-empty.png
deleted file mode 100644
index 318219c..0000000
--- a/httemplate/images/progressbar-empty.png
+++ /dev/null
diff --git a/httemplate/images/progressbar-full.png b/httemplate/images/progressbar-full.png
deleted file mode 100644
index 863d8e1..0000000
--- a/httemplate/images/progressbar-full.png
+++ /dev/null
diff --git a/httemplate/index.html b/httemplate/index.html
index b8f300d..2d326b5 100644
--- a/httemplate/index.html
+++ b/httemplate/index.html
@@ -62,16 +62,16 @@
     <TR><TD>
         <BR><FONT SIZE="+1"><A HREF="edit/cust_main.cgi">New Customer</A></FONT>
         <BR>
-        <BR><FORM ACTION="search/cust_main.cgi" METHOD="GET"><INPUT TYPE="hidden" NAME="custnum_on" VALUE="1">Customer # <INPUT TYPE="text" NAME="custnum_text"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=custnum">all customers by customer number</A></FORM>
-        <FORM ACTION="search/cust_main.cgi" METHOD="GET"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
-        <FORM ACTION="search/cust_main.cgi" METHOD="GET"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="company_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
+        <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="custnum_on" VALUE="1">Customer # <INPUT TYPE="text" NAME="custnum_text"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=custnum">all customers by customer number</A></FORM>
+        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="last_on" VALUE="1">Last name <INPUT TYPE="text" NAME="last_text"><SELECT NAME="last_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=last">all customers by last name</A></FORM>
+        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="company_on" VALUE="1">Company <INPUT TYPE="text" NAME="company_text"><SELECT NAME="company_type"><OPTION SELECTED VALUE="All">(all)</OPTION><OPTION>Fuzzy<OPTION>Substring</OPTION><OPTION>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/cust_main.cgi?browse=company">all customers by company</A></FORM>
 <% if ( $conf->exists('address2-search') ) { %>
-        <FORM ACTION="search/cust_main.cgi" METHOD="GET"><INPUT TYPE="hidden" NAME="address2_on" VALUE="1">Unit <INPUT TYPE="text" NAME="address2_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
+        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="address2_on" VALUE="1">Unit <INPUT TYPE="text" NAME="address2_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
 <% } %>
-        <FORM ACTION="search/cust_main.cgi" METHOD="GET"><INPUT TYPE="hidden" NAME="phone_on" VALUE="1">Phone # <INPUT TYPE="text" NAME="phone_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
-        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="GET">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A> or <A HREF="search/svc_acct.cgi?uid">uid</A></FORM>
-        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="GET">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
-	<BR><FORM ACTION="search/svc_broadband.cgi" METHOD="GET">IP Address <INPUT TYPE="text" NAME="ip_addr"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_broadband.cgi?svcnum">all services by svcnum</A> or <A HREF="search/svc_broadband.cgi?blocknum">address block</A></FORM>
+        <FORM ACTION="search/cust_main.cgi" METHOD="POST"><INPUT TYPE="hidden" NAME="phone_on" VALUE="1">Phone # <INPUT TYPE="text" NAME="phone_text"><INPUT TYPE="submit" VALUE="Search"></FORM>
+        <BR><FORM ACTION="search/svc_acct.cgi" METHOD="POST">Username <INPUT TYPE="text" NAME="username"><SELECT NAME="username_type"><OPTION VALUE="All">(all)</OPTION><OPTION>Fuzzy</OPTION><OPTION>Substring</OPTION><OPTION SELECTED>Exact</OPTION></SELECT><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_acct.cgi?username">all accounts by username</A> or <A HREF="search/svc_acct.cgi?uid">uid</A></FORM>
+        <BR><FORM ACTION="search/svc_domain.cgi" METHOD="POST">Domain <INPUT TYPE="text" NAME="domain"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_domain.cgi?domain">all domains</A></FORM>
+	<BR><FORM ACTION="search/svc_broadband.cgi" METHOD="POST">IP Address <INPUT TYPE="text" NAME="ip_addr"><INPUT TYPE="submit" VALUE="Search"> or <A HREF="search/svc_broadband.cgi?svcnum">all services by svcnum</A> or <A HREF="search/svc_broadband.cgi?blocknum">address block</A></FORM>
         <BR><A HREF="search/svc_forward.cgi?svcnum">all mail forwards by svcnum</A><BR>
         <BR><A HREF="search/svc_www.cgi?svcnum">all virtual hosts by svcnum</A><BR>
         <BR><A HREF="search/svc_external.cgi?svcnum">all external services by svcnum</A><BR>
@@ -91,17 +91,12 @@
     <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0" WIDTH="100%" BGCOLOR="#eeeeee">
     <TR><TH BGCOLOR="#cccccc">Support/Ticketing</TH></TR>
     <TR><TD>
-	<% if ( $conf->config('ticket_system') eq 'RT_Internal' ) { %>
         <BR><FONT SIZE="+1"><A HREF="rt/">Ticketing Main</A></FONT>
         <BR><BR>
         Reports
         <UL>
           <LI><A HREF="search/cust_main.cgi?browse=tickets">Customers sorted by active tickets</A>
-	  <!-- <LI><A HREF="">Active tickets not assigned to a customer</A> -->
-	<% } else { %>
-	<BR><FONT SIZE="+1"><A HREF="<%=FS::TicketSystem->baseurl()%>">Ticketing Main</A></FONT>
-        <BR><BR>
-        <% } %>
+          <!-- <LI><A HREF="">Active tickets not assigned to a customer</A> -->
     </TD></TR>
     </TABLE>
 
@@ -120,14 +115,15 @@
     <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0 WIDTH="100%" BGCOLOR="#eeeeee">
     <TR><TH BGCOLOR="#cccccc">Bookkeeping / Collections</TH></TR>
     <TR><TD>
-      <BR><A HREF="misc/batch-cust_pay.html">Quick payment entry</A>
+      <BR><A HREF="search/cust_main-quickpay.html">Quick payment entry</A>
       <BR>
-      <BR><FORM ACTION="search/cust_main.cgi" METHOD="GET">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <FORM ACTION="search/cust_bill.html" METHOD="GET">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
-      <FORM ACTION="search/cust_pay.cgi" METHOD="GET">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
+      <BR><FORM ACTION="search/cust_main.cgi" METHOD="POST">Credit card # <INPUT TYPE="hidden" NAME="card_on" VALUE="1"><INPUT TYPE="text" NAME="card"><INPUT TYPE="submit" VALUE="Search"></FORM>
+      <FORM ACTION="search/cust_bill.html" METHOD="POST">Invoice # <INPUT TYPE="text" NAME="invnum" SIZE="8"><INPUT TYPE="submit" VALUE="Search"></FORM>
+      <FORM ACTION="search/cust_pay.cgi" METHOD="POST">Check # <INPUT TYPE="text" NAME="payinfo" SIZE="8"><INPUT TYPE="hidden" NAME="payby" VALUE="BILL"><INPUT TYPE="submit" VALUE="Search"></FORM>
       <BR><A HREF="browse/cust_pay_batch.cgi">View pending credit card batch</A>      <BR><BR><A HREF="search/cust_pkg_report.cgi">Packages (by next bill date range)</A>
       <BR><BR>Invoice reports
             <UL>
+              <LI><a href="search/cust_bill_event.html">Invoice event errors (failed credit cards, processor or printer problems, etc.)</a>
               <LI>open invoices (<A HREF="search/cust_bill.html?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN_custnum">by customer number</A>)
               <LI>15 day open invoices (<A HREF="search/cust_bill.html?OPEN15_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN15_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN15_custnum">by customer number</A>)
               <LI>30 day open invoices (<A HREF="search/cust_bill.html?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN30_custnum">by customer number</A>)
@@ -136,12 +132,6 @@
               <LI>120 day open invoices (<A HREF="search/cust_bill.html?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN120_custnum">by customer number</A>)
               <LI>all invoices (<A HREF="search/cust_bill.html?invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?date">by date</A>) (<A HREF="search/cust_bill.html?custnum">by customer number</A>)
             </UL>
-      <A HREF="search/report_cust_bill.html">Advanced invoice reports</A><BR><BR>
-      Invoice event reports
-            <UL>
-              <LI><a href="search/cust_bill_event.html">All invoice events for a date range</a>
-              <LI><a href="search/cust_bill_event.html?failed=1">Invoice event errors for a date range (failed credit cards, processor or printer problems, etc.)</a>
-            </UL>
       <A HREF="search/report_cust_pay.html">Payment report (by type and/or date range)</A>
       <BR><BR><A HREF="search/report_cust_credit.html">Credit report (by employee and/or date range)</A>
       <BR><BR><A HREF="graph/money_time.cgi">Sales, Credits and Receipts Summary</A>
@@ -149,6 +139,26 @@
       <BR><BR><A HREF="search/report_prepaid_income.html">Prepaid Income (Unearned Revenue) Report</A>
       <BR><BR><A HREF="search/report_tax.html">Sales Tax Liability Report</A>
       <BR><BR>
+      <CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
+      <A NAME="admin">Administration</a>
+        <ul>
+          <LI><A HREF="browse/part_pkg.cgi">View/Edit package definitions</A>
+            - One or more services are grouped together into a package and
+              given pricing information.  Customers purchase packages, not
+              services.
+<!--          <LI><A HREF="browse/agent_type.cgi">View/Edit agent types</A>
+            - Agent types define groups of package definitions that you can
+              then assign to particular agents.
+          <LI><A HREF="browse/agent.cgi">View/Edit agents</A>
+            - Agents are resellers of your service.  Agents may be limited
+              to a subset of your full offerings (via their type).
+-->
+          <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
+            - Change tax rates, or break down a country into states, or a state
+              into counties and assign different tax rates to each.
+          <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
+        </ul>
+      <BR>
     </TD></TR>
     </TABLE>
 
@@ -173,7 +183,7 @@
       Auditing pre-Freeside services with no customer record
       <UL>
         <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
-        <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>)
+<!--        <LI>unlinked mail forwards (<A HREF="search/svc_forward.cgi?UN_svcnum">by service number</A>) (by ?)) -->
         <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
         <LI>unlinked externals (<A HREF="search/svc_external.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_external.cgi?UN_id">by id</A>)
       </UL>
@@ -185,12 +195,12 @@
         <LI><A HREF="search/cust_pkg_report.cgi">packages (by next bill date range)</A>
       </UL>
       <A HREF="browse/part_pkg.cgi?active=1">Package definitions (by number of active packages)</A><BR><BR>
-      <A HREF="browse/part_svc.cgi?orderby=active">Service definitions (by number of active services)</A><BR><BR>
+      <A HREF="browse/part_svc.cgi?active=1">Service definitions (by number of active services)</A><BR><BR>
     Customers
       <UL>
         <LI><A HREF="search/cust_main-otaker.cgi">Search customers by ordering employee</A>
       </UL>
-    <FORM ACTION="search/sql.html" METHOD="GET">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
+    <FORM ACTION="search/sql.html" METHOD="POST">SQL query: <TT>SELECT </TT><INPUT TYPE="text" NAME="sql" SIZE=32><INPUT TYPE="submit" VALUE="Query"></FORM>
 
     <BR>
     </TD></TR>
@@ -222,7 +232,7 @@
       <BR><A HREF="misc/dump.cgi">Download database dump</A>
       <BR><BR><CENTER><HR WIDTH="94%" NOSHADE></CENTER><BR>
       <A NAME="config" HREF="config/config-view.cgi">Configuration</a><!-- - <font size="+2" color="#ff0000">start here</font> -->
-      <BR><BR><A NAME="admin">Provisioning, services and packages</a>
+      <BR><BR><A NAME="admin">Administration</a>
         <ul>
           <LI><A HREF="browse/part_export.cgi">View/Edit exports</A>
             - Provisioning services to external machines, databases and APIs.
@@ -232,51 +242,30 @@
             - One or more services are grouped together into a package and
               given pricing information.  Customers purchase packages, not
               services.
-        </ul>
-      <A NAME="admin_agent">Resellers</a>
-        <ul>
           <LI><A HREF="browse/agent_type.cgi">View/Edit agent types</A>
             - Agent types define groups of package definitions that you can
               then assign to particular agents.
           <LI><A HREF="browse/agent.cgi">View/Edit agents</A>
             - Agents are resellers of your service.  Agents may be limited
               to a subset of your full offerings (via their type).
-        </ul>
-      <A NAME="admin_billing">Billing</a>
-        <ul>
-          <LI><A HREF="browse/payment_gateway.html">View/Edit payment gateways</A>
-            - Credit card and electronic check processors
-          <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A>
-            - Actions for overdue invoices
-          <LI><A HREF="search/prepay_credit.html">View/Edit prepaid cards</A>
-            - View outstanding cards, generate new cards
-	  <LI><A HREF="browse/rate.cgi">View/Edit call rates and regions</A>
-	    - Manage rate plans, regions and prefixes for VoIP and call billing.
+          <LI><A HREF="browse/part_referral.cgi">View/Edit advertising sources</A>
+            - Where a customer heard about your service.  Tracked for
+              informational purposes.
           <LI><A HREF="browse/cust_main_county.cgi">View/Edit locales and tax rates</A>
             - Change tax rates, or break down a country into states, or a state
               into counties and assign different tax rates to each.
-        </ul>
-      <A NAME="admin_svc_acct">Dialup</a>
-        <ul>
           <LI><A HREF="browse/svc_acct_pop.cgi">View/Edit access numbers</A>
             - Points of Presence 
-        </ul>
-      <A NAME="admin_svc_broadband">Fixed (username-less) broadband</a>
-        <ul>
+          <LI><A HREF="browse/part_bill_event.cgi">View/Edit invoice events</A> - Actions for overdue invoices
+	  <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A> - Change error messages and other customizable labels.
+    <LI><A HREF="browse/part_virtual_field.cgi">View/Edit virtual fields</A>
+	  - Locally defined fields
 	  <LI><A HREF="browse/router.cgi">View/Edit routers</A>
 	  - Broadband access routers
 	  <LI><A HREF="browse/addr_block.cgi">View/Edit address blocks</A>
 	  - Manage address blocks and block assignments to broadband routers.
-	</ul>
-      <A NAME="admin_misc">Miscellaneous</a>
-        <ul>
-          <LI><A HREF="browse/part_referral.cgi">View/Edit advertising sources</A>
-            - Where a customer heard about your service.  Tracked for
-              informational purposes.
-          <LI><A HREF="browse/part_virtual_field.cgi">View/Edit virtual fields</A>
-	  - Locally defined fields
-	  <LI><A HREF="browse/msgcat.cgi">View/Edit message catalog</A>
-	  - Change error messages and other customizable labels.
+	  <LI><A HREF="browse/rate.cgi">View/Edit call rates and regions</A>
+	  - Manage rate plans, regions and prefixes for VoIP and call billing.
 	</ul>
         <BR>
       </TD></TR>
diff --git a/httemplate/misc/batch-cust_pay.html b/httemplate/misc/batch-cust_pay.html
deleted file mode 100644
index 20cc890..0000000
--- a/httemplate/misc/batch-cust_pay.html
+++ /dev/null
@@ -1,396 +0,0 @@
-<%= header( 'Quick payment entry',
-            menubar(
-                     'Main Menu' => $p, #popurl(1),
-                     'Old-style quick payment entry' =>
-                       $p. 'search/cust_main-quickpay.html',
-                   ),
-            ( $cgi->param('error') ? '' : 'onload="addRow()"' ),
-          )
-%>
-
-<% if ( $cgi->param('error') ) { %>
-  <FONT SIZE="+1" COLOR="#ff0000"><%= $cgi->param('error') %></FONT><BR><BR>
-<% } %>
-
-
-<FORM ACTION="process/batch-cust_pay.cgi" NAME="OneTrueForm" METHOD="POST" onsubmit="document.OneTrueForm.submit.disabled=true;">
-
-<!-- <B>Batch</B> <INPUT TYPE="text" NAME="paybatch"><BR><BR> -->
-
-<SCRIPT TYPE="text/javascript">
-
-  function clearhint_custnum() {
-
-    //this.style.color = '#000000';
-
-    if ( this.value == 'Not found' || this.value == 'Multiple' ) {
-      this.value = '';
-      this.style.color = '#000000';
-    }
-
-  }
-
-  function clearhint_customer() {
-
-    this.style.color = '#000000';
-
-    if ( this.value == '(last name or company)' || this.value == 'Not found' )
-      this.value = '';
-
-  }
-
-  function search_custnum() {
-
-    this.style.color = '#000000'
-
-    var custnum_obj = this;
-    var searchrow = this.getAttribute('rownum');
-    var custnum = this.value;
-
-    if ( custnum == 'searching...' || custnum == 'Not found' || custnum == '' )
-      return;
-
-    if ( this.getAttribute('magic') == 'nosearch' ) {
-      this.setAttribute('magic', '');
-      return;
-    }
-
-    if ( ( rownum - searchrow ) == 1 ) {
-      addRow();
-    }
-    var customer = document.getElementById('customer'+searchrow);
-    customer.value = 'searching...';
-    customer.disabled = true;
-    customer.style.color = '#000000';
-    customer.style.backgroundColor = '#dddddd';
-
-    var customer_select = document.getElementById('cust_select'+searchrow);
-
-    //alert('search for custnum ' + custnum + ', row#' + searchrow );
-
-    customer.style.display = '';
-    customer_select.style.display = 'none';
-
-    function search_custnum_update(name) {
-
-      var name = eval('(' + name + ')' );
-
-      customer.disabled = false;
-      customer.style.backgroundColor = '#ffffff';
-
-      if ( name.length > 0 ) {
-        //alert('custnum found: ' + name);
-        customer.value = name;
-        customer.setAttribute('magic', 'nosearch');
-      } else {
-        customer.value = 'Not found';
-        customer.style.color = '#ff0000';
-        custnum_obj.style.color = '#ff0000';
-
-      }
-
-    }
-
-    custnum_search( custnum, search_custnum_update );
-
-  }
-
-  function search_customer() {
-
-    var customer_obj = this;
-    var searchrow = this.getAttribute('rownum');
-    var customer = this.value;
-
-    if ( customer == 'searching...' || customer == 'Not found' || customer == '' )
-      return;
-
-    if ( this.getAttribute('magic') == 'nosearch' ) {
-      this.setAttribute('magic', '');
-      return;
-    }
-
-    if ( ( rownum - searchrow ) == 1 ) {
-      addRow();
-    }
-
-    var custnum_obj = document.getElementById('custnum'+searchrow);
-    custnum_obj.value = 'searching...';
-    custnum_obj.disabled = true;
-    custnum_obj.style.color = '#000000';
-    custnum_obj.style.backgroundColor = '#dddddd';
-
-    var customer_select = document.getElementById('cust_select'+searchrow);
-
-    //alert('search for customer ' + customer + ', row#' + searchrow );
-
-    function search_customer_update(customers) {
-
-      //alert('customers returned: ' + customers);
-
-      var customerArray = eval('(' + customers + ')');
-
-      custnum_obj.disabled = false;
-      custnum_obj.style.backgroundColor = '#ffffff';
-
-      if ( customerArray.length == 0 ) {
-
-        custnum_obj.value = 'Not found';
-        custnum_obj.style.color = '#ff0000';
-        customer_obj.style.color = '#ff0000';
-
-        customer_obj.style.display = '';
-        customer_select.style.display = 'none';
-
-
-      } else if ( customerArray.length == 1 ) {
-
-        //alert('one customer found: ' + customerArray[0]);
-
-        custnum_obj.value = customerArray[0][0];
-        customer_obj.value = customerArray[0][1];
-
-        customer_obj.style.display = '';
-        customer_select.style.display = 'none';
-
-
-      } else {
-
-        custnum_obj.value = 'Multiple'; // or something
-        custnum_obj.style.color = '#ff0000';
-
-        //alert('multiple customers found, have to create select dropdown');
-
-        //blank the current list
-        for ( var i = customer_select.length; i >= 0; i-- )
-          customer_select.options[i] = null;
-
-        opt(customer_select, '', 'Multiple customers match "' + customer + '" - select one', '#ff0000');
-
-        //add the multiple customers
-        for ( var s = 0; s < customerArray.length; s++ )
-          opt(customer_select, customerArray[s][0], customerArray[s][1], '#000000');
-
-        opt(customer_select, 'cancel', '(Edit search string)', '#000000');
-
-        customer_obj.style.display = 'none';
-
-        customer_select.style.display = '';
-
-      }
-
-    }
-
-    smart_search( customer, search_customer_update );
-
-  }
-
-  function select_customer() {
-
-    var custnum = this.options[this.selectedIndex].value;
-    var customer = this.options[this.selectedIndex].text;
-
-    var searchrow = this.getAttribute('rownum');
-    var custnum_obj = document.getElementById('custnum'+searchrow);
-    var customer_obj = document.getElementById('customer'+searchrow);
-
-    if ( custnum == '' ) {
-      //this.style.color = '#ff0000';
-
-    } else if ( custnum == 'cancel' ) {
-
-      custnum_obj.value = '';
-      custnum_obj.style.color = '#000000';
-
-      this.style.display = 'none';
-      customer_obj.style.display = '';
-      customer_obj.focus();
-
-    } else {
-
-
-      custnum_obj.value = custnum;
-      custnum_obj.style.color = '#000000';
-
-      customer_obj.value = customer;
-      customer_obj.style.color = '#000000';
-
-      this.style.display = 'none';
-      customer_obj.style.display = '';
-
-    }
-
-  }
-
-  function opt(what,value,text,color) {
-    var optionName = new Option(text, value, false, false);
-    optionName.style.color = color;
-    var length = what.length;
-    what.options[length] = optionName;
-  }
-
-</SCRIPT>
-
-<TABLE ID="OneTrueTable" BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0>
-
-<TR>
-  <TH>Cust #</TH>
-  <TH>Customer</TH>
-  <TH>Amount</TH>
-  <TH>Check #</TH>
-  <TH BGCOLOR="#e8e8e8"></TH>
-</TR>
-
-<% my $row = 0;
-   if ( $cgi->param('error') ) {
-     my $param = $cgi->Vars;
-%>
-
-  <% for ( $row = 0; exists($param->{"custnum$row"}); $row++ ) { %>
-
-    <TR>
-
-      <TD>
-        <INPUT TYPE="text" NAME="custnum<%= $row %>" ID="custnum<%= $row %>" SIZE=8 MAXLENGTH=12 VALUE="<%= $param->{"custnum$row"} %>" rownum="<%= $row %>">
-          <SCRIPT TYPE="text/javascript">
-            var custnum_input<%= $row %> = document.getElementById("custnum<%= $row %>");
-            custnum_input<%= $row %>.onfocus = clearhint_custnum;
-            custnum_input<%= $row %>.onchange = search_custnum;
-          </SCRIPT>
-      </TD>
-
-      <TD>
-        <INPUT TYPE="text" NAME="customer<%= $row %>" ID="customer<%= $row %>" SIZE=64 VALUE="<%= $param->{"customer$row"} %>" rownum="<%= $row %>">
-          <SCRIPT TYPE="text/javascript">
-            var customer_input<%= $row %> = document.getElementById("customer<%= $row %>");
-            customer_input<%= $row %>.onfocus = clearhint_customer;
-            customer_input<%= $row %>.onclick = clearhint_customer;
-            customer_input<%= $row %>.onchange = search_customer;
-          </SCRIPT>
-        <SELECT NAME="cust_select<%= $row %>" ID="cust_select<%= $row %>" rownum="<%= $row %>" STYLE="color:#ff0000; display:none"">
-        </SELECT>
-          <SCRIPT TYPE="text/javascript">
-            var customer_select<%= $row %> = document.getElementById("cust_select<%= $row %>");
-            customer_select<%= $row %>.onchange = select_customer;
-          </SCRIPT>
-      </TD>
-
-      <TD>
-        $<INPUT TYPE="text" NAME="paid<%= $row %>" SIZE=8 MAXLENGTH=8 VALUE="<%= $param->{"paid$row"} %>" >
-      </TD>
-
-      <TD>
-        <INPUT TYPE="text" NAME="payinfo<%= $row %>" SIZE=10 VALUE="<%= $param->{"payinfo$row"} %>" >
-      </TD>
-
-      <TD BGCOLOR="#e8e8e8">
-      <% if ( $param->{"error$row"} ) { %>
-        <FONT SIZE="-1" COLOR="#ff0000">Error: <%= $param->{"error$row"} %></FONT>
-      <% } %>
-      </TD>
-
-    </TR>
-
-  <% } %>
-
-<% } %>
-
-</TABLE>
-
-<!-- <BR>
-<INPUT TYPE="button" VALUE="TEST addrow" onclick="addRow()"> -->
-
-<BR>
-<INPUT TYPE="submit" NAME="submit" VALUE="Post payment batch">
-
-</FORM>
-
-
-<%= include('/elements/xmlhttp.html',
-              'url'  => $p. 'misc/xmlhttp-cust_main-search.cgi',
-              'subs' => [qw( custnum_search smart_search )],
-           )
-%>
-
-<SCRIPT TYPE="text/javascript">
-
-  var rownum = <%= $row %>;
-
-  function addRow() {
-
-    var table = document.getElementById('OneTrueTable');
-    var tablebody = table.getElementsByTagName('tbody').item(0);
-
-    var row = document.createElement('TR');
-
-    var custnum_cell = document.createElement('TD');
-
-      var custnum_input = document.createElement('INPUT');
-      custnum_input.setAttribute('name', 'custnum'+rownum);
-      custnum_input.setAttribute('id',   'custnum'+rownum);
-      custnum_input.setAttribute('size', 8);
-      custnum_input.setAttribute('maxlength', 12);
-      custnum_input.setAttribute('rownum', rownum);
-      custnum_input.onfocus = clearhint_custnum;
-      custnum_input.onchange = search_custnum;
-      custnum_cell.appendChild(custnum_input);
-
-    row.appendChild(custnum_cell);
-
-    var customer_cell = document.createElement('TD');
-
-      var customer_input = document.createElement('INPUT');
-      customer_input.setAttribute('name', 'customer'+rownum);
-      customer_input.setAttribute('id',   'customer'+rownum);
-      customer_input.setAttribute('size', 64);
-      customer_input.setAttribute('value', '(last name or company)' );
-      customer_input.setAttribute('rownum', rownum);
-      customer_input.onfocus = clearhint_customer;
-      customer_input.onclick = clearhint_customer;
-      customer_input.onchange = search_customer;
-      customer_cell.appendChild(customer_input);
-
-      var customer_select = document.createElement('SELECT');
-      customer_select.setAttribute('name', 'cust_select'+rownum);
-      customer_select.setAttribute('id',   'cust_select'+rownum);
-      customer_select.setAttribute('rownum', rownum);
-      customer_select.style.color = '#ff0000';
-      customer_select.style.display = 'none';
-      customer_select.onchange = select_customer;
-      customer_cell.appendChild(customer_select);
-
-    row.appendChild(customer_cell);
-
-    var paid_cell = document.createElement('TD');
-
-      var paid_text = document.createTextNode('$');
-      paid_cell.appendChild(paid_text);
-
-      var paid_input = document.createElement('INPUT');
-      paid_input.setAttribute('name', 'paid'+rownum);
-      paid_input.setAttribute('size', 8);
-      paid_input.setAttribute('maxlength', 8);
-      paid_cell.appendChild(paid_input);
-
-    row.appendChild(paid_cell);
-
-    var payinfo_cell = document.createElement('TD');
-      var payinfo_input = document.createElement('INPUT');
-      payinfo_input.setAttribute('name', 'payinfo'+rownum);
-      payinfo_input.setAttribute('size', 10);
-      payinfo_cell.appendChild(payinfo_input);
-    row.appendChild(payinfo_cell);
-
-    var error_cell = document.createElement('TD');
-    error_cell.style.backgroundColor = '#e8e8e8';
-    row.appendChild(error_cell);
-
-    tablebody.appendChild(row);
-
-    rownum++;
-
-  }
-
-</SCRIPT>
-
-</BODY>
-</HTML>
diff --git a/httemplate/misc/counties.cgi b/httemplate/misc/counties.cgi
deleted file mode 100644
index 80ae616..0000000
--- a/httemplate/misc/counties.cgi
+++ /dev/null
@@ -1,17 +0,0 @@
-<%
-
-  my( $state, $country ) = $cgi->param('arg');
-
-  my @counties = 
-     sort
-     map { s/[\n\r]//g; $_; }
-     map { $_->county; }
-     qsearch( 'cust_main_county',
-              { 'state'   => $state,
-                'country' => $country,
-              },
-            )
-  ;
-
-
-%>[ <%= join(', ', map { qq("$_") } @counties) %> ]
diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi
index 519e6c2..257c338 100755
--- a/httemplate/misc/cust_main-cancel.cgi
+++ b/httemplate/misc/cust_main-cancel.cgi
@@ -1,19 +1,13 @@
 <%
 
-my $custnum;
-my $ban = '';
-if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
-  $custnum = $1;
-  $ban = $cgi->param('ban');
-} else {
-  my($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/ || die "Illegal custnum";
-  $custnum = $1;
-}
+#untaint custnum
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal custnum";
+my $custnum = $1;
 
 my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
 
-my @errors = $cust_main->cancel( 'ban' => $ban );
+my @errors = $cust_main->cancel;
 eidiot(join(' / ', @errors)) if scalar(@errors);
 
 #print $cgi->redirect($p. "view/cust_main.cgi?". $cust_main->custnum);
diff --git a/httemplate/misc/email-invoice.cgi b/httemplate/misc/email-invoice.cgi
index ad9ba1a..a560a18 100755
--- a/httemplate/misc/email-invoice.cgi
+++ b/httemplate/misc/email-invoice.cgi
@@ -1,17 +1,23 @@
 <%
 
+my $conf = new FS::Conf;
+
 #untaint invnum
 my($query) = $cgi->keywords;
-$query =~ /^((.+)-)?(\d+)$/;
-my $template = $2;
-my $invnum = $3;
+$query =~ /^(\d*)$/;
+my $invnum = $1;
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
-$cust_bill->email($template); 
+my $error = send_email(
+  'from'    => $cust_bill->_agent_invoice_from || $conf->config('invoice_from'),
+  'to'      => [ grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ],
+  'subject' => 'Invoice',
+  'body'    => [ $cust_bill->print_text ],
+);
+eidiot($error) if $error;
 
 my $custnum = $cust_bill->getfield('custnum');
-
 print $cgi->redirect("${p}view/cust_main.cgi?$custnum");
 
 %>
diff --git a/httemplate/misc/email_invoice_events.cgi b/httemplate/misc/email_invoice_events.cgi
deleted file mode 100644
index 12d58d6..0000000
--- a/httemplate/misc/email_invoice_events.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-<%
-
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reemail';
-$server->process;
-
-%>
diff --git a/httemplate/misc/email_invoices.cgi b/httemplate/misc/email_invoices.cgi
deleted file mode 100644
index 0a39783..0000000
--- a/httemplate/misc/email_invoices.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-<%
-
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reemail';
-$server->process;
-
-%>
diff --git a/httemplate/misc/fax-invoice.cgi b/httemplate/misc/fax-invoice.cgi
deleted file mode 100755
index 94fee2c..0000000
--- a/httemplate/misc/fax-invoice.cgi
+++ /dev/null
@@ -1,17 +0,0 @@
-<%
-
-#untaint invnum
-my($query) = $cgi->keywords;
-$query =~ /^((.+)-)?(\d+)$/;
-my $template = $2;
-my $invnum = $3;
-my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
-die "Can't find invoice!\n" unless $cust_bill;
-
-$cust_bill->fax($template);
-
-my $custnum = $cust_bill->getfield('custnum');
-
-print $cgi->redirect("${p}view/cust_main.cgi?$custnum");
-
-%>
diff --git a/httemplate/misc/fax_invoice_events.cgi b/httemplate/misc/fax_invoice_events.cgi
deleted file mode 100644
index a8ded05..0000000
--- a/httemplate/misc/fax_invoice_events.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-<%
-
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_refax';
-$server->process;
-
-%>
diff --git a/httemplate/misc/fax_invoices.cgi b/httemplate/misc/fax_invoices.cgi
deleted file mode 100644
index f16ba8b..0000000
--- a/httemplate/misc/fax_invoices.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-<%
-
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_refax';
-$server->process;
-
-%>
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index d4fb4a2..02c6c54 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -22,7 +22,7 @@
    my $conf = new FS::Conf;
    my %states = map { $_->state => 1 }
                   qsearch('cust_main_county', {
-                    'country' => $conf->config('countrydefault') || 'US'
+                    'country' => $conf->config('defaultcountry') || 'US'
                   } );
    my @states = sort { $a cmp $b } keys %states;
 
@@ -183,7 +183,7 @@ function achclose() {
   <TR>
     <TD ALIGN="right">
       Account&nbsp;holder<BR>
-      Social&nbsp;security&nbsp;or&nbsp;tax&nbsp;ID&nbsp;#
+      Social&nbsp;security&nbsp;or&nbsp;tax&nbspID&nbsp;#
     </TD>
     <TD><INPUT TYPE="text" NAME="ss" VALUE="<%=$ss%>"></TD>
   </TR>
diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
index 6a4c2d7..144f615 100755
--- a/httemplate/misc/print-invoice.cgi
+++ b/httemplate/misc/print-invoice.cgi
@@ -1,14 +1,26 @@
 <%
 
+my $conf = new FS::Conf;
+my $lpr = $conf->config('lpr');
+
 #untaint invnum
 my($query) = $cgi->keywords;
-$query =~ /^((.+)-)?(\d+)$/;
-my $template = $2;
-my $invnum = $3;
+$query =~ /^(\d*)$/;
+my $invnum = $1;
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
-$cust_bill->print($template);
+        open(LPR,"|$lpr") or die "Can't open $lpr: $!";
+
+        if ( $conf->exists('invoice_latex') ) {
+          print LPR $cust_bill->print_ps; #( date )
+        } else {
+          print LPR $cust_bill->print_text; #( date )
+        }
+
+        close LPR
+          or die $! ? "Error closing $lpr: $!"
+                       : "Exit status $? from $lpr";
 
 my $custnum = $cust_bill->getfield('custnum');
 
diff --git a/httemplate/misc/print_invoice_events.cgi b/httemplate/misc/print_invoice_events.cgi
deleted file mode 100644
index c6a7885..0000000
--- a/httemplate/misc/print_invoice_events.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-<%
-
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reprint';
-$server->process;
-
-%>
diff --git a/httemplate/misc/print_invoices.cgi b/httemplate/misc/print_invoices.cgi
deleted file mode 100644
index d7b271c..0000000
--- a/httemplate/misc/print_invoices.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-<%
-
-my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reprint';
-$server->process;
-
-%>
diff --git a/httemplate/misc/process/batch-cust_pay.cgi b/httemplate/misc/process/batch-cust_pay.cgi
deleted file mode 100644
index 12d72e8..0000000
--- a/httemplate/misc/process/batch-cust_pay.cgi
+++ /dev/null
@@ -1,42 +0,0 @@
-<%
-  my $param = $cgi->Vars;
-
-  #my $paybatch = $param->{'paybatch'};
-  my $paybatch = time2str('webbatch-%Y/%m/%d-%T'. "-$$-". rand() * 2**32, time);
-
-  my @cust_pay = ();
-  #my $row = 0;
-  #while ( exists($param->{"custnum$row"}) ) {
-  for ( my $row = 0; exists($param->{"custnum$row"}); $row++ ) {
-    push @cust_pay, new FS::cust_pay {
-                                       'custnum'  => $param->{"custnum$row"},
-                                       'paid'     => $param->{"paid$row"},
-                                       'payby'    => 'BILL',
-                                       'payinfo'  => $param->{"payinfo$row"},
-                                       'paybatch' => $paybatch,
-                                     }
-      if    $param->{"custnum$row"}
-         || $param->{"paid$row"}
-         || $param->{"payinfo$row"};
-    #$row++;
-  }
-
-  my @errors = FS::cust_pay->batch_insert(@cust_pay);
-  my $num_errors = scalar(grep $_, @errors);
-
-  if ( $num_errors ) {
-
-    $cgi->param('error', "$num_errors error". ($num_errors>1 ? 's' : '').
-                         ' - Batch not processed, correct and resubmit'
-               );
-
-    my $erow=0;
-    $cgi->param('error'. $erow++, shift @errors) while @errors;
-
-    %><%= $cgi->redirect($p.'batch-cust_pay.html?'. $cgi->query_string)
-
-  %><% } else {
-
-    %><%= $cgi->redirect(popurl(3). "search/cust_pay.cgi?magic=paybatch;paybatch=$paybatch") %>
-
-  <% } %>
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index c3d79e2..acdd1ad 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,7 +1,5 @@
 <%
 
-my $DEBUG = 0;
-
 $cgi->param('pkgnum') =~ /^(\d+)$/;
 my $pkgnum = $1;
 $cgi->param('svcpart') =~ /^(\d+)$/;
@@ -18,31 +16,14 @@ unless ( $svcnum ) {
   if ( $cgi->param('link_field2') =~ /^(\w+)$/ ) {
     $search{$1} = $cgi->param('link_value2');
   }
-
-  my @svc_x = ( sort { ($a->cust_svc->pkgnum > 0) <=> ($b->cust_svc->pkgnum > 0)
+  my $svc_x = ( sort { ($b->cust_svc->pkgnum > 0) <=> ($a->cust_svc->pkgnum > 0)
                        or ($b->cust_svc->svcpart == $svcpart)
                             <=> ($a->cust_svc->svcpart == $svcpart)
                      }
                      qsearch( $svcdb, \%search )
-              );
-
-  if ( $DEBUG ) {
-    warn scalar(@svc_x). " candidate accounts found for linking ".
-         "(svcpart $svcpart):\n";
-    foreach my $svc_x ( @svc_x ) {
-      warn "  ". $svc_x->email.
-           " (svcnum ". $svc_x->svcnum. ",".
-           " pkgnum ".  $svc_x->cust_svc->pkgnum. ",".
-           " svcpart ". $svc_x->cust_svc->svcpart. ")\n";
-    }
-  }
-
-  my $svc_x = $svc_x[0];
-
+              )[0];
   eidiot("$link_field not found!") unless $svc_x;
-
   $svcnum = $svc_x->svcnum;
-
 }
 
 my $old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
diff --git a/httemplate/misc/states.cgi b/httemplate/misc/states.cgi
deleted file mode 100644
index cff2c97..0000000
--- a/httemplate/misc/states.cgi
+++ /dev/null
@@ -1,16 +0,0 @@
-<%
-
-  my $country = $cgi->param('arg');
-
-  my @states = 
-     sort
-     map { s/[\n\r]//g; $_; }
-     map { $_->state; }
-     qsearch( 'cust_main_county',
-              { 'country' => $country },
-              'DISTINCT ON ( state ) *',
-            )
-  ;
-
-
-%>[ <%= join(', ', map { qq("$_") } @states) %> ]
diff --git a/httemplate/misc/unvoid-cust_pay_void.cgi b/httemplate/misc/unvoid-cust_pay_void.cgi
deleted file mode 100755
index 539cd4a..0000000
--- a/httemplate/misc/unvoid-cust_pay_void.cgi
+++ /dev/null
@@ -1,16 +0,0 @@
-<%
-
-#untaint paynum
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/ || die "Illegal paynum";
-my $paynum = $1;
-
-my $cust_pay_void = qsearchs('cust_pay_void', { 'paynum' => $paynum } );
-my $custnum = $cust_pay_void->custnum;
-
-my $error = $cust_pay_void->unvoid;
-eidiot($error) if $error;
-
-print $cgi->redirect($p. "view/cust_main.cgi?". $custnum);
-
-%>
diff --git a/httemplate/misc/xmlhttp-cust_main-search.cgi b/httemplate/misc/xmlhttp-cust_main-search.cgi
deleted file mode 100644
index 8dbd5a4..0000000
--- a/httemplate/misc/xmlhttp-cust_main-search.cgi
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-   my $sub = $cgi->param('sub');
- 
-   if ( $sub eq 'custnum_search' ) {
- 
-     my $custnum = $cgi->param('arg');
-     my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-
-     %>"<%= $cust_main ? $cust_main->name : '' %>"
-
-<% } elsif ( $sub eq 'smart_search' ) {
-
-     my $string = $cgi->param('arg');
-     my @cust_main = smart_search( 'search' => $string );
-     my $return = [ map [ $_->custnum, $_->name ], @cust_main ];
-
-     %><%= objToJson($return) %>
-
-<% } %>
-
-
diff --git a/httemplate/misc/xmlrpc.cgi b/httemplate/misc/xmlrpc.cgi
deleted file mode 100644
index 53ef8fb..0000000
--- a/httemplate/misc/xmlrpc.cgi
+++ /dev/null
@@ -1,17 +0,0 @@
-<%
-
-  my $request_xml = $cgi->param('POSTDATA');
-
-  #$r->log_error($request_xml);
-
-  my $fsxmlrpc = new FS::XMLRPC;
-  my ($error, $response_xml) = $fsxmlrpc->serve($request_xml);
-  
-  #$r->log_error($error) if $error;
-
-  http_header('Content-Type' => 'text/xml',
-              'Content-Length' => length($response_xml));
-
-  print $response_xml;
-
-%>
diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 2108653..3ae624a 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -1,52 +1,6 @@
 <%
    my( $count_query, $sql_query );
-   my( $count_addl ) = ( '' );
-   my( $distinct ) = ( '' );
-   my($begin, $end) = ( '', '' );
-   my($agentnum) = ( '' );
-   my($open, $days) = ( '', '' );
-   if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
-     $count_query = "SELECT COUNT(*) FROM cust_bill WHERE invnum = $2";
-     $sql_query = {
-       'table'     => 'cust_bill',
-       'hashref'   => { 'invnum' => $2 },
-       #'select'    => '*',
-     };
-   } else {
-   #if ( $cgi->param('begin') || $cgi->param('end')
-   #     || $cgi->param('beginning') || $cgi->param('ending')
-   #     || $cgi->keywords
-   #   )
-   #{
-
-     #some false laziness w/cust_bill::re_X
-     my @where;
-     my $orderby = 'ORDER BY cust_bill._date';
-
-     if ( $cgi->param('beginning')
-          && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-       $begin = str2time($1);
-       push @where, "cust_bill._date >= $begin";
-     }
-     if (  $cgi->param('ending')
-           && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-       $end = str2time($1) + 86399;
-       push @where, "cust_bill._date < $end";
-     }
-
-     if ( $cgi->param('begin') =~ /^(\d+)$/ ) {
-       $begin = $1;
-       push @where, "cust_bill._date >= $begin";
-     }
-     if ( $cgi->param('end') =~ /^(\d+)$/ ) {
-       $end = $1;
-       push @where, "cust_bill._date < $end";
-     }
-
-     if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-       $agentnum = $1;
-       push @where, "cust_main.agentnum = $agentnum";
-     }
+   if ( $cgi->param('begin') || $cgi->param('end') || $cgi->keywords ) {
 
      my $owed =
        "charged - ( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay
@@ -54,126 +8,94 @@
                 - ( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill
                     WHERE cust_credit_bill.invnum = cust_bill.invnum )";
 
-     if ( $cgi->param('open') ) {
-       push @where, "0 != $owed";
-       $open = 1;
+     my @where;
+     my $orderby = 'ORDER BY cust_bill._date';
+
+     if ( $cgi->param('begin') =~ /^(\d+)$/ ) {
+       push @where, "cust_bill._date >= $1",
+     }
+     if ( $cgi->param('end') =~ /^(\d+)$/ ) {
+       push @where, "cust_bill._date < $1",
      }
 
      my($query) = $cgi->keywords;
      if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
-       ($open, $days, my $field) = ($1, $2, $3);
+       my($open, $days, $field) = ($1, $2, $3);
        $field = "_date" if $field eq 'date';
        $orderby = "ORDER BY cust_bill.$field";
        push @where, "0 != $owed" if $open;
        push @where, "cust_bill._date < ". (time-86400*$days) if $days;
      }
-
+   
      my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
-
-     my $addl_from = 'left join cust_main using ( custnum )';
-
-     if ( $cgi->param('newest_percust') ) {
-       $distinct = 'DISTINCT ON ( cust_bill.custnum )';
-       $orderby = 'ORDER BY cust_bill.custnum ASC, cust_bill._date DESC';
-       #$count_query = "SELECT 'N/A', 'N/A', 'N/A'"; #XXXXXXX fix
-       $count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'";
-     }
    
-     unless ( $count_query ) {
-       $count_query = "SELECT COUNT(*), sum(charged), sum($owed)";
-       $count_addl = [ '$%.2f total invoiced',
-                       '$%.2f total outstanding balance',
-                     ];
-     }
-     $count_query .=  " FROM cust_bill $addl_from $extra_sql";
+     $count_query = "SELECT COUNT(*), sum(charged), sum($owed)
+                     FROM cust_bill $extra_sql";
    
      $sql_query = {
        'table'     => 'cust_bill',
-       'addl_from' => $addl_from,
        'hashref'   => {},
-       'select'    => "$distinct ". join(', ',
-                        'cust_bill.*',
-                        #( map "cust_main.$_", qw(custnum last first company) ),
-                        'cust_main.custnum as cust_main_custnum',
-                        FS::UI::Web::cust_sql_fields(),
-                        "$owed as owed",
-                      ),
+       'select'    => "cust_bill.*, $owed as owed",
        'extra_sql' => "$extra_sql $orderby"
      };
    
+   } else {
+     $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
+     $count_query = "SELECT COUNT(*) FROM cust_bill WHERE invnum = $2";
+     $sql_query = {
+       'table'     => 'cust_bill',
+       'hashref'   => { 'invnum' => $2 },
+       #'select'    => '*',
+     };
    }
 
    my $link  = [ "${p}view/cust_bill.cgi?", 'invnum', ];
    my $clink = sub {
      my $cust_bill = shift;
-     $cust_bill->cust_main_custnum
+     my $cust_main = $cust_bill->cust_main;
+     $cust_main
        ? [ "${p}view/cust_main.cgi?", 'custnum' ]
        : '';
    };
 
-  my $conf = new FS::Conf;
-  my $money_char = $conf->config('money_char') || '$';
-
-  my $html_init = join("\n", map {
-    ( my $action = $_ ) =~ s/_$//;
-    include('/elements/progress-init.html',
-              $_.'form',
-              [ 'begin', 'end', 'agentnum', 'open', 'days', 'newest_percust' ],
-              "../misc/${_}invoices.cgi",
-              { 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but...
-              $_, #key
-           ),
-    qq!<FORM NAME="${_}form">!,
-    qq!<INPUT TYPE="hidden" NAME="begin"     VALUE="$begin">!,
-    qq!<INPUT TYPE="hidden" NAME="end"       VALUE="$end">!,
-    qq!<INPUT TYPE="hidden" NAME="agentnum"  VALUE="$agentnum">!,
-    qq!<INPUT TYPE="hidden" NAME="open"      VALUE="$open">!,
-    qq!<INPUT TYPE="hidden" NAME="days"      VALUE="$days">!,
-    qq!</FORM>!
-  } qw( print_ email_ fax_ ) );
-
-  my $menubar =  [
-                   'Main menu' => $p,
-                   'Print these invoices' =>
-                     "javascript:print_process()",
-                   'Email these invoices' =>
-                     "javascript:email_process()",
-                 ];
-
-  push @$menubar, 'Fax these invoices' =>
-                    "javascript:fax_process()"
-    if $conf->exists('hylafax');
-
-%><%= include( 'elements/search.html',
-                 'title'       => 'Invoice Search Results',
-                 'html_init'   => $html_init,
-                 'menubar'     => $menubar,
-                 'name'        => 'invoices',
-                 'query'       => $sql_query,
-                 'count_query' => $count_query,
-                 'count_addl'  => $count_addl,
-                 'redirect'    => $link,
-                 'header'      => [ 'Invoice #',
-                                    'Balance',
-                                    'Amount',
-                                    'Date',
-                                    FS::UI::Web::cust_header(),
-                                  ],
-                 'fields'      => [
-                   'invnum',
-                   sub { sprintf($money_char.'%.2f', shift->get('owed') ) },
-                   sub { sprintf($money_char.'%.2f', shift->charged     ) },
-                   sub { time2str('%b %d %Y', shift->_date ) },
-                   \&FS::UI::Web::cust_fields,
-                 ],
-                 'align' => 'rrrrll',
-                 'links' => [
-                   $link,
-                   $link,
-                   $link,
-                   $link,
-                   ( map { $clink } FS::UI::Web::cust_header() ),
-                 ],
-  
-      )
+%>
+<%= include( 'elements/search.html',
+               'title'       => 'Invoice Search Results',
+               'name'        => 'invoices',
+               'query'       => $sql_query,
+               'count_query' => $count_query,
+               'count_addl'  => [ '$%.2f total invoiced',
+                                  '$%.2f total outstanding balance',
+                                ],
+               'redirect'    => $link,
+               'header'      =>
+                 [ 'Invoice #', qw(Balance Amount Date), 'Contact name',
+                   'Company' ],
+               'fields'      => [
+                 'invnum',
+                 sub { sprintf('$%.2f', shift->get('owed') ) },
+                 sub { sprintf('$%.2f', shift->charged     ) },
+                 sub { time2str('%b %d %Y', shift->_date ) },
+                 sub { my $cust_bill = shift;
+                       my $cust_main = $cust_bill->cust_main;
+                       $cust_main
+                         ? $cust_main->get('last'). ', '. $cust_main->first
+                         : "WARNING: can't find cust_main.custnum ".
+                           $cust_bill->custnum. ' (cust_bill.invnum '.
+                           $cust_bill->invnum. ')';
+                     },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main ? $cust_main->company : '';
+                     },
+               ],
+               'links' => [
+                 $link,
+                 $link,
+                 $link,
+                 $link,
+                 $clink,
+                 $clink,
+               ],
+
+    )
 %>
diff --git a/httemplate/search/cust_bill_event.cgi b/httemplate/search/cust_bill_event.cgi
index d82a833..7c2b3a2 100644
--- a/httemplate/search/cust_bill_event.cgi
+++ b/httemplate/search/cust_bill_event.cgi
@@ -1,137 +1,62 @@
+<!-- mason kludge -->
 <%
 
-my $title = $cgi->param('failed') ? 'Failed invoice events' : 'Invoice events';
+#false laziness with view/cust_bill.cgi
 
-my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
+my $beginning = str2time($1) || 0;
 
-##tie my %hash, 'Tie::DxHash', 
-#my %hash = (
-#      _date => { op=> '>=', value=>$beginning },
-## i wish...
-##      _date => { op=> '<=', value=>$ending },
-#);
-#$hash{'statustext'} = { op=> '!=', value=>'' }
-#  if $cgi->param('failed');
+$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
+my $ending =  ( $1 ? str2time($1) : 4294880896 ) + 86399;
 
-my $where = " WHERE cust_bill_event._date >= $beginning".
-            "   AND cust_bill_event._date <= $ending";
+my @cust_bill_event =
+  sort { $a->_date <=> $b->_date }
+    qsearch('cust_bill_event', {
+      _date => { op=> '>=', value=>$beginning },
+      statustext => { op=> '!=', value=>'' },
+# i wish...
+#      _date => { op=> '<=', value=>$ending },
+    }, '', "AND _date <= $ending");
 
-if ( $cgi->param('failed') ) {
-  $where .= " AND statustext != '' ".
-            " AND statustext IS NOT NULL ".
-            " AND statustext != 'N/A' "
-}
-
-if ( $cgi->param('part_bill_event.payby') =~ /^(\w+)$/ ) {
-  $where .= " AND part_bill_event.payby = '$1' ";
-}
-
-my $sql_query = {
-  'table'     => 'cust_bill_event',
-  #'hashref'   => \%hash,
-  'hashref'   => {}, 
-  'select'    => join(', ',
-                   'cust_bill_event.*',
-                   'part_bill_event.event',
-                   'cust_bill.custnum',
-                   'cust_bill._date AS cust_bill_date',
-                   'cust_main.custnum AS cust_main_custnum',
-                   FS::UI::Web::cust_sql_fields(),
-                 ),
-  'extra_sql' => "$where ORDER BY _date ASC",
-  'addl_from' => 'LEFT JOIN part_bill_event USING ( eventpart ) '.
-                 'LEFT JOIN cust_bill       USING ( invnum    ) '.
-                 'LEFT JOIN cust_main       USING ( custnum   ) ',
-};
-
-my $count_sql = "SELECT COUNT(*) FROM cust_bill_event ".
-                "LEFT JOIN part_bill_event USING ( eventpart ) ".
-                $where;
-
-my $conf = new FS::Conf;
-
-my $failed = $cgi->param('failed');
-
-my $html_init = join("\n", map {
-  ( my $action = $_ ) =~ s/_$//;
-  include('/elements/progress-init.html',
-            $_.'form',
-            [ 'action', 'beginning', 'ending', 'failed' ],
-            "../misc/${_}invoice_events.cgi",
-            { 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but...
-            $_, #key
-         ),
-  qq!<FORM NAME="${_}form">!,
-  qq!<INPUT TYPE="hidden" NAME="action" VALUE="$_">!, #not used though
-  qq!<INPUT TYPE="hidden" NAME="beginning" VALUE="$beginning">!,
-  qq!<INPUT TYPE="hidden" NAME="ending"    VALUE="$ending">!,
-  qq!<INPUT TYPE="hidden" NAME="failed"    VALUE="$failed">!,
-  qq!</FORM>!
-} qw( print_ email_ fax_ ) );
-
-my $menubar =  [
-                 'Main menu' => $p,
-                 'Re-print these events' =>
-                   "javascript:print_process()",
-                 'Re-email these events' =>
-                   "javascript:email_process()",
-               ];
-
-push @$menubar, 'Re-fax these events' =>
-                  "javascript:fax_process()"
-  if $conf->exists('hylafax');
-
-my $link_cust = sub {
-  my $cust_bill_event = shift;
-  $cust_bill_event->cust_main_custnum
-    ? [ "${p}view/cust_main.cgi?", 'custnum' ]
-    : '';
-};
+%>
 
-%><%= include( 'elements/search.html',
-                 'title'       => $title,
-                 'html_init'   => $html_init,
-                 'menubar'     => $menubar,
-                 'name'        => 'billing events',
-                 'query'       => $sql_query,
-                 'count_query' => $count_sql,
-                 'header'      => [ 'Event',
-                                    'Date',
-                                    'Status',
-                                    #'Inv #', 'Inv Date', 'Cust #',
-                                    'Invoice',
-                                    FS::UI::Web::cust_header(),
-                                  ],
-                 'fields' => [
-                               'event',
-                               sub { time2str("%b %d %Y %T", $_[0]->_date) },
-                               sub { 
-                                     #my $cust_bill_event = shift;
-                                     my $status = $_[0]->status;
-                                     $status .= ': '.$_[0]->statustext
-                                       if $_[0]->statustext;
-                                     $status;
-                                   },
-                               sub {
-                                     #my $cust_bill_event = shift;
-                                     'Invoice #'. $_[0]->invnum.
-                                     ' ('.
-                                       time2str("%D", $_[0]->cust_bill_date).
-                                     ')';
-                                   },
-                               \&FS::UI::Web::cust_fields,
-                             ],
-                 'links' => [
-                              '',
-                              '',
-                              '',
-                              sub {
-                                my $part_bill_event = shift;
-                                my $template = $part_bill_event->templatename;
-                                $template .= '-' if $template;
-                                [ "${p}view/cust_bill.cgi?$template", 'invnum'];
-                              },
-                              ( map { $link_cust } FS::UI::Web::cust_header() ),
-                            ],
-             )
+<%= header('Failed billing events') %>
+
+<%= table() %>
+<TR>
+  <TH>Event</TH>
+  <TH>Date</TH>
+  <TH>Status</TH>
+  <TH>Invoice</TH>
+  <TH>(bill) name</TH>
+  <TH>company</TH>
+<% if ( defined dbdef->table('cust_main')->column('ship_last') ) { %>
+  <TH>(service) name</TH>
+  <TH>company</TH>
+<% } %>
+</TR>
+
+<% foreach my $cust_bill_event ( @cust_bill_event ) {
+   my $status = $cust_bill_event->status;
+   $status .= ': '.$cust_bill_event->statustext if $cust_bill_event->statustext;
+   my $cust_bill = $cust_bill_event->cust_bill;
+   my $cust_main = $cust_bill->cust_main;
+   my $invlink = "${p}view/cust_bill.cgi?". $cust_bill->invnum;
+   my $custlink = "${p}view/cust_main.cgi?". $cust_main->custnum;
 %>
+<TR>
+  <TD><%= $cust_bill_event->part_bill_event->event %></TD>
+  <TD><%= time2str("%a %b %e %T %Y", $cust_bill_event->_date) %></TD>
+  <TD><%= $status %></TD>
+  <TD><A HREF="<%=$invlink%>">Invoice #<%= $cust_bill->invnum %> (<%= time2str("%D", $cust_bill->_date ) %>)</A></TD>
+  <TD><A HREF="<%=$custlink%>"><%= $cust_main->last. ', '. $cust_main->first %></A></TD>
+  <TD><A HREF="<%=$custlink%>"><%= $cust_main->company %></A></TD>
+  <% if ( defined dbdef->table('cust_main')->column('ship_last') ) { %>
+    <TD><A HREF="<%=$custlink%>"><%= $cust_main->ship_last. ', '. $cust_main->ship_first %></A></TD>
+    <TD><A HREF="<%=$custlink%>"><%= $cust_main->ship_company %></A></TD>
+  <% } %>
+</TR>
+<% } %>
+</TABLE>
+
+</BODY></HTML>
diff --git a/httemplate/search/cust_bill_event.html b/httemplate/search/cust_bill_event.html
index 197f280..cd96ddf 100755
--- a/httemplate/search/cust_bill_event.html
+++ b/httemplate/search/cust_bill_event.html
@@ -1,15 +1,14 @@
-<%= include(
-      '/elements/header.html',
-      ( $cgi->param('failed') ? 'Failed invoice events' : 'Invoice events' ),
-      include('/elements/menubar.html',
-                'Main menu' => $p, # popurl(2),
-             ),
-
-    )
-%>
-
-    <FORM ACTION="cust_bill_event.cgi" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="failed" VALUE="<%= $cgi->param('failed') %>">
+<HTML>
+  <HEAD>
+    <TITLE>Invoice event errors</TITLE>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+  </HEAD>
+  <BODY BGCOLOR="#e8e8e8">
+    <H1>Invoice event errors</H1>
+    <FORM ACTION="cust_bill_event.cgi" METHOD="post">
     <TABLE>
       <!--<TR>
         <TD ALIGN="right">Customer type</TD>
@@ -23,36 +22,33 @@
         </TD>
       </TR>
       -->
-      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-      <!--
       <TR>
-        <TD ALIGN="right">Events: </TD>
-        <TD>
-          <SELECT NAME="eventpart">
-            <OPTION SELECTED VALUE=""><%= $cgi->param('failed') ? '(all failed events)' : '(all events)' %>
-            <% foreach my $part_bill_event ( qsearch( 'part_bill_event', {} ) ) { %>
-            <% } %>
-          </SELECT>
-        </TD>
+        <TD ALIGN="right">From: </TD>
+        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
       </TR>
-      -->
       <TR>
-        <TD ALIGN="right">Events for payment type: </TD>
-        <TD>
-          <SELECT NAME="part_bill_event.payby">
-            <OPTION SELECTED VALUE="">(all)
-            <OPTION VALUE="CARD">Credit card (automatic)
-            <OPTION VALUE="BILL">Billing
-            <OPTION VALUE="CHEK">Electronic check (automatic)
-            <OPTION VALUE="DCRD">Credit card (on-demand)
-            <OPTION VALUE="DCHK">Electronic check (on-demand)
-            <OPTION VALUE="LECB">Phone bill billing
-            <OPTION VALUE="COMP">Complimentary
-          </SELECT>
-        </TD>
+        <TD ALIGN="right">To: </TD>
+        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
       </TR>
     </TABLE>
     <BR><INPUT TYPE="submit" VALUE="Get Report">
     </FORM>
   </BODY>
 </HTML>
+
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
deleted file mode 100644
index 082ccc8..0000000
--- a/httemplate/search/cust_bill_pkg.cgi
+++ /dev/null
@@ -1,148 +0,0 @@
-<%
-
-my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-
-my $join_cust = "
-    JOIN cust_bill USING ( invnum ) 
-    JOIN cust_main USING ( custnum )
-";
-
-my $join_pkg = "
-    LEFT JOIN cust_pkg USING ( pkgnum )
-    LEFT JOIN part_pkg USING ( pkgpart )
-";
-
-my $where = "
-  WHERE _date >= $beginning AND _date <= $ending
-    AND payby != 'COMP'
-";
-
-if ( $cgi->param('out') ) {
-
-  $where .= "
-    AND 0 = (
-      SELECT COUNT(*) FROM cust_main_county
-      WHERE (    cust_main_county.county  = cust_main.county
-              OR ( cust_main_county.county IS NULL AND cust_main.county  =  '' )
-              OR ( cust_main_county.county  =  ''  AND cust_main.county IS NULL)
-              OR ( cust_main_county.county IS NULL AND cust_main.county IS NULL)
-            )
-        AND (    cust_main_county.state   = cust_main.state
-              OR ( cust_main_county.state  IS NULL AND cust_main.state  =  ''  )
-              OR ( cust_main_county.state   =  ''  AND cust_main.state IS NULL )
-              OR ( cust_main_county.state  IS NULL AND cust_main.state IS NULL )
-            )
-        AND cust_main_county.country = cust_main.country
-        AND cust_main_county.tax > 0
-    )
-  ";
-
-} elsif ( $cgi->param('country' ) ) {
-
-  my $county  = dbh->quote( $cgi->param('county')  );
-  my $state   = dbh->quote( $cgi->param('state')   );
-  my $country = dbh->quote( $cgi->param('country') );
-  $where .= "
-    AND ( county  = $county OR $county = '' )
-    AND ( state   = $state  OR $state = '' )
-    AND   country = $country
-  ";
-  $where .= ' AND taxclass = '. dbh->quote( $cgi->param('taxclass') )
-    if $cgi->param('taxclass');
-
-}
-
-$where .= ' AND pkgnum != 0' if $cgi->param('nottax');
-
-$where .= ' AND pkgnum = 0' if $cgi->param('istax');
-
-$where .= " AND tax = 'Y'" if $cgi->param('cust_tax');
-
-my $count_query;
-if ( $cgi->param('pkg_tax') ) {
-
-  $count_query =
-    "SELECT COUNT(*), SUM( ( CASE WHEN part_pkg.setuptax = 'Y'
-                                 THEN cust_bill_pkg.setup
-                                 ELSE 0 )
-                          +
-                          ( CASE WHEN part_pkg.recurtax = 'Y'
-                                 THEN cust_bill_pkg.recur
-                                 ELSE 0 )
-                        )";
-
-  $where .= " AND (
-                       ( part_pkg.setuptax = 'Y' AND cust_bill_pkg.setup > 0 )
-                    OR ( part_pkg.recurtax = 'Y' AND cust_bill_pkg.recur > 0 )
-                  )";
-
-} else {
-
-  $count_query =
-    "SELECT COUNT(*), SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)";
-
-}
-$count_query .= " FROM cust_bill_pkg $join_cust  $join_pkg $where";
-
-my $query = {
-  'table'     => 'cust_bill_pkg',
-  'addl_from' => "$join_cust $join_pkg",
-  'hashref'   => {},
-  'select'    => join(', ',
-                   'cust_bill_pkg.*',
-                   'cust_bill._date',
-                   'part_pkg.pkg',
-                   'cust_main.custnum',
-                   FS::UI::Web::cust_sql_fields(),
-                 ),
-  'extra_sql' => $where,
-};
-
-my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ];
-my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
-
-my $conf = new FS::Conf;
-my $money_char = $conf->config('money_char') || '$';
-
-%><%= include( 'elements/search.html',
-                 'title'       => 'Line items',
-                 'name'        => 'line items',
-                 'query'       => $query,
-                 'count_query' => $count_query,
-                 'count_addl'  => [ $money_char. '%.2f total', ],
-                 'header'      => [
-                   '#',
-                   'Description',
-                   'Setup charge',
-                   'Recurring charge',
-                   'Invoice',
-                   'Date',
-                   FS::UI::Web::cust_header(),
-                 ],
-                 'fields'      => [
-                   'billpkgnum',
-                   sub { $_[0]->pkgnum > 0
-                           ? $_[0]->get('pkg')
-                           : $_[0]->get('itemdesc')
-                       },
-                   #strikethrough or "N/A ($amount)" or something these when
-                   # they're not applicable to pkg_tax search
-                   sub { sprintf($money_char.'%.2f', shift->setup ) },
-                   sub { sprintf($money_char.'%.2f', shift->recur ) },
-                   'invnum',
-                   sub { time2str('%b %d %Y', shift->_date ) },
-                   \&FS::UI::Web::cust_fields,
-                 ],
-                 'links'       => [
-                   '',
-                   '',
-                   '',
-                   '',
-                   $ilink,
-                   $ilink,
-                   ( map { $clink } FS::UI::Web::cust_header() ),
-                 ],
-                 'align' => 'rlrrrc',
-           )
-%>
-
diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index 279d682..faaa7a8 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -1,18 +1,10 @@
 <%
-   my $title = 'Credit Search Results';
    #my( $count_query, $sql_query );
 
    my @search = ();
 
    if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) {
-     push @search, "cust_credit.otaker = '$1'";
-   }
-
-   if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-     push @search, "agentnum = $1";
-     my $agent = qsearchs('agent', { 'agentnum' => $1 } );
-     die "unknown agentnum $1" unless $agent;
-     $title = $agent->agent. " $title";
+     push @search, "otaker = '$1'";
    }
 
    #false laziness with cust_pkg.cgi and cust_pay.cgi
@@ -40,58 +32,49 @@
                  ? 'WHERE '. join(' AND ', @search)
                  : '';
 
-   my $count_query = 'SELECT COUNT(*), SUM(amount) '.
-                     'FROM cust_credit LEFT JOIN cust_main USING ( custnum ) '.
-                     $where;
-
+   my $count_query = "SELECT COUNT(*), SUM(amount) FROM cust_credit $where";
    my $sql_query   = {
      'table'     => 'cust_credit',
-     'select'    => join(', ',
-                      'cust_credit.*',
-                      'cust_main.custnum as cust_main_custnum',
-                      FS::UI::Web::cust_sql_fields(),
-                    ),
      'hashref'   => {},
      'extra_sql' => $where,
-     'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
    };
 
-     my $clink = sub {
-       my $cust_bill = shift;
-       $cust_bill->cust_main_custnum
-         ? [ "${p}view/cust_main.cgi?", 'custnum' ]
-         : '';
-     };
+   my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
 
-%><%= include( 'elements/search.html',
-                 'title'       => $title,
-                 'name'        => 'credits',
-                 'query'       => $sql_query,
-                 'count_query' => $count_query,
-                 'count_addl'  => [ '$%.2f total credited', ],
-                 #'redirect'    => $link,
-                 'header'      => [ 'Amount',
-                                    'Date',
-                                    FS::UI::Web::cust_header(),
-                                    'By',
-                                    'Reason'
-                                  ],
-                 'fields'      => [
-                   #'crednum',
-                   sub { sprintf('$%.2f', shift->amount ) },
-                   sub { time2str('%b %d %Y', shift->_date ) },
-                   \&FS::UI::Web::cust_fields,
-                   'otaker',
-                   'reason',
-                 ],
-                 #'align' => 'rrrllll',
-                 'align' => 'rr',
-                 'links' => [
-                   '',
-                   '',
-                   ( map { $clink } FS::UI::Web::cust_header() ),
-                   '',
-                   '',
-                 ],
-      )
+%>
+<%= include( 'elements/search.html',
+               'title'       => 'Credit Search Results',
+               'name'        => 'credits',
+               'query'       => $sql_query,
+               'count_query' => $count_query,
+               'count_addl'  => [ '$%.2f total credited', ],
+               #'redirect'    => $link,
+               'header'      =>
+                 [ qw(Amount Date), 'Cust #', 'Contact name',
+                   qw(Company By Reason) ],
+               'fields'      => [
+                 #'crednum',
+                 sub { sprintf('$%.2f', shift->amount ) },
+                 sub { time2str('%b %d %Y', shift->_date ) },
+                 'custnum',
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->get('last'). ', '. $cust_main->first;
+                     },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->company;
+                     },
+                 'otaker',
+                 'reason',
+               ],
+               'align' => 'rrrllll',
+               'links' => [
+                 '',
+                 '',
+                 $clink,
+                 $clink,
+                 $clink,
+                 '',
+                 '',
+               ],
+    )
 %>
diff --git a/httemplate/search/cust_main-otaker.cgi b/httemplate/search/cust_main-otaker.cgi
index 03c2619..4421436 100755
--- a/httemplate/search/cust_main-otaker.cgi
+++ b/httemplate/search/cust_main-otaker.cgi
@@ -7,7 +7,7 @@
       Customer Search
     </FONT>
     <BR>
-    <FORM ACTION="cust_main.cgi" METHOD="GET">
+    <FORM ACTION="cust_main.cgi" METHOD="post">
       Search for <B>Order taker</B>: 
       <INPUT TYPE="hidden" NAME="otaker_on" VALUE="TRUE">
       <% my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
diff --git a/httemplate/search/cust_main-payinfo.html b/httemplate/search/cust_main-payinfo.html
index b82b610..671b5ef 100755
--- a/httemplate/search/cust_main-payinfo.html
+++ b/httemplate/search/cust_main-payinfo.html
@@ -7,7 +7,7 @@
       Customer Search
     </FONT>
     <BR>
-    <FORM ACTION="cust_main.cgi" METHOD="GET">
+    <FORM ACTION="cust_main.cgi" METHOD="post">
       Search for <B>Credit card #</B>: 
       <INPUT TYPE="hidden" NAME="card_on" VALUE="TRUE">
       <INPUT TYPE="text" NAME="card">
diff --git a/httemplate/search/cust_main-quickpay.html b/httemplate/search/cust_main-quickpay.html
index 154a641..077d290 100755
--- a/httemplate/search/cust_main-quickpay.html
+++ b/httemplate/search/cust_main-quickpay.html
@@ -8,7 +8,7 @@
     </FONT>
     <BR><BR>
     <A HREF="../">Main Menu</A><BR><BR>
-    <FORM ACTION="cust_main.cgi" METHOD="GET">
+    <FORM ACTION="cust_main.cgi" METHOD="post">
       <INPUT TYPE="hidden" NAME="quickpay" VALUE="yes">
       <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
       <INPUT TYPE="text" NAME="last_text">
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 665f563..ecff4bf 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -57,7 +57,6 @@ if ( $cgi->param('browse')
 ) {
 
   my %search = ();
-
   if ( $cgi->param('browse') ) {
     my $query = $cgi->param('browse');
     if ( $query eq 'custnum' ) {
@@ -81,16 +80,15 @@ if ( $cgi->param('browse')
   } else {
     $sortby = \*last_sort; #??
     $orderby = "ORDER BY LOWER(last || ' ' || first)"; #??
-  }
-
-  if ( $cgi->param('otaker_on') ) {
-    $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
-    $search{otaker} = $1;
-  } elsif ( $cgi->param('agentnum_on') ) {
-    $cgi->param('agentnum') =~ /^(\d+)$/ or eidiot "Illegal agentnum\n";
-    $search{agentnum} = $1;
-#  } else {
-#    die "unknown query...";
+    if ( $cgi->param('otaker_on') ) {
+      $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
+      $search{otaker} = $1;
+    } elsif ( $cgi->param('agentnum_on') ) {
+      $cgi->param('agentnum') =~ /^(\d+)$/ or eidiot "Illegal agentnum\n";
+      $search{agentnum} = $1;
+    } else {
+      die "unknown query...";
+    }
   }
 
   my @qual = ();
@@ -287,7 +285,7 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
       or eidiot "Illegal referral_custnum\n";
     my $referral_custnum = $1;
     my $cust_main = qsearchs('cust_main', { custnum => $referral_custnum } );
-    print '<FORM METHOD="GET">'.
+    print '<FORM METHOD=POST>'.
           qq!<INPUT TYPE="hidden" NAME="referral_custnum" VALUE="$referral_custnum">!.
           'referrals of <A HREF="'. popurl(2).
           "view/cust_main.cgi?$referral_custnum\">$referral_custnum: ".
diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index 4f75084..5a066e4 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -7,7 +7,7 @@
       Customer Search
     </FONT>
     <BR><BR>
-    <FORM ACTION="cust_main.cgi" METHOD="GET">
+    <FORM ACTION="cust_main.cgi" METHOD="post">
       <INPUT TYPE="checkbox" NAME="last_on" CHECKED> Search for <B>last name</B>: 
       <INPUT TYPE="text" NAME="last_text">
       using search method: <SELECT NAME="last_type">
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 99ffc3d..3f5b72a 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -1,122 +1,74 @@
 <%
-   my $title = 'Payment Search Results';
    my( $count_query, $sql_query );
-   if ( $cgi->param('magic') ) {
-
-     my @search = ();
-     my $orderby;
-     if ( $cgi->param('magic') eq '_date' ) {
+   if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
    
-  
-       if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-         push @search, "agentnum = $1"; # $search{'agentnum'} = $1;
-         my $agent = qsearchs('agent', { 'agentnum' => $1 } );
-         die "unknown agentnum $1" unless $agent;
-         $title = $agent->agent. " $title";
-       }
-     
-       if ( $cgi->param('payby') ) {
-         $cgi->param('payby') =~
-           /^(CARD|CHEK|BILL|PREP|CASH|WEST|MCRD)(-(VisaMC|Amex|Discover|Maestro))?$/
-             or die "illegal payby ". $cgi->param('payby');
-         push @search, "cust_pay.payby = '$1'";
-         if ( $3 ) {
-           if ( $3 eq 'VisaMC' ) {
-             #avoid posix regexes for portability
-             push @search,
-               " ( (     substring(cust_pay.payinfo from 1 for 1) = '4'     ".
-               "     AND substring(cust_pay.payinfo from 1 for 4) != '4936' ".
-               "     AND substring(cust_pay.payinfo from 1 for 6)           ".
-               "         NOT SIMILAR TO '49030[2-9]'                        ".
-               "     AND substring(cust_pay.payinfo from 1 for 6)           ".
-               "         NOT SIMILAR TO '49033[5-9]'                        ".
-               "     AND substring(cust_pay.payinfo from 1 for 6)           ".
-               "         NOT SIMILAR TO '49110[1-2]'                        ".
-               "     AND substring(cust_pay.payinfo from 1 for 6)           ".
-               "         NOT SIMILAR TO '49117[4-9]'                        ".
-               "     AND substring(cust_pay.payinfo from 1 for 6)           ".
-               "         NOT SIMILAR TO '49118[1-2]'                        ".
-               "   )".
-               "   OR substring(cust_pay.payinfo from 1 for 2) = '51' ".
-               "   OR substring(cust_pay.payinfo from 1 for 2) = '52' ".
-               "   OR substring(cust_pay.payinfo from 1 for 2) = '53' ".
-               "   OR substring(cust_pay.payinfo from 1 for 2) = '54' ".
-               "   OR substring(cust_pay.payinfo from 1 for 2) = '54' ".
-               "   OR substring(cust_pay.payinfo from 1 for 2) = '55' ".
-               " ) ";
-           } elsif ( $3 eq 'Amex' ) {
-             push @search,
-               " (    substring(cust_pay.payinfo from 1 for 2 ) = '34' ".
-               "   OR substring(cust_pay.payinfo from 1 for 2 ) = '37' ".
-               " ) ";
-           } elsif ( $3 eq 'Discover' ) {
-             push @search,
-               " (    substring(cust_pay.payinfo from 1 for 4 ) = '6011'  ".
-               "   OR substring(cust_pay.payinfo from 1 for 3 ) = '650'   ".
-               " ) ";
-           } elsif ( $3 eq 'Maestro' ) { 
-             push @search,
-               " (    substring(cust_pay.payinfo from 1 for 2 ) = '63'     ".
-               "   OR substring(cust_pay.payinfo from 1 for 2 ) = '67'     ".
-               "   OR substring(cust_pay.payinfo from 1 for 6 ) = '564182' ".
-               "   OR substring(cust_pay.payinfo from 1 for 4 ) = '4936'   ".
-               "   OR substring(cust_pay.payinfo from 1 for 6 )            ".
-               "      SIMILAR TO '49030[2-9]'                             ".
-               "   OR substring(cust_pay.payinfo from 1 for 6 )            ".
-               "      SIMILAR TO '49033[5-9]'                             ".
-               "   OR substring(cust_pay.payinfo from 1 for 6 )            ".
-               "      SIMILAR TO '49110[1-2]'                             ".
-               "   OR substring(cust_pay.payinfo from 1 for 6 )            ".
-               "      SIMILAR TO '49117[4-9]'                             ".
-               "   OR substring(cust_pay.payinfo from 1 for 6 )            ".
-               "      SIMILAR TO '49118[1-2]'                             ".
-               " ) ";
-           } else {
-             die "unknown card type $3";
-           }
+     my %search;
+     my @search;
+   
+     if ( $cgi->param('payby') ) {
+       $cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
+         or die "illegal payby ". $cgi->param('payby');
+       $search{'payby'} = $1;
+       if ( $3 ) {
+         if ( $3 eq 'VisaMC' ) {
+           #avoid posix regexes for portability
+           push @search, " (    substring(payinfo from 1 for 1) = '4'  ".
+                         "   OR substring(payinfo from 1 for 2) = '51' ".
+                         "   OR substring(payinfo from 1 for 2) = '52' ".
+                         "   OR substring(payinfo from 1 for 2) = '53' ".
+                         "   OR substring(payinfo from 1 for 2) = '54' ".
+                         "   OR substring(payinfo from 1 for 2) = '54' ".
+                         "   OR substring(payinfo from 1 for 2) = '55' ".
+                         " ) ";
+         } elsif ( $3 eq 'Amex' ) {
+           push @search, " (    substring(payinfo from 1 for 2 ) = '34' ".
+                         "   OR substring(payinfo from 1 for 2 ) = '37' ".
+                         " ) ";
+         } elsif ( $3 eq 'Discover' ) {
+           push @search, " substring(payinfo from 1 for 4 ) = '6011' ";
+         } else {
+           die "unknown card type $3";
          }
        }
-  
-       my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-       push @search, "_date >= $beginning ",
-                     "_date <= $ending";
-  
-       $orderby = '_date';
+     }
    
-     } elsif ( $cgi->param('magic') eq 'paybatch' ) {
-
-       $cgi->param('paybatch') =~ /^([\w\/\:\-\.]+)$/
-         or die "illegal paybatch: ". $cgi->param('paybatch');
-
-       push @search, "paybatch = '$1'";
-
-       $orderby = "LOWER(company || ' ' || last || ' ' || first )";
-
-     } else {
-       die "unknown search magic: ". $cgi->param('magic');
+     #false laziness with cust_pkg.cgi
+     if ( $cgi->param('beginning')
+          && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+       my $beginning = str2time($1);
+       push @search, "_date >= $beginning ";
      }
-
-     my $search = '';
+     if ( $cgi->param('ending')
+               && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+       my $ending = str2time($1) + 86399;
+       push @search, " _date <= $ending ";
+     }
+     if ( $cgi->param('begin')
+          && $cgi->param('begin') =~ /^(\d+)$/ ) {
+       push @search, "_date >= $1 ";
+     }
+     if ( $cgi->param('end')
+               && $cgi->param('end') =~ /^(\d+)$/ ) {
+       push @search, " _date < $1 ";
+     }
+   
+     my $search;
      if ( @search ) {
-       $search = ' WHERE '. join(' AND ', @search);
+       $search = ( scalar(keys %search) ? ' AND ' : ' WHERE ' ).
+                 join(' AND ', @search);
      }
-  
-     $count_query = "SELECT COUNT(*), SUM(paid) ".
-                    "FROM cust_pay LEFT JOIN cust_main USING ( custnum )".
-                    $search;
 
+     my $hsearch = join(' AND ', map { "$_ = '$search{$_}'" } keys %search );
+     $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
+                    ( $hsearch ? " WHERE $hsearch " : '' ).
+                    $search;
+   
      $sql_query = {
        'table'     => 'cust_pay',
-       'select'    => join(', ',
-                        'cust_pay.*',
-                        'cust_main.custnum as cust_main_custnum',
-                        FS::UI::Web::cust_sql_fields(),
-                      ),
-       'hashref'   => {},
-       'extra_sql' => "$search ORDER BY $orderby",
-       'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
+       'hashref'   => \%search,
+       'extra_sql' => "$search ORDER BY _date",
      };
-
+   
    } else {
    
      $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
@@ -137,56 +89,49 @@
    
    }
 
-   my $link = sub {
-     my $cust_pay = shift;
-     $cust_pay->cust_main_custnum
-       ? [ "${p}view/cust_main.cgi?", 'custnum' ] 
-       : '';
-   };
+   my $link = [ "${p}view/cust_main.cgi?", 'custnum' ];
 
-%><%= include( 'elements/search.html',
-                 'title'       => $title,
-                 'name'        => 'payments',
-                 'query'       => $sql_query,
-                 'count_query' => $count_query,
-                 'count_addl'  => [ '$%.2f total paid', ],
-                 'header'      => [ 'Payment',
-                                    'Amount',
-                                    'Date',
-                                    FS::UI::Web::cust_header(),
-                                  ],
-                 'fields'      => [
-                   sub {
-                     my $cust_pay = shift;
-                     if ( $cust_pay->payby eq 'CARD' ) {
-                       'Card #'. $cust_pay->payinfo_masked;
-                     } elsif ( $cust_pay->payby eq 'CHEK' ) {
-                       'E-check acct#'. $cust_pay->payinfo;
-                     } elsif ( $cust_pay->payby eq 'BILL' ) {
-                       'Check #'. $cust_pay->payinfo;
-                     } elsif ( $cust_pay->payby eq 'PREP' ) {
-                       'Prepaid card #'. $cust_pay->payinfo;
-                     } elsif ( $cust_pay->payby eq 'CASH' ) {
-                       'Cash '. $cust_pay->payinfo;
-                     } elsif ( $cust_pay->payby eq 'WEST' ) {
-                       'Western Union'; #. $cust_pay->payinfo;
-                     } elsif ( $cust_pay->payby eq 'MCRD' ) {
-                       'Manual credit card'; #. $cust_pay->payinfo;
-                     } else {
-                       $cust_pay->payby. ' '. $cust_pay->payinfo;
-                     }
-                   },
-                   sub { sprintf('$%.2f', shift->paid ) },
-                   sub { time2str('%b %d %Y', shift->_date ) },
-                   \&FS::UI::Web::cust_fields,
-                 ],
-                 #'align' => 'lrrrll',
-                 'align' => 'rrr',
-                 'links' => [
-                   '',
-                   '',
-                   '',
-                   ( map { $link } FS::UI::Web::cust_header() ),
-                 ],
-      )
+%>
+<%= include( 'elements/search.html',
+               'title'       => 'Payment Search Results',
+               'name'        => 'payments',
+               'query'       => $sql_query,
+               'count_query' => $count_query,
+               'count_addl'  => [ '$%.2f total paid', ],
+               'header'      =>
+                 [ qw(Payment Amount Date), 'Cust #', 'Contact name',
+                   'Company', ],
+               'fields'      => [
+                 sub {
+                   my $cust_pay = shift;
+                   if ( $cust_pay->payby eq 'CARD' ) {
+                     'Card #'. $cust_pay->payinfo_masked;
+                   } elsif ( $cust_pay->payby eq 'CHEK' ) {
+                     'E-check acct#'. $cust_pay->payinfo;
+                   } elsif ( $cust_pay->payby eq 'BILL' ) {
+                     'Check #'. $cust_pay->payinfo;
+                   } else {
+                     $cust_pay->payby. ' '. $cust_pay->payinfo;
+                   }
+                 },
+                 sub { sprintf('$%.2f', shift->paid ) },
+                 sub { time2str('%b %d %Y', shift->_date ) },
+                 'custnum',
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->get('last'). ', '. $cust_main->first;
+                     },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->company;
+                     },
+               ],
+               'align' => 'lrrrll',
+               'links' => [
+                 '',
+                 '',
+                 '',
+                 $link,
+                 $link,
+                 $link,
+               ],
+    )
 %>
diff --git a/httemplate/search/cust_pay.html b/httemplate/search/cust_pay.html
index 6414cf7..3848d66 100755
--- a/httemplate/search/cust_pay.html
+++ b/httemplate/search/cust_pay.html
@@ -7,7 +7,7 @@
       Check # Search
     </FONT>
     <BR><BR>
-    <FORM ACTION="cust_pay.cgi" METHOD="GET">
+    <FORM ACTION="cust_pay.cgi" METHOD="post">
       Search for <B>check #</B>:
       <INPUT TYPE="text" NAME="payinfo">
       <INPUT TYPE="hidden" NAME="payby" VALUE="BILL">
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 5da4d82..6d26317 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,234 +1,363 @@
 <%
 
+my $conf = new FS::Conf;
+my $maxrecords = $conf->config('maxsearchrecordsperpage');
+
 my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
 
-my($query) = $cgi->keywords;
+my $limit = '';
+$limit .= "LIMIT $maxrecords" if $maxrecords;
 
-my $orderby;
-my @where;
-my $cjoin = '';
+my $offset = $cgi->param('offset') || 0;
+$limit .= " OFFSET $offset" if $offset;
 
-if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
-  $cjoin = "LEFT JOIN cust_main USING ( custnum )";
-  push @where,
-    "agentnum = $1";
-}
+my $total;
+
+my($query) = $cgi->keywords;
+my $sortby;
+my @cust_pkg;
 
 if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
-  $orderby = 'ORDER BY bill';
+  $sortby=\*bill_sort;
+
+  #false laziness with cust_pay.cgi
+  my $range = '';
+  if ( $cgi->param('beginning')
+       && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+    my $beginning = str2time($1);
+    $range = " WHERE bill >= $beginning ";
+  }
+  if ( $cgi->param('ending')
+            && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+    my $ending = str2time($1) + 86399;
+    $range .= ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
+  }
 
-  my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-  push @where,
-    "bill >= $beginning ",
-    "bill <= $ending",
-    '( cancel IS NULL OR cancel = 0 )';
+  $range .= ( $range ? 'AND ' : ' WHERE ' ). '( cancel IS NULL OR cancel = 0 )';
+
+  if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
+    $range .= ( $range ? 'AND ' : ' WHERE ' ). 
+              "$1 = ( SELECT agentnum FROM cust_main".
+                    " WHERE cust_main.custnum = cust_pkg.custnum )";
+  }
+
+  #false laziness with below
+  my $statement = "SELECT COUNT(*) FROM cust_pkg $range";
+  warn $statement;
+  my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
+  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+  
+  $total = $sth->fetchrow_arrayref->[0];
+  
+  @cust_pkg = qsearch('cust_pkg',{}, '', " $range ORDER BY bill $limit" );
 
 } else {
 
+  my $qual = '';
   if ( $cgi->param('magic') &&
-       $cgi->param('magic') =~ /^(active|suspended|cancell?ed)$/
+       $cgi->param('magic') =~ /^(active|suspended|canceled)$/
   ) {
 
-    $orderby = 'ORDER BY pkgnum';
-
     if ( $cgi->param('magic') eq 'active' ) {
-
-      #push @where,
-      #  '( susp IS NULL OR susp = 0 )',
-      #  '( cancel IS NULL OR cancel = 0)';
-      push @where, FS::cust_pkg->active_sql();
-
+      $qual = 'WHERE ( susp IS NULL OR susp = 0 )'.
+              ' AND ( cancel IS NULL OR cancel = 0)';
     } elsif ( $cgi->param('magic') eq 'suspended' ) {
-
-      push @where,
-        'susp IS NOT NULL',
-        'susp != 0',
-        '( cancel IS NULL OR cancel = 0)';
-
-    } elsif ( $cgi->param('magic') =~ /^cancell?ed$/ ) {
-
-      push @where,
-        'cancel IS NOT NULL',
-        'cancel != 0';
-
+      $qual = 'WHERE susp IS NOT NULL AND susp != 0'.
+              ' AND ( cancel IS NULL OR cancel = 0)';
+    } elsif ( $cgi->param('magic') eq 'canceled' ) {
+      $qual = 'WHERE cancel IS NOT NULL AND cancel != 0';
     } else {
       die "guru meditation #420";
     }
 
+    $sortby = \*pkgnum_sort;
+
     if ( $cgi->param('pkgpart') =~ /^(\d+)$/ ) {
-      push @where, "pkgpart = $1";
+      $qual .= " AND pkgpart = $1";
     }
 
   } elsif ( $query eq 'pkgnum' ) {
 
-    $orderby = 'ORDER BY pkgnum';
+    $sortby=\*pkgnum_sort;
 
   } elsif ( $query eq 'APKG_pkgnum' ) {
   
-    $orderby = 'ORDER BY pkgnum';
+    $sortby=\*pkgnum_sort;
+  
+    #@cust_pkg=();
+    ##perhaps this should go in cust_pkg as a qsearch-like constructor?
+    #my($cust_pkg);
+    #foreach $cust_pkg (
+    #  qsearch('cust_pkg',{}, '', "ORDER BY pkgnum $limit" )
+    #) {
+    #  my($flag)=0;
+    #  my($pkg_svc);
+    #  PKG_SVC: 
+    #  foreach $pkg_svc (qsearch('pkg_svc',{ 'pkgpart' => $cust_pkg->pkgpart })) {
+    #    if ( $pkg_svc->quantity 
+    #         > scalar(qsearch('cust_svc',{
+    #             'pkgnum' => $cust_pkg->pkgnum,
+    #             'svcpart' => $pkg_svc->svcpart,
+    #           }))
+    #       )
+    #    {
+    #      $flag=1;
+    #      last PKG_SVC;
+    #    }
+    #  }
+    #  push @cust_pkg, $cust_pkg if $flag;
+    #}
+
+    if ( driver_name eq 'mysql' ) {
+      #$query = "DROP TABLE temp1_$$,temp2_$$;";
+      #my $sth = dbh->prepare($query);
+      #$sth->execute;
+
+      $query = "CREATE TEMPORARY TABLE temp1_$$ TYPE=MYISAM
+                  SELECT cust_svc.pkgnum,cust_svc.svcpart,COUNT(*) as count
+                    FROM cust_pkg,cust_svc,pkg_svc
+                      WHERE cust_pkg.pkgnum = cust_svc.pkgnum
+                      AND cust_svc.svcpart = pkg_svc.svcpart
+                      AND cust_pkg.pkgpart = pkg_svc.pkgpart
+                      GROUP BY cust_svc.pkgnum,cust_svc.svcpart";
+      my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
+         
+      $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
   
-    push @where, '0 < (
-      SELECT count(*) FROM pkg_svc
-       WHERE pkg_svc.pkgpart =  cust_pkg.pkgpart
-         AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
-                                   WHERE cust_svc.pkgnum  = cust_pkg.pkgnum
-                                     AND cust_svc.svcpart = pkg_svc.svcpart
-                                )
-    )';
+      $query = "CREATE TEMPORARY TABLE temp2_$$ TYPE=MYISAM
+                  SELECT cust_pkg.pkgnum FROM cust_pkg
+                    LEFT JOIN pkg_svc ON (cust_pkg.pkgpart=pkg_svc.pkgpart)
+                    LEFT JOIN temp1_$$ ON (cust_pkg.pkgnum = temp1_$$.pkgnum
+                                           AND pkg_svc.svcpart=temp1_$$.svcpart)
+                    WHERE ( pkg_svc.quantity > temp1_$$.count
+                            OR temp1_$$.pkgnum IS NULL )
+                          AND pkg_svc.quantity != 0;";
+      $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";   
+      $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
+      $qual = " LEFT JOIN temp2_$$ ON cust_pkg.pkgnum = temp2_$$.pkgnum
+                  WHERE temp2_$$.pkgnum IS NOT NULL";
+
+    } else {
+
+     $qual = "
+       WHERE 0 <
+         ( SELECT count(*) FROM pkg_svc
+             WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
+               AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
+                                        WHERE cust_svc.pkgnum = cust_pkg.pkgnum
+                                          AND cust_svc.svcpart = pkg_svc.svcpart
+                                      )
+         )
+     ";
+
+    }
     
   } else {
     die "Empty or unknown QUERY_STRING!";
   }
+  
+  my $statement = "SELECT COUNT(*) FROM cust_pkg $qual";
+  my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
+  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+  
+  $total = $sth->fetchrow_arrayref->[0];
+
+  my $tblname = driver_name eq 'mysql' ? 'cust_pkg.' : '';
+  @cust_pkg =
+    qsearch('cust_pkg',{}, '', "$qual ORDER BY ${tblname}pkgnum $limit" );
+
+  if ( driver_name eq 'mysql' ) {
+    $query = "DROP TABLE temp1_$$,temp2_$$;";
+    my $sth = dbh->prepare($query) or die dbh->errstr. " doing $query";
+    $sth->execute; # or die "Error executing \"$query\": ". $sth->errstr;
+  }
+  
+}
+
+if ( scalar(@cust_pkg) == 1 ) {
+  print $cgi->redirect("${p}view/cust_main.cgi?". $cust_pkg[0]->custnum.
+                       "#cust_pkg". $cust_pkg[0]->pkgnum );
+  #exit;
+} elsif ( scalar(@cust_pkg) == 0 ) { #error
+%>
+<!-- mason kludge -->
+<%
+  eidiot("No packages found");
+} else {
+%>
+<!-- mason kludge -->
+<%
+  $total ||= scalar(@cust_pkg);
+
+  #begin pager
+  my $pager = '';
+  if ( $total != scalar(@cust_pkg) && $maxrecords ) {
+    unless ( $offset == 0 ) {
+      $cgi->param('offset', $offset - $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
+    }
+    my $poff;
+    my $page;
+    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
+      $page++;
+      if ( $offset == $poff ) {
+        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
+      } else {
+        $cgi->param('offset', $poff);
+        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
+      }
+    }
+    unless ( $offset + $maxrecords > $total ) {
+      $cgi->param('offset', $offset + $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
+    }
+  }
+  #end pager
+  
+  print header('Package Search Results',''),
+        "$total matching packages found<BR><BR>$pager", &table(), <<END;
+      <TR>
+        <TH>Package</TH>
+        <TH><FONT SIZE=-1>Setup</FONT></TH>
+END
+
+  print '<TH><FONT SIZE=-1>Last<BR>bill</FONT></TH>'
+    if defined dbdef->table('cust_pkg')->column('last_bill');
+
+  print <<END;
+        <TH><FONT SIZE=-1>Next<BR>bill</FONT></TH>
+        <TH><FONT SIZE=-1>Susp.</FONT></TH>
+        <TH><FONT SIZE=-1>Expire</FONT></TH>
+        <TH><FONT SIZE=-1>Cancel</FONT></TH>
+        <TH><FONT SIZE=-1>Cust#</FONT></TH>
+        <TH>(bill) name</TH>
+        <TH>company</TH>
+END
+
+  print '<TH>(service) name</TH><TH>company</TH>'
+    if defined dbdef->table('cust_main')->column('ship_last');
+
+  print '<TH COLSPAN=2>Services</TH></TR>';
+
+  my $n1 = '<TR>';
+  my(%saw,$cust_pkg);
+  foreach $cust_pkg (
+    sort $sortby grep(!$saw{$_->pkgnum}++, @cust_pkg)
+  ) {
+    my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
+    my($pkgnum, $setup, $bill, $susp, $expire, $cancel,
+       $custnum, $last, $first, $company ) = (
+      $cust_pkg->pkgnum,
+      $cust_pkg->getfield('setup')
+        ? time2str("%D", $cust_pkg->getfield('setup') )
+        : '',
+      $cust_pkg->getfield('bill')
+        ? time2str("%D", $cust_pkg->getfield('bill') )
+        : '',
+      $cust_pkg->getfield('susp')
+        ? time2str("%D", $cust_pkg->getfield('susp') )
+        : '',
+      $cust_pkg->getfield('expire')
+        ? time2str("%D", $cust_pkg->getfield('expire') )
+        : '',
+      $cust_pkg->getfield('cancel')
+        ? time2str("%D", $cust_pkg->getfield('cancel') )
+        : '',
+      $cust_pkg->custnum,
+      $cust_main ? $cust_main->last : '',
+      $cust_main ? $cust_main->first : '',
+      $cust_main ? $cust_main->company : '',
+    );
+
+    my $last_bill = $cust_pkg->getfield('last_bill')
+                      ? time2str("%D", $cust_pkg->getfield('last_bill') )
+                      : ''
+      if defined dbdef->table('cust_pkg')->column('last_bill');
+
+    my($ship_last, $ship_first, $ship_company);
+    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+      ($ship_last, $ship_first, $ship_company) = (
+        $cust_main
+          ? ( $cust_main->ship_last || $cust_main->getfield('last') )
+          : '',
+        $cust_main 
+          ? ( $cust_main->ship_last
+              ? $cust_main->ship_first
+              : $cust_main->first )
+          : '',
+        $cust_main 
+          ? ( $cust_main->ship_last
+              ? $cust_main->ship_company
+              : $cust_main->company )
+          : '',
+      );
+    }
+    my $pkg = $part_pkg{$cust_pkg->pkgpart}->pkg;
+    #$pkg .= ' - '. $part_pkg{$cust_pkg->pkgpart}->comment;
+    my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
+    my $rowspan = scalar(@cust_svc) || 1;
+    my $p = popurl(2);
+    print $n1, <<END;
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_main.cgi?$custnum#cust_pkg$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
+      <TD ROWSPAN=$rowspan>$setup</TD>
+END
+
+    print "<TD ROWSPAN=$rowspan>$last_bill</TD>"
+      if defined dbdef->table('cust_pkg')->column('last_bill');
+
+    print <<END;
+      <TD ROWSPAN=$rowspan>$bill</TD>
+      <TD ROWSPAN=$rowspan>$susp</TD>
+      <TD ROWSPAN=$rowspan>$expire</TD>
+      <TD ROWSPAN=$rowspan>$cancel</TD>
+END
+    if ( $cust_main ) {
+      print <<END;
+      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$custnum</A></FONT></TD>
+      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$last, $first</A></FONT></TD>
+      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$company</A></FONT></TD>
+END
+      if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+        print <<END;
+      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$ship_last, $ship_first</A></FONT></TD>
+      <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$ship_company</A></FONT></TD>
+END
+      }
+    } else {
+      my $colspan = defined dbdef->table('cust_main')->column('ship_last')
+                    ? 5 : 3;
+      print <<END;
+      <TD ROWSPAN=$rowspan COLSPAN=$colspan>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
+END
+    }
+
+    my $n2 = '';
+    foreach my $cust_svc ( @cust_svc ) {
+      my($label, $value, $svcdb) = $cust_svc->label;
+      my $svcnum = $cust_svc->svcnum;
+      my $sview = $p. "view";
+      print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
+            qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+      $n2="</TR><TR>";
+    }
+
+    $n1 = "</TR><TR>";
+
+  }
+    print '</TR>';
+ 
+  print "</TABLE>$pager</BODY></HTML>";
+
+}
 
+sub pkgnum_sort {
+  $a->getfield('pkgnum') <=> $b->getfield('pkgnum');
 }
 
-my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';
-
-my $count_query = "SELECT COUNT(*) FROM cust_pkg $cjoin $extra_sql";
-
-my $sql_query = {
-  'table'     => 'cust_pkg',
-  'hashref'   => {},
-  'select'    => join(', ',
-                            'cust_pkg.*',
-                            'cust_main.custnum as cust_main_custnum',
-                            FS::UI::Web::cust_sql_fields(),
-                 ),
-  'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => ' LEFT JOIN cust_main USING ( custnum ) ',
-                 #' LEFT JOIN part_pkg  USING ( pkgpart ) '
-};
-
-my $link = sub {
-  [ "${p}view/cust_main.cgi?".shift->custnum.'#cust_pkg', 'pkgnum' ];
-};
-
-my $clink = sub {
-  my $cust_pkg = shift;
-  $cust_pkg->cust_main_custnum
-    ? [ "${p}view/cust_main.cgi?", 'custnum' ] 
-    : '';
-};
-
-#if ( scalar(@cust_pkg) == 1 ) {
-#  print $cgi->redirect("${p}view/cust_main.cgi?". $cust_pkg[0]->custnum.
-#                       "#cust_pkg". $cust_pkg[0]->pkgnum );
-
-#    my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
-#    my $rowspan = scalar(@cust_svc) || 1;
-
-#    my $n2 = '';
-#    foreach my $cust_svc ( @cust_svc ) {
-#      my($label, $value, $svcdb) = $cust_svc->label;
-#      my $svcnum = $cust_svc->svcnum;
-#      my $sview = $p. "view";
-#      print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-#            qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
-#      $n2="</TR><TR>";
-#    }
-
-sub time_or_blank {
-   my $column = shift;
-   return sub {
-     my $record = shift;
-     my $value = $record->get($column); #mmm closures
-     $value ? time2str('%b %d %Y', $value ) : '';
-   };
+sub bill_sort {
+  $a->getfield('bill') <=> $b->getfield('bill');
 }
 
-%><%=  include( 'elements/search.html',
-                  'title'       => 'Package Search Results', 
-                  'name'        => 'packages',
-                  'query'       => $sql_query,
-                  'count_query' => $count_query,
-                  'redirect'    => $link,
-                  'header'      => [ '#',
-                                     'Package',
-                                     'Status',
-                                     'Freq.',
-                                     'Setup',
-                                     'Last bill',
-                                     'Next bill',
-                                     'Susp.',
-                                     'Expire',
-                                     'Cancel',
-                                     FS::UI::Web::cust_header(),
-                                     'Services',
-                                   ],
-                  'fields'      => [
-                    'pkgnum',
-                    sub { my $part_pkg = $part_pkg{shift->pkgpart};
-                          $part_pkg->pkg; # ' - '. $part_pkg->comment;
-                        },
-                    sub { ucfirst(shift->status); },
-                    sub { #shift->part_pkg->freq_pretty;
-                          my $part_pkg = $part_pkg{shift->pkgpart};
-                          $part_pkg->freq_pretty;
-                        },
-
-                    #sub { time2str('%b %d %Y', shift->setup); },
-                    #sub { time2str('%b %d %Y', shift->last_bill); },
-                    #sub { time2str('%b %d %Y', shift->bill); },
-                    #sub { time2str('%b %d %Y', shift->susp); },
-                    #sub { time2str('%b %d %Y', shift->expire); },
-                    #sub { time2str('%b %d %Y', shift->get('cancel')); },
-                    ( map { time_or_blank($_) }
-                          qw( setup last_bill bill susp expire cancel ) ),
-
-                    \&FS::UI::Web::cust_fields,
-                    #sub { '<table border=0 cellspacing=0 cellpadding=0 STYLE="border:none">'.
-                    #      join('', map { '<tr><td align="right" style="border:none">'. $_->[0].
-                    #                     ':</td><td style="border:none">'. $_->[1]. '</td></tr>' }
-                    #                   shift->labels
-                    #          ).
-                    #      '</table>';
-                    #    },
-                    sub {
-                          [ map {
-                                  [ 
-                                    { 'data' => $_->[0]. ':',
-                                      'align'=> 'right',
-                                    },
-                                    { 'data' => $_->[1],
-                                      'align'=> 'left',
-                                      'link' => $p. 'view/' .
-                                                $_->[2]. '.cgi?'. $_->[3],
-                                    },
-                                  ];
-                                } shift->labels
-                          ];
-                        },
-                  ],
-                  'color' => [
-                    '',
-                    '',
-                    sub { shift->statuscolor; },
-                    '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    ( map { '' } FS::UI::Web::cust_header() ),
-                    '',
-                  ],
-                  'style' => [ '', '', 'b' ],
-                  'size'  => [ '', '', '-1', ],
-                  'align' => 'rlclrrrrrr',
-                  'links' => [
-                    $link,
-                    $link,
-                    '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    ( map { $clink } FS::UI::Web::cust_header() ),
-                    '',
-                  ],
-              )
 %>
diff --git a/httemplate/search/cust_pkg_report.cgi b/httemplate/search/cust_pkg_report.cgi
index 412c3f7..b316745 100755
--- a/httemplate/search/cust_pkg_report.cgi
+++ b/httemplate/search/cust_pkg_report.cgi
@@ -1,18 +1,58 @@
 <HTML>
   <HEAD>
     <TITLE>Packages</TITLE>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
   <BODY BGCOLOR="#e8e8e8">
     <H1>Packages</H1>
-    <FORM ACTION="cust_pkg.cgi" METHOD="GET">
+    <FORM ACTION="cust_pkg.cgi" METHOD="post">
     <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
       Return packages with next bill date:<BR><BR>
       <TABLE>
-        <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-        <%= include( '/elements/tr-select-agent.html',
-                       $cgi->param('agentnum'),
-                   )
-        %>
+        <TR>
+          <TD ALIGN="right">From: </TD>
+          <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+        </TR>
+        <TR>
+          <TD ALIGN="right">To: </TD>
+          <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+        </TR>
+<% my %agent_search = dbdef->table('agent')->column('disabled')
+                        ? ( 'disabled' => '' ) : ();
+   my @agents = qsearch( 'agent', \%agent_search );
+   if ( scalar(@agents) == 1 ) {
+%>
+     <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agents[0]->agentnum %>">
+<% } else { %>
+
+        <TR>
+          <TD ALIGN="right">Agent: </TD>
+          <TD><SELECT NAME="agentnum"><OPTION VALUE="">(all)
+          <% foreach my $agent ( sort { $a->agent cmp $b->agent; } @agents) { %>
+            <OPTION VALUE="<%= $agent->agentnum %>"><%= $agent->agent %>
+          <% } %>
+          </TD>
+        </TR>
+<% } %>
       </TABLE>
       <BR><INPUT TYPE="submit" VALUE="Get Report">
 
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index d19fb4a..566ea83 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -1,7 +1,6 @@
 <%
 
   my(%opt) = @_;
-  #warn join(' / ', map { "$_ => $opt{$_}" } keys %opt ). "\n";
 
   my %align = (
     'l' => 'left',
@@ -13,39 +12,31 @@
   $opt{align} = [ map $align{$_}, split(//, $opt{align}) ],
     unless !$opt{align} || ref($opt{align});
 
-  my $type = '';
-  my $limit = '';
-  my($maxrecords, $total, $offset, $count_arrayref);
-
-  if ( $cgi->param('_type') =~ /^(csv|\w*\.xls)$/ ) {
-  
-    $type = $1;
-
-  } else { #setup some pagination things if we're in html mode
+  if ( ref($opt{'query'}) ) {
 
-    unless (exists($opt{'count_query'}) && length($opt{'count_query'})) {
-      ( $opt{'count_query'} = $opt{'query'} ) =~
-        s/^\s*SELECT\s*(.*?)\s+FROM\s/SELECT COUNT(*) FROM /i;
-    }
+  }
 
-    my $conf = new FS::Conf;
-    $maxrecords = $conf->config('maxsearchrecordsperpage');
+  unless (exists($opt{'count_query'}) && length($opt{'count_query'})) {
+    ( $opt{'count_query'} = $opt{'query'} ) =~
+      s/^\s*SELECT\s*(.*?)\s+FROM\s/SELECT COUNT(*) FROM /i;
+  }
 
-    $limit = $maxrecords ? "LIMIT $maxrecords" : '';
+  my $conf = new FS::Conf;
+  my $maxrecords = $conf->config('maxsearchrecordsperpage');
 
-    $offset = $cgi->param('offset') || 0;
-    $limit .= " OFFSET $offset" if $offset;
+  my $limit = $maxrecords ? "LIMIT $maxrecords" : '';
 
-    my $count_sth = dbh->prepare($opt{'count_query'})
-      or die "Error preparing $opt{'count_query'}: ". dbh->errstr;
-    $count_sth->execute
-      or die "Error executing $opt{'count_query'}: ". $count_sth->errstr;
-    $count_arrayref = $count_sth->fetchrow_arrayref;
-    $total = $count_arrayref->[0];
+  my $offset = $cgi->param('offset') || 0;
+  $limit .= " OFFSET $offset" if $offset;
 
-  }
+  my $count_sth = dbh->prepare($opt{'count_query'})
+    or die "Error preparing $opt{'count_query'}: ". dbh->errstr;
+  $count_sth->execute
+    or die "Error executing $opt{'count_query'}: ". $count_sth->errstr;
+  my $count_arrayref = $count_sth->fetchrow_arrayref;
+  my $total = $count_arrayref->[0];
 
-  # run the query
+  #warn join(' / ', map { "$_ => $opt{$_}" } keys %opt ). "\n";
 
   my $header = $opt{'header'};
   my $rows;
@@ -56,8 +47,6 @@
       $opt{'query'}->{'hashref'} || {}, 
       $opt{'query'}->{'select'},
       $opt{'query'}->{'extra_sql'}. " $limit",
-      '',
-      (exists($opt{'query'}->{'addl_from'}) ? $opt{'query'}->{'addl_from'} : '')
     ) ];
   } else {
     my $sth = dbh->prepare("$opt{'query'} $limit")
@@ -71,322 +60,80 @@
     $header ||= $sth->{NAME};
   }
 
-  if ( $type eq 'csv' ) {
-
-    #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
-    http_header('Content-Type' => 'text/plain' );
-
-    my $csv = new Text::CSV_XS { 'always_quote' => 1,
-                                 'eol'          => "\n", #"\015\012", #"\012"
-                               };
-
-    $csv->combine(@$header); #or die $csv->status;
-    %><%= $csv->string %><%
-
-    foreach my $row ( @$rows ) {
-
-      if ( $opt{'fields'} ) {
-
-        my @line = ();
-
-        foreach my $field ( @{$opt{'fields'}} ) {
-          if ( ref($field) eq 'CODE' ) {
-            push @line, map {
-                              ref($_) eq 'ARRAY'
-                                ? '(N/A)' #unimplemented
-                                : $_;
-                            }
-                            &{$field}($row);
-          } else {
-            push @line, $row->$field();
-          }
-        }
-
-        $csv->combine(@line); #or die $csv->status;
-
-      } else {
-        $csv->combine(@$row); #or die $csv->status;
-      }
-
-      %><%= $csv->string %><%
-
-    }
-
-  #} elsif ( $type eq 'excel' ) {
-  } elsif ( $type =~ /\.xls$/ ) {
-
-    #http_header('Content-Type' => 'application/excel' ); #eww
-    http_header('Content-Type' => 'application/vnd.ms-excel' );
-    #http_header('Content-Type' => 'application/msexcel' ); #alas
-
-    my $data = '';
-    my $XLS = new IO::Scalar \$data;
-    my $workbook = Spreadsheet::WriteExcel->new($XLS)
-      or die "Error opening .xls file: $!";
-
-    my $worksheet = $workbook->add_worksheet(substr($opt{'title'},0,31));
-
-    my($r,$c) = (0,0);
-
-    $worksheet->write($r, $c++, $_) foreach @$header;
-
-    foreach my $row ( @$rows ) {
-      $r++;
-      $c = 0;
-
-      if ( $opt{'fields'} ) {
-
-        #my $links = $opt{'links'} ? [ @{$opt{'links'}} ] : '';
-        #my $aligns = $opt{'align'} ? [ @{$opt{'align'}} ] : '';
-
-        foreach my $field ( @{$opt{'fields'}} ) {
-          #my $align = $aligns ? shift @$aligns : '';
-          #$align = " ALIGN=$align" if $align;
-          #my $a = '';
-          #if ( $links ) {
-          #  my $link = shift @$links;
-          #  $link = &{$link}($row) if ref($link) eq 'CODE';
-          #  if ( $link ) {
-          #    my( $url, $method ) = @{$link};
-          #    if ( ref($method) eq 'CODE' ) {
-          #      $a = $url. &{$method}($row);
-          #    } else {
-          #      $a = $url. $row->$method();
-          #    }
-          #    $a = qq(<A HREF="$a">);
-          #  }
-          #}
-          if ( ref($field) eq 'CODE' ) {
-            foreach my $value ( &{$field}($row) ) {
-              if ( ref($value) eq 'ARRAY' ) { 
-                $worksheet->write($r, $c++, '(N/A)' ); #unimplemented
-              } else {
-                $worksheet->write($r, $c++, $value );
-              }
-            }
-          } else {
-            $worksheet->write($r, $c++, $row->$field() );
-          }
-        }
-
-      } else {
-        $worksheet->write($r, $c++, $_) foreach @$row;
-      }
-
-    }
-
-    $workbook->close();# or die "Error creating .xls file: $!";
-
-    http_header('Content-Length' => length($data) );
-    %><%= $data %><%
-
-  } else { # regular HTML
-
-    if ( exists($opt{'redirect'}) && scalar(@$rows) == 1 && $total == 1 ) {
-      my $redirect = $opt{'redirect'};
-      $redirect = &{$redirect}($rows->[0]) if ref($redirect) eq 'CODE';
-      my( $url, $method ) = @$redirect;
-      redirect( $url. $rows->[0]->$method() );
-    } else {
-      ( my $xlsname = $opt{'name'} ) =~ s/\W//g;
-      $opt{'name'} =~ s/s$// if $total == 1;
-
-      my @menubar = ();
-      if ( $opt{'menubar'} ) {
-        @menubar = @{ $opt{'menubar'} };
-      } else {
-        @menubar = ( 'Main menu' => $p );
-      }
-  %>
-  <%= include( '/elements/header.html', $opt{'title'},
-                 include( '/elements/menubar.html', @menubar )
-             )
-  %>
-  <%= defined($opt{'html_init'}) ? $opt{'html_init'} : '' %>
-  <% my $pager = include ( '/elements/pager.html',
-                             'offset'     => $offset,
-                             'num_rows'   => scalar(@$rows),
-                             'total'      => $total,
-                             'maxrecords' => $maxrecords,
-                         );
-  %>
-  <% unless ( $total ) { %>
-    No matching <%= $opt{'name'} %> found.<BR>
-  <% } else { %>
-  
-    <TABLE>
-      <TR>
-        <TD VALIGN="bottom">
-          <%= $total %> total <%= $opt{'name'} %><BR>
-          <% if ( $opt{'count_addl'} ) { %>
-            <% my $n=0; foreach my $count ( @{$opt{'count_addl'}} ) { %>
-              <%= sprintf( $count, $count_arrayref->[++$n] ) %><BR>
-            <% } %>
-          <% } %>
-        </TD>
-        <TD ALIGN="right">
-          <% $cgi->param('_type', "$xlsname.xls" ); %>
-          Download full results<BR>
-          as <A HREF="<%= $cgi->self_url %>">Excel spreadsheet</A><BR>
-          <% $cgi->param('_type', 'csv'); %>
-          as <A HREF="<%= $cgi->self_url %>">CSV file</A>
-        </TD>
-      </TR>
-      <TR>
-        <TD COLSPAN=2>
-            <%= $pager %>
-
-            <%= include('/elements/table-grid.html') %>
-
-              <TR>
-              <% foreach my $header ( @$header ) { %>
-                   <TH CLASS="grid" BGCOLOR="#cccccc"><%= $header %></TH>
-              <% } %>
-              </TR>
-              <% my $bgcolor1 = '#eeeeee';
-                 my $bgcolor2 = '#ffffff';
-                 my $bgcolor;
-                 foreach my $row ( @$rows ) {
-                   if ( $bgcolor eq $bgcolor1 ) {
-                     $bgcolor = $bgcolor2;
-                   } else {
-                     $bgcolor = $bgcolor1;
-                   }
-              %>
-                   <TR>
-                   <% if ( $opt{'fields'} ) {
-
-                        my $links  = $opt{'links'} ? [ @{$opt{'links'}} ] : '';
-                        my $aligns = $opt{'align'} ? [ @{$opt{'align'}} ] : '';
-                        my $colors = $opt{'color'} ? [ @{$opt{'color'}} ] : [];
-                        my $sizes  = $opt{'size'}  ? [ @{$opt{'size'}}  ] : [];
-                        my $styles = $opt{'style'} ? [ @{$opt{'style'}} ] : [];
-
-                        foreach my $field (
-
-                          map {
-                                if ( ref($_) eq 'ARRAY' ) {
-
-                                  my $tableref = $_;
-
-                                  '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0'.
-                                  ' STYLE="border:none">'.
-
-                                  join('', map {
-
-                                    my $rowref = $_;
-
-                                    '<tr>'.
-
-                                    join('', map {
-
-                                      my $element = $_;
-
-                                      '<TD STYLE="border:none"'.
-                                      ( $element->{'align'}
-                                          ? ' ALIGN="'. $element->{'align'}. '"'
-                                          : ''
-                                      ). '>'.
-                                      ( $element->{'link'}
-                                          ? '<A HREF="'. $element->{'link'}.'">'
-                                          : ''
-                                      ).
-                                      $element->{'data'}.
-                                      ( $element->{'link'}
-                                          ? '</A>'
-                                          : ''
-                                      ).
-                                      '</td>';
-
-                                    } @$rowref ).
-
-                                    '</tr>';
-                                  } @$tableref ).
-
-                                  '</table>';
-
-                                } else {
-                                  $_;
-                                }
-                              }
-
-                          map {
-                                if ( ref($_) eq 'CODE' ) {
-                                  &{$_}($row);
-                                } else {
-                                  $row->$_();
-                                }
-                              }
-                          @{$opt{'fields'}}
-
-                        ) {
-
-                          my $align = $aligns ? shift @$aligns : '';
-                          $align = " ALIGN=$align" if $align;
-
-                          my $a = '';
-                          if ( $links ) {
-                            my $link = shift @$links;
-                            $link = &{$link}($row) if ref($link) eq 'CODE';
-                            if ( $link ) {
-                              my( $url, $method ) = @{$link};
-                              if ( ref($method) eq 'CODE' ) {
-                                $a = $url. &{$method}($row);
-                              } else {
-                                $a = $url. $row->$method();
-                              }
-                              $a = qq(<A HREF="$a">);
-                            }
-                          }
-
-                          my $font = '';
-                          my $color = shift @$colors;
-                          $color = &{$color}($row) if ref($color) eq 'CODE';
-                          my $size = shift @$sizes;
-                          $size = &{$size}($row) if ref($size) eq 'CODE';
-                          if ( $color || $size ) {
-                            $font = '<FONT '.
-                                    ( $color ? "COLOR=#$color "   : '' ).
-                                    ( $size  ? qq(SIZE="$size" )  : '' ).
-                                    '>';
-                          }
-
-                          my($s, $es) = ( '', '' );
-                          my $style = shift @$styles;
-                          $style = &{$style}($row) if ref($style) eq 'CODE';
-                          if ( $style ) {
-                            $s = join( '', map "<$_>", split('', $style) );
-                            $es = join( '', map "</$_>", split('', $style) );
-                          }
-
-                       %>
-                       <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"<%= $align %>><%= $font %><%= $a %><%= $s %><%= $field %><%= $es %><%= $a ? '</A>' : '' %><%= $font ? '</FONT>' : '' %></TD>
-                     <% } %>
-                   <% } else { %>
-                     <% foreach ( @$row ) { %>
-                          <TD CLASS="grid" BGCOLOR="$bgcolor"><%= $_ %></TD>
-                     <% } %>
-                   <% } %>
-                   </TR>
-              <% } %>
-
-              <% if ( $opt{'footer'} ) { %>
-                <TR>
-                <% foreach my $footer ( @{ $opt{'footer'} } ) { %>
-                     <TD CLASS="grid" BGCOLOR="#dddddd" STYLE="border-top: dashed 1px black;"><i><%= $footer %></i></TH>
-                <% } %>
-                </TR>
-              <% } %>
-            
-            </TABLE>
-            <%= $pager %>
-  
-          </TD>
-        </TR>
-      </TABLE>
-  
-  <% } %>
-  </BODY>
-  </HTML>
+  if ( exists($opt{'redirect'}) && scalar(@$rows) == 1 && $total == 1 ) {
+    my( $url, $method ) = @{$opt{'redirect'}};
+    redirect( $url. $rows->[0]->$method() );
+  } else {
+    $opt{'name'} =~ s/s$// if $total == 1;
+%>
+<%= include( '/elements/header.html', $opt{'title'},
+               include( '/elements/menubar.html', 'Main menu' => $p )
+           )
+%>
+<% my $pager = include ( '/elements/pager.html',
+                           'offset'     => $offset,
+                           'num_rows'   => scalar(@$rows),
+                           'total'      => $total,
+                           'maxrecords' => $maxrecords,
+                       );
+%>
+<% unless ( $total ) { %>
+  No matching <%= $opt{'name'} %> found.<BR>
+<% } else { %>
+  <%= $total %> total <%= $opt{'name'} %><BR>
+  <% if ( $opt{'count_addl'} ) { %>
+    <% my $n=0; foreach my $count ( @{$opt{'count_addl'}} ) { %>
+      <%= sprintf( $count, $count_arrayref->[++$n] ) %><BR>
+    <% } %>
   <% } %>
+  <BR><%= $pager %>
+  <%= include( '/elements/table.html' ) %>
+    <TR>
+    <% foreach my $header ( @$header ) { %>
+         <TH><%= $header %></TH>
+    <% } %>
+    </TR>
+    <% foreach my $row ( @$rows ) { %>
+         <TR>
+         <% if ( $opt{'fields'} ) {
+              my $links = $opt{'links'} ? [ @{$opt{'links'}} ] : '';
+              my $aligns = $opt{'align'} ? [ @{$opt{'align'}} ] : '';
+              foreach my $field ( @{$opt{'fields'}} ) {
+                my $align = $aligns ? shift @$aligns : '';
+                $align = " ALIGN=$align" if $align;
+                my $a = '';
+                if ( $links ) {
+                  my $link = shift @$links;
+                  $link = &{$link}($row) if ref($link) eq 'CODE';
+                  if ( $link ) {
+                    my( $url, $method ) = @{$link};
+                    if ( ref($method) eq 'CODE' ) {
+                      $a = $url. &{$method}($row);
+                    } else {
+                      $a = $url. $row->$method();
+                    }
+                    $a = qq(<A HREF="$a">);
+                  }
+                }
+             %>
+             <% if ( ref($field) eq 'CODE' ) { %>
+               <TD<%= $align %>><%= $a %><%= &{$field}($row) %><%= $a ? '</A>' : '' %></TD>
+             <% } else { %>
+               <TD<%= $align %>><%= $a %><%= $row->$field() %><%= $a ? '</A>' : '' %></TD>
+             <% } %>
+           <% } %>
+         <% } else { %>
+           <% foreach ( @$row ) { %>
+                <TD><%= $_ %></TD>
+           <% } %>
+         <% } %>
+         </TR>
+    <% } %>
+  
+  </TABLE>
+  <%= $pager %>
 <% } %>
+</BODY>
+</HTML>
+<% } %>
+
diff --git a/httemplate/search/prepay_credit.html b/httemplate/search/prepay_credit.html
deleted file mode 100644
index 8c8f57b..0000000
--- a/httemplate/search/prepay_credit.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-my $agent = '';
-my $hashref = {};
-if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-  $hashref->{agentnum} = $1;
-  $agent = qsearchs('agent', { 'agentnum' => $1 } );
-}
-
-my $count_query = 'SELECT COUNT(*) FROM prepay_credit';
-$count_query .= ' WHERE agentnum = '. $agent->agentnum if $agent;
-
-%><%= include( 'elements/search.html',
-                 'title'       => 'Unused Prepaid Cards'.
-                                  ($agent ? ' for '. $agent->agent : ''),
-                 'menubar'     => [
-                   'Main menu'      => $p,
-                   'Generate cards' => $p.'edit/prepay_credit.cgi',
-                 ],
-                 'name'        => 'prepaid cards',
-                 'query'       => {  'table'   => 'prepay_credit',
-                                     'hashref' => $hashref,
-                                  },
-                 'count_query' => $count_query,
-                 #'redirect'    => $link,
-                 'header'      => [ '#', qw(Amount Time Agent) ],
-                 'fields'      => [
-                   'identifier',
-                   sub { sprintf('$%.2f', shift->amount ) },
-                   sub { my $c = shift; $c ? duration_exact($c->seconds) : '' },
-                   sub { my $agent = shift->agent;
-                         $agent ? $agent->agent : '';
-                       },
-                 ],
-                 'links' => [
-                   '',
-                   '',
-                   '',
-                   sub { my $agent = shift->agent;
-                         $agent ? [ "${p}view/agent.cgi?", 'agentnum' ] : '';
-                       },
-                 ],
-      )
-%>
diff --git a/httemplate/search/reg_code.html b/httemplate/search/reg_code.html
deleted file mode 100644
index 52a99ff..0000000
--- a/httemplate/search/reg_code.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<%
-
-my $agentnum = $cgi->param('agentnum');
-$agentnum =~ /^(\d+)$/ or eidiot "illegal agentnum $agentnum";
-$agentnum = $1;
-my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
-
-my $count_query = "SELECT COUNT(*) FROM reg_code WHERE agentnum = $agentnum";
-
-%><%= include( 'elements/search.html',
-                 'title'       => 'Unused Registration Codes for '.
-                                  $agent->agent,
-                 'name'        => 'registration codes',
-                 'query'       => {  'table'   => 'reg_code',
-                                     'hashref' => { 'agentnum' => $agentnum, },
-                                  },
-                 'count_query' => $count_query,
-                 #'redirect'    => $link,
-                 'header'      => [ qw(Code Packages) ],
-                 'fields'      => [
-                   'code',
-                   sub {
-                     map { 
-                       qq!<A HREF="${p}edit/part_pkg.cgi?!. $_->pkgpart. '">'.
-                       $_->pkg. ' - '. $_->comment.
-                       '</A><BR>'
-                     } $_[0]->part_pkg
-                   },
-                 ],
-                 'links' => [
-                   '',
-                   #$plink,
-                   '',
-                 ],
-      )
-%>
diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html
deleted file mode 100644
index a7be766..0000000
--- a/httemplate/search/report_cust_bill.html
+++ /dev/null
@@ -1,28 +0,0 @@
-  <HEAD>
-    <TITLE>Invoice report criteria</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Invoice report criteria</H1>
-    <FORM ACTION="cust_bill.html" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
-    <TABLE>
-      <%= include( '/elements/tr-select-agent.html',
-                     $cgi->param('agentnum'),
-                     'label' => 'Invoices for agent: ',
-                 )
-      %>
-      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-      <TR>
-        <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
-        <TD>Show only open invoices</TD>
-      </TR>
-      <TR>
-        <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD>
-        <TD>Show only the single most recent invoice per-customer</TD>
-      </TR>
-    </TABLE>
-    <BR><INPUT TYPE="submit" VALUE="Get Report">
-    </FORM>
-  </BODY>
-</HTML>
-
diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index 56bbd0a..ceffca7 100644
--- a/httemplate/search/report_cust_credit.html
+++ b/httemplate/search/report_cust_credit.html
@@ -1,10 +1,14 @@
 <HTML>
   <HEAD>
     <TITLE>Credit report criteria</TITLE>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
   <BODY BGCOLOR="#e8e8e8">
     <H1>Credit report criteria</H1>
-    <FORM ACTION="cust_credit.html" METHOD="GET">
+    <FORM ACTION="cust_credit.html" METHOD="post">
     <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
     <TABLE>
       <TR>
@@ -23,12 +27,30 @@
             </SELECT>
         </TD>
       </TR>
-      <%= include( '/elements/tr-select-agent.html',
-                     $cgi->param('agentnum'),
-                     'label' => 'for agent: ',
-                 )
-      %>
-      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+      <TR>
+        <TD ALIGN="right">From: </TD>
+        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+      <TR>
+        <TD ALIGN="right">To: </TD>
+        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
     </TABLE>
     <BR><INPUT TYPE="submit" VALUE="Get Report">
     </FORM>
diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html
index 5d8b74e..95198c7 100644
--- a/httemplate/search/report_cust_pay.html
+++ b/httemplate/search/report_cust_pay.html
@@ -1,10 +1,14 @@
 <HTML>
   <HEAD>
     <TITLE>Payment report criteria</TITLE>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
   <BODY BGCOLOR="#e8e8e8">
     <H1>Payment report criteria</H1>
-    <FORM ACTION="cust_pay.cgi" METHOD="GET">
+    <FORM ACTION="cust_pay.cgi" METHOD="post">
     <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
     <TABLE>
       <TR>
@@ -15,22 +19,35 @@
               <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
               <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
               <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
-              <OPTION VALUE="CARD-Maestro">credit card (Maestro/Switch/Solo)</OPTION>
               <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
-              <OPTION VALUE="BILL">check</OPTION>
-              <OPTION VALUE="PREP">prepaid card</OPTION>
-              <OPTION VALUE="CASH">cash</OPTION>
-              <OPTION VALUE="WEST">Western Union</OPTION>
-              <OPTION VALUE="MCRD">manual credit card</OPTION>
+              <OPTION VALUE="BILL">check / cash</OPTION>
             </SELECT>
         </TD>
       </TR>
-      <%= include( '/elements/tr-select-agent.html',
-                     $cgi->param('agentnum'),
-                     'label' => 'for agent: ',
-                 )
-      %>
-      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+      <TR>
+        <TD ALIGN="right">From: </TD>
+        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+      <TR>
+        <TD ALIGN="right">To: </TD>
+        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
     </TABLE>
     <BR><INPUT TYPE="submit" VALUE="Get Report">
     </FORM>
diff --git a/httemplate/search/report_prepaid_income.html b/httemplate/search/report_prepaid_income.html
index 57c318e..e8b6ac4 100644
--- a/httemplate/search/report_prepaid_income.html
+++ b/httemplate/search/report_prepaid_income.html
@@ -8,7 +8,7 @@
   </HEAD>
   <BODY BGCOLOR="#e8e8e8">
     <H1>Prepaid Income (Unearned Revenue) Report</H1>
-    <FORM ACTION="report_prepaid_income.cgi" METHOD="GET">
+    <FORM ACTION="report_prepaid_income.cgi" METHOD="post">
     <TABLE>
       <TR>
         <TD>Prepaid income (unearned revenue) as of </TD>
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index d675346..0e95ad7 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
   my $charged = <<END;
@@ -49,7 +50,7 @@ END
              and cust_main.custnum = cust_bill.custnum
          )
          ,0
-       ) as owed_90_pl,
+       ) as owed_90_plus,
 
        coalesce(
          ( select $charged from cust_bill
@@ -60,8 +61,8 @@ END
 END
 
   my $recurring = <<END;
-        '0' != ( select freq from part_pkg
-                   where cust_pkg.pkgpart = part_pkg.pkgpart )
+        0 < ( select freq from part_pkg
+                where cust_pkg.pkgpart = part_pkg.pkgpart )
 END
 
   my $packages_cols = <<END;
@@ -81,7 +82,9 @@ END
 
 END
 
-  my $where = <<END;
+  my $sql = <<END;
+
+select *, $owed_cols, $packages_cols from cust_main
 where 0 <
   coalesce(
            ( select $charged from cust_bill
@@ -89,144 +92,67 @@ where 0 <
            )
            ,0
          )
+
+order by coalesce(lower(company), ''), lower(last)
+
 END
 
-  my $agentnum = '';
-  if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-    $agentnum = $1;
-    $where .= " AND agentnum = '$agentnum' ";
-  }
-
-  my $count_sql = "select count(*) from cust_main $where";
-
-  my $sql_query = {
-    'table'     => 'cust_main',
-    'hashref'   => {},
-    'select'    => "*, $owed_cols, $packages_cols",
-    'extra_sql' => "$where order by coalesce(lower(company), ''), lower(last)",
-  };
-
-  if ( $agentnum ) {
-    $owed_cols =~
-      s/cust_bill\.custnum/cust_bill.custnum AND cust_main.agentnum = '$agentnum'/g;
-  }
   my $total_sql = "select $owed_cols";
+
+  my $sth = dbh->prepare($sql) or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+
   my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
   $total_sth->execute or die $total_sth->errstr;
-  my $row = $total_sth->fetchrow_hashref();
-
-  my $conf = new FS::Conf;
-  my $money_char = $conf->config('money_char') || '$';
-
-  my $align = join('', map { /#/ ? 'r' : 'l' } FS::UI::Web::cust_header() ).
-             'crrrrr';
-
-  my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
-
-%><%= include( 'elements/search.html',
-                 'title'       => 'Accounts Receivable Aging Summary',
-                 'name'        => 'customers',
-                 'query'       => $sql_query,
-                 'count_query' => $count_sql,
-                 'header'      => [
-                                    FS::UI::Web::cust_header(),
-                                    'Status', # (me)',
-                                    #'Status', # (cust_main)',
-                                    '0-30',
-                                    '30-60',
-                                    '60-90',
-                                    '90+',
-                                    'Total',
-                                  ],
-                 'footer'      => [
-                                    'Total',
-                                    ( map '',
-                                          ( 1 .. 
-                                            scalar(FS::UI::Web::cust_header()-1)
-                                          )
-                                    ),
-                                    '',
-                                    #'',
-                                    sprintf( $money_char.'%.2f',
-                                             $row->{'owed_0_30'} ),
-                                    sprintf( $money_char.'%.2f',
-                                             $row->{'owed_30_60'} ),
-                                    sprintf( $money_char.'%.2f',
-                                             $row->{'owed_60_90'} ),
-                                    sprintf( $money_char.'%.2f',
-                                             $row->{'owed_90_pl'} ),
-                                    sprintf( '<b>'. $money_char.'%.2f'. '</b>',
-                                             $row->{'owed_total'} ),
-                                  ],
-                 'fields'      => [
-                                    \&FS::UI::Web::cust_fields,
-                                    sub {
-                                          my $row = shift;
-                                          my $status = 'Cancelled';
-                                          my $statuscol = 'FF0000';
-                                          if ( $row->uncancelled_pkgs ) {
-                                            $status = 'Suspended';
-                                            $statuscol = 'FF9900';
-                                            if ( $row->active_pkgs ) {
-                                              $status = 'Active';
-                                              $statuscol = '00CC00';
-                                            }
-                                          }
-                                          $status;
-                                        },
-                                    #sub { ucfirst(shift->status) },
-                                    sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_0_30') ) },
-                                    sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_30_60') ) },
-                                    sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_60_90') ) },
-                                    sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_90_pl') ) },
-                                    sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_total') ) },
-                                  ],
-                 'links'       => [
-                                    ( map $clink, FS::UI::Web::cust_header() ),
-                                    '',
-                                    #'',
-                                    '',
-                                    '',
-                                    '',
-                                    '',
-                                    '',
-                                  ],
-                 #'align'       => 'rlccrrrrr',
-                 'align'       => $align,
-                 #'size'        => [ '', '', '-1', '-1', '', '', '', '',  '', ],
-                 #'style'       => [ '', '',  'b',  'b', '', '', '', '', 'b', ],
-                 'size'        => [ ( map '', FS::UI::Web::cust_header() ),
-                                    '-1', '', '', '', '',  '', ],
-                 'style'       => [ ( map '', FS::UI::Web::cust_header() ),
-                                    'b', '', '', '', '', 'b', ],
-                 'color'       => [
-                                    ( map '', FS::UI::Web::cust_header() ),
-                                    sub {  
-                                          my $row = shift;
-                                          my $status = 'Cancelled';
-                                          my $statuscol = 'FF0000';
-                                          if ( $row->uncancelled_pkgs ) {
-                                            $status = 'Suspended';
-                                            $statuscol = 'FF9900';
-                                            if ( $row->active_pkgs ) {
-                                              $status = 'Active';
-                                              $statuscol = '00CC00';
-                                            }
-                                          }
-                                           $statuscol;
-                                        },
-                                    #sub { shift->statuscolor; },
-                                    '',
-                                    '',
-                                    '',
-                                    '',
-                                    '',
-                                  ],
-
-             )
+
+%>
+<%= header('Accounts Receivable Aging Summary', menubar( 'Main Menu'=>$p, ) ) %>
+<%= table() %>
+  <TR>
+    <TH>Customer</TH>
+    <TH>Status</TH>
+    <TH>0-30</TH>
+    <TH>30-60</TH>
+    <TH>60-90</TH>
+    <TH>90+</TH>
+    <TH>Total</TH>
+  </TR>
+<% while ( my $row = $sth->fetchrow_hashref() ) {
+     my $status = 'Cancelled';
+     my $statuscol = 'FF0000';
+     if ( $row->{uncancelled_pkgs} ) {
+       $status = 'Suspended';
+       $statuscol = 'FF9900';
+       if ( $row->{active_pkgs} ) {
+         $status = 'Active';
+         $statuscol = '00CC00';
+       }
+     }
 %>
+  <TR>
+    <TD><A HREF="<%= $p %>view/cust_main.cgi?<%= $row->{'custnum'} %>"><%= $row->{'custnum'} %>:
+        <%= $row->{'company'} ? $row->{'company'}. ' (' : '' %><%= $row->{'last'}. ', '. $row->{'first'} %><%= $row->{'company'} ? ')' : '' %></A>
+    </TD>
+    <TD><B><FONT SIZE=-1 COLOR="#<%= $statuscol %>"><%= $status %></FONT></B></TD>
+    <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_0_30'} ) %></TD>
+    <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_30_60'} ) %></TD>
+    <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_60_90'} ) %></TD>
+    <TD ALIGN="right">$<%= sprintf("%.2f", $row->{'owed_90_plus'} ) %></TD>
+    <TD ALIGN="right"><B>$<%= sprintf("%.2f", $row->{'owed_total'} ) %></B></TD>
+  </TR>
+<% } %>
+<% my $row = $total_sth->fetchrow_hashref(); %>
+  <TR>
+    <TD COLSPAN=6>&nbsp;</TD>
+  </TR>
+  <TR>
+    <TD COLSPAN=2><I>Total</I></TD>
+    <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_0_30'} ) %></TD>
+    <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_30_60'} ) %></TD>
+    <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_60_90'} ) %></TD>
+    <TD ALIGN="right"><I>$<%= sprintf("%.2f", $row->{'owed_90_plus'} ) %></TD>
+    <TD ALIGN="right"><I><B>$<%= sprintf("%.2f", $row->{'owed_total'} ) %></B></I></TD>
+  </TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 9062f06..5876657 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -1,11 +1,15 @@
+<!-- mason kludge -->
 <%
 
-my $conf = new FS::Conf;
-my $money_char = $conf->config('money_char') || '$';
-
 my $user = getotaker;
 
-my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
+my $pbeginning = $1;
+my $beginning = $1 ? str2time($1) : 0;
+
+$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
+my $pending = $1;
+my $ending = ( $1 ? str2time($1) : 4294880896 ) + 86399;
 
 my $from_join_cust = "
   FROM cust_bill_pkg
@@ -20,19 +24,11 @@ my $where = "
   WHERE _date >= $beginning AND _date <= $ending
     AND ( county  = ? OR ? = '' )
     AND ( state   = ? OR ? = '' )
-    AND   country = ?
+    AND ( country = ? )
     AND payby != 'COMP'
 ";
 my @base_param = qw( county county state state country );
 
-my $agentname = '';
-if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-  my $agent = qsearchs('agent', { 'agentnum' => $1 } );
-  die "agent not found" unless $agent;
-  $agentname = $agent->agent;
-  $where .= ' AND agentnum = '. $agent->agentnum;
-}
-
 my $gotcust = "
   WHERE 0 < ( SELECT COUNT(*) FROM cust_main
               WHERE ( cust_main.county  = cust_main_county.county
@@ -47,72 +43,52 @@ my $gotcust = "
 ";
 
 my $monthly_exempt_warning = 0;
-my $taxclass_flag = 0;
-my($total, $tot_taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 );
-my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0 );
+my($total, $exempt, $taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 );
 my $out = 'Out of taxable region(s)';
-my %regions = ();
+my %regions;
 foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
   #warn $r->county. ' '. $r->state. ' '. $r->country. "\n";
 
   my $label = getlabel($r);
   $regions{$label}->{'label'} = $label;
-  $regions{$label}->{'url_param'} = join(';', map "$_=".$r->$_(), qw( county state country ) );
 
   my $fromwhere = $from_join_cust. $join_pkg. $where;
-  my @param = @base_param;
+  my @param = @base_param; 
 
   if ( $r->taxclass ) {
-    $fromwhere .= " AND taxclass = ? ";
+    $fromwhere .= " AND ( taxclass = ?  ) ";
     push @param, 'taxclass';
-    $regions{$label}->{'url_param'} .= ';taxclass='. $r->taxclass
-      if $cgi->param('show_taxclasses');
-    $taxclass_flag = 1;
   }
 
-#  my $label = getlabel($r);
-#  $regions{$label}->{'label'} = $label;
-
   my $nottax = 'pkgnum != 0';
 
-  ## calculate total for this region
-
-  my $t = scalar_sql($r, \@param,
+  my $a = scalar_sql($r, \@param,
     "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere AND $nottax"
   );
-  $total += $t;
-  $regions{$label}->{'total'} += $t;
-
-  ## calculate package-exemption for this region
+  $total += $a;
+  $regions{$label}->{'total'} += $a;
 
   foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i }
                        qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
     my $x = scalar_sql($r, \@param,
       "SELECT SUM($e) $fromwhere AND $nottax"
     );
-    $exempt_pkg += $x;
-    $regions{$label}->{'exempt_pkg'} += $x;
+    $exempt += $x;
+    $regions{$label}->{'exempt'} += $x;
   }
 
-  ## calculate customer-exemption for this region
-
-  my($taxable, $x_cust) = (0, 0);
+  my($t, $x) = (0, 0);
   foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
                        qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
-    $taxable += scalar_sql($r, \@param, 
+    $t += scalar_sql($r, \@param, 
       "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
     );
 
-    $x_cust += scalar_sql($r, \@param, 
+    $x += scalar_sql($r, \@param, 
       "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
     );
   }
 
-  $exempt_cust += $x_cust;
-  $regions{$label}->{'exempt_cust'} += $x_cust;
-
-  ## calculate monthly exemption (texas tax) for this region
-
   my($sday,$smon,$syear) = (localtime($beginning) )[ 3, 4, 5 ];
   $monthly_exempt_warning=1 if $sday != 1 && $beginning;
   $smon++; $syear+=1900;
@@ -121,24 +97,25 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
   my($eday,$emon,$eyear) = (localtime($eending) )[ 3, 4, 5 ];
   $emon++; $eyear+=1900;
 
-  my $x_monthly = scalar_sql($r, [ 'taxnum' ],
+  my $monthly_exemption = scalar_sql($r, [ 'taxnum' ],
     "SELECT SUM(amount) FROM cust_tax_exempt where taxnum = ? ".
     "  AND ( year > $syear OR ( year = $syear and month >= $smon ) )".
     "  AND ( year < $eyear OR ( year = $eyear and month <= $emon ) )"
   );
-  if ( $x_monthly ) {
-    warn $r->taxnum(). ": $x_monthly\n";
-    $taxable -= $x_monthly;
+  #warn $r->taxnum(). ": $monthly_exemption\n";
+  if ( $monthly_exemption ) {
+    $t -= $monthly_exemption;
+    $x += $monthly_exemption;
   }
 
-  $exempt_monthly += $x_monthly;
-  $regions{$label}->{'exempt_monthly'} += $x_monthly;
+  $taxable += $t;
+  $regions{$label}->{'taxable'} += $t;
 
-  $tot_taxable += $taxable;
-  $regions{$label}->{'taxable'} += $taxable;
+  $exempt += $x;
+  $regions{$label}->{'exempt'} += $x;
 
-  $owed += $taxable * ($r->tax/100);
-  $regions{$label}->{'owed'} += $taxable * ($r->tax/100);
+  $owed += $t * ($r->tax/100);
+  $regions{$label}->{'owed'} += $t * ($r->tax/100);
 
   if ( defined($regions{$label}->{'rate'})
        && $regions{$label}->{'rate'} != $r->tax.'%' ) {
@@ -151,7 +128,7 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
 
 my $taxwhere = "$from_join_cust $where";
 my @taxparam = @base_param;
-my %base_regions = ();
+
 #foreach my $label ( keys %regions ) {
 foreach my $r (
   qsearch( 'cust_main_county',
@@ -180,58 +157,30 @@ foreach my $r (
   $tax += $x;
   $regions{$label}->{'tax'} += $x;
 
-  if ( $cgi->param('show_taxclasses') ) {
-    my $base_label = getlabel($r, 'no_taxclass'=>1 );
-    $base_regions{$base_label}->{'label'} = $base_label;
-    $base_regions{$base_label}->{'url_param'} =
-      join(';', map "$_=".$r->$_(), qw( county state country ) );
-    $base_regions{$base_label}->{'tax'} += $x;
-  }
-
 }
 
 #ordering
-my @regions =
-  map $regions{$_},
-  sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
-  keys %regions;
-
-my @base_regions =
-  map $base_regions{$_},
-  sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
-  keys %base_regions;
+my @regions = map $regions{$_},
+              sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
+              keys %regions;
 
 push @regions, {
-  'label'          => 'Total',
-  'url_param'      => '',
-  'total'          => $total,
-  'exempt_cust'    => $exempt_cust,
-  'exempt_pkg'     => $exempt_pkg,
-  'exempt_monthly' => $exempt_monthly,
-  'taxable'        => $tot_taxable,
-  'rate'           => '',
-  'owed'           => $owed,
-  'tax'            => $tax,
+  'label'     => 'Total',
+  'total'     => $total,
+  'exempt'    => $exempt,
+  'taxable'   => $taxable,
+  'rate'      => '',
+  'owed'      => $owed,
+  'tax'       => $tax,
 };
 
 #-- 
 
 sub getlabel {
   my $r = shift;
-  my %opt = @_;
 
   my $label;
-  if (
-    $r->tax == 0 
-    && ! scalar( qsearch('cust_main_county', { 'state'   => $r->state,
-                                               'county'  => $r->county,
-                                               'country' => $r->country,
-                                               'tax' => { op=>'>', value=>0 },
-                                             }
-                        )
-               )
-
-  ) {
+  if ( $r->tax == 0 ) {
     #kludge to avoid "will not stay shared" warning
     my $out = 'Out of taxable region(s)';
     $label = $out;
@@ -243,10 +192,6 @@ sub getlabel {
     $label = $r->country;
     $label = $r->state.", $label" if $r->state;
     $label = $r->county." county, $label" if $r->county;
-    $label = "$label (". $r->taxclass. ")"
-      if $r->taxclass
-      && $cgi->param('show_taxclasses')
-      && ! $opt{'no_taxclasses'};
     #$label = $r->taxname. " ($label)" if $r->taxname;
   }
   return $label;
@@ -265,159 +210,35 @@ sub scalar_sql {
 
 %>
 
-<%
-
-my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
-
-%>
-
-
-<%= header( "$agentname Sales Tax Report - ".
-              time2str('%h %o %Y through ', $beginning ).
-              ( $ending == 4294967295
-                  ? 'now'
-                  : time2str('%h %o %Y', $ending )
-              ),
-            menubar( 'Main Menu'=>$p, )
-          )
-%>
-
-<%= include('/elements/table-grid.html') %>
-
+<%= header( "Sales Tax Report - $pbeginning through ".($pending||'now'),
+            menubar( 'Main Menu'=>$p, ) )               %>
+<%= table() %>
   <TR>
-    <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=9>Sales</TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Rate</TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Tax owed</TH>
-    <% unless ( $cgi->param('show_taxclasses') ) { %>
-      <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Tax invoiced</TH>
-    <% } %>
+    <TH ROWSPAN=2></TH>
+    <TH COLSPAN=3>Sales</TH>
+    <TH ROWSPAN=2>Rate</TH>
+    <TH ROWSPAN=2>Tax owed</TH>
+    <TH ROWSPAN=2>Tax invoiced</TH>
   </TR>
   <TR>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Total</TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Non-taxable<BR><FONT SIZE=-1>(tax-exempt customer)</FONT></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Non-taxable<BR><FONT SIZE=-1>(tax-exempt package)</FONT></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Non-taxable<BR><FONT SIZE=-1>(monthly exemption)</FONT></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Taxable</TH>
+    <TH>Total</TH>
+    <TH>Non-taxable</TH>
+    <TH>Taxable</TH>
   </TR>
-
-<% my $bgcolor1 = '#eeeeee';
-   my $bgcolor2 = '#ffffff';
-   my $bgcolor;
-%>
-
-  <% foreach my $region ( @regions ) {
-
-       if ( $bgcolor eq $bgcolor1 ) {
-         $bgcolor = $bgcolor2;
-       } else {
-         $bgcolor = $bgcolor1;
-       }
-
-       my $link = $baselink;
-       if ( $region->{'label'} ne 'Total' ) {
-         if ( $region->{'label'} eq $out ) {
-           $link .= ';out=1';
-         } else {
-           $link .= ';'. $region->{'url_param'};
-         }
-       }
-  %>
-
+  <% foreach my $region ( @regions ) { %>
     <TR>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $region->{'label'} %></TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <A HREF="<%= $link %>;nottax=1"><%= $money_char %><%= sprintf('%.2f', $region->{'total'} ) %></A>
-      </TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><FONT SIZE="+1"><B> - </B></FONT></TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <A HREF="<%= $link %>;nottax=1;cust_tax=Y"><%= $money_char %><%= sprintf('%.2f', $region->{'exempt_cust'} ) %></A>
-      </TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><FONT SIZE="+1"><B> - </B></FONT></TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <A HREF="<%= $link %>;nottax=1;pkg_tax=Y"><%= $money_char %><%= sprintf('%.2f', $region->{'exempt_pkg'} ) %></A>
-      </TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><FONT SIZE="+1"><B> - </B></FONT></TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <%= $money_char %><%= sprintf('%.2f', $region->{'exempt_monthly'} ) %></A>
-        </TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><FONT SIZE="+1"><B> = </B></FONT></TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <%= $money_char %><%= sprintf('%.2f', $region->{'taxable'} ) %></A>
-      </TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $region->{'label'} eq 'Total' ? '' : '<FONT FACE="sans-serif" SIZE="+1"><B> X </B></FONT>' %></TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right"><%= $region->{'rate'} %></TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $region->{'label'} eq 'Total' ? '' : '<FONT FACE="sans-serif" SIZE="+1"><B> = </B></FONT>' %></TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <%= $money_char %><%= sprintf('%.2f', $region->{'owed'} ) %>
-      </TD>
-      <% unless ( $cgi->param('show_taxclasses') ) { %>
-        <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-          <A HREF="<%= $link %>;istax=1"><%= $money_char %><%= sprintf('%.2f', $region->{'tax'} ) %></A>
-        </TD>
-      <% } %>
+      <TD><%= $region->{'label'} %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'total'} ) %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'exempt'} ) %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'taxable'} ) %></TD>
+      <TD ALIGN="right"><%= $region->{'rate'} %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'owed'} ) %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'tax'} ) %></TD>
     </TR>
-    
   <% } %>
 
 </TABLE>
 
-
-<% if ( $cgi->param('show_taxclasses') ) { %>
-
-  <BR>
-  <%= include('/elements/table-grid.html') %>
-  <TR>
-    <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Tax invoiced</TH>
-  </TR>
-
-  <% #some false laziness w/above
-     foreach my $region ( @base_regions ) {
-
-       if ( $bgcolor eq $bgcolor1 ) {
-         $bgcolor = $bgcolor2;
-       } else {
-         $bgcolor = $bgcolor1;
-       }
-
-       my $link = $baselink;
-       #if ( $region->{'label'} ne 'Total' ) {
-         if ( $region->{'label'} eq $out ) {
-           $link .= ';out=1';
-         } else {
-           $link .= ';'. $region->{'url_param'};
-         }
-       #}
-  %>
-
-    <TR>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $region->{'label'} %></TD>
-      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-        <A HREF="<%= $link %>;istax=1"><%= $money_char %><%= sprintf('%.2f', $region->{'tax'} ) %></A>
-      </TD>
-    </TR>
-
-  <% } %>
-
-  <TR>
-   <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">Total</TD>
-    <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
-      <A HREF="<%= $baselink %>;istax=1"><%= $money_char %><%= sprintf('%.2f', $tax ) %></A>
-    </TD>
-  </TR>
-
-  </TABLE>
-
-<% } %>
-
-
 <% if ( $monthly_exempt_warning ) { %>
   <BR>
   Partial-month tax reports (except for current month) may not be correct due
diff --git a/httemplate/search/report_tax.html b/httemplate/search/report_tax.html
index eeaccc1..d217e56 100755
--- a/httemplate/search/report_tax.html
+++ b/httemplate/search/report_tax.html
@@ -1,17 +1,39 @@
 <HTML>
   <HEAD>
     <TITLE>Tax Report Criteria</TITLE>
-  </HEAD>
+    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>  </HEAD>
   <BODY BGCOLOR="#e8e8e8">
     <H1>Tax Report Criteria</H1>
-    <FORM ACTION="report_tax.cgi" METHOD="GET">
+    <FORM ACTION="report_tax.cgi" METHOD="post">
+      Return <B>tax report</B> for period:
     <TABLE>
-     <%= include( '/elements/tr-select-agent.html' ) %>
-     <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-     <TR>
-       <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_taxclasses" VALUE="1"></TD>
-       <TD>Show tax classes</TD>
-     </TR>
+      <TR>
+        <TD ALIGN="right">From: </TD>
+        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
+      <TR>
+        <TD ALIGN="right">To: </TD>
+        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+      </TR>
     </TABLE>
 
       <BR><INPUT TYPE="submit" VALUE="Get Report">
diff --git a/httemplate/search/sqlradius.html b/httemplate/search/sqlradius.html
index 8f4878d..20e8fb8 100644
--- a/httemplate/search/sqlradius.html
+++ b/httemplate/search/sqlradius.html
@@ -4,7 +4,7 @@
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
 ') %>
-<FORM NAME="OneTrueForm" ACTION="sqlradius.cgi" METHOD="GET">
+<FORM NAME="OneTrueForm" ACTION="sqlradius.cgi" METHOD="POST">
 <% #include( '/elements/table.html' ) %>
 <%= ntable('#cccccc') %>
 <TR>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index b145919..1e4a03d 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,37 +1,250 @@
 <%
 
-my $orderby = 'ORDER BY svcnum';
+my $conf = new FS::Conf;
+my $maxrecords = $conf->config('maxsearchrecordsperpage');
+
+my $orderby = ''; #removeme
+
+my $limit = '';
+$limit .= "LIMIT $maxrecords" if $maxrecords;
+
+my $offset = $cgi->param('offset') || 0;
+$limit .= " OFFSET $offset" if $offset;
+
+my $total;
 
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
 
-my $cjoin = '';
-my @extra_sql = ();
+my $unlinked = '';
 if ( $query =~ /^UN_(.*)$/ ) {
   $query = $1;
-  $cjoin = 'LEFT JOIN cust_svc USING ( svcnum )';
-  push @extra_sql, 'pkgnum IS NULL';
+  my $empty = driver_name eq 'Pg' ? qq('') : qq("");
+  if ( driver_name eq 'mysql' ) {
+    $unlinked = "LEFT JOIN cust_svc ON cust_svc.svcnum = svc_acct.svcnum
+                 WHERE cust_svc.pkgnum IS NULL
+                    OR cust_svc.pkgnum = 0
+                    OR cust_svc.pkgnum = $empty";
+  } else {
+    $unlinked = "
+      WHERE 0 <
+        ( SELECT count(*) FROM cust_svc
+            WHERE cust_svc.svcnum = svc_acct.svcnum
+              AND ( pkgnum IS NULL OR pkgnum = 0 )
+        )
+    ";
+  }
 }
 
+my $tblname = driver_name eq 'mysql' ? 'svc_acct.' : '';
+my(@svc_acct, $sortby);
 if ( $query eq 'svcnum' ) {
-  #$orderby = "ORDER BY svcnum";
+  $sortby=\*svcnum_sort;
+  $orderby = "ORDER BY ${tblname}svcnum";
 } elsif ( $query eq 'username' ) {
-  $orderby = "ORDER BY LOWER(username)";
+  $sortby=\*username_sort;
+  $orderby = "ORDER BY ${tblname}username";
 } elsif ( $query eq 'uid' ) {
-  $orderby = "ORDER BY uid";
-  push @extra_sql, "uid IS NOT NULL";
+  $sortby=\*uid_sort;
+  $orderby = ( $unlinked ? ' AND' : ' WHERE' ).
+             " ${tblname}uid IS NOT NULL ORDER BY ${tblname}uid";
 } elsif ( $cgi->param('popnum') =~ /^(\d+)$/ ) {
-  push @extra_sql, "popnum = $1";
-  $orderby = "ORDER BY LOWER(username)";
+  $unlinked .= ( $unlinked ? 'AND' : 'WHERE' ).
+               " popnum = $1";
+  $sortby=\*username_sort;
+  $orderby = "ORDER BY ${tblname}username";
 } elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
-  $cjoin ||= 'LEFT JOIN cust_svc USING ( svcnum )';
-  push @extra_sql, "svcpart = $1";
-  $orderby = "ORDER BY uid";
-  #$orderby = "ORDER BY svcnum";
+  $unlinked .= ( $unlinked ? ' AND' : ' WHERE' ).
+               " $1 = ( SELECT svcpart FROM cust_svc ".
+               "        WHERE cust_svc.svcnum = svc_acct.svcnum ) ";
+  $sortby=\*uid_sort;
+  #$sortby=\*svcnum_sort;
 } else {
-  $orderby = "ORDER BY uid";
+  $sortby=\*uid_sort;
+  @svc_acct = @{&usernamesearch};
+}
+
+
+if (    $query eq 'svcnum'
+     || $query eq 'username'
+     || $query eq 'uid'
+     || $cgi->param('popnum') =~ /^(\d+)$/
+     || $cgi->param('svcpart') =~ /^(\d+)$/
+   ) {
+
+  my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";
+  my $sth = dbh->prepare($statement)
+    or die dbh->errstr. " doing $statement";
+  $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+
+  $total = $sth->fetchrow_arrayref->[0];
+
+  @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $orderby $limit");
+
+}
+
+if ( scalar(@svc_acct) == 1 ) {
+  my($svcnum)=$svc_acct[0]->svcnum;
+  print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum");  #redirect
+  #exit;
+} elsif ( scalar(@svc_acct) == 0 ) { #error
+%>
+<!-- mason kludge -->
+<%
+  idiot("Account not found");
+} else {
+%>
+<!-- mason kludge -->
+<%
+  $total ||= scalar(@svc_acct);
+
+  #begin pager
+  my $pager = '';
+  if ( $total != scalar(@svc_acct) && $maxrecords ) {
+    unless ( $offset == 0 ) {
+      $cgi->param('offset', $offset - $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
+    }
+    my $poff;
+    my $page;
+    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
+      $page++;
+      if ( $offset == $poff ) {
+        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
+      } else {
+        $cgi->param('offset', $poff);
+        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
+      }
+    }
+    unless ( $offset + $maxrecords > $total ) {
+      $cgi->param('offset', $offset + $maxrecords);
+      $pager .= '<A HREF="'. $cgi->self_url.
+                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
+    }
+  }
+  #end pager
+
+  print header("Account Search Results",menubar('Main Menu'=>popurl(2))),
+        "$total matching accounts found<BR><BR>$pager",
+        &table(), <<END;
+      <TR>
+        <TH><FONT SIZE=-1>#</FONT></TH>
+        <TH><FONT SIZE=-1>Username</FONT></TH>
+        <TH><FONT SIZE=-1>Domain</FONT></TH>
+        <TH><FONT SIZE=-1>UID</FONT></TH>
+        <TH><FONT SIZE=-1>Service</FONT></TH>
+        <TH><FONT SIZE=-1>Cust#</FONT></TH>
+        <TH><FONT SIZE=-1>(bill) name</FONT></TH>
+        <TH><FONT SIZE=-1>company</FONT></TH>
+END
+  if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+    print <<END;
+        <TH><FONT SIZE=-1>(service) name</FONT></TH>
+        <TH><FONT SIZE=-1>company</FONT></TH>
+END
+  }
+  print "</TR>";
 
-  my @username_sql;
+  my(%saw,$svc_acct);
+  my $p = popurl(2);
+  foreach $svc_acct (
+    sort $sortby grep(!$saw{$_->svcnum}++, @svc_acct)
+  ) {
+    my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_acct->svcnum })
+      or die "No cust_svc record for svcnum ". $svc_acct->svcnum;
+    my $part_svc = qsearchs('part_svc', { 'svcpart' => $cust_svc->svcpart })
+      or die "No part_svc record for svcpart ". $cust_svc->svcpart;
+
+    my $domain;
+    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc });
+    if ( $svc_domain ) {
+      $domain = "<A HREF=\"${p}view/svc_domain.cgi?". $svc_domain->svcnum.
+                "\">". $svc_domain->domain. "</A>";
+    } else {
+      die "No svc_domain.svcnum record for svc_acct.domsvc: ".
+          $svc_acct->domsvc;
+    }
+    my($cust_pkg,$cust_main);
+    if ( $cust_svc->pkgnum ) {
+      $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_svc->pkgnum })
+        or die "No cust_pkg record for pkgnum ". $cust_svc->pkgnum;
+      $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pkg->custnum })
+        or die "No cust_main record for custnum ". $cust_pkg->custnum;
+    }
+    my($svcnum, $username, $uid, $svc, $custnum, $last, $first, $company) = (
+      $svc_acct->svcnum,
+      $svc_acct->getfield('username'),
+      $svc_acct->getfield('uid'),
+      $part_svc->svc,
+      $cust_svc->pkgnum ? $cust_main->custnum : '',
+      $cust_svc->pkgnum ? $cust_main->getfield('last') : '',
+      $cust_svc->pkgnum ? $cust_main->getfield('first') : '',
+      $cust_svc->pkgnum ? $cust_main->company : '',
+    );
+    my($pcustnum) = $custnum
+      ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\"><FONT SIZE=-1>$custnum</FONT></A>"
+      : "<I>(unlinked)</I>"
+    ;
+    my $pname = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$last, $first</A>" : '';
+    my $pcompany = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$company</A>" : '';
+    my($pship_name, $pship_company);
+    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+      my($ship_last, $ship_first, $ship_company) = (
+        $cust_svc->pkgnum ? ( $cust_main->ship_last || $last ) : '',
+        $cust_svc->pkgnum ? ( $cust_main->ship_last
+                              ? $cust_main->ship_first
+                              : $first
+                            ) : '',
+        $cust_svc->pkgnum ? ( $cust_main->ship_last
+                              ? $cust_main->ship_company
+                              : $company
+                            ) : '',
+      );
+      $pship_name = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$ship_last, $ship_first</A>" : '';
+      $pship_company = $custnum ? "<A HREF=\"${p}view/cust_main.cgi?$custnum\">$ship_company</A>" : '';
+    }
+    print <<END;
+    <TR>
+      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$svcnum</FONT></A></TD>
+      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$username</FONT></A></TD>
+      <TD><FONT SIZE=-1>$domain</FONT></TD>
+      <TD><A HREF="${p}view/svc_acct.cgi?$svcnum"><FONT SIZE=-1>$uid</FONT></A></TD>
+      <TD><FONT SIZE=-1>$svc</FONT></TH>
+      <TD><FONT SIZE=-1>$pcustnum</FONT></TH>
+      <TD><FONT SIZE=-1>$pname<FONT></TH>
+      <TD><FONT SIZE=-1>$pcompany</FONT></TH>
+END
+    if ( defined dbdef->table('cust_main')->column('ship_last') ) {
+      print <<END;
+      <TD><FONT SIZE=-1>$pship_name<FONT></TH>
+      <TD><FONT SIZE=-1>$pship_company</FONT></TH>
+END
+    }
+    print "</TR>";
+
+  }
+ 
+  print "</TABLE>$pager<BR>".
+        '</BODY></HTML>';
+
+}
+
+sub svcnum_sort {
+  $a->getfield('svcnum') <=> $b->getfield('svcnum');
+}
+
+sub username_sort {
+  $a->getfield('username') cmp $b->getfield('username');
+}
+
+sub uid_sort {
+  $a->getfield('uid') <=> $b->getfield('uid');
+}
+
+sub usernamesearch {
+
+  my @svc_acct;
 
   my %username_type;
   foreach ( $cgi->param('username_type') ) {
@@ -41,13 +254,17 @@ if ( $query eq 'svcnum' ) {
   $cgi->param('username') =~ /^([\w\-\.\&]+)$/; #untaint username_text
   my $username = $1;
 
-  push @username_sql, "username ILIKE '$username'"
-    if $username_type{'Exact'}
-    || $username_type{'Fuzzy'};
+  if ( $username_type{'Exact'} || $username_type{'Fuzzy'} ) {
+    push @svc_acct, qsearch( 'svc_acct',
+                             { 'username' => { 'op'    => 'ILIKE',
+                                               'value' => $username } } );
+  }
 
-  push @username_sql, "username ILIKE '\%$username\%'"
-    if $username_type{'Substring'}
-    || $username_type{'All'};
+  if ( $username_type{'Substring'} || $username_type{'All'} ) {
+    push @svc_acct, qsearch( 'svc_acct',
+                             { 'username' => { 'op'    => 'ILIKE',
+                                               'value' => "%$username%" } } );
+  }
 
   if ( $username_type{'Fuzzy'} || $username_type{'All'} ) {
     &FS::svc_acct::check_and_rebuild_fuzzyfiles;
@@ -63,78 +280,15 @@ if ( $query eq 'svcnum' ) {
     #if ($username_type{'Sound-alike'}) {
     #}
 
-    push @username_sql, "username = '$_'"
-      foreach (keys %username);
+    foreach ( keys %username ) {
+      push @svc_acct, qsearch('svc_acct',{'username'=>$_});
+    }
 
   }
 
-  push @extra_sql, '( '. join( ' OR ', @username_sql). ' )';
+  #[ qsearch('svc_acct',{'username'=>$username}) ];
+  \@svc_acct;
 
 }
 
-my $extra_sql = 
-  scalar(@extra_sql)
-    ? ' WHERE '. join(' AND ', @extra_sql )
-    : '';
-
-my $count_query = "SELECT COUNT(*) FROM svc_acct $cjoin $extra_sql";
-#if ( keys %svc_acct ) {
-#  $count_query .= ' WHERE '.
-#                    join(' AND ', map "$_ = ". dbh->quote($svc_acct{$_}),
-#                                      keys %svc_acct
-#                        );
-#}
-
-my $sql_query = {
-  'table' => 'svc_acct',
-  'hashref'   => {}, # \%svc_acct,
-  'select'    => join(', ',
-                    'svc_acct.*',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
-                  ),
-  'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                 ' LEFT JOIN part_svc  USING ( svcpart ) '.
-                 ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                 ' LEFT JOIN cust_main USING ( custnum ) ',
-};
-
-my $link      = [ "${p}view/svc_acct.cgi?",   'svcnum'  ];
-my $link_cust = sub {
-  my $svc_acct = shift;
-  if ( $svc_acct->custnum ) {
-    [ "${p}view/cust_main.cgi?", 'custnum' ];
-  } else {
-    '';
-  }
-};
-
-%><%= include( 'elements/search.html',
-                 'title'       => 'Account Search Results',
-                 'name'        => 'accounts',
-                 'query'       => $sql_query,
-                 'count_query' => $count_query,
-                 'redirect'    => $link,
-                 'header'      => [ '#',
-                                    'Account',
-                                    'UID',
-                                    'Service',
-                                    FS::UI::Web::cust_header(),
-                                  ],
-                 'fields'      => [ 'svcnum',
-                                    'email',
-                                    'uid',
-                                    'svc',
-                                    \&FS::UI::Web::cust_fields,
-                                  ],
-                 'links'       => [ $link,
-                                    $link,
-                                    $link,
-                                    '',
-                                    ( map { $link_cust }
-                                          FS::UI::Web::cust_header()
-                                    ),
-                                  ],
-             )
 %>
diff --git a/httemplate/search/svc_acct.html b/httemplate/search/svc_acct.html
index c504c2f..7423605 100755
--- a/httemplate/search/svc_acct.html
+++ b/httemplate/search/svc_acct.html
@@ -7,7 +7,7 @@
       Account Search
     </FONT>
     <BR><BR>
-    <FORM ACTION="svc_acct.cgi" METHOD="GET">
+    <FORM ACTION="svc_acct.cgi" METHOD="post">
       Search for <B>username</B>: 
       <INPUT TYPE="text" NAME="username">
 
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index f261ea9..948b1d9 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -4,82 +4,158 @@ my $conf = new FS::Conf;
 
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
-
-my $orderby = 'ORDER BY svcnum';
-my $join = '';
-my %svc_domain = ();
-my $extra_sql = '';
+my(@svc_domain,$sortby);
 if ( $query eq 'svcnum' ) {
-  #$orderby = 'ORDER BY svcnum';
+  $sortby=\*svcnum_sort;
+  @svc_domain=qsearch('svc_domain',{});
 } elsif ( $query eq 'domain' ) {
-  $orderby = 'ORDER BY domain';
+  $sortby=\*domain_sort;
+  @svc_domain=qsearch('svc_domain',{});
 } elsif ( $query eq 'UN_svcnum' ) {
-  #$orderby = 'ORDER BY svcnum';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = ' WHERE pkgnum IS NULL';
+  $sortby=\*svcnum_sort;
+  @svc_domain = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_domain',{});
 } elsif ( $query eq 'UN_domain' ) {
-  $orderby = 'ORDER BY domain';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = ' WHERE pkgnum IS NULL';
+  $sortby=\*domain_sort;
+  @svc_domain = grep qsearchs('cust_svc',{
+      'svcnum' => $_->svcnum,
+      'pkgnum' => '',
+    }), qsearch('svc_domain',{});
 } elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
-  #$orderby = 'ORDER BY svcnum';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = " WHERE svcpart = $1";
+  @svc_domain =
+    qsearch( 'svc_domain', {}, '',
+               " WHERE $1 = ( SELECT svcpart FROM cust_svc ".
+               "              WHERE cust_svc.svcnum = svc_domain.svcnum ) "
+    );
+  $sortby=\*svcnum_sort;
 } else {
   $cgi->param('domain') =~ /^([\w\-\.]+)$/; 
-  $join = '';
-  $svc_domain{'domain'} = $1;
+  my($domain)=$1;
+  #push @svc_domain, qsearchs('svc_domain',{'domain'=>$domain});
+  @svc_domain = qsearchs('svc_domain',{'domain'=>$domain});
+}
+
+if ( scalar(@svc_domain) == 1 ) {
+  print $cgi->redirect(popurl(2). "view/svc_domain.cgi?". $svc_domain[0]->svcnum);
+  #exit;
+} elsif ( scalar(@svc_domain) == 0 ) {
+%>
+<!-- mason kludge -->
+<%
+  eidiot "No matching domains found!\n";
+} else {
+%>
+<!-- mason kludge -->
+<%
+  my($total)=scalar(@svc_domain);
+  print header("Domain Search Results",''), <<END;
+
+    $total matching domains found
+    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+      <TR>
+        <TH>Service #</TH>
+        <TH>Domain</TH>
+<!--        <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+-->
+      </TR>
+END
+
+#  my(%saw);                 # if we've multiple domains with the same
+                             # svcnum, then we've a corrupt database
+
+  foreach my $svc_domain (
+#    sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
+    sort $sortby (@svc_domain)
+  ) {
+    my($svcnum,$domain)=(
+      $svc_domain->svcnum,
+      $svc_domain->domain,
+    );
+
+    #don't display all accounts here
+    my $rowspan = 1;
+
+    #my @svc_acct=qsearch('svc_acct',{'domsvc' => $svcnum});
+    #my $rowspan = 0;
+    #
+    #my $n1 = '';
+    #my($svc_acct, @rows);
+    #foreach $svc_acct (
+    #  sort {$b->getfield('username') cmp $a->getfield('username')} (@svc_acct)
+    #) {
+    #
+    #  my (@forwards) = ();
+    #
+    #  my($svcnum,$username)=(
+    #    $svc_acct->svcnum,
+    #    $svc_acct->username,
+    #  );
+    #
+    #  my @svc_forward = qsearch( 'svc_forward', { 'srcsvc' => $svcnum } );
+    #  my $svc_forward;
+    #  foreach $svc_forward (@svc_forward) {
+    #    my($dstsvc,$dst) = (
+    #      $svc_forward->dstsvc,
+    #      $svc_forward->dst,
+    #    );
+    #    if ($dstsvc) {
+    #      my $dst_svc_acct=qsearchs( 'svc_acct', { 'svcnum' => $dstsvc } );
+    #      my $destination=$dst_svc_acct->email;
+    #      push @forwards, qq!<TD><A HREF="!, popurl(2),
+    #            qq!view/svc_acct.cgi?$dstsvc">$destination</A>!,
+    #            qq!</TD></TR>!
+    #      ;
+    #    }else{
+    #      push @forwards, qq!<TD>$dst</TD></TR>!
+    #      ;
+    #    }
+    #  }
+    #
+    #  push @rows, qq!$n1<TD ROWSPAN=!, (scalar(@svc_forward) || 1),
+    #        qq!><A HREF="!. popurl(2). qq!view/svc_acct.cgi?$svcnum">!,
+    #  #print '', ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser );
+    #        ( ($username eq '*') ? "<I>(anything)</I>" : $username ),
+    #        qq!\@$domain</A> </TD>!,
+    #  ;
+    #
+    #  push @rows, @forwards;
+    #
+    #  $rowspan += (scalar(@svc_forward) || 1);
+    #  $n1 = "</TR><TR>";
+    #}
+    ##end of false laziness
+    #
+    #
+
+    print <<END;
+    <TR>
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum">$svcnum</A></TD>
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_domain.cgi?$svcnum">$domain</A></TD>
+END
+
+    #print @rows;
+    print "</TR>";
+
+  }
+ 
+  print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
+
 }
 
-my $count_query = "SELECT COUNT(*) FROM svc_domain $join $extra_sql";
-if ( keys %svc_domain ) {
-  $count_query .= ' WHERE '.
-                    join(' AND ', map "$_ = ". dbh->quote($svc_domain{$_}),
-                                      keys %svc_domain
-                        );
+sub svcnum_sort {
+  $a->getfield('svcnum') <=> $b->getfield('svcnum');
 }
 
-my $sql_query = {
-  'table'     => 'svc_domain',
-  'hashref'   => \%svc_domain,
-  'select'    => join(', ',
-                   'svc_domain.*',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
-                 ),
-  'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                 'LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                 'LEFT JOIN cust_main USING ( custnum ) ',
-};
-
-my $link = [ "${p}view/svc_domain.cgi?", 'svcnum' ];
-
-#smaller false laziness w/svc_*.cgi here
-my $link_cust = sub {
-  my $svc_x = shift;
-  $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
-};
-
-%><%= include ('elements/search.html',
-                 'title'             => "Domain Search Results",
-                 'name'              => 'domains',
-                 'query'             => $sql_query,
-                 'count_query'       => $count_query,
-                 'redirect'          => $link,
-                 'header'            => [ '#',
-                                          'Domain',
-                                          FS::UI::Web::cust_header(),
-                                        ],
-                 'fields'            => [ 'svcnum',
-                                          'domain',
-                                          \&FS::UI::Web::cust_fields,
-                                        ],
-                 'links'             => [ $link,
-                                          $link,
-                                          ( map { $link_cust }
-                                                FS::UI::Web::cust_header()
-                                          ),
-                                        ],
-              )
+sub domain_sort {
+  $a->getfield('domain') cmp $b->getfield('domain');
+}
+
+
 %>
diff --git a/httemplate/search/svc_domain.html b/httemplate/search/svc_domain.html
index b759102..94bb9a6 100755
--- a/httemplate/search/svc_domain.html
+++ b/httemplate/search/svc_domain.html
@@ -7,7 +7,7 @@
       Domain Search
     </FONT>
     <BR><BR>
-    <FORM ACTION="svc_domain.cgi" METHOD="GET">
+    <FORM ACTION="svc_domain.cgi" METHOD="post">
       Search for <B>domain</B>: 
       <INPUT TYPE="text" NAME="domain">
 
diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
index a204e34..10094bc 100755
--- a/httemplate/search/svc_forward.cgi
+++ b/httemplate/search/svc_forward.cgi
@@ -4,117 +4,76 @@ my $conf = new FS::Conf;
 
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
-
-
-my $orderby;
-
-my $cjoin = '';
-my @extra_sql = ();
-if ( $query =~ /^UN_(.*)$/ ) {
-  $query = $1;
-  $cjoin = 'LEFT JOIN cust_svc USING ( svcnum )';
-  push @extra_sql, 'pkgnum IS NULL';
-}
-
+my(@svc_forward,$sortby);
 if ( $query eq 'svcnum' ) {
-  $orderby = 'ORDER BY svcnum';
+  $sortby=\*svcnum_sort;
+  @svc_forward=qsearch('svc_forward',{});
 } else {
   eidiot('unimplemented');
 }
 
-my $extra_sql = 
-  scalar(@extra_sql)
-    ? ' WHERE '. join(' AND ', @extra_sql )
-    : '';
-
-my $count_query = "SELECT COUNT(*) FROM svc_forward $cjoin $extra_sql";
-my $sql_query = {
-  'table'     => 'svc_forward',
-  'hashref'   => {},
-  'select'    => join(', ',
-                   'svc_forward.*',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
-                 ),
-  'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                 ' LEFT JOIN part_svc  USING ( svcpart ) '.
-                 ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                 ' LEFT JOIN cust_main USING ( custnum ) ',
-};
-
-#        <TH>Service #<BR><FONT SIZE=-1>(click to view forward)</FONT></TH>
-#        <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-#        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-
-my $link = [ "${p}view/svc_forward.cgi?", 'svcnum' ];
+if ( scalar(@svc_forward) == 1 ) {
+  print $cgi->redirect(popurl(2). "view/svc_forward.cgi?". $svc_forward[0]->svcnum);
+  #exit;
+} elsif ( scalar(@svc_forward) == 0 ) {
+%>
+<!-- mason kludge -->
+<%
+  eidiot "No matching forwards found!\n";
+} else {
+%>
+<!-- mason kludge -->
+<%
+  my $total = scalar(@svc_forward);
+  print header("Mail forward Search Results",''), <<END;
+
+    $total matching mail forwards found
+    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
+      <TR>
+        <TH>Service #<BR><FONT SIZE=-1>(click to view forward)</FONT></TH>
+        <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+      </TR>
+END
+
+  foreach my $svc_forward (
+    sort $sortby (@svc_forward)
+  ) {
+    my $svcnum = $svc_forward->svcnum;
 
-my $format_src = sub {
-  my $svc_forward = shift;
-  if ( $svc_forward->srcsvc_acct ) {
-    $svc_forward->srcsvc_acct->email;
-  } else {
     my $src = $svc_forward->src;
     $src = "<I>(anything)</I>$src" if $src =~ /^@/;
-    $src;
-  }
-};
+    if ( $svc_forward->srcsvc_acct ) {
+      $src = qq!<A HREF="${p}view/svc_acct.cgi?!. $svc_forward->srcsvc. '">'.
+             $svc_forward->srcsvc_acct->email. '</A>';
+    }
+
+    my $dst = $svc_forward->dst;
+    if ( $svc_forward->dstsvc_acct ) {
+      $dst = qq!<A HREF="${p}view/svc_acct.cgi?!. $svc_forward->dstsvc. '">'.
+             $svc_forward->dstsvc_acct->email. '</A>';
+    }
+
+    print <<END;
+      <TR>
+        <TD><A HREF="${p}view/svc_forward.cgi?$svcnum">$svcnum</A></TD>
+        <TD>$src</TD>
+        <TD>$dst</TD>
+      </TR>
+END
 
-my $link_src = sub {
-  my $svc_forward = shift;
-  if ( $svc_forward->srcsvc_acct ) {
-    [ "${p}view/svc_acct.cgi?", 'srcsvc' ];
-  } else {
-    '';
   }
-};
+ 
+  print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+END
 
-my $format_dst = sub {
-  my $svc_forward = shift;
-  if ( $svc_forward->dstsvc_acct ) {
-    $svc_forward->dstsvc_acct->email;
-  } else {
-    $svc_forward->dst;
-  }
-};
-
-my $link_dst = sub {
-  my $svc_forward = shift;
-  if ( $svc_forward->dstsvc_acct ) {
-    [ "${p}view/svc_acct.cgi?", 'dstsvc' ];
-  } else {
-    '';
-  }
-};
+}
 
-#smaller false laziness w/svc_*.cgi here
-my $link_cust = sub {
-  my $svc_x = shift;
-  $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
-};
+sub svcnum_sort {
+  $a->getfield('svcnum') <=> $b->getfield('svcnum');
+}
 
-%><%= include( 'elements/search.html',
-                 'title'             => "Mail forward Search Results",
-                 'name'              => 'mail forwards',
-                 'query'             => $sql_query,
-                 'count_query'       => $count_query,
-                 'redirect'          => $link,
-                 'header'            => [ '#',
-                                          'Mail to',
-                                          'Forwards to',
-                                          FS::UI::Web::cust_header(),
-                                        ],
-                 'fields'            => [ 'svcnum',
-                                          $format_src,
-                                          $format_dst,
-                                          \&FS::UI::Web::cust_fields,
-                                        ],
-                 'links'             => [ $link,
-                                          $link_src,
-                                          $link_dst,
-                                          ( map { $link_cust }
-                                                FS::UI::Web::cust_header()
-                                          ),
-                                        ],
-             )
 %>
diff --git a/httemplate/search/svc_www.cgi b/httemplate/search/svc_www.cgi
index ae51c61..1f05c23 100755
--- a/httemplate/search/svc_www.cgi
+++ b/httemplate/search/svc_www.cgi
@@ -4,7 +4,7 @@
 
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
-my $orderby;
+my(@svc_www, $orderby);
 if ( $query eq 'svcnum' ) {
   $orderby = 'ORDER BY svcnum';
 } else {
@@ -15,55 +15,28 @@ my $count_query = 'SELECT COUNT(*) FROM svc_www';
 my $sql_query = {
   'table'     => 'svc_www',
   'hashref'   => {},
-  'select'    => join(', ',
-                   'svc_www.*',
-                   'cust_main.custnum',
-                   FS::UI::Web::cust_sql_fields(),
-                 ),
   'extra_sql' => $orderby,
-  'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  )'.
-                 'LEFT JOIN cust_pkg  USING ( pkgnum  )'.
-                 'LEFT JOIN cust_main USING ( custnum )',
 };
 
 my $link  = [ "${p}view/svc_www.cgi?", 'svcnum', ];
 #my $dlink = [ "${p}view/svc_www.cgi?", 'svcnum', ];
 my $ulink = [ "${p}view/svc_acct.cgi?", 'usersvc', ];
 
-#smaller false laziness w/svc_*.cgi here
-my $link_cust = sub {
-  my $svc_x = shift;
-  $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
-};
 
-%><%= include( 'elements/search.html',
-                 'title'       => 'Virtual Host Search Results',
-                 'name'        => 'virtual hosts',
-                 'query'       => $sql_query,
-                 'count_query' => $count_query,
-                 'redirect'    => $link,
-                 'header'      => [ '#',
-                                    'Zone',
-                                    'User',
-                                    FS::UI::Web::cust_header(),
-                                  ],
-                 'fields'      => [ 'svcnum',
-                                    sub { $_[0]->domain_record->zone },
-                                    sub {
-                                          my $svc_www = shift;
-                                          my $svc_acct = $svc_www->svc_acct;
-                                          $svc_acct
-                                            ? $svc_acct->email
-                                            : '';
-                                        },
-                                    \&FS::UI::Web::cust_fields,
-                                  ],
-                 'links'       => [ $link,
-                                    '',
-                                    $ulink,
-                                    ( map { $link_cust }
-                                          FS::UI::Web::cust_header()
-                                    ),
-                                  ],
-             )
+%>
+<%= include( 'elements/search.html',
+               'title'       => 'Virtual Host Search Results',
+               'name'        => 'virtual hosts',
+               'query'       => $sql_query,
+               'count_query' => $count_query,
+               'header'      => [ '#', 'Zone', 'User', ],
+               'fields'      => [ 'svcnum',
+                                  sub { $_[0]->domain_record->zone },
+                                  sub { $_[0]->svc_acct->email },
+                                ],
+               'links'       => [ $link,
+                                  '',
+                                  $ulink,
+                                ],
+           )
 %>
diff --git a/httemplate/view/cust_bill-logo.cgi b/httemplate/view/cust_bill-logo.cgi
deleted file mode 100755
index 235485f..0000000
--- a/httemplate/view/cust_bill-logo.cgi
+++ /dev/null
@@ -1,15 +0,0 @@
-<%
-
-my $conf = new FS::Conf;
-
-my($query) = $cgi->keywords;
-$query =~ /^([^\.\/]*)$/;
-my $templatename = $1;
-if ( $templatename && $conf->exists("logo_$templatename.png") ) {
-  $templatename = "_$templatename";
-} else {
-  $templatename = '';
-}
-
-http_header('Content-Type' => 'image/png' );
-%><%= $conf->config_binary("logo$templatename.png") %>
diff --git a/httemplate/view/cust_bill-pdf.cgi b/httemplate/view/cust_bill-pdf.cgi
index ce7ab0c..a72a605 100755
--- a/httemplate/view/cust_bill-pdf.cgi
+++ b/httemplate/view/cust_bill-pdf.cgi
@@ -14,4 +14,5 @@ my $pdf = $cust_bill->print_pdf( '', $templatename);
 http_header('Content-Type' => 'application/pdf' );
 http_header('Content-Length' => length($pdf) );
 http_header('Cache-control' => 'max-age=60' );
-%><%= $pdf %>
+%>
+<%= $pdf %>
diff --git a/httemplate/view/cust_bill-ps.cgi b/httemplate/view/cust_bill-ps.cgi
index e730a82..8485a15 100755
--- a/httemplate/view/cust_bill-ps.cgi
+++ b/httemplate/view/cust_bill-ps.cgi
@@ -10,4 +10,5 @@ my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Invoice #$invnum not found!" unless $cust_bill;
 
 http_header('Content-Type' => 'application/postscript' );
-%><%= $cust_bill->print_ps( '', $templatename) %>
+%>
+<%= $cust_bill->print_ps( '', $templatename) %>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 56c0c17..ca0612d 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 #untaint invnum
@@ -6,146 +7,76 @@ $query =~ /^((.+)-)?(\d+)$/;
 my $templatename = $2;
 my $invnum = $3;
 
-my $conf = new FS::Conf;
-
-my @payby =  grep /\w/, $conf->config('payby');
-#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
-@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
-  unless @payby;
-my %payby = map { $_=>1 } @payby;
-
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Invoice #$invnum not found!" unless $cust_bill;
 my $custnum = $cust_bill->getfield('custnum');
 
 #my $printed = $cust_bill->printed;
 
-my $link = $templatename ? "$templatename-$invnum" : $invnum;
-
-%>
-<%= header('Invoice View', menubar(
+print header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-)) %>
+));
 
-<% if ( $cust_bill->owed > 0
-        && ( $payby{'BILL'} || $payby{'CASH'} || $payby{'WEST'} || $payby{'MCRD'} )
-      )
-   {
-     my $s = 0;
-%>
+print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A> | !
+  if $cust_bill->owed > 0;
 
-  Post 
+print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!;
+if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
+  print qq! | <A HREF="${p}misc/email-invoice.cgi?$invnum">!.
+        qq!Re-email this invoice</A>!;
+}
 
-  <% if ( $payby{'BILL'} ) { %>
-  
-    <%= $s++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=BILL;invnum=<%= $invnum %>">check</A>
-  
-  <% } %>
-  
-  <% if ( $payby{'CASH'} ) { %>
-  
-    <%= $s++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=CASH;invnum=<%= $invnum %>">cash</A>
-  
-  <% } %>
-  
-  <% if ( $payby{'WEST'} ) { %>
-  
-    <%= $s++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;invnum=<%= $invnum %>">Western Union</A>
-  
-  <% } %>
-
-  <% if ( $payby{'MCRD'} ) { %>
-  
-    <%= $s++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<%= $invnum %>">manual credit card</A>
-  
-  <% } %>
-
-  payment against this invoice<BR>
-
-<% } %>
-
-<A HREF="<%= $p %>misc/print-invoice.cgi?<%= $link %>">Re-print this invoice</A>
-
-<% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { %>
-  | <A HREF="<%= $p %>misc/email-invoice.cgi?<%= $link %>">Re-email
-      this invoice</A>
-<% } %>
-
-<% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) { %>
-  | <A HREF="<%= $p %>misc/fax-invoice.cgi?<%= $link %>">Re-fax
-      this invoice</A>
-<% } %>
-
-<BR><BR>
-
-<% if ( $conf->exists('invoice_latex') ) { %>
-  <A HREF="<%= $p %>view/cust_bill-pdf.cgi?<%= $link %>.pdf">View typeset invoice</A>
-  <BR><BR>
-<% } %>
-
-<% #false laziness with search/cust_bill_event.cgi
-   unless ( $templatename ) { %>
-
-  <%= table() %>
-  <TR>
-    <TH>Event</TH>
-    <TH>Date</TH>
-    <TH>Status</TH>
-  </TR>
-
-  <% foreach my $cust_bill_event (
-       sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
-     ) {
+print '<BR><BR>';
 
+my $conf = new FS::Conf;
+if ( $conf->exists('invoice_latex') ) {
+  my $link = "${p}view/cust_bill-pdf.cgi?";
+  $link .= "$templatename-" if $templatename;
+  $link .= "$invnum.pdf";
+  print menubar(
+    'View typeset invoice' => $link,
+  ), '<BR><BR>';
+}
+
+#false laziness with search/cust_bill_event.cgi
+
+unless ( $templatename ) {
+  print table(). '<TR><TH>Event</TH><TH>Date</TH><TH>Status</TH></TR>';
+  foreach my $cust_bill_event (
+    sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
+  ) {
     my $status = $cust_bill_event->status;
     $status .= ': '. encode_entities($cust_bill_event->statustext)
       if $cust_bill_event->statustext;
     my $part_bill_event = $cust_bill_event->part_bill_event;
-  %>
-    <TR>
-      <TD><%= $part_bill_event->event %>
+    print '<TR><TD>'. $part_bill_event->event;
   
-        <% if ( $part_bill_event->templatename ) {
-          my $alt_templatename = $part_bill_event->templatename;
-          my $alt_link = "$alt_templatename-$invnum";
-        %>
-          ( <A HREF="<%= $p %>view/cust_bill.cgi?<%= $alt_link %>">view</A>
-          | <A HREF="<%= $p %>view/cust_bill-pdf.cgi?<%= $alt_link %>.pdf">view
-              typeset</A>
-          | <A HREF="<%= $p %>misc/print-invoice.cgi?<%= $alt_link %>">re-print</A>
-          <% if ( grep { $_ ne 'POST' }
-                       $cust_bill->cust_main->invoicing_list ) { %>
-            | <A HREF="<%= $p %>misc/email-invoice.cgi?<%= $alt_link %>">re-email</A>
-          <% } %>
-                       
-          <% if ( $conf->exists('hylafax')
-                  && length($cust_bill->cust_main->fax) ) { %>
-            | <A HREF="<%= $p %>misc/fax-invoice.cgi?<%= $alt_link %>">re-fax</A>
-          <% } %>
-
-          )
-        <% } %>
+    if (
+      $part_bill_event->plan eq 'send_alternate'
+      && $part_bill_event->plandata =~ /^templatename (.*)$/m
+    ) {
+      my $templatename = $1;
+      print qq! ( <A HREF="${p}view/cust_bill.cgi?$templatename-$invnum">!.
+            'view text</A> | '.
+            qq!<A HREF="${p}view/cust_bill-pdf.cgi?$templatename-$invnum.pdf">!.
+            'view typeset</A> )';
+    }
   
-      </TD>
-      <TD><%= time2str("%a %b %e %T %Y", $cust_bill_event->_date) %></TD>
-      <TD><%= $status %></TD>
-    </TR>
-  <% } %>
+    print '</TD><TD>'.
+          time2str("%a %b %e %T %Y", $cust_bill_event->_date). '</TD><TD>'.
+          $status. '</TD></TR>';
+  }
+  print '</TABLE><BR>';
+}
+
+print '<PRE>', $cust_bill->print_text('', $templatename);
+
+	#formatting
+	print <<END;
+    </PRE></FONT>
+  </BODY>
+</HTML>
+END
 
-  </TABLE>
-  <BR>
-
-<% } %>
-
-<% if ( $conf->exists('invoice_html') ) { %>
-  <%= join('', $cust_bill->print_html('', $templatename) ) %>
-<% } else { %>
-  <PRE><%= join('', $cust_bill->print_text('', $templatename) ) %></PRE>
-<% } %>
-
-</BODY></HTML>
+%>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 59c1a4b..d5d77f2 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -16,6 +16,12 @@ foreach my $part_svc ( qsearch('part_svc',{}) ) {
   'Main Menu' => $p,
 )) %>
 
+<STYLE TYPE="text/css">
+.package TH { font-size: medium }
+.package TR { font-size: smaller }
+.package .provision { font-weight: bold }
+</STYLE>
+
 <%
 
 die "No customer specified (bad URL)!" unless $cgi->keywords;
@@ -29,43 +35,18 @@ print qq!<A HREF="${p}edit/cust_main.cgi?$custnum">Edit this customer</A>!;
 
 %>
 
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
-
-<SCRIPT TYPE="text/javascript">
+<SCRIPT>
 function areyousure(href, message) {
-  if (confirm(message) == true)
-    window.location.href = href;
+    if (confirm(message) == true)
+        window.location.href = href;
 }
 </SCRIPT>
 
-<SCRIPT TYPE="text/javascript">
-
 <%
-my $ban = '';
-if ( $cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) {
-  $ban = '<BR><P ALIGN="center">'.
-         '<INPUT TYPE="checkbox" NAME="ban" VALUE="1"> Ban this customer\\\'s ';
-  if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
-    $ban .= 'credit card';
-  } elsif (  $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
-    $ban .= 'ACH account';
-  }
-}
-%>
-
-var confirm_cancel = '<FORM METHOD="POST" ACTION="<%= $p %>misc/cust_main-cancel.cgi"> <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $custnum %>"> <BR><P ALIGN="center"><B>Permanently delete all services and cancel this customer?</B> <%= $ban%><BR><P ALIGN="CENTER"> <INPUT TYPE="submit" VALUE="Cancel customer">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="BUTTON" VALUE="Don\'t cancel" onClick="cClick()"> </FORM> ';
-
-</SCRIPT>
-
-<% if ( $cust_main->ncancelled_pkgs ) { %>
 
-  | <A HREF="javascript:void(0);" onClick="overlib(confirm_cancel, CAPTION, 'Confirm cancellation', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' ); return false; ">Cancel this customer</A>
-
-<% } %>
-
-<%
+print qq! | <A HREF="javascript:areyousure('${p}misc/cust_main-cancel.cgi?$custnum', 'Perminantly delete all services and cancel this customer?')">!.
+      'Cancel this customer</A>'
+  if $cust_main->ncancelled_pkgs;
 
 print qq! | <A HREF="${p}misc/delete-customer.cgi?$custnum">!.
       'Delete this customer</A>'
@@ -128,6 +109,13 @@ Comments
 <% } %>
 
 <BR><BR>
+<%= include('cust_main/order_pkg.html', $cust_main ) %>
+
+<% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
+  <%= include('cust_main/quick-charge.html', $cust_main ) %>
+  <BR>
+<% } %>
+
 <%= include('cust_main/packages.html', $cust_main ) %>
 
 <% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 5786a07..18a203b 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -6,7 +6,22 @@
 Billing information
 (<A HREF="<%= $p %>misc/bill.cgi?<%= $cust_main->custnum %>">Bill now</A>)
 <%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
-
+<TR>
+  <TD ALIGN="right">Tax&nbsp;exempt</TD>
+  <TD BGCOLOR="#ffffff"><%= $cust_main->tax ? 'yes' : 'no' %></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Postal&nbsp;invoices</TD>
+  <TD BGCOLOR="#ffffff">
+    <%= ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no' %>
+  </TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Email&nbsp;invoices</TD>
+  <TD BGCOLOR="#ffffff">
+    <%= join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no' %>
+  </TD>
+</TR>
 <TR>
   <TD ALIGN="right">Billing&nbsp;type</TD>
   <TD BGCOLOR="#ffffff">
@@ -20,37 +35,10 @@ Billing information
   <TD ALIGN="right">Card number</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->payinfo_masked %></TD>
 </TR>
-
-<%
-#false laziness w/elements/select-month_year.html & edit/cust_main/billing.html
-my( $mon, $year );
-my $date = $cust_main->paydate || '12-2037';
-if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-  ( $mon, $year ) = ( $2, $1 );
-} elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-  ( $mon, $year ) = ( $1, $3 );
-} else {
-  warn "unrecognized expiration date format: $date";
-  ( $mon, $year ) = ( '', '' );
-}
-%>
 <TR>
   <TD ALIGN="right">Expiration</TD>
-  <TD BGCOLOR="#ffffff"><%= "$mon/$year" %></TD>
-</TR>
-
-<% if ( $cust_main->paystart_month ) { %>
-  <TR>
-    <TD ALIGN="right">Start date</TD>
-    <TD BGCOLOR="#ffffff"><%= $cust_main->paystart_month. '/'. $cust_main->paystart_year %>
-  </TR>
-<% } elsif ( $cust_main->payissue ) { %>
-  <TR>
-    <TD ALIGN="right">Issue #</TD>
-    <TD BGCOLOR="#ffffff"><%= $cust_main->payissue %>
-  </TR>
-<% } %>
-
+  <TD BGCOLOR="#ffffff"><%= $cust_main->paydate %></TD>
+</TR>
 <TR>
   <TD ALIGN="right">Name on card</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->payname %></TD>
@@ -69,7 +57,7 @@ if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
 </TR>
 <TR>
   <TD ALIGN="right">Account number</TD>
-  <TD BGCOLOR="#ffffff"><%= 'x'x(length($account)-2). substr($account,(length($account)-2)) %></TD>
+  <TD BGCOLOR="#ffffff"><%= $account %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Bank name</TD>
@@ -103,6 +91,10 @@ if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
   <% } %>
 
 <TR>
+  <TD ALIGN="right">Expiration</TD>
+  <TD BGCOLOR="#ffffff"><%= $cust_main->paydate %></TD>
+</TR>
+<TR>
   <TD ALIGN="right">Attention</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->payname %></TD>
 </TR>
@@ -116,49 +108,12 @@ if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
   <TD ALIGN="right">Authorized&nbsp;by</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->payinfo %></TD>
 </TR>
-
-<%
-#false laziness w/above etc.
-my( $mon, $year );
-my $date = $cust_main->paydate || '12-2037';
-if ( $date  =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
-  ( $mon, $year ) = ( $2, $1 );
-} elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
-  ( $mon, $year ) = ( $1, $3 );
-} else {
-  warn "unrecognized expiration date format: $date";
-  ( $mon, $year ) = ( '', '' );
-}
-%>
 <TR>
   <TD ALIGN="right">Expiration</TD>
-  <TD BGCOLOR="#ffffff"><%= "$mon/$year" %></TD>
+  <TD BGCOLOR="#ffffff"><%= $cust_main->paydate %></TD>
 </TR>
 
 <% } %>
 
-<TR>
-  <TD ALIGN="right">Tax&nbsp;exempt</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->tax ? 'yes' : 'no' %></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Postal&nbsp;invoices</TD>
-  <TD BGCOLOR="#ffffff">
-    <%= ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no' %>
-  </TD>
-</TR>
-<TR>
-  <TD ALIGN="right">FAX&nbsp;invoices</TD>
-  <TD BGCOLOR="#ffffff">
-    <%= ( grep { $_ eq 'FAX' } @invoicing_list ) ? 'yes' : 'no' %>
-  </TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Email&nbsp;invoices</TD>
-  <TD BGCOLOR="#ffffff">
-    <%= join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %>
-  </TD>
-</TR>
-
 </TABLE></TD></TR></TABLE>
 
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index ece1b62..c5a0706 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -5,42 +5,8 @@
   my $packages = get_packages($cust_main, $conf);
 %>
 
-<STYLE TYPE="text/css">
-.package .provision { font-weight: bold }
-</STYLE>
-
-<A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A>
-
-<%= include('order_pkg.html', $cust_main ) %>
-
-<% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
-  <%= include('quick-charge.html', $cust_main ) %>
-<% } %>
-
-<A HREF="<%= $p %>edit/cust_pkg.cgi?<%= $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services)
-<BR><BR>
-
-<% if ( @$packages ) { %>
-Current packages
-<% } %>
-
-<% if ( $cust_main->num_cancelled_pkgs ) {
-     if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
-          || ( $conf->exists('hidecancelledpackages')
-               && ! $cgi->param('showcancelledpackages')
-             )
-        )
-     {
-       $cgi->param('showcancelledpackages', 1);
-%>
-  ( <a href="<%= $cgi->self_url %>">show
-<%   } else {
-       $cgi->param('showcancelledpackages', 0);
-%>
-  ( <a href="<%= $cgi->self_url %>">hide
-<%   } %>
- cancelled packages</a> )
-<% } %>
+<A NAME="cust_pkg">Packages</A>
+( <A HREF="<%= $p %>edit/cust_pkg.cgi?<%= $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services) )
 
 <% if ( @$packages ) { %>
 
@@ -75,10 +41,12 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
     (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;|&nbsp;<%=pkg_customize_link($pkg,$cust_main->custnum)%>&nbsp;)
 <% } %>
   </TD>
-  <TD ROWSPAN=<%=$rowspan%>>
-    <TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
-
 <%
+  #foreach (qw(setup last_bill next_bill susp expire cancel)) {
+  #  print qq!  <TD ROWSPAN=$rowspan>! . pkg_datestr($pkg,$_,$conf) . qq!</TD>\n!;
+  #}
+  print "<TD ROWSPAN=$rowspan>". &itable('');
+
   sub myfreq {
     my $part_pkg = shift;
     my $freq = $part_pkg->freq_pretty;
@@ -86,190 +54,92 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
     $freq;
   }
 
-  #this should use cust_pkg->status and cust_pkg->statuscolor eventually
-
-  my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4;
-  my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%';
+  if ( $pkg->{cancel} ) { #status: cancelled
+
+    print '<TR><TD><FONT COLOR="#ff0000"><B>Cancelled&nbsp;</B></FONT></TD>'.
+          '<TD>'. pkg_datestr($pkg,'cancel',$conf). '</TD></TR>';
+    unless ( $pkg->{setup} ) {
+      print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
+    } else {
+      print "<TR><TD>Setup&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'setup',$conf). '</TD></TR>';
+      print "<TR><TD>Last&nbsp;bill&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'last_bill',$conf). '</TD></TR>'
+        if $pkg->{'last_bill'};
+      print "<TR><TD>Suspended&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'susp',$conf). '</TD></TR>'
+        if $pkg->{'susp'};
+    }
 
-  #false laziness w/edit/REAL_cust_pkg.cgi
-  my( $billed_or_prepaid, $last_bill_or_renewed, $next_bill_or_prepaid_until );
-  unless ( $pkg->{'part_pkg'}->is_prepaid ) {
-    $billed_or_prepaid = 'billed';
-    $last_bill_or_renewed = 'Last&nbsp;bill';
-    $next_bill_or_prepaid_until = 'Next&nbsp;bill';
   } else {
-    $billed_or_prepaid = 'prepaid';
-    $last_bill_or_renewed = 'Renewed';
-    $next_bill_or_prepaid_until = 'Prepaid&nbsp;until';
-  }
-
-%>
-
-<% if ( $pkg->{cancel} ) { %> <!-- #status: cancelled -->
-
-  <TR>
-    <TD WIDTH="<%=$width%>" ALIGN="right"><FONT COLOR="#ff0000"><B>Cancelled&nbsp;</B></FONT></TD>
-    <%= pkg_datestr($pkg,'cancel',$conf) %>
-  </TR>
-
-  <% unless ( $pkg->{setup} ) { %>
-
-    <TR>
-      <TD COLSPAN=<%=$colspan%>>Never billed</TD>
-    </TR>
-
-  <% } else { %>
-
-    <TR>
-      <TD WIDTH="<%=$width%>" ALIGN="right">Setup&nbsp;</TD>
-      <%= pkg_datestr($pkg, 'setup',$conf) %>
-    </TR>
-
-    <% if ( $pkg->{'last_bill'} ) { %>
-      <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right"><%= $last_bill_or_renewed %>&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'last_bill',$conf) %>
-      </TR>
-    <% } %>
-
-    <% if ( $pkg->{'susp'} ) { %>
-      <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right">Suspended&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'susp',$conf) %>
-      </TR>
-    <% } %>
-
-  <% } %>
-
-<% } else { %>
-
-  <% if ( $pkg->{susp} ) { %> <!-- #status: suspended -->
-
-    <TR>
-      <TD WIDTH="<%=$width%>" ALIGN="right"><FONT COLOR="#FF9900"><B>Suspended</B>&nbsp;</FONT></TD>
-      <%= pkg_datestr($pkg,'susp',$conf) %>
-    </TR>
-
-    <% unless ( $pkg->{setup} ) { %>
-
-      <TR>
-        <TD COLSPAN=<%=$colspan%>>Never billed</TD>
-      </TR>
-
-    <% } else { %>
 
-      <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right">Setup&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'setup',$conf) %>
-      </TR>
-      
-    <% } %>
+    if ( $pkg->{susp} ) { #status: suspended
+      print '<TR><TD><FONT COLOR="#FF9900"><B>Suspended</B>&nbsp;</FONT></TD>'.
+            '<TD>'. pkg_datestr($pkg,'susp',$conf). '</TD></TR>';
+      unless ( $pkg->{setup} ) {
+        print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
+      } else {
+        print "<TR><TD>Setup&nbsp;</TD><TD>". 
+              pkg_datestr($pkg, 'setup',$conf). '</TD></TR>';
+      }
+      print "<TR><TD>Last&nbsp;bill&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'last_bill',$conf). '</TD></TR>'
+        if $pkg->{'last_bill'};
+      # next bill ??
+      print "<TR><TD>Expires&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'expire',$conf). '</TD></TR>'
+        if $pkg->{'expire'};
+      print '<TR><TD COLSPAN=2>(&nbsp;'. pkg_unsuspend_link($pkg).
+            '&nbsp;|&nbsp;'. pkg_cancel_link($pkg). '&nbsp;)</TD></TR>';
+
+    } else { #status: active
+
+      unless ( $pkg->{setup} ) { #not setup
+
+        print '<TR><TD COLSPAN=2>Not&nbsp;yet&nbsp;billed&nbsp;(';
+        unless ( $pkg->{freq} ) {
+          print 'one-time&nbsp;charge)</TD></TR>';
+          print '<TR><TD COLSPAN=2>(&nbsp;'. pkg_cancel_link($pkg).
+                '&nbsp;)</TD</TR>';
+        } else {
+          print 'billed&nbsp;'. myfreq($pkg->{part_pkg}). ')</TD></TR>';
+        }
+
+      } else { #setup
+
+        unless ( $pkg->{freq} ) {
+          print "<TR><TD COLSPAN=2>One-time&nbsp;charge</TD></TR>".
+                '<TR><TD>Billed&nbsp;</TD><TD>'.
+                pkg_datestr($pkg,'setup',$conf). '</TD></TR>';
+        } else {
+          print '<TR><TD COLSPAN=2><FONT COLOR="#00CC00"><B>Active</B></FONT>'.
+                ',&nbsp;billed&nbsp;'. myfreq($pkg->{part_pkg}). '</TD></TR>'.
+                '<TR><TD>Setup&nbsp;</TD><TD>'.
+                pkg_datestr($pkg, 'setup',$conf). '</TD></TR>';
+        }
+
+      }
+
+      print "<TR><TD>Last&nbsp;bill&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'last_bill',$conf). '</TD></TR>'
+        if $pkg->{'last_bill'};
+      print "<TR><TD>Next&nbsp;bill&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'next_bill',$conf). '</TD></TR>'
+        if $pkg->{'next_bill'};
+      print "<TR><TD>Expires&nbsp;</TD><TD>".
+            pkg_datestr($pkg, 'expire',$conf). '</TD></TR>'
+        if $pkg->{'expire'};
+      if ( $pkg->{freq} ) {
+        print '<TR><TD COLSPAN=2>(&nbsp;'. pkg_suspend_link($pkg).
+              '&nbsp;|&nbsp;'. pkg_cancel_link($pkg). '&nbsp;)</TD></TR>';
+      }
 
-    <% if ( $pkg->{'last_bill'} ) { %>
-      <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right"><%= $last_bill_or_renewed %>&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'last_bill',$conf) %>
-      </TR>
-    <% } %>
-
-    <!-- # next bill ?? -->
-
-    <% if ( $pkg->{'expire'} ) { %>
-      <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right">Expires&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'expire',$conf) %>
-      </TR>
-    <% } %>
-
-    <TR>
-      <TD COLSPAN=<%=$colspan%>>(&nbsp;<%= pkg_unsuspend_link($pkg) %>&nbsp;|&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)</TD>
-    </TR>
-
-  <% } else { %> <!-- #status: active -->
-
-    <% unless ( $pkg->{setup} ) { %> <!-- #not setup -->
-
-      <% unless ( $pkg->{'freq'} ) { %>
-
-        <TR>
-          <TD COLSPAN=<%=$colspan%>>Not&nbsp;yet&nbsp;billed&nbsp;(one-time&nbsp;charge)</TD>
-        </TR>
-
-        <TR>
-          <TD COLSPAN=<%=$colspan%>>(&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)</TD>
-        </TR>
-
-      <% } else { %>
-
-        <TR>
-          <TD COLSPAN=<%=$colspan%>>Not&nbsp;yet&nbsp;billed&nbsp;(<%= $billed_or_prepaid %>&nbsp;<%= myfreq($pkg->{part_pkg}) %>)</TD>
-        </TR>
-
-      <% } %>
-
-    <% } else { %> <!-- #setup -->
-
-      <% unless ( $pkg->{freq} ) { %>
-
-        <TR>
-          <TD COLSPAN=<%=$colspan%>>One-time&nbsp;charge</TD>
-        </TR>
-
-        <TR>
-          <TD WIDTH="<%=$width%>" ALIGN="right">Billed&nbsp;</TD>
-          <%= pkg_datestr($pkg,'setup',$conf) %>
-        </TR>
-
-      <% } else { %>
-
-        <TR>
-          <TD COLSPAN=<%=$colspan%>><FONT COLOR="#00CC00"><B>Active</B></FONT>,&nbsp;<%= $billed_or_prepaid %>&nbsp;<%= myfreq($pkg->{part_pkg}) %></TD>
-        </TR>
-
-        <TR>
-          <TD WIDTH="<%=$width%>" ALIGN="right">Setup&nbsp;</TD>
-          <%= pkg_datestr($pkg, 'setup',$conf) %>
-        </TR>
-
-      <% } %>
-
-    <% } %>
-
-    <% if ( $pkg->{'last_bill'} ) { %>
-      <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right"><%= $last_bill_or_renewed %>&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'last_bill',$conf) %>
-      </TR>
-    <% } %>
-
-    <% if ( $pkg->{'next_bill'} ) { %>
-      <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right"><%= $next_bill_or_prepaid_until %>&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'next_bill',$conf) %>
-      </TR>
-    <% } %>
-
-    <% if ( $pkg->{'expire'} ) { %>
-      <TR>
-        <TD WIDTH="<%=$width%>" ALIGN="right">Expires&nbsp;</TD>
-        <%= pkg_datestr($pkg, 'expire',$conf) %>
-      </TR>
-    <% } %>
-
-    <% if ( $pkg->{freq} ) { %>
-      <TR>
-        <TD COLSPAN=<%=$colspan%>>(&nbsp;<%= pkg_suspend_link($pkg) %>&nbsp;|&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)</TD>
-      </TR>
-    <% } %>
-
-  <% } %>
+    }
 
-<% } %>
+  }
 
-</TABLE>
-</TD>
+  print "</TABLE></TD>\n";
 
-<%
   if ($rowspan == 0) { print qq!</TR>\n!; next; }
 
   my $cnt = 0;
@@ -289,14 +159,12 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
     }
   }
 }
+print '</TABLE>';
+}
+
 #end display packages
 %>
 
-</TABLE>
-<% } else { %>
-<BR>
-<% } %>
-
 <%
 #subroutines
 
@@ -305,18 +173,12 @@ sub get_packages {
   my $conf = shift;
   
   my @packages = ();
-  my $method;
-  if (  $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
-     || ( $conf->exists('hidecancelledpackages')
-           && ! $cgi->param('showcancelledpackages') )
-     )
-  {
-    $method = 'ncancelled_pkgs';
-  } else {
-    $method = 'all_pkgs';
-  }
   
-  foreach my $cust_pkg ( $cust_main->$method() ) {
+  foreach my $cust_pkg (
+    $conf->exists('hidecancelledpackages')
+      ? $cust_main->ncancelled_pkgs
+      : $cust_main->all_pkgs
+  ) { 
   
     my $part_pkg = $cust_pkg->part_pkg;
 
@@ -442,15 +304,9 @@ sub pkgsort_pkgnum_cancel {
 sub pkg_datestr {
   my($pkg, $field, $conf) = @_ or return '';
   return '&nbsp;' unless $pkg->{$field};
-  my $format = '<TD align="left"><B>%b</B></TD>'.
-               '<TD align="right"><B>&nbsp;%o,</B></TD>'.
-               '<TD align="right"><B>&nbsp;%Y</B></TD>';
-  #$format .= '&nbsp;<FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>'
-  $format .= '<TD ALIGN="right"><B>&nbsp;%l</TD>'.
-             '<TD ALIGN="center"><B>:</B></TD>'.
-             '<TD ALIGN="left"><B>%M</B></TD>'.
-             '<TD ALIGN="left"><B>&nbsp;%P</B></TD>'
-    if $conf->exists('cust_pkg-display_times');
+  my $format = $conf->exists('pkg_showtimes')
+               ? '<B>%D</B>&nbsp;<FONT SIZE=-3>%l:%M:%S%P&nbsp;%z</FONT>'
+               : '<B>%b&nbsp;%o,&nbsp;%Y</B>';
   ( my $strip = time2str($format, $pkg->{$field}) ) =~ s/ (\d)/$1/g;
   $strip;
 }
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index ec99b8c..0f3a987 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -1,63 +1,13 @@
 <%
   my( $cust_main ) = @_;
-  my $custnum = $cust_main->custnum;
-
   my $conf = new FS::Conf;
-
-  my @payby = grep /\w/, $conf->config('payby');
-  #@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
-  @payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
-    unless @payby;
-  my %payby = map { $_=>1 } @payby;
-
-  my $s = 0;
-
+  my $custnum = $cust_main->custnum;
 %>
 
 <BR><BR><A NAME="history"><FONT SIZE="+2">Payment History</FONT></A><BR>
-
-<% if ( $payby{'BILL'} ) { %>
-
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=BILL;custnum=<%= $custnum %>">Post check payment</A>
-
-<% } %>
-
-<% if ( $payby{'CASH'} ) { %>
-
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=CASH;custnum=<%= $custnum %>">Post cash payment</A>
-
-<% } %>
-
-<% if ( $payby{'WEST'} ) { %>
-
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;custnum=<%= $custnum %>">Post Western Union payment</A>
-
-<% } %>
-
-<% if ( $payby{'CARD'} || $payby{'DCRD'} ) { %>
-
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>misc/payment.cgi?payby=CARD;custnum=<%= $custnum %>">Process credit card payment</A>
-
-<% } %>
-
-<% if ( $payby{'CHEK'} || $payby{'DCHK'} ) { %>
-
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>misc/payment.cgi?payby=CHEK;custnum=<%= $custnum %>">Process electronic check (ACH) payment</A>
-
-<% } %>
-
-<% if ( $payby{'MCRD'} ) { %>
-
-  <%= $s++ ? ' | ' : '' %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<%= $custnum %>">Post manual credit card payment</A>
-
-<% } %>
-
+<A HREF="<%= $p %>edit/cust_pay.cgi?custnum=<%= $custnum %>">Post cash/check payment</A>
+| <A HREF="<%= $p %>misc/payment.cgi?payby=CARD;custnum=<%= $custnum %>">Process credit card payment</A>
+| <A HREF="<%= $p %>misc/payment.cgi?payby=CHEK;custnum=<%= $custnum %>">Process electronic check (ACH) payment</A>
 <BR><A HREF="<%= $p %>edit/cust_credit.cgi?<%= $custnum %>">Post credit</A>
 <BR>
 
@@ -100,13 +50,8 @@ foreach my $cust_pay ($cust_main->cust_pay) {
   my $target = "$payby$payinfo";
   $payby =~ s/^BILL$/Check #/ if $payinfo;
   $payby =~ s/^CHEK$/Electronic check /;
-  $payby =~ s/^PREP$/Prepaid card /;
-  $payby =~ s/^CARD$/Credit card #/; 
-  $payby =~ s/^COMP$/Complimentary by /; 
-  $payby =~ s/^CASH$/Cash/;
-  $payby =~ s/^WEST$/Western Union/;
-  $payby =~ s/^MCRD$/Manual credit card/;
   $payby =~ s/^BILL$//;
+  $payby =~ s/^(CARD|COMP)$/$1 /;
   my $info = $payby ? " ($payby$payinfo)" : '';
 
   my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' );
@@ -172,14 +117,14 @@ foreach my $cust_pay ($cust_main->cust_pay) {
 
   my $void = '';
   if (    $cust_pay->closed !~ /^Y/i
-       && ( $cust_pay->payby ne 'CARD' || $conf->exists('cc-void')     )
+       && $cust_pay->payby ne 'CARD'
        && ( $cust_pay->payby ne 'CHEK' || $conf->exists('echeck-void') ) 
      ) {
     $void = qq! (<A HREF="javascript:areyousure('!.
             qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
             qq!', 'Are you sure you want to void this payment?')"!.
             qq! TITLE="Void this payment from the database!.
-              ( $cust_pay->payby =~ /^(CARD|CHEK)$/
+              ( $cust_pay->payby eq 'CHEK'
                 ? ' (do not send anything to the payment gateway)'
                 : '' 
               ). '"'.
@@ -229,24 +174,11 @@ foreach my $cust_pay_void ($cust_main->cust_pay_void) {
   $payby =~ s/^(CARD|COMP)$/$1 /;
   my $info = $payby ? " ($payby$payinfo)" : '';
 
-  my $unvoid = '';
-  if ( $cust_pay_void->closed !~ /^Y/i && $conf->exists('unvoid') ) {
-    $unvoid = qq! (<A HREF="javascript:areyousure('!.
-              qq!${p}misc/unvoid-cust_pay_void.cgi?!. $cust_pay_void->paynum.
-              qq!', 'Are you sure you want to unvoid this payment?')"!.
-              qq! TITLE="Unvoid this payment from the database!.
-                ( $cust_pay_void->payby =~ /^(CARD|CHEK)$/
-                  ? ' (do not send anything to the payment gateway)'
-                  : '' 
-                ). '"'.
-              qq!>unvoid</A>)!;
-  }
-
   push @history, {
     'date'   => $cust_pay_void->_date,
     'desc'   => "<DEL>Payment $info</DEL> <I>voided ".
                 time2str("%D", $cust_pay_void->void_date).
-                " by ". $cust_pay_void->otaker. '</i>'. $unvoid,
+                " by ". $cust_pay_void->otaker. '</i>',
     'void_payment' => $cust_pay_void->paid,
   };
 
@@ -326,10 +258,7 @@ foreach my $cust_credit ($cust_main->cust_credit) {
   push @history, {
     'date'   => $cust_credit->_date,
     'desc'   => $pre. "Credit$post by ". $cust_credit->otaker.
-                ( $cust_credit->reason
-		    ? ' ('. $cust_credit->reason. ')'
-		    : ''
-		).
+                ' ('. $cust_credit->reason. ')'.
                 "$desc$apply$delete$unapply",
     'credit' => $cust_credit->amount,
   };
diff --git a/httemplate/view/cust_main/quick-charge.html b/httemplate/view/cust_main/quick-charge.html
index 2fe3d5f..0b51586 100644
--- a/httemplate/view/cust_main/quick-charge.html
+++ b/httemplate/view/cust_main/quick-charge.html
@@ -1,18 +1,32 @@
 <%
   my( $cust_main ) = @_;
+  my $conf = new FS::Conf;
 %>
 
 <FORM ACTION="<%=$p%>edit/process/quick-charge.cgi" METHOD="POST">
-
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $cust_main->custnum %>">
-
 Description:<INPUT TYPE="text" NAME="pkg">
+&nbsp;Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>
+&nbsp;<% 
+  
+  #false laziness w/ edit/part_pkg.cgi
+  if ( $conf->exists('enable_taxclasses') ) {
+    print '<SELECT NAME="taxclass">';
+    my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+      or die dbh->errstr;
+    $sth->execute or die $sth->errstr;
+    foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
+      print qq!<OPTION VALUE="$taxclass"!;
+      #print ' SELECTED' if $taxclass eq $hashref->{taxclass};
+      print qq!>$taxclass</OPTION>!;
+    }
+    print '</SELECT>';
+  } else {
+    print '<INPUT TYPE="hidden" NAME="taxclass" VALUE="">';
+  }
 
-Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>
-
-<%= include('/elements/select-taxclass.html') %>
-
+%>
+  
 <INPUT TYPE="submit" VALUE="One-time charge">
-
 </FORM>
 
diff --git a/httemplate/view/cust_main/tickets.html b/httemplate/view/cust_main/tickets.html
index 72d6815..d6ddfa6 100644
--- a/httemplate/view/cust_main/tickets.html
+++ b/httemplate/view/cust_main/tickets.html
@@ -30,7 +30,7 @@
 
 Highest priority tickets
 (<A HREF="<%= FS::TicketSystem->href_customer_tickets($cust_main->custnum) %>">View all tickets for this customer</A>)
-(<A HREF="<%= FS::TicketSystem->href_new_ticket($cust_main, join(', ', grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list ) ) %>">New ticket for this customer</A>)
+(<A HREF="<%= FS::TicketSystem->href_new_ticket($cust_main->custnum, join(', ', grep { $_ ne 'POST' } $cust_main->invoicing_list ) ) %>">New ticket for this customer</A>)
 <%= table() %>
 <TR>
   <TH>#</TH>
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index a20149a..5f0e6bf 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -104,9 +104,8 @@ unless ($cancel) {
 
   #list of services this pkgpart includes
   my $pkg_svc;
-  my %pkg_svc;
-  #foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
-  foreach $pkg_svc ( $cust_pkg->part_pkg->pkg_svc ) {
+  my %pkg_svc = ();
+  foreach $pkg_svc ( qsearch('pkg_svc',{'pkgpart'=> $cust_pkg->pkgpart }) ) {
     $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity if $pkg_svc->quantity;
   }
 
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index b42362d..6ca9bf0 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
@@ -23,46 +24,41 @@ if ($pkgnum) {
 
 my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unknown svcpart" unless $part_svc;
-my $svc = $part_svc->svc;
 
-die 'Empty domsvc for svc_acct.svcnum '. $svc_acct->svcnum
-  unless $svc_acct->domsvc;
-my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
-die 'Unknown domain (domsvc '. $svc_acct->domsvc.
-    ' for svc_acct.svcnum '. $svc_acct->svcnum. ')'
-  unless $svc_domain;
-my $domain = $svc_domain->domain;
+my $domain;
+if ( $svc_acct->domsvc ) {
+  my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+  die "Unknown domain" unless $svc_domain;
+  $domain = $svc_domain->domain;
+} else {
+  die "No svc_domain.svcnum record for svc_acct.domsvc: ". $cust_svc->domsvc;
+}
 
 %>
 
-<% if ( $custnum ) { %>
-
-  <%= header("View $svc account", menubar(
-    "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-    "Main menu" => $p,
-  )) %>
-
-  <%= include( '/elements/small_custview.html', $custnum, '', 1 ) %>
-  <BR>
-
-<% } else { %>
+<SCRIPT>
+function areyousure(href) {
+    if (confirm("Permanently delete this account?") == true)
+        window.location.href = href;
+}
+</SCRIPT>
 
-  <SCRIPT>
-  function areyousure(href) {
-      if (confirm("Permanently delete this account?") == true)
-          window.location.href = href;
-  }
-  </SCRIPT>
-  
-  <%= header('Account View', menubar(
-    "Cancel this (unaudited) account" =>
-            "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
-    "Main menu" => $p,
-  )) %>
+<%= header('Account View', menubar(
+  ( ( $pkgnum || $custnum )
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+      )
+    : ( "Cancel this (unaudited) account" =>
+          "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" )
+  ),
+  "Main menu" => $p,
+)) %>
 
-<% } %>
+<%
 
-<% if ( $part_svc->part_export_usage ) {
+#if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
+if (    $part_svc->part_export('sqlradius')
+     || $part_svc->part_export('sqlradius_withdomain')
+) {
 
   my $last_bill;
   my %plandata;
@@ -155,178 +151,122 @@ function enable_change () {
   }
 %>
 
-Service #<B><%= $svcnum %></B>
-| <A HREF="<%=$p%>edit/svc_acct.cgi?<%=$svcnum%>">Edit this service</A>
+Service Information
+| <A HREF="<%=$p%>edit/svc_acct.cgi?<%=$svcnum%>">Edit this information</A>
 
 <% if ( @part_svc ) { %>
 | <SELECT NAME="svcpart" onChange="enable_change()">
     <OPTION VALUE="">Change service</OPTION>
     <OPTION VALUE="">--------------</OPTION>
-    <% foreach my $opt_part_svc ( @part_svc ) { %>
-      <OPTION VALUE="<%= $opt_part_svc->svcpart %>"><%= $opt_part_svc->svc %></OPTION>
+    <% foreach my $part_svc ( @part_svc ) { %>
+      <OPTION VALUE="<%= $part_svc->svcpart %>"><%= $part_svc->svc %></OPTION>
     <% } %>
   </SELECT>
   <INPUT NAME="submit" TYPE="submit" VALUE="Change" disabled>
 <% } %>
 
 <%= &ntable("#cccccc") %><TR><TD><%= &ntable("#cccccc",2) %>
+<TR><TD ALIGN="right">Service number</TD>
+  <TD BGCOLOR="#ffffff"><%= $svcnum %></TD></TR>
+<TR><TD ALIGN="right">Service</TD>
+  <TD BGCOLOR="#ffffff"><%= $part_svc->svc %></TD></TR>
+<TR><TD ALIGN="right">Username</TD>
+  <TD BGCOLOR="#ffffff"><%= $svc_acct->username %></TD></TR>
+<TR><TD ALIGN="right">Domain</TD>
+  <TD BGCOLOR="#ffffff"><%= $domain %></TD></TR>
+
+<TR><TD ALIGN="right">Password</TD>
+  <TD BGCOLOR="#ffffff"><% 
+
+my $password = $svc_acct->_password;
+if ( $password =~ /^\*\w+\* (.*)$/ ) {
+  $password = $1;
+  print "<I>(login disabled)</I> ";
+}
+if ( $conf->exists('showpasswords') ) {
+  print '<PRE>'. encode_entities($password). '</PRE>';
+} else {
+  print "<I>(hidden)</I>";
+}
+print "</TR></TD>";
+$password = '';
 
-<TR>
-  <TD ALIGN="right">Service</TD>
-  <TD BGCOLOR="#ffffff"><%= $part_svc->svc %></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Username</TD>
-  <TD BGCOLOR="#ffffff"><%= $svc_acct->username %></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">Domain</TD>
-  <TD BGCOLOR="#ffffff"><%= $domain %></TD>
-</TR>
-
-<TR>
-  <TD ALIGN="right">Password</TD>
-  <TD BGCOLOR="#ffffff">
-
-    <% my $password = $svc_acct->_password; %>
-    <% if ( $password =~ /^\*\w+\* (.*)$/ ) {
-         $password = $1;
-    %>
-      <I>(login disabled)</I>
-    <% } %>
-
-    <% if ( $conf->exists('showpasswords') ) { %>
-      <PRE><%= encode_entities($password) %></PRE>
-    <% } else { %>
-      <I>(hidden)</I>
-    <% } %>
-
-  </TD>
-</TR>
-<% $password = ''; %>
-
-<% if ( $conf->exists('security_phrase') ) {
-     my $sec_phrase = $svc_acct->sec_phrase;
-%>
-  <TR>
-    <TD ALIGN="right">Security phrase</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->sec_phrase %></TD>
-  </TR>
-<% } %>
-
-<% if ( $svc_acct->popnum ) {
-    my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
-%>
-  <TR>
-    <TD ALIGN="right">Access number</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct_pop->text %></TD>
-  </TR>
-<% } %>
-
-<% if ($svc_acct->uid ne '') { %>
-  <TR>
-    <TD ALIGN="right">UID</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->uid %></TD>
-  </TR>
-<% } %>
-
-<% if ($svc_acct->gid ne '') { %>
-  <TR>
-    <TD ALIGN="right">GID</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->gid %></TD>
-  </TR>
-<% } %>
-
-<% if ($svc_acct->finger ne '') { %>
-  <TR>
-    <TD ALIGN="right">GECOS</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->finger %></TD>
-  </TR>
-<% } %>
-
-<% if ($svc_acct->dir ne '') { %>
-  <TR>
-    <TD ALIGN="right">Home directory</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->dir %></TD>
-  </TR>
-<% } %>
-
-<% if ($svc_acct->shell ne '') { %>
-  <TR>
-    <TD ALIGN="right">Shell</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->shell %></TD>
-  </TR>
-<% } %>
-
-<% if ($svc_acct->quota ne '') { %>
-  <TR>
-    <TD ALIGN="right">Quota</TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->quota %></TD>
-  </TR>
-<% } %>
-
-<% if ($svc_acct->slipip) { %>
-  <TR>
-    <TD ALIGN="right">IP address</TD>
-    <TD BGCOLOR="#ffffff">
-      <%= ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
-            ? "<I>(Dynamic)</I>"
-            : $svc_acct->slipip
-      %>
-    </TD>
-  </TR>
-<% } %>
-
-<% foreach my $attribute ( grep /^radius_/, $svc_acct->fields ) {
-  $attribute =~ /^radius_(.*)$/;
-  my $pattribute = $FS::raddb::attrib{$1};
-%>
-  <TR>
-    <TD ALIGN="right">Radius (reply) <%= $pattribute %></TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->getfield($attribute) %></TD>
-  </TR>
-<% } %>
+if ( $conf->exists('security_phrase') ) {
+  my $sec_phrase = $svc_acct->sec_phrase;
+  print '<TR><TD ALIGN="right">Security phrase</TD><TD BGCOLOR="#ffffff">'.
+        $svc_acct->sec_phrase. '</TD></TR>';
+}
 
-<% foreach my $attribute ( grep /^rc_/, $svc_acct->fields ) {
-  $attribute =~ /^rc_(.*)$/;
-  my $pattribute = $FS::raddb::attrib{$1};
-%>
-  <TR>
-    <TD ALIGN="right">Radius (check) <%= $pattribute %></TD>
-    <TD BGCOLOR="#ffffff"><%= $svc_acct->getfield($attribute) %></TD>
-  </TR>
-<% } %>
+my $svc_acct_pop = $svc_acct->popnum
+                     ? qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum})
+                     : '';
+print "<TR><TD ALIGN=\"right\">Access number</TD>".
+      "<TD BGCOLOR=\"#ffffff\">". $svc_acct_pop->text. '</TD></TR>'
+  if $svc_acct_pop;
+
+if ($svc_acct->uid ne '') {
+  print "<TR><TD ALIGN=\"right\">Uid</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->uid. "</TD></TR>",
+        "<TR><TD ALIGN=\"right\">Gid</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->gid. "</TD></TR>",
+        "<TR><TD ALIGN=\"right\">GECOS</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->finger. "</TD></TR>",
+        "<TR><TD ALIGN=\"right\">Home directory</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->dir. "</TD></TR>",
+        "<TR><TD ALIGN=\"right\">Shell</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->shell. "</TD></TR>",
+        "<TR><TD ALIGN=\"right\">Quota</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->quota. "</TD></TR>"
+  ;
+} else {
+  print "<TR><TH COLSPAN=2>(No shell account)</TH></TR>";
+}
 
-<TR>
-  <TD ALIGN="right">RADIUS groups</TD>
-  <TD BGCOLOR="#ffffff"><%= join('<BR>', $svc_acct->radius_groups) %></TD>
-</TR>
+if ($svc_acct->slipip) {
+  print "<TR><TD ALIGN=\"right\">IP address</TD><TD BGCOLOR=\"#ffffff\">".
+        ( ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
+          ? "<I>(Dynamic)</I>"
+          : $svc_acct->slipip
+        ). "</TD>";
+  my($attribute);
+  foreach $attribute ( grep /^radius_/, $svc_acct->fields ) {
+    #warn $attribute;
+    $attribute =~ /^radius_(.*)$/;
+    my $pattribute = $FS::raddb::attrib{$1};
+    print "<TR><TD ALIGN=\"right\">Radius (reply) $pattribute</TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
+          "</TD></TR>";
+  }
+  foreach $attribute ( grep /^rc_/, $svc_acct->fields ) {
+    #warn $attribute;
+    $attribute =~ /^rc_(.*)$/;
+    my $pattribute = $FS::raddb::attrib{$1};
+    print "<TR><TD ALIGN=\"right\">Radius (check) $pattribute: </TD>".
+          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
+          "</TD></TR>";
+  }
+} else {
+  print "<TR><TH COLSPAN=2>(No SLIP/PPP account)</TH></TR>";
+}
 
-<% if ( $svc_acct->seconds =~ /^\d+$/ ) { %>
-  <TR>
-    <TD ALIGN="right">Prepaid time</TD>
-    <TD BGCOLOR="#ffffff"><%= duration_exact($svc_acct->seconds) %></TD>
-  </TR>
-<% } %>
+print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
+      join('<BR>', $svc_acct->radius_groups). '</TD></TR>';
 
-<%
 # Can this be abstracted further?  Maybe a library function like
 # widget('HTML', 'view', $svc_acct) ?  It would definitely make UI 
 # style management easier.
-%>
-
-<% foreach (sort { $a cmp $b } $svc_acct->virtual_fields) { %>
-  <%= $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)) %>
-<% } %>
 
-</TABLE></TD></TR></TABLE>
-</FORM>
-<BR><BR>
+foreach (sort { $a cmp $b } $svc_acct->virtual_fields) {
+  print $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)),
+      "\n";
+}
+%>
+</TABLE></TD></TR></TABLE></FORM>
+<%
 
-<%= join("<BR>", $conf->config('svc_acct-notes') ) %>
-<BR><BR>
+print '<BR><BR>';
 
-<%= joblisting({'svcnum'=>$svcnum}, 1) %>
+print join("\n", $conf->config('svc_acct-notes') ). '<BR><BR>'.
+      joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
 
-</BODY>
-</HTML>
+%>
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 428f3e9..cd9f79d 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -36,8 +36,8 @@ my $domain = $svc_domain->domain;
   ( ( $pkgnum || $custnum )
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
-    : ( "Delete this (unaudited) domain" =>
-          "javascript:areyousure('${p}misc/cancel-unaudited.cgi?$svcnum', 'Delete $domain and all records?' )" )
+    : ( "Cancel this (unaudited) domain" =>
+          "${p}misc/cancel-unaudited.cgi?$svcnum" )
   ),
   "Main menu" => $p,
 )) %>
@@ -50,8 +50,8 @@ Service #<%= $svcnum %>
 <BR><BR><A HREF="<%= ${p} %>misc/whois.cgi?custnum=<%=$custnum%>;svcnum=<%=$svcnum%>;domain=<%=$domain%>">View whois information.</A>
 <BR><BR>
 <SCRIPT>
-  function areyousure(href, message) {
-    if ( confirm(message) == true )
+  function areyousure(href) {
+    if ( confirm("Remove this record?") == true )
       window.location.href = href;
   }
   function slave_areyousure() {
@@ -74,7 +74,7 @@ Service #<%= $svcnum %>
     <td><%= $domain_record->recdata %>
 
     <% unless ( $domain_record->rectype eq 'SOA' ) { %>
-      (<A HREF="javascript:areyousure('<%=$p%>misc/delete-domain_record.cgi?<%=$domain_record->recnum%>', 'Delete \'<%= $domain_record->reczone %> <%= $type %> <%= $domain_record->recdata %>\' ?' )">delete</A>)
+      (<A HREF="javascript:areyousure('<%=$p%>misc/delete-domain_record.cgi?<%=$domain_record->recnum%>')">delete</A>)
     <% } %>
     </td></tr>
   <% } %>
@@ -87,7 +87,7 @@ Service #<%= $svcnum %>
 <INPUT TYPE="text" NAME="reczone"> 
 <INPUT TYPE="hidden" NAME="recaf" VALUE="IN"> IN 
  <SELECT NAME="rectype">
-<% foreach (qw( A NS CNAME MX PTR TXT) ) { %>
+<% foreach (qw( A NS CNAME MX PTR) ) { %>
   <OPTION VALUE="<%=$_%>"><%=$_%></OPTION>
 <% } %>
  </SELECT>
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 6c8cd6a..2980f84 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -21,13 +21,9 @@ if ($pkgnum) {
 #eofalse
 
 my $usersvc = $svc_www->usersvc;
-my $svc_acct = '';
-my $email = '';
-if ( $usersvc ) {
-  $svc_acct = qsearchs('svc_acct', { 'svcnum' => $usersvc } )
-    or die "svc_www: Unknown usersvc $usersvc";
-  $email = $svc_acct->email;
-}
+my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $usersvc } )
+  or die "svc_www: Unknown usersvc $usersvc";
+my $email = $svc_acct->email;
 
 my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } )
   or die "svc_www: Unknown recnum ". $svc_www->recnum;
@@ -50,15 +46,7 @@ print header('Website View', menubar(
       qq!<TR><TD ALIGN="right">Website name</TD>!.
         qq!<TD BGCOLOR="#ffffff"><A HREF="http://$www">$www<A></TD></TR>!.
       qq!<TR><TD ALIGN="right">Account</TD>!.
-        qq!<TD BGCOLOR="#ffffff">!;
-
-if ( $usersvc ) {
-  print qq!<A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A>!;
-} else {
-  print '</i>(none)</i>';
-}
-
-print '</TD></TR>';
+        qq!<TD BGCOLOR="#ffffff"><A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A></TD></TR>!;
 
 foreach (sort { $a cmp $b } $svc_www->virtual_fields) {
   print $svc_www->pvf($_)->widget('HTML', 'view', $svc_www->getfield($_)),
diff --git a/init.d/freeside-init b/init.d/freeside-init
index 56733bd..57801dd 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -5,6 +5,8 @@
 
 QUEUED_USER=%%%QUEUED_USER%%%
 
+FREESIDE_PATH="%%%FREESIDE_PATH%%%"
+
 SELFSERVICE_USER=%%%SELFSERVICE_USER%%%
 SELFSERVICE_MACHINES="%%%SELFSERVICE_MACHINES%%%"
 
@@ -19,14 +21,6 @@ case "$1" in
         freeside-queued $QUEUED_USER
         echo "done."
 
-        #echo -n "Starting freeside-sqlradius-radacctd: "
-        #freeside-sqlradius-radacctd $QUEUED_USER
-        #echo "done."
-
-        echo -n "Starting freeside-prepaidd: "
-        freeside-prepaidd $QUEUED_USER
-        echo "done."
-
         for MACHINE in $SELFSERVICE_MACHINES; do
           echo -n "Starting freeside-selfservice-server to $MACHINE: "
           freeside-selfservice-server $SELFSERVICE_USER $MACHINE
@@ -40,14 +34,6 @@ case "$1" in
         kill `cat /var/run/freeside-queued.pid`
         echo "done."
 
-        echo -n "Stopping freeside-sqlradius-radacctd: "
-        kill `cat /var/run/freeside-sqlradius-radacctd.pid`
-        echo "done."
-
-        echo -n "Stopping freeside-prepaidd: "
-        kill `cat /var/run/freeside-prepaidd.pid`
-        echo "done."
-
         if [ -e /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid ]
         then
           echo -n "Stopping (old) freeside-selfservice-server: "
diff --git a/install/centos/3/INSTALL b/install/centos/3/INSTALL
deleted file mode 100644
index 9228f57..0000000
--- a/install/centos/3/INSTALL
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-yum install cvs perl perl-DateManip perl-HTML-Parser \
-            perl-HTML-Tagset perl-URI perl-libwww-perl perl-CPAN \
-            rsync screen zsh lftp cvs autoconf \
-            gcc gd \
-            rh-postgresql rh-postgresql-docs rh-postgresql-libs \
-            rh-postgresql-server rh-postgresql-devel
-
-
-perl -MCPAN -e"install Net::Whois::Raw, Business::CreditCard, \
-                       File::CounterFile, String::Approx, Text::Template, \
-                       FreezeThaw, DBIx::DBSchema, \
-                       Net::SSH, String::ShellQuote, Net::SCP, \
-                       HTML::Mason, Tie::IxHash, Time::Duration, \
-                       HTML::Widgets::SelectLayers, Apache::DBI, \
-                       Cache::Cache, IPC::ShareLite, Locale::SubCountry, \
-                       Crypt::PasswdMD5, \
-                       Locale::SubCountry, DBI, DBD::Pg, \
-                       File::Temp, Storable, JavaScript::RPC::Server::CGI"
-
-#RT
-#perl -MCPAN -e "install Digest::MD5, Test::Inline, Class::ReturnValue, DBIx::SearchBuilder, HTML::Scrubber, Log::Dispatch, Locale::Maketext::Fuzzy, MIME::Entity, Text::Wrapper, Time::ParseDate, Term::ReadKey, Text::Autoformat, Text::Quoted, Tree::Simple, Module::Versions::Report"
-
-lftpget http://dag.wieers.com/packages/apt/apt-0.5.15cnc6-3.1.el3.dag.i386.rpm
-rpm -i apt-0.5.15cnc6-3.1.el3.dag.i386.rpm 
-apt-get update
-apt-get install perl-GD perl-MailTools perl-TimeDate perl-NetAddr-IP
-
-perl -MCPAN -e"install Chart::Base"
-
-#apachetoolbox
-apt-get remove httpd
-yum install krb5-devel openssl-devel
-lftpget http://umn.dl.sourceforge.net/sourceforge/apachetoolbox/Apachetoolbox-install-1.5.72.tar.gz
-tar xzvf Apachetoolbox-install-1.5.72.tar.gz
-cd Apachetoolbox-1.5.72
-./install.sh
-# export INCLUDES="-I/usr/kerberos/include"
-cd apache_1.3.31;make
-make certificate TYPE=dummy
-make install
-ln -s /usr/local/apache/bin/htpasswd /usr/local/bin
-cp httpd-init /etc/init.d/httpd-freeside
-chmod a+rx /etc/init.d/httpd-freeside 
-/sbin/chkconfig httpd-freeside on
-#end apachetoolbox
-
-/usr/sbin/useradd freeside
-
-/sbin/chkconfig rhdb on
-/etc/init.d/rhdb start
-
-su postgres -c "createuser -P freeside"
-
-su freeside -c "createdb freeside"
-
-#?
-cd ../../..
-make install-perl-modules
-make create-config
-freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
-LANG=C su freeside -c 'freeside-setup ivan'
-su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
-make deploy
-
diff --git a/install/centos/3/httpd-init b/install/centos/3/httpd-init
deleted file mode 100644
index dca95cf..0000000
--- a/install/centos/3/httpd-init
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-#
-# Startup script for the Apache Web Server
-#
-# chkconfig: - 85 15
-# description: Apache is a World Wide Web server.  It is used to serve \
-#              HTML files and CGI.
-# processname: httpd
-# Source function library.
-
-# Path to the apachectl script, server binary, and short-form for messages.
-apachectl=/usr/local/apache/bin/apachectl
-prog=httpd
-RETVAL=0
-
-start() {
-        echo -n $"Starting $prog: "
-        $apachectl startssl
-        RETVAL=$?
-}
-stop() {
-        echo -n $"Stopping $prog: "
-        $apachectl stop
-        RETVAL=$?
-}
-
-# See how we were called.
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  restart)
-        stop
-        sleep 3
-        start
-        ;;
-  graceful|help|configtest)
-        $apachectl $@
-        RETVAL=$?
-        ;;
-  *)
-        echo $"Usage: $prog {start|stop|restart|graceful|help|configtest}"
-        exit 1
-esac
-
-exit $RETVAL
-
diff --git a/install/debian/3.1/INSTALL b/install/debian/3.1/INSTALL
deleted file mode 100644
index 550c71a..0000000
--- a/install/debian/3.1/INSTALL
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-echo "deb http://420.am/~ivan/freeside-sarge/ ./" >>/etc/apt/sources.list
-
-apt-get update
-apt-get install make screen zsh cvs fsh rsync \
-        apache libapache-mod-ssl libapache-mod-ssl-doc libapache-mod-perl \
-        postgresql postgresql-contrib \
-        tetex-base tetex-bin tetex-extra \
-        gs lpr libpaper-utils psutils dialog psfontmgr \
-        liburi-perl libhtml-tagset-perl libnet-perl \
-        libwww-perl libbusiness-creditcard-perl \
-        libmailtools-perl libtimedate-perl libdate-manip-perl \
-        libfile-counterfile-perl libfreezethaw-perl libstring-approx-perl \
-        libtext-template-perl libdbi-perl libdbd-pg-perl \
-        libdbix-dbschema-perl libnet-ssh-perl \
-        libstring-shellquote-perl libnet-scp-perl libhtml-mason-perl \
-        libtie-ixhash-perl libtime-duration-perl \
-        libhtml-widgets-selectlayers-perl \
-        libapache-dbi-perl libcache-cache-perl libdbd-mysql-perl \
-        libcrypt-passwdmd5-perl libnetaddr-ip-perl \
-        libnet-whois-raw-perl libchart-perl \
-        libmime-perl libapache-session-perl libhtml-tree-perl \
-        libhtml-format-perl libtest-inline-perl libclass-returnvalue-perl \
-        libdbix-searchbuilder-perl  liblog-dispatch-perl \
-        liblocale-maketext-lexicon-perl liblocale-maketext-fuzzy-perl \
-        libtext-wrapper-perl libtime-modules-perl libterm-readkey-perl \
-        libtext-autoformat-perl libtext-quoted-perl libregexp-common-perl \
-        libhtml-scrubber-perl libtree-simple-perl liblocale-subcountry-perl \
-        libtext-csv-perl libspreadsheet-writeexcel-perl libfrontier-rpc-perl \
-	libjavascript-rpc-perl libipc-run3-perl
-
-useradd freeside
-groupadd freeside
-su postgres -c "createuser -P freeside"
-
-su freeside -c "createdb freeside"
-
-perl -p -i.fsbackup -e 's/^(User|Group) .*/$1 freeside/' /etc/apache/httpd.conf
-( cd /usr/share/doc/libapache-mod-ssl/examples/;
-  cp mod-ssl.conf vhost.conf.gz /etc/apache/conf.d
-)
-gunzip /etc/apache/conf.d/vhost.conf.gz
-
-#?
-cd ../../..
-make install-perl-modules
-make create-config
-freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
-freeside-adduser fs_queue
-su freeside -c 'freeside-setup ivan'
-su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
-make configure-rt
-
-#muck with pg perms
-make create-rt
-#unmuck pg perms
-
-make deploy
diff --git a/install/fedora/fc3/INSTALL b/install/fedora/fc3/INSTALL
deleted file mode 100755
index 93f746b..0000000
--- a/install/fedora/fc3/INSTALL
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-wget --passive-ftp --continue http://download.fedora.us/fedora/fedora/3/i386/RPMS.extras/apt-0.5.15cnc6-16.r362.i386.rpm
-rpm -i apt*i386.rpm
-
-wget --continue http://atrpms.physik.fu-berlin.de/RPM-GPG-KEY.atrpms
-rpm --import RPM-GPG-KEY.atrpms
-wget --continue http://dag.wieers.com/packages/RPM-GPG-KEY.dag.txt
-rpm --import RPM-GPG-KEY.dag.txt
-
-#echo 'RPM::Allow-Duplicated { "^db4$"; };' >>/etc/apt/apt.conf
-
-#might need to uncomment
-#  GPG-Check "false";
-#in /etc/apt/apt.conf
-
-apt-get update
-cp sources.list /etc/apt/sources.list
-rm /etc/apt/sources.list.d/mirror-select.list
-apt-get update
-
-apt-get -f install
-#apt-get remove httpd mod_perl
-pt-get remove httpd mod_perl httpd-manual httpd-suexec mod_auth_kerb mod_auth_mysql mod_auth_pgsql  mod_authz_ldap mod_python mod_ssl php system-config-httpd MyODBC MySQL-python php php-pgsql php-mysql php-pear php-odbc php-ldap mod_perl
-
-apt-get install perl-Devel-Symdump perl-BSD-Resource perl-DBD-MySQL perl-DBI perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server postgresql-devel screen zsh lftp cvs gcc gd perl-GD perl-MailTools perl-FreezeThaw perl-NetAddr-IP perl-Chart perl-Text-Template perl-Cache-Cache perl-MIME-tools perl-Text-Template openssl openssl-devel perl-Text-CSV_XS perl-Frontier-RPC
-
-#for rt
-#apt-get install perl-Apache-Session perl-TermReadKey perl-MLDBM perl-MLDBM-Sync perl-Log-Dispatch perl-Term-ReadKey
-
-perl -MCPAN -e"install Net::Whois::Raw, Business::CreditCard, \
-                       File::CounterFile, String::Approx, \
-                       DBIx::DataSource, DBIx::DBSchema, Net::SSH, \
-                       String::ShellQuote, Net::SCP, HTML::Mason, \
-                       Tie::IxHash, Time::Duration, \
-                       HTML::Widgets::SelectLayers, Apache::DBI, \
-                       Locale::SubCountry, \
-                       DBD::Pg, Crypt::PasswdMD5, Spreadsheet::WriteExcel, \
-                       Fax::Hylafax::Client, JavaScript::RPC::Server::CGI"
-
-#for rt
-#perl -MCPAN -e"install HTML::TreeBuilder, HTML::FormatText, Test::Inline, \
-#                       Class::ReturnValue, DBIx::SearchBuilder, \
-#                       Log::Dispatch, Locale::Maketext::Lexicon, \
-#                       Locale::Maketext::Fuzzy, Text::Wrapper, \
-#                       Time::ParseDate, Text::AutoFormat, Text::Quoted, \
-#                       Regexp::Common, HTML::Scrubber, Tree::Simple"
-
-
-#apachetoolbox
-#lftpget http://easynews.dl.sourceforge.net/sourceforge/apachetoolbox/Apachetoolbox-install-1.5.72.tar.gz
-#apache config
-#apache init script 
-
-/usr/sbin/useradd freeside
-chsh freeside -s /bin/bash
-
-/sbin/chkconfig postgresql on
-/etc/init.d/postgresql start
-
-echo -e '\n\ny\nn' | su postgres -c "createuser -P freeside"
-
-su freeside -c "createdb freeside"
-
-#?
-cd ../../..
-make install-perl-modules
-make create-config
-ln -s /usr/local/apache/bin/htpasswd /usr/local/bin/
-freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
-su freeside -c 'freeside-setup ivan'
-su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
-make deploy
-
diff --git a/install/fedora/fc3/sources.list b/install/fedora/fc3/sources.list
deleted file mode 100644
index d299e9d..0000000
--- a/install/fedora/fc3/sources.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# Fedora Core (Kernel.org, San Francisco California, USA)
-rpm http://mirrors.kernel.org/fedora.us/fedora fedora/3/i386 os updates
-rpm-src http://mirrors.kernel.org/fedora.us/fedora fedora/3/i386 os updates
-
-# Fedora Extras (Kernel.org, San Francisco California, USA)
-rpm http://mirrors.kernel.org/fedora.us/fedora fedora/3/i386 extras
-rpm-src http://mirrors.kernel.org/fedora.us/fedora fedora/3/i386 extras
-
-### Dag Apt Repository for Red Hat Fedora Core 3 (rhfc3)
-rpm http://apt.sw.be fedora/3/en/i386 dag
-
-rpm http://apt.physik.fu-berlin.de fedora/3/en/i386 at-testing
diff --git a/install/freebsd/INSTALL b/install/freebsd/INSTALL
index e8c92b0..53fc613 100755
--- a/install/freebsd/INSTALL
+++ b/install/freebsd/INSTALL
@@ -1,53 +1,26 @@
 #!/bin/sh
 
-# if /usr/local/sbin/portupgrade does not exist
-# then install portupgrade
 ( cd /usr/ports/sysutils/portupgrade
-  #??? setenv WITH_OPENSSL_PORT "yes"
-  make install clean
+  make install
 )
 
-# ???
-##rehash
-#pkgdb -u
+pkgdb -u
 
-# if cvsup is not installed, then
 portinstall -PR cvsup-without-gui
 
-#cp /usr/share/examples/cvsup/ports-supfile /root
-#perl -pi -e 's/CHANGE_THIS/cvsup13/;' /root/ports-supfile
-#cvsup /root/ports-supfile
-
-# choose the fastest cvsup server, then cvsup update
-/usr/local/bin/cvsup -g -L 2 -h cvsup2.freebsd.org /usr/share/examples/cvsup/ports-supfile
-
-# Update the ports database
-#/usr/local/sbin/portsdb -Uu
-portsdb -Uu
-
-portinstall -PR portupgrade
-
-portinstall -PR lang/perl5.8
-# if FreeBSD 4.x, then
-/usr/local/bin/use.perl port
-
-#portupgrade -f `(pkg_info -R perl-5\* |tail +4; \
-#        find /usr/local/lib/perl5/site_perl/5.[68].[1245] -type f -print0 \
-#        | xargs -0 pkg_which -fv | sed -e '/: ?/d' -e 's/.*: //')|sort -u`
-
+cp /usr/share/examples/cvsup/ports-supfile /root
+perl -pi -e 's/CHANGE_THIS/cvsup1/;' /root/ports-supfile
+cvsup /root/ports-supfile
 
 for port in `grep -v '^ *#' ports`; do
-  portinstall -PR $port
+  #cd /usr/ports/$port
+  #make install || exit
+  portinstall -P -R $port || exit
 done
 
-for a in JavaScript::RPC::Server::CGI Chart::LinesPoints Frontier::RPC2; do perl -MCPAN -e"install $a"; done
+for a in Net::SSH DBIx::DBSchema HTML::Widgets::SelectLayers Time::Duration Business::CreditCard; do perl -MCPAN -e"install $a"; done
 
 su -l pgsql -c initdb
-echo '
-postgresql_enable="YES"
-postgresql_data="/usr/local/pgsql/data"
-postgresql_flags="-w -s -m fast"
-' >>/etc/rc.conf
 
 /usr/local/etc/rc.d/010.pgsql.sh start
 
@@ -61,16 +34,7 @@ su -l freeside -c 'createdb freeside'
 cd ../..
 make install-perl-modules
 make create-config
-freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
-su freeside -c 'freeside-setup ivan'
-su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
+make deploy
 
 #edit apache config, etc.
 
-echo '
-apache_enable="YES"
-apache_flags="-DSSL"
-' >>/etc/rc.conf
-
-make deploy
-
diff --git a/install/freebsd/ports b/install/freebsd/ports
index 90b49e6..019c5e1 100644
--- a/install/freebsd/ports
+++ b/install/freebsd/ports
@@ -1,13 +1,10 @@
 shells/zsh
 misc/screen
-security/sudo
 ftp/lftp
-lang/perl5.8
 www/apache13-modssl
 www/mod_perl
 net/rsync
-databases/postgresql74-server
-#databases/postgresql74-client
+databases/postgresql7
 misc/p5-Array-PrintCols
 devel/p5-Term-Query
 converters/p5-MIME-Base64
@@ -18,9 +15,9 @@ www/p5-HTML-Tagset
 www/p5-HTML-Parser
 net/p5-Net
 misc/p5-Locale-Codes
-net/p5-Net-Whois-Raw
+net/p5-Net-Whois
 www/p5-libwww
-finance/p5-Business-CreditCard
+     #misc/p5-Business-CreditCard
 devel/p5-Data-ShowTable
 mail/p5-Mail-Tools
 devel/p5-TimeDate
@@ -31,26 +28,17 @@ devel/p5-String-Approx
 textproc/p5-Text-Template
 databases/p5-DBI
 databases/p5-DBD-Pg
-    #databases/p5-DBD-mysql
-    #databases/p5-DBIx-DataSource
-database/p5-DBIx-DBSchema
-net/p5-Net-SSH
+#databases/p5-DBD-mysql
+databases/p5-DBIx-DataSource
+    #database/p5-DBIx-DBSchema
+    #net/p5-Net-SSH
 textproc/p5-String-ShellQuote
 net/p5-Net-SCP
-    #www/p5-Apache-ASP
-www/p5-HTML-Mason
+www/p5-Apache-ASP
+    #www/p5-HTML-Mason
 devel/p5-Tie-IxHash
-devel/p5-Time-Duration
-www/p5-HTML-Widgets-SelectLayers
+    #devel/p5-Time-Duration
+    #www/p5-HTML-Widgets-SelectLayers
 devel/p5-Storable
 www/p5-Apache-DBI
 devel/p5-Cache-Cache
-security/p5-Crypt-PasswdMD5
-net-mgmt/p5-NetAddr-IP
-graphics/p5-GD
-textproc/p5-Spreadsheet-WriteExcel
-textproc/p5-Text-CSV_XS
-misc/p5-Locale-SubCountry
-devel/p5-IO-stringy
-textproc/p5-XML-Parser
-mail/p5-MIME-Tools
diff --git a/install/redhat/9/INSTALL b/install/redhat/9/INSTALL
index ad69d9b..c32a235 100644
--- a/install/redhat/9/INSTALL
+++ b/install/redhat/9/INSTALL
@@ -1,51 +1,32 @@
 #!/bin/sh
 
-wget --passive-ftp --continue http://download.fedora.us/fedora/redhat/9/i386/RPMS.stable/apt-0.5.5cnc6-0.fdr.8.rh90.i386.rpm
+wget --passive-ftp --continue http://redhat.usu.edu/mirrors/apt4rpm/apt-0.5.5cnc4.1-fr1.20030325a.2.i386.rpm
 rpm -i apt*i386.rpm
-#cp sources.list /etc/apt/
+cp sources.list /etc/apt/
 apt-get update
 
-apt-get install krb5-devel perl-CGI perl-CPAN perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs gcc # perl-DBD-MySQL # perl-suidperl gd openssh
+apt-get install httpd mod_perl mod_ssl perl-CGI perl-CPAN perl-DBD-MySQL perl-DateManip perl-HTML-Parser perl-HTML-Tagset perl-TimeDate perl-URI perl-libwww-perl perl-suidperl rsync postgresql postgresql-docs postgresql-libs postgresql-server screen zsh lftp cvs gcc # gd openssh
 
-wget --passive-ftp --continue http://dl.atrpms.net/production/packages/redhat-9-i386/atrpms/perl-GD-2.16-10.rh9.at.i386.rpm http://dl.atrpms.net/production/packages/common/atrpms/atrpms-61-1.at.noarch.rpm http://dl.atrpms.net/testing/packages/redhat-9-i386/atrpms/gd-2.0.28-1_10.rh9.at.i386.rpm http://dl.atrpms.net/testing/packages/redhat-9-i386/atrpms/libgd2-2.0.28-1_10.rh9.at.i386.rpm
+wget --passive-ftp --continue http://atrpms.physik.fu-berlin.de/dist/rh9/perl-GD/perl-GD-2.11-7.rh9.at.i386.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/atrpms/atrpms-54-1.rh9.at.noarch.rpm http://atrpms.physik.fu-berlin.de/dist/rh9/gd/gd-2.0.15-1_6.rh9.at.i386.rpm
 
-#cp /etc/apt/apt.conf /etc/apt/apt.conf.real
+cp /etc/apt/apt.conf /etc/apt/apt.conf.real
 
-rpm -i atrpms*.rpm libgd2*i386.rpm gd-2*i386.rpm perl-GD*i386.rpm 
+rpm -i gd-2.0.15-1_6.rh9.at.i386.rpm atrpms-54-1.rh9.at.noarch.rpm perl-GD-2.11-7.rh9.at.i386.rpm 
 
-#mv /etc/apt/apt.conf.real /etc/apt/apt.conf
+mv /etc/apt/apt.conf.real /etc/apt/apt.conf
 
-apt-get install perl-MIME-tools
-
-perl -MCPAN -e"install Locale::Country, Business::CreditCard, \
+perl -MCPAN -e"install Locale::Country, Net::Whois, Business::CreditCard, \
                        Mail::Internet, File::CounterFile, FreezeThaw, \
                        String::Approx, Text::Template, DBIx::DataSource, \
                        DBIx::DBSchema, Net::SSH, String::ShellQuote, \
-                       Net::SCP, HTML::Mason, Tie::IxHash, Time::Duration, \
+                       Net::SCP, Apache::ASP, Tie::IxHash, Time::Duration, \
                        HTML::Widgets::SelectLayers, Apache::DBI, \
                        Cache::Cache, Test::Pod, NetAddr::IP, IPC::ShareLite, \
                        Chart::LinesPoints, Net::Whois::Raw, \
-                       Locale::SubCountry, Crypt::PasswdMD5, DBI, DBD::Pg, \
-                       JavaScript::RPC::Server::CGI, Text::CSV_XS, \
-                       Spreadsheet::WriteExcel, Frontier::RPC2, \
-                       File::Temp, Storable"
-
-apt-get remove httpd mod_perl mod_ssl
-#apachetoolbox
-lftpget http://easynews.dl.sourceforge.net/sourceforge/apachetoolbox/Apachetoolbox-install-1.5.72.tar.gz
-tar xzvf Apachetoolbox-install-1.5.72.tar.gz
-(cd Apachetoolbox-1.5.72; sh install.sh)
-# 4
-# 16
-# go
-# export INCLUDES="-I/usr/kerberos/include"
-cd apache_1.3.31;make
-#make certificate TYPE=dummy
-make install
+                       Locale::SubCountry, Crypt::PasswdMD5, DBI, DBD::Pg"
 
 
-#apache config
-#apache init script 
+#apachetoolbox i guess
 
 /usr/sbin/useradd freeside
 
diff --git a/install/redhat/es3/INSTALL b/install/redhat/es3/INSTALL
index 67e47ec..e28ca45 100644
--- a/install/redhat/es3/INSTALL
+++ b/install/redhat/es3/INSTALL
@@ -1,43 +1,21 @@
 #!/bin/sh
 
-#up2date cvs perl perl-DBD-MySQL perl-DBI perl-DateManip perl-HTML-Parser \
-up2date cvs perl perl-DateManip perl-HTML-Parser \
+up2date cvs perl-DBD-MySQL perl-DBI perl-DateManip perl-HTML-Parser \
         perl-HTML-Tagset perl-URI perl-libwww-perl perl-CPAN \
         rsync screen zsh lftp cvs autoconf \
-        gcc gd tetex tetex-afm tetex-dvips tetex-font tetex-latex
-
-up2date --src rh-postgresql rh-postgresql-docs rh-postgresql-libs \
+        gcc gd rh-postgresql rh-postgresql-docs rh-postgresql-libs \
         rh-postgresql-server rh-postgresql-devel
 
-##slony bits...
-#up2date rpm-build bison flex python-devel tcl-devel readline-devel zlib-devel openssl-devel krb5-devel pam-devel
-#mkdir /usr/src/redhat
-#rpm -i /var/spool/up2date/rh-postgresql-*.src.rpm
-#rpmbuild -bb /usr/src/redhat/SPECS/rh-postgresql.spec
-#apt-get remove rh-postgresql rh-postgresql-docs rh-postgresql-libs rh-postgresql-server rh-postgresql-devel
-#rpm -i /usr/src/redhat/RPMS/i386/rh-postgresql-7.3.8-2.i386.rpm /usr/src/redhat/RPMS/i386/rh-postgresql-devel-7.3.8-2.i386.rpm /usr/src/redhat/RPMS/i386/rh-postgresql-docs-7.3.8-2.i386.rpm /usr/src/redhat/RPMS/i386/rh-postgresql-libs-7.3.8-2.i386.rpm /usr/src/redhat/RPMS/i386/rh-postgresql-server-7.3.8-2.i386.rpm
-#
-#lftpget http://developer.postgresql.org/~wieck/slony1/download/slony1-1.0.5.tar.gz
-#tar xzvf slony1-1.0.5.tar.gz
-#cd slony1-1.0.5
-#./configure --with-pgsourcetree=/usr/src/redhat/BUILD/postgresql-7.3.8/
-#make
-#make install
-##edit /var/lib/pgsql/data/postgresql.conf: tcpip_socket = true
-##edit /var/lib/pgsql/data/pg_hba.conf (entries for both hosts on both):
-#host   freeside freeside        IP.ADDRESS   255.255.255.255 trust
-##end of slony bits
-
 perl -MCPAN -e"install Net::Whois::Raw, Business::CreditCard, \
                        File::CounterFile, String::Approx, Text::Template, \
-                       FreezeThaw, DBIx::DBSchema, \
-                       Net::SSH, String::ShellQuote, Net::SCP, \
+                       DBIx::DataSource, FreezeThaw, DBIx::DBSchema, \
+                       Net::SSH, String::ShellQuote, Net::SCP, Apache::ASP, \
                        HTML::Mason, Tie::IxHash, Time::Duration, \
                        HTML::Widgets::SelectLayers, Apache::DBI, \
                        Cache::Cache, IPC::ShareLite, Locale::SubCountry, \
                        Crypt::PasswdMD5, \
                        Locale::SubCountry, DBI, DBD::Pg, \
-                       File::Temp, Storable, JavaScript::RPC::Server::CGI"
+                       File::Temp"
 
 lftpget http://dag.wieers.com/packages/apt/apt-0.5.15cnc6-3.1.el3.dag.i386.rpm
 rpm -i apt-0.5.15cnc6-3.1.el3.dag.i386.rpm 
@@ -47,21 +25,9 @@ apt-get install perl-GD perl-MailTools perl-TimeDate perl-NetAddr-IP
 perl -MCPAN -e"install Chart::Base"
 
 #apachetoolbox
-apt-get remove httpd
-up2date krb5-devel openssl-devel
-lftpget http://umn.dl.sourceforge.net/sourceforge/apachetoolbox/Apachetoolbox-install-1.5.72.tar.gz
-tar xzvf Apachetoolbox-install-1.5.72.tar.gz
-cd Apachetoolbox-1.5.72
-./install.sh
-# export INCLUDES="-I/usr/kerberos/include"
-cd apache_1.3.31;make
-make certificate TYPE=dummy
-make install
-ln -s /usr/local/apache/bin/htpasswd /usr/local/bin
+#lftpget http://umn.dl.sourceforge.net/sourceforge/apachetoolbox/Apachetoolbox-install-1.5.70.tar.gz
 cp httpd-init /etc/init.d/httpd-freeside
-chmod a+rx /etc/init.d/httpd-freeside 
 /sbin/chkconfig httpd-freeside on
-#end apachetoolbox
 
 /usr/sbin/useradd freeside
 
@@ -77,14 +43,7 @@ cd ../../..
 make install-perl-modules
 make create-config
 freeside-adduser -c -h /usr/local/etc/freeside/htpasswd ivan
-LANG=C su freeside -c 'freeside-setup ivan'
-## do slony foo in here
-##master
-#su freeside -c 'pg_dump freeside' >dumps/setup.sql
-#scp dumps/setup.sql othermachine:.
-##slave
-#su freeside -c 'psql freeside <setup.sql'
-##end slony foo
+su freeside -c 'freeside-setup ivan'
 su freeside -c '/home/ivan/freeside/bin/populate-msgcat ivan'
 make deploy
 
diff --git a/rt/Changelog b/rt/Changelog
index 2da390e..fe2fd50 100644
--- a/rt/Changelog
+++ b/rt/Changelog
@@ -1,12427 +1,10243 @@
 ------------------------------------------------------------------------
-r3729 | jesse | 2005-08-28 15:45:06 -0400 (Sun, 28 Aug 2005) | 1 line
+r1565 | jesse | 2004-09-27 15:19:43 -0400 (Mon, 27 Sep 2004) | 1 line
 Changed paths:
-   A /rt/tags/3.4.4 (from /rt/branches/3.4-RELEASE:3728)
+   A /rt/tags/3.2.2 (from /rt/branches/3.2-RELEASE:1564)
 
-Tagged as 3.4.4 by svn RelEng 1.0
+Tagged as 3.2.2 by svn RelEng 1.0
 ------------------------------------------------------------------------
-r3728 | jesse | 2005-08-28 15:44:18 -0400 (Sun, 28 Aug 2005) | 3 lines
+r1564 | jesse | 2004-09-27 15:06:12 -0400 (Mon, 27 Sep 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
-
- r13812@hualien:  jesse | 2005-08-28 15:43:29 -0400
- * bumping to 3.4.4
-
-------------------------------------------------------------------------
-r3727 | jesse | 2005-08-27 21:26:24 -0400 (Sat, 27 Aug 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
-
- r13804@hualien:  jesse | 2005-08-27 21:25:50 -0400
- * Updated French translation from jfenal
- 
-
-------------------------------------------------------------------------
-r3725 | jesse | 2005-08-25 16:05:12 -0400 (Thu, 25 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
-
- r13763@hualien:  jesse | 2005-08-25 16:04:29 -0400
- * 3.4.4rc3
-
-------------------------------------------------------------------------
-r3724 | jesse | 2005-08-25 15:54:00 -0400 (Thu, 25 Aug 2005) | 9 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
-
- r13760@hualien:  jesse | 2005-08-25 15:51:57 -0400
- RT-Ticket: 6855
- RT-Status: resolved
- RT-Update: correspond
- 
- * Applied a patch from Andreas Jakum to improve RT::Ticket->Import's handling
-   of watchers
- 
-
-------------------------------------------------------------------------
-r3723 | jesse | 2005-08-25 15:53:40 -0400 (Thu, 25 Aug 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/EmailParser.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm
-
- r13759@hualien:  jesse | 2005-08-25 15:31:56 -0400
- * Fixes to IsRTAddress processing. Spotted by Travis Campbell.
- 
-
-------------------------------------------------------------------------
-r3722 | jesse | 2005-08-25 15:25:28 -0400 (Thu, 25 Aug 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Footer
-   M /rt/branches/3.4-RELEASE/sbin/extract-message-catalog
-
- r13757@hualien:  jesse | 2005-08-25 15:23:18 -0400
- RT-Ticket: 6934
- RT-Status: resolved
- RT-Update: correspond
- 
- * A couple of patches to improve how localization extraction works from jfenal
- 
-
-------------------------------------------------------------------------
-r3721 | jesse | 2005-08-25 15:01:03 -0400 (Thu, 25 Aug 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Groups_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Users_Overlay.pm
-
- r13754@hualien:  jesse | 2005-08-25 14:55:32 -0400
- * EquivObjects support for acl queries, from Todd Chapman
- 
-
-------------------------------------------------------------------------
-r3720 | jesse | 2005-08-25 15:00:44 -0400 (Thu, 25 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/releng.cnf
 
- r13753@hualien:  jesse | 2005-08-25 14:53:06 -0400
- * Removing warnings about mod_perl2
+ r10387@Jesse-Vincents-Computer:  jesse | 2004-09-27T19:03:14.292883Z
+ Bumping to 3.2.2
 
 ------------------------------------------------------------------------
-r3719 | jesse | 2005-08-24 02:00:52 -0400 (Wed, 24 Aug 2005) | 7 lines
+r1563 | jesse | 2004-09-27 15:05:28 -0400 (Mon, 27 Sep 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/rt.in
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay.pm
 
- r13743@hualien:  jesse | 2005-08-24 02:00:08 -0400
- RT-Ticket: 6957
- RT-Status: resolved
- RT-Update: correspond
- 
- * Applied a patch from ams to restore his byline to bin/rt
+ r10386@Jesse-Vincents-Computer:  jesse | 2004-09-27T19:02:50.654824Z
+ Removing a debugging statement
 
 ------------------------------------------------------------------------
-r3714 | jesse | 2005-08-23 23:39:37 -0400 (Tue, 23 Aug 2005) | 3 lines
+r1558 | jesse | 2004-09-24 01:22:14 -0400 (Fri, 24 Sep 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay.pm
 
- r13733@hualien:  jesse | 2005-08-23 23:38:39 -0400
- * bumped to pre2
+ r10374@Jesse-Vincents-Computer:  jesse | 2004-09-24T05:20:01.110609Z
+ Searching on multiple watcher criteria now works
 
 ------------------------------------------------------------------------
-r3713 | jesse | 2005-08-23 23:39:17 -0400 (Tue, 23 Aug 2005) | 4 lines
+r1557 | jesse | 2004-09-24 01:21:43 -0400 (Fri, 24 Sep 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Callback
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
 
- r13732@hualien:  jesse | 2005-08-23 23:38:28 -0400
- * Applied tom's callbacks fix
+ r10372@Jesse-Vincents-Computer:  jesse | 2004-09-24T03:55:47.365106Z
  
+ r10373@Jesse-Vincents-Computer:  jesse | 2004-09-24T05:16:30.614961Z
+ Ticket creation doc updates
 
 ------------------------------------------------------------------------
-r3711 | jesse | 2005-08-23 22:37:51 -0400 (Tue, 23 Aug 2005) | 3 lines
+r1498 | leira | 2004-09-16 18:28:20 -0400 (Thu, 16 Sep 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMessageHeaders
 
- r13728@hualien:  jesse | 2005-08-23 22:37:12 -0400
- * Bumped to 3.4.4pre1
+Add another callback that passes parsed headers.
 
-------------------------------------------------------------------------
-r3710 | jesse | 2005-08-23 22:33:47 -0400 (Tue, 23 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-   M /rt/branches/3.4-RELEASE/bin/webmux.pl.in
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Handler.pm
-
- r13725@hualien:  jesse | 2005-08-23 22:10:42 -0400
- * Added support for mod_perl 2.0 
+Useful for MakeClicky, among other things.
 
 ------------------------------------------------------------------------
-r3709 | jesse | 2005-08-23 17:58:20 -0400 (Tue, 23 Aug 2005) | 3 lines
+r1495 | leira | 2004-09-15 15:22:35 -0400 (Wed, 15 Sep 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/de.po
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMessageHeaders
 
- r13720@hualien:  jesse | 2005-08-23 17:54:29 -0400
- * Bugfixes to the German translation file
+Removed <pre> block around the header keys, and removed an extraneous </td>.
 
 ------------------------------------------------------------------------
-r3708 | glasser | 2005-08-22 16:05:46 -0400 (Mon, 22 Aug 2005) | 3 lines
+r1487 | jesse | 2004-09-14 12:14:00 -0400 (Tue, 14 Sep 2004) | 11 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
-
- r40177@tin-foil:  glasser | 2005-08-18 18:49:13 -0400
- Updates to the standalone server to not dupe as much code, but may be rolled back if HSSM needs to be.
-
-------------------------------------------------------------------------
-r3707 | glasser | 2005-08-22 16:04:25 -0400 (Mon, 22 Aug 2005) | 10 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/html/Search/Results.html
 
- r38371@tin-foil:  glasser | 2005-08-02 15:05:25 -0400
- RT-Ticket: 6899
+ r10266@tinbook:  jesse | 2004-09-14T16:14:14.588686Z
+ RT-Ticket: 5836
  RT-Status: resolved
- RT-Update: correspond
- 
- When limiting based on a whole date, make sure you're not being pushed to 
- another if you happen to be east of GMT.
+ RT-ACtion: reply
  
- Patch by Ruslan Zakirov, problem found by Olivier Horec.
-
-------------------------------------------------------------------------
-r3706 | glasser | 2005-08-22 15:55:57 -0400 (Mon, 22 Aug 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
-
- r36571@tin-foil:  glasser | 2005-07-08 16:53:26 -0400
- Fix from Tom Yu; if the Handle will give us a server-side function to lowercase
- values, use that.
-
-------------------------------------------------------------------------
-r3700 | trs | 2005-08-18 22:39:02 -0400 (Thu, 18 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Queue_Overlay.pm
-
- r6002@wintermute:  tom | 2005-08-18 22:37:53 -0400
- Fixed typo
-
-------------------------------------------------------------------------
-r3668 | jesse | 2005-08-17 22:04:31 -0400 (Wed, 17 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
-
- r13155@hualien:  jesse | 2005-08-17 19:15:11 -0400
- * Note dependency on a current HSSM
-
-------------------------------------------------------------------------
-r3667 | jesse | 2005-08-17 22:04:12 -0400 (Wed, 17 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm
-
- r13154@hualien:  jesse | 2005-08-17 19:14:26 -0400
- * Fixes to standalone webserver for mason 1.30
-
-------------------------------------------------------------------------
-r3666 | alexmv | 2005-08-17 13:41:38 -0400 (Wed, 17 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Quicksearch
-
- r5920@zoq-fot-pik:  chmrr | 2005-08-17 13:44:59 -0400
-  * My memory was faulty; HTML escaping is not needed
-
-------------------------------------------------------------------------
-r3663 | alexmv | 2005-08-17 13:29:32 -0400 (Wed, 17 Aug 2005) | 1 line
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-
-
-------------------------------------------------------------------------
-r3662 | alexmv | 2005-08-17 13:29:25 -0400 (Wed, 17 Aug 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Quicksearch
-
- r5914@zoq-fot-pik:  chmrr | 2005-08-17 13:32:00 -0400
-  * We love escaping!  We need to escape quotes and slashes in
- TicketSQL, then URI escape, then HTML escape.  And the query comes
- from the TicketSQL-escaped one, not the URI and HTML-escaped one.  Oh,
- yeah, and don't forget to turn off the automatic HTML escaping that
- Mason does, or it'll be TicketSQL-HTML-URI-HTML escaped, which is
- Right Out.
-
-------------------------------------------------------------------------
-r3640 | jesse | 2005-08-11 13:46:50 -0400 (Thu, 11 Aug 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
-
- r12938@hualien:  jesse | 2005-08-11 13:46:14 -0400
- * French localization had lost its header
- 
-
-------------------------------------------------------------------------
-r3627 | jesse | 2005-08-10 15:25:55 -0400 (Wed, 10 Aug 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
-
- r7634@hualien:  jesse | 2005-08-10 15:25:31 -0400
- * This is 3.4.3
  
-
-------------------------------------------------------------------------
-r3610 | jesse | 2005-08-05 19:18:01 -0400 (Fri, 05 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/22search_tix_by_txn.t
-
- r7399@hualien:  jesse | 2005-08-05 19:16:58 -0400
- * Cleaned up searching by ticket or txn date.
-
-------------------------------------------------------------------------
-r3589 | kevinr | 2005-08-03 01:51:55 -0400 (Wed, 03 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
-
- r6872@SAD-GIRL-IN-SNOW:  kevinr | 2005-08-03 01:51:33 -0400
- * More minor perldoc cleanup
-
-------------------------------------------------------------------------
-r3588 | kevinr | 2005-08-03 01:20:35 -0400 (Wed, 03 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Groups_Overlay.pm
-
- r6868@SAD-GIRL-IN-SNOW:  kevinr | 2005-08-03 01:19:47 -0400
- * Fixed an outdated bit of POD
-
-------------------------------------------------------------------------
-r3585 | kevinr | 2005-08-02 20:18:54 -0400 (Tue, 02 Aug 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Base.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CachedGroupMember_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/EmailParser.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Group_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Groups_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Handle.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/SearchBuilder.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Template_Overlay.pm
-
- r6849@SAD-GIRL-IN-SNOW:  kevinr | 2005-08-02 20:17:38 -0400
- * POD formatting fixes
-
-------------------------------------------------------------------------
-r3582 | glasser | 2005-08-02 15:10:05 -0400 (Tue, 02 Aug 2005) | 10 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
-
- r38371@tin-foil:  glasser | 2005-08-02 15:05:25 -0400
- RT-Ticket: 6899
- RT-Status: resolved
- RT-Update: correspond
+ Added back a "ticket refresh" dropdown on the search results page.
+ Thanks to Dirk Pape.
  
- When limiting based on a whole date, make sure you're not being pushed to 
- another if you happen to be east of GMT.
  
- Patch by Ruslan Zakirov, problem found by Olivier Horec.
 
 ------------------------------------------------------------------------
-r3581 | glasser | 2005-08-02 15:08:03 -0400 (Tue, 02 Aug 2005) | 4 lines
+r1486 | jesse | 2004-09-14 02:12:08 -0400 (Tue, 14 Sep 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/lib/RT/Attributes_Overlay.pm
 
- r36571@tin-foil:  glasser | 2005-07-08 16:53:26 -0400
- Fix from Tom Yu; if the Handle will give us a server-side function to lowercase
- values, use that.
+ r10262@tinbook:  jesse | 2004-09-14T06:12:21.353389Z
+ Never try to fetch attributes when we don't have an object to fetch attributes on
 
 ------------------------------------------------------------------------
-r3579 | kevinr | 2005-08-02 14:22:27 -0400 (Tue, 02 Aug 2005) | 7 lines
+r1477 | jesse | 2004-09-13 16:01:18 -0400 (Mon, 13 Sep 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/it.po
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/releng.cnf
 
- r6837@SAD-GIRL-IN-SNOW:  kevinr | 2005-08-02 14:20:51 -0400
- RT-Ticket: 6897
- RT-Status: resolved
- RT-Update: correspond
+ r10249@tinbook:  jesse | 2004-09-13T19:56:43.541086Z
+  ----------------------------------------------------------------------
+  r10238@tinbook (orig r1474):  jesse | 2004-09-10T19:40:40.885981Z
+  
+  
+  ----------------------------------------------------------------------
  
- * Incorporated the updated Italian translation from Angelo Turetta
+ r10250@tinbook:  jesse | 2004-09-13T19:58:31.660069Z
+ Bumped to 3.2.2rc1
 
 ------------------------------------------------------------------------
-r3576 | robert | 2005-08-02 00:23:36 -0400 (Tue, 02 Aug 2005) | 3 lines
+r1474 | jesse | 2004-09-10 15:40:40 -0400 (Fri, 10 Sep 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Menu
-
- r3582@woof:  rspier | 2005-08-01 21:20:12 -0700
- allow arbitrary https?: urls in the menus
-
-------------------------------------------------------------------------
-r3564 | jesse | 2005-07-30 11:11:02 -0400 (Sat, 30 Jul 2005) | 1 line
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-
-
-------------------------------------------------------------------------
-r3563 | jesse | 2005-07-30 11:10:42 -0400 (Sat, 30 Jul 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
-
- r7153@hualien:  jesse | 2005-07-30 11:07:37 -0400
- 3.4.3rc2
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrip_Overlay.pm
 
-------------------------------------------------------------------------
-r3562 | jesse | 2005-07-30 11:10:02 -0400 (Sat, 30 Jul 2005) | 5 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/cs.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/da.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/de.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/es.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fi.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/he.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/hu.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/id.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/it.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ja.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/nl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/no.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pt_br.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ru.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_tw.po
+-l
 
- r7152@hualien:  jesse | 2005-07-30 11:06:46 -0400
- * German and Danish translation header fixes. 
- besides that just a message catalog regenration
- 
 
 ------------------------------------------------------------------------
-r3546 | kevinr | 2005-07-28 14:51:34 -0400 (Thu, 28 Jul 2005) | 8 lines
+r1464 | leira | 2004-09-08 17:41:43 -0400 (Wed, 08 Sep 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/SelfService/Display.html
+   M /rt/branches/3.2-RELEASE/html/Elements/RT__Ticket/ColumnMap
 
- r6713@SAD-GIRL-IN-SNOW:  kevinr | 2005-07-28 14:50:47 -0400
- RT-Ticket: 6892
- RT-Status: resolved
- RT-Update: correspond
- 
- * Applied patch from Hsin-Chan Chien to fix a bug with attachment uploading
- in SelfService mode.
+Don't put a span around things if it won't do anything.
 
 ------------------------------------------------------------------------
-r3501 | alexmv | 2005-07-18 15:00:38 -0400 (Mon, 18 Jul 2005) | 3 lines
+r1462 | leira | 2004-09-08 17:31:51 -0400 (Wed, 08 Sep 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/3.2-RELEASE/html/NoAuth/webrt.css
 
- r5198@zoq-fot-pik:  chmrr | 2005-07-18 14:59:07 -0400
-  * Fix TransactionBatch / DESTROY bug (backport from QUEBEC)
+Overdue things are now read.
 
 ------------------------------------------------------------------------
-r3498 | jesse | 2005-07-18 13:46:24 -0400 (Mon, 18 Jul 2005) | 3 lines
+r1460 | leira | 2004-09-08 17:29:25 -0400 (Wed, 08 Sep 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
+   M /rt/branches/3.2-RELEASE/html/Elements/RT__Ticket/ColumnMap
 
- r4894@hualien:  jesse | 2005-07-18 13:44:44 -0400
- * releng.cnf bump to rc1
+Use time() instead of making an RT::Date.
 
 ------------------------------------------------------------------------
-r3476 | kevinr | 2005-07-14 18:22:40 -0400 (Thu, 14 Jul 2005) | 4 lines
+r1458 | leira | 2004-09-08 17:19:51 -0400 (Wed, 08 Sep 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Principal_Overlay.pm
+   M /rt/branches/3.2-RELEASE/html/Elements/RT__Ticket/ColumnMap
 
- r6308@SAD-GIRL-IN-SNOW:  kevinr | 2005-07-14 18:22:19 -0400
- * Applied Ruslan Zakirov's patch to fix the way ACE Object{,Type,Id} handles
- arguments
+If something is overdue, set DueRelative to class "overdue".
 
-------------------------------------------------------------------------
-r3466 | kevinr | 2005-07-12 18:35:15 -0400 (Tue, 12 Jul 2005) | 7 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/lib/t/regression/07rights.t
-
- r6229@sad-girl-in-snow:  kevinr | 2005-07-12 18:34:56 -0400
- RT-Ticket: 6825
- RT-Status: resolved
- RT-Update: correspond
- 
- Added Ruslan Zakirov's new queue-rights tests.
+Note: core RT doesn't have an "overdue" class at this time.
 
 ------------------------------------------------------------------------
-r3465 | kevinr | 2005-07-12 18:12:03 -0400 (Tue, 12 Jul 2005) | 3 lines
+r1380 | jesse | 2004-08-31 14:49:23 -0400 (Tue, 31 Aug 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT.pm.in
-
- r6225@sad-girl-in-snow:  kevinr | 2005-07-12 18:06:39 -0400
- * Applied Ruslan Zakirov's patch to clean up the ACE code and a trailing \n
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditBasics
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowBasics
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm
 
-------------------------------------------------------------------------
-r3464 | alexmv | 2005-07-12 12:22:01 -0400 (Tue, 12 Jul 2005) | 13 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/PageLayout
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/Generic.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripAction_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
 
- r4959@zoq-fot-pik:  chmrr | 2005-07-12 12:22:32 -0400
-  * Better threading support; Message-IDs of emails are based on the
-    transaction which spawned them.
- 
-  * Support for ScripActionObj in Action::Generic (argument was being
-    passed in but never used)
- 
-  * Standardize on case of 'Message-ID' per RFC
+ ----------------------------------------------------------------------
+ r8480@tinbook:  jesse | 2004-08-31T18:48:19.505579Z
+ Added callbacks to let users add entries to show and edit basics boxes
  
-  * Remove newline from Message-ID before inserting into DB
+ Made "type" an editable field on tickets (at the web api level, not in the UI)
  
-  * Fixed minor HTML nit in PageLayout
-
-------------------------------------------------------------------------
-r3416 | kevinr | 2005-07-07 17:36:00 -0400 (Thu, 07 Jul 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
-
- r6064@sad-girl-in-snow:  kevinr | 2005-07-07 17:35:40 -0400
- * Updated the custom field perldoc to explain some non-intuitive behavior.
-
-------------------------------------------------------------------------
-r3414 | kevinr | 2005-07-07 16:19:34 -0400 (Thu, 07 Jul 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
-
- r6055@sad-girl-in-snow:  kevinr | 2005-07-07 16:19:18 -0400
- * Noted the deprecation of the *Ticket methods in the perldoc
- * Corrected some copied-and-pasted-but-not-fully-updated error messages
-
-------------------------------------------------------------------------
-r3405 | kevinr | 2005-07-06 16:08:17 -0400 (Wed, 06 Jul 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-
- r6033@sad-girl-in-snow:  kevinr | 2005-07-06 16:07:34 -0400
- * Improving consistency of perldoc presentation
-
-------------------------------------------------------------------------
-r3404 | kevinr | 2005-07-06 14:53:19 -0400 (Wed, 06 Jul 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Template_Overlay.pm
-
- r6009@sad-girl-in-snow:  kevinr | 2005-07-06 14:39:22 -0400
- * Documented the behavior which was tripping me up.
-
-------------------------------------------------------------------------
-r3399 | alexmv | 2005-07-06 11:07:45 -0400 (Wed, 06 Jul 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowHistory
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowTransaction
+ ----------------------------------------------------------------------
 
- r4801@zoq-fot-pik:  chmrr | 2005-07-06 11:03:17 -0400
-  * Fix '#' links after ticket update
 
 ------------------------------------------------------------------------
-r3394 | glasser | 2005-07-05 21:53:14 -0400 (Tue, 05 Jul 2005) | 9 lines
+r1379 | jesse | 2004-08-31 04:14:54 -0400 (Tue, 31 Aug 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay_SQL.pm
 
- r36303@tin-foil:  glasser | 2005-07-05 19:55:16 -0300
- RT-Ticket: 6757
- RT-Status: resolved
- RT-Update: correspond
+ ----------------------------------------------------------------------
+ r8478@tinbook:  jesse | 2004-08-31T08:14:29.467020Z
+ Inlined Tickets_Overlay_SQL's "match"
  
- Transaction custom fields weren't always being set in Updates, because
- Transaction->UpdateCustomFields was being confused by the -Magic values.
- (I should write a test for this, too.)
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r3393 | glasser | 2005-07-05 21:52:54 -0400 (Tue, 05 Jul 2005) | 13 lines
+r1376 | jesse | 2004-08-31 00:22:49 -0400 (Tue, 31 Aug 2004) | 18 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt/branches/3.2-RELEASE
+   A /rt/branches/3.2-RELEASE/html/Elements/CollectionAsTable
+   A /rt/branches/3.2-RELEASE/html/Elements/CollectionAsTable/Header
+   A /rt/branches/3.2-RELEASE/html/Elements/CollectionAsTable/ParseFormat
+   A /rt/branches/3.2-RELEASE/html/Elements/CollectionAsTable/Row
+   A /rt/branches/3.2-RELEASE/html/Elements/RT__Ticket
+   A /rt/branches/3.2-RELEASE/html/Elements/RT__Ticket/ColumnMap
+   M /rt/branches/3.2-RELEASE/html/Elements/TicketList
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickBasics
+   M /rt/branches/3.2-RELEASE/html/Search/Results.html
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay_SQL.pm
 
- r36299@tin-foil:  glasser | 2005-07-05 16:39:02 -0300
- RT-Ticket: 6774
- RT-Status: resolved
- RT-Update: correspond
- 
- Actually set password when creating a new user, and clean up the error reporting
- from password setting.  (And if you don't manage to set a password (either by leaving
- it blank or by entering an invalid password) when creating a user, add a notice that
- the user won't be able to log in.)  Also, indentation cleanup.
+ ----------------------------------------------------------------------
+ r8457@tinbook:  jesse | 2004-08-29T01:52:08.449173Z
+ Refactored the TicketList compnent to be more reusable
+ ----------------------------------------------------------------------
+ r8458@tinbook:  jesse | 2004-08-29T02:41:50.808026Z
+ Adding a callback for a customer
+ ----------------------------------------------------------------------
+ r8471@tinbook:  jesse | 2004-08-31T04:20:29.035587Z
+ Fixed the callback in Results.html to not flake out when we've got interesting %ARGS coming into it.
  
- Patch by Ruslan Zakirov.
+ ----------------------------------------------------------------------
+ r8472@tinbook:  jesse | 2004-08-31T04:21:47.346418Z
+ Added "DependedOnBy" to TicketSQL  to mean what it means elsewhere.
  
-
-------------------------------------------------------------------------
-r3392 | glasser | 2005-07-05 21:52:35 -0400 (Tue, 05 Jul 2005) | 7 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-
- r36292@tin-foil:  glasser | 2005-07-05 13:43:16 -0300
- RT-Ticket: 6811
- RT-Status: resolved
- RT-Update: correspond
+ Made TicketSQL let you search by ticket type
  
- Update French localization for 3.4.2 (thanks to J?\195?\169r?\195?\180me Fenal)
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r3391 | kevinr | 2005-07-05 20:48:09 -0400 (Tue, 05 Jul 2005) | 9 lines
+r1372 | jesse | 2004-08-28 19:47:32 -0400 (Sat, 28 Aug 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/SelfService/Display.html
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/html/Search/Results.html
 
- r6005@SAD-GIRL-IN-SNOW:  kevinr | 2005-07-05 20:47:55 -0400
- RT-Ticket: 6505
- RT-Status: resolved
- RT-Update: correspond
+ ----------------------------------------------------------------------
+ r8454@tinbook:  jesse | 2004-08-28T23:42:12.276700Z
  
- Fixed the bug Seph noted where the "Brief/Full Headers" links in SelfService
- were attempting to direct the user to /Ticket/Display.html instead of 
- /SelfService/Display.html
+ ----------------------------------------------------------------------
+ r8455@tinbook:  jesse | 2004-08-28T23:46:06.962020Z
+ Adding a "SearchActions" callback to Search/Results.html
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r3390 | kevinr | 2005-07-05 19:11:14 -0400 (Tue, 05 Jul 2005) | 3 lines
+r1352 | alexmv | 2004-08-18 18:04:57 -0400 (Wed, 18 Aug 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/bin/rt-crontool.in
 
- r5982@SAD-GIRL-IN-SNOW:  kevinr | 2005-07-05 19:06:09 -0400
- * Fixed a typo in the perldoc
+RT-Ticket: 5809
+RT-Status: resolved
 
-------------------------------------------------------------------------
-r3389 | glasser | 2005-07-05 16:05:39 -0400 (Tue, 05 Jul 2005) | 13 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/Modify.html
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
-
- r36299@tin-foil:  glasser | 2005-07-05 16:39:02 -0300
- RT-Ticket: 6774
- RT-Status: resolved
- RT-Update: correspond
- 
- Actually set password when creating a new user, and clean up the error reporting
- from password setting.  (And if you don't manage to set a password (either by leaving
- it blank or by entering an invalid password) when creating a user, add a notice that
- the user won't be able to log in.)  Also, indentation cleanup.
- 
- Patch by Ruslan Zakirov.
- 
+ * Derivative of the doc. patch in [fsck.com #5809] applied
 
 ------------------------------------------------------------------------
-r3388 | glasser | 2005-07-05 12:45:50 -0400 (Tue, 05 Jul 2005) | 7 lines
+r1351 | alexmv | 2004-08-18 17:53:17 -0400 (Wed, 18 Aug 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
-
- r36292@tin-foil:  glasser | 2005-07-05 13:43:16 -0300
- RT-Ticket: 6811
- RT-Status: resolved
- RT-Update: correspond
- 
- Update French localization for 3.4.2 (thanks to J?\195?\169r?\195?\180me Fenal)
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowHistory
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowTransaction
 
-------------------------------------------------------------------------
-r3379 | glasser | 2005-07-04 14:18:35 -0400 (Mon, 04 Jul 2005) | 7 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Results.html
+RT-Ticket: 5792
+RT-Update: correspond
+RT-Status: resolved
 
- r36245@tin-foil:  glasser | 2005-07-04 14:10:53 -0300
- RT-Ticket: 6747
- RT-Status: resolved
- RT-Update: Correspond
- 
- Shorter links for RSS feed and offline 
+ * Move the lasttrans anchor into a table cell
 
 ------------------------------------------------------------------------
-r3378 | robert | 2005-07-04 00:40:37 -0400 (Mon, 04 Jul 2005) | 4 lines
+r1349 | alexmv | 2004-08-18 16:38:09 -0400 (Wed, 18 Aug 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/rt.in
+   M /rt/branches/3.2-RELEASE/bin/rt-mailgate.in
 
- r3412@bear:  rspier | 2005-07-04T04:39:33.953112Z
- documentation error, use -m not -t
- 
-
-------------------------------------------------------------------------
-r3295 | jesse | 2005-07-03 16:37:15 -0400 (Sun, 03 Jul 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
+RT-Ticket: 5963
+RT-Update: correspond
+RT-Status: resolved
 
- r22106@hualien:  jesse | 2005-07-03 16:35:22 -0400
- * We don't actually need a newer Text::WikiFormat
+ * Some mailers care about the return value rt-mailgate; 'return 0'
+   instead of 'die' to ensure that we fake success
 
 ------------------------------------------------------------------------
-r3293 | jesse | 2005-07-03 16:14:29 -0400 (Sun, 03 Jul 2005) | 3 lines
+r1348 | alexmv | 2004-08-18 16:22:42 -0400 (Wed, 18 Aug 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/rt-mailgate.in
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/06mailgateway.t
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
 
- r22091@hualien:  jesse | 2005-07-03 16:13:10 -0400
-  * Disabling a new feature that might be dangerous; test fixes; cf fixes
-
-------------------------------------------------------------------------
-r3292 | jesse | 2005-07-03 16:14:21 -0400 (Sun, 03 Jul 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
+RT-Ticket: 5215
+RT-Update: correspond
+RT-Status: resolved
 
- r22039@hualien:  jesse | 2005-07-01 21:05:38 -0400
- * Refactoring of how RT::Record deals with custom fields for greater consistency
- 
+ * When merging tickets, the resulting ticket's
+   Time{Estimated,Worked,Left} should be the sum of the fields from
+   both tickets
 
 ------------------------------------------------------------------------
-r3272 | alexmv | 2005-07-01 00:32:15 -0400 (Fri, 01 Jul 2005) | 1 line
+r1347 | alexmv | 2004-08-18 15:31:10 -0400 (Wed, 18 Aug 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm
 
-------------------------------------------------------------------------
-r3271 | alexmv | 2005-07-01 00:32:10 -0400 (Fri, 01 Jul 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
+RT-Ticket: 5826
+RT-Update: correspond
+RT-Status: resolved
 
- r4556@zoq-fot-pik:  chmrr | 2005-06-30 17:58:57 -0400
-  * Don't assume link is happy on creation
+ * Fix logic; bounce message as a loop if $IsALoop and not $RT::StoreLoops;
+   was "if $IsALoop and ($RT::LoopsToOwner and not $RT::StoreLoops)"
 
 ------------------------------------------------------------------------
-r3270 | alexmv | 2005-07-01 00:32:06 -0400 (Fri, 01 Jul 2005) | 3 lines
+r1344 | alexmv | 2004-08-17 22:27:04 -0400 (Tue, 17 Aug 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/ShowCustomFieldWikitext
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SendEmail.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/EmailParser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/User_Overlay.pm
 
- r4555@zoq-fot-pik:  chmrr | 2005-06-30 17:36:05 -0400
-  * WikiText updates to auto-link http:// style links
-
-------------------------------------------------------------------------
-r3261 | kevinr | 2005-06-28 18:47:38 -0400 (Tue, 28 Jun 2005) | 7 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Ticket/Display.html
+RT-Ticket: 5988
+RT-Update: correspond
+RT-Status: resolved
 
- r5752@sad-girl-in-snow:  kevinr | 2005-06-28 17:45:36 -0500
- RT-Ticket: 6745
- RT-Status: resolved
- RT-Update: correspond
- 
- Applied Seph's patch to add a BeforeShowHistory callback.
+ * Back out change r1338, as it breaks API compatibility in a stable
+   release
 
 ------------------------------------------------------------------------
-r3254 | jesse | 2005-06-27 11:39:18 -0400 (Mon, 27 Jun 2005) | 3 lines
+r1343 | huberth | 2004-08-17 22:23:42 -0400 (Tue, 17 Aug 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/PageLayout
+   M /rt/branches/3.2-RELEASE/html/Search/Bulk.html
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
 
- r21952@hualien:  jesse | 2005-06-27 11:38:54 -0400
- * Fixed a broken callback
+ * Made bulk editing of custom fields slightly more efficient and 
+   simultaneously cleaned up some of its code.
+ * Also added a little bit of docs for RT::Ticket::Create() - Priority
+   is a valid arg also.
 
 ------------------------------------------------------------------------
-r3252 | jesse | 2005-06-24 13:55:24 -0400 (Fri, 24 Jun 2005) | 3 lines
+r1342 | alexmv | 2004-08-17 20:05:11 -0400 (Tue, 17 Aug 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/id.po
-
- r21656@hualien:  jesse | 2005-06-24 13:53:26 -0400
-  * New Indonesian translation from James Briggs
+   M /rt/branches/3.2-RELEASE/html/index.html
 
-------------------------------------------------------------------------
-r3251 | jesse | 2005-06-24 13:55:11 -0400 (Fri, 24 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm
+RT-Ticket: 5823
+RT-Update: correspond
+RT-Status: resolved
 
- r21522@hualien:  jesse | 2005-06-23 19:49:51 -0400
- * Some warning avoidance in Action/SendEmail.pm
+ * Applied patch from bobg at the domain of uic.edu, prefixing refresh
+   form's url with $RT::WebPath
 
 ------------------------------------------------------------------------
-r3250 | jesse | 2005-06-24 13:54:56 -0400 (Fri, 24 Jun 2005) | 3 lines
+r1341 | alexmv | 2004-08-17 19:57:59 -0400 (Tue, 17 Aug 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/EditCustomField
-
- r21521@hualien:  jesse | 2005-06-23 19:49:30 -0400
- * Custom field edit widget bullet proofing
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowTransaction
 
-------------------------------------------------------------------------
-r3249 | jesse | 2005-06-24 13:54:42 -0400 (Fri, 24 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/t/regression/07acl.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/09record_cf_api.t
+RT-Ticket: 5897
+RT-Update: correspond
+RT-Status: resolved
 
- r21520@hualien:  jesse | 2005-06-23 19:49:06 -0400
- * Test suite improvements and cleanups
+ * ModifyTicket includes CommentOnTicket and ReplyToTicket rights;
+   this effects display of "[Reply] [Comment]" links per transaction
 
 ------------------------------------------------------------------------
-r3248 | jesse | 2005-06-24 13:54:19 -0400 (Fri, 24 Jun 2005) | 3 lines
+r1340 | alexmv | 2004-08-17 18:18:15 -0400 (Tue, 17 Aug 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowAttachments
 
- r20757@hualien:  jesse | 2005-06-17 19:34:37 -0400
-  * Updated mailgateway documentation
+RT-Ticket: 5939
+RT-Status: resolved
+RT-Update: correspond
 
-------------------------------------------------------------------------
-r3246 | alexmv | 2005-06-23 17:48:26 -0400 (Thu, 23 Jun 2005) | 7 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
-
- r4485@zoq-fot-pik:  chmrr | 2005-06-23 17:50:48 -0400
- RT-Ticket: 6781
- RT-Update: correspond
- RT-Status: resolved
- 
-  * _AddWatcher takes Email, not Person; thanks to Andreas Jakum <ajakum@inode.at>
+ * Take out un-needed $fontsize variable; removing <font> tags will
+   have to wait
 
 ------------------------------------------------------------------------
-r3245 | alexmv | 2005-06-23 17:43:57 -0400 (Thu, 23 Jun 2005) | 7 lines
+r1339 | alexmv | 2004-08-17 18:16:11 -0400 (Tue, 17 Aug 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/RT_SiteConfig.pm
+   M /rt/branches/3.2-RELEASE/bin/rt-mailgate.in
 
- r4483@zoq-fot-pik:  chmrr | 2005-06-23 17:46:18 -0400
- RT-Ticket: 6782
- RT-Update: correspond
- RT-Status: resolved
- 
-  * Fix perl invocation; thanks to Kim Toms <kim.toms@gmail.com>
+RT-Ticket: 5963
+RT-Update: correspond
+RT-Status: resolved
 
-------------------------------------------------------------------------
-r3244 | alexmv | 2005-06-23 17:37:31 -0400 (Thu, 23 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Quicksearch
+ * Applied patch provided by bobg at the domain of uic.edu to exit if
+   there is no content on standard input
 
- r4481@zoq-fot-pik:  chmrr | 2005-06-23 17:39:53 -0400
-  * Actually fix the escaping bug
 
 ------------------------------------------------------------------------
-r3243 | alexmv | 2005-06-23 16:58:14 -0400 (Thu, 23 Jun 2005) | 3 lines
+r1338 | alexmv | 2004-08-17 17:05:10 -0400 (Tue, 17 Aug 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Quicksearch
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SendEmail.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/EmailParser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/User_Overlay.pm
 
- r4469@zoq-fot-pik:  chmrr | 2005-06-23 17:00:09 -0400
-  * Escape queue name properly
+RT-Ticket: 5716
+RT-Update: correspond
+RT-Status: resolved
 
-------------------------------------------------------------------------
-r3242 | alexmv | 2005-06-23 16:58:02 -0400 (Thu, 23 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/MyRequests
-   M /rt/branches/3.4-RELEASE/html/Elements/MyTickets
+ * Move code which is not specific to parsing mime messages into
+   RT::Email::Interface; this removes a large base of duplicated code,
+   and some sketchy "methods" that were getting called with "" as self
+   often
 
- r4468@zoq-fot-pik:  chmrr | 2005-06-23 16:59:51 -0400
-  * Remove possible closure issue (my $foo = .... if $bar;)
 
 ------------------------------------------------------------------------
-r3241 | alexmv | 2005-06-23 16:57:54 -0400 (Thu, 23 Jun 2005) | 3 lines
+r1337 | alexmv | 2004-08-17 15:03:04 -0400 (Tue, 17 Aug 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
+   M /rt/branches/3.2-RELEASE/bin/rt.in
 
- r4467@zoq-fot-pik:  chmrr | 2005-06-23 16:58:52 -0400
-  * Doc that CanonicalizeEmailAddress may be called as static
-
-------------------------------------------------------------------------
-r3240 | alexmv | 2005-06-23 16:57:51 -0400 (Thu, 23 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT.pm.in
+RT-Ticket: 5820
+RT-Update: correspond
+RT-Status: resolved
 
- r4466@zoq-fot-pik:  chmrr | 2005-06-23 16:58:19 -0400
-  * Document Set() a little better
+ * Use "local $_" to prevent "modification of read-only value..."
+   caused by aliasing $_ to a constant
 
 ------------------------------------------------------------------------
-r3227 | jesse | 2005-06-18 23:47:04 -0400 (Sat, 18 Jun 2005) | 2 lines
+r1335 | leira | 2004-08-17 12:03:08 -0400 (Tue, 17 Aug 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/ListGlobalScrips
+   M /rt/branches/3.2-RELEASE/html/Ticket/Display.html
 
-* Fixed typo in kevin's fix (/l is a filter. it needs the |)
+Added a new callback at the very beginning of the <%INIT> block.
 
-------------------------------------------------------------------------
-r3226 | kevinr | 2005-06-18 22:37:51 -0400 (Sat, 18 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/ListGlobalScrips
+RTIR uses this callback to look at the queue and hijack the display
+page, however, the callback itself is more generic than that: it
+happens at the very beginning, and receives all arguments.
 
- r4496@sad-girl-in-snow:  kevinr | 2005-06-18 21:37:27 -0500
- * Fixes possible cross-site scripting bug.
 
 ------------------------------------------------------------------------
-r3225 | kevinr | 2005-06-18 22:26:51 -0400 (Sat, 18 Jun 2005) | 1 line
+r1326 | alexmv | 2004-08-10 15:38:59 -0400 (Tue, 10 Aug 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt/branches/3.2-RELEASE/html/Elements/Header
 
+ * Add callback in header proper, to allow injection of style and script tags
 
 ------------------------------------------------------------------------
-r3224 | kevinr | 2005-06-18 22:26:40 -0400 (Sat, 18 Jun 2005) | 5 lines
+r1313 | huberth | 2004-08-05 14:47:43 -0400 (Thu, 05 Aug 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/ListGlobalScrips
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/CustomField.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/CustomField.html
 
- r4487@sad-girl-in-snow:  kevinr | 2005-06-18 21:23:04 -0500
- * Fixed a typo
- * now use $RT::WebAddress because it's a good idea
- * now localize 'Scrip' and number, instead of only the former
+ * Fixed a couple of other stupid errors resulting from r1311 relating to
+   quoting of pathnames.
 
 ------------------------------------------------------------------------
-r3223 | kevinr | 2005-06-18 03:41:38 -0400 (Sat, 18 Jun 2005) | 3 lines
+r1312 | alexmv | 2004-08-04 20:50:16 -0400 (Wed, 04 Aug 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditScrips
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/ListGlobalScrips
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomField
 
- r4484@sad-girl-in-snow:  kevinr | 2005-06-18 02:40:00 -0500
- * Cleaned up the list-of-scrips element and made it provide more useful info.
+ * Removing accidental paste
 
 ------------------------------------------------------------------------
-r3222 | jesse | 2005-06-17 19:36:28 -0400 (Fri, 17 Jun 2005) | 3 lines
+r1311 | huberth | 2004-08-04 20:44:40 -0400 (Wed, 04 Aug 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/rt-mailgate.in
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomField
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/CustomField.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/CustomField.html
 
- r20757@hualien:  jesse | 2005-06-17 19:34:37 -0400
-  * Updated mailgateway documentation
-
-------------------------------------------------------------------------
-r3212 | jesse | 2005-06-16 12:40:01 -0400 (Thu, 16 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/cs.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/da.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/de.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/en.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/es.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fi.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/he.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/hu.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/it.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ja.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/nl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/no.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pt_br.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ru.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_tw.po
+RT-Ticket: 4234
+RT-Status: resolved
 
- r20717@hualien:  jesse | 2005-06-16 12:24:50 -0400
- * Message catalog updates
+ * Doubled headers and navbars no longer appear when an unprivileged user
+   creates a Custom Field.  (This happened because Abort was called within
+   a subcomponent.)
 
 ------------------------------------------------------------------------
-r3211 | jesse | 2005-06-16 12:39:48 -0400 (Thu, 16 Jun 2005) | 9 lines
+r1310 | alexmv | 2004-08-04 15:03:51 -0400 (Wed, 04 Aug 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/Notify.pm
+   M /rt/branches/3.2-RELEASE/html/Elements/MyRequests
+   M /rt/branches/3.2-RELEASE/html/Elements/MyTickets
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBoxStart
+   M /rt/branches/3.2-RELEASE/html/NoAuth/webrt.css
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/cs.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/da.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/de.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/es.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/fi.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/fr.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/he.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/hu.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/it.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/ja.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/nl.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/no.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/pt_br.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/ru.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/zh_cn.po
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/zh_tw.po
+
+RT-Ticket: 5942
+RT-Status: resolved
+ * Use a:after {content: "..."} to put dots after titlebox links; this
+   involves one loc string change
 
- r20716@hualien:  jesse | 2005-06-16 12:23:58 -0400
-  r20713@hualien:  jesse | 2005-06-16 12:16:28 -0400
-   r20711@hualien (orig r3204):  alexmv | 2005-06-16 04:31:40 -0400
-    r4308@zoq-fot-pik:  chmrr | 2005-06-16 04:31:30 -0400
-     * Missed an lc
-   
-  
- 
+ * Also force titlebox hrefs to be white, not black
 
 ------------------------------------------------------------------------
-r3210 | jesse | 2005-06-16 12:39:36 -0400 (Thu, 16 Jun 2005) | 10 lines
+r1309 | alexmv | 2004-08-04 13:42:42 -0400 (Wed, 04 Aug 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/Notify.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/EmailParser.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Queue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/sbin/rt-setup-database.in
 
- r20715@hualien:  jesse | 2005-06-16 12:20:34 -0400
-  r20712@hualien:  jesse | 2005-06-16 12:16:22 -0400
-   r20710@hualien (orig r3203):  alexmv | 2005-06-16 04:29:14 -0400
-    r4306@zoq-fot-pik:  chmrr | 2005-06-16 04:29:06 -0400
-     * Move /^$foo$/ regexes to use eq instead, to prevent regex insertion
-       exploits
-   
-  
- 
+ * Warn if running MySQL < 4.0.x
 
-------------------------------------------------------------------------
-r3209 | jesse | 2005-06-16 12:39:21 -0400 (Thu, 16 Jun 2005) | 9 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Scrip_Overlay.pm
-
- r20714@hualien:  jesse | 2005-06-16 12:20:30 -0400
-  r20705@hualien:  jesse | 2005-06-16 12:11:06 -0400
-   r19183@hualien (orig r3063):  pdh | 2005-06-03 01:01:55 -0400
-   Misleading error referred to IsApplicable, not Commit
-   
-   
-  
- 
+ * Suggest something slightly more useful if we don't have InnoDB and
+   we're running MySQL 3.23
 
 ------------------------------------------------------------------------
-r3208 | jesse | 2005-06-16 12:39:07 -0400 (Thu, 16 Jun 2005) | 1 line
+r1308 | alexmv | 2004-08-04 11:54:14 -0400 (Wed, 04 Aug 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Template.html
 
+RT-Ticket: 4036
+RT-Status: resolved
+ * 'Create' is uppercase
+ * TemplateObj->QueueObj is null if the template is just being created
 
 ------------------------------------------------------------------------
-r3207 | jesse | 2005-06-16 12:38:53 -0400 (Thu, 16 Jun 2005) | 1 line
+r1307 | alexmv | 2004-08-04 10:33:55 -0400 (Wed, 04 Aug 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt/branches/3.2-RELEASE/etc/upgrade/3.1.0/schema.Pg
 
+RT-Ticket: 5916
+RT-Status: resolved
+ * Postgres doesn't use '#' as a comment character
 
 ------------------------------------------------------------------------
-r3206 | jesse | 2005-06-16 12:38:40 -0400 (Thu, 16 Jun 2005) | 1 line
+r1302 | huberth | 2004-08-03 18:06:00 -0400 (Tue, 03 Aug 2004) | 9 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripAction_Overlay.pm
-
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowAttachments
 
-------------------------------------------------------------------------
-r3205 | jesse | 2005-06-16 12:38:27 -0400 (Thu, 16 Jun 2005) | 1 line
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripAction_Overlay.pm
+RT-Ticket: 4473
+RT-Status: resolved
 
+ * In Ticket/Elements/ShowAttachments, the font code that is generated
+   no longer tries to escape the quotes (to give something like
+   <font size=&#34;-1&#34;>).  Now the quotes appear.  Also, the default
+   font size for the date and size has been changed to -2, because -1
+   looks huge and out of place.
 
 ------------------------------------------------------------------------
-r3181 | alexmv | 2005-06-15 17:52:14 -0400 (Wed, 15 Jun 2005) | 1 line
+r1298 | huberth | 2004-08-03 10:02:14 -0400 (Tue, 03 Aug 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt/branches/3.2-RELEASE/lib/RT/Date.pm
 
+RT-Ticket: 5927
+RT-Status: resolved
 
-------------------------------------------------------------------------
-r3180 | alexmv | 2005-06-15 17:52:08 -0400 (Wed, 15 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/html/Elements/ShowCustomFieldBinary
-
- r4266@zoq-fot-pik:  chmrr | 2005-06-15 17:51:16 -0400
-  * Backport r3147 from quebec
+ * Due dates in the past no longer look like they're in the future,
+   i.e. "6 days ago".
 
 ------------------------------------------------------------------------
-r3170 | jesse | 2005-06-15 15:58:48 -0400 (Wed, 15 Jun 2005) | 4 lines
+r1297 | huberth | 2004-07-30 17:46:43 -0400 (Fri, 30 Jul 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/SearchBuilder.pm
+   M /rt/branches/3.2-RELEASE/html/Search/Bulk.html
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm
 
- r20542@hualien:  jesse | 2005-06-15 15:56:43 -0400
- * Made search-by-any-customfield work
- 
-
-------------------------------------------------------------------------
-r3155 | jesse | 2005-06-14 17:00:26 -0400 (Tue, 14 Jun 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/lib/RT/I18N/id.po
+RT-Ticket: 5699
+RT-Status: resolved
 
- r20078@hualien:  jesse | 2005-06-14 16:57:41 -0400
- * First draft Indonesian message catalog from James Briggs
- 
+ * Bulk editing of custom fields (finally!) added.  Not quite as fast as
+   would be preferred, probably, but it (should) work.
 
-------------------------------------------------------------------------
-r3142 | kevinr | 2005-06-13 15:43:08 -0400 (Mon, 13 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
 
- r4210@SAD-GIRL-IN-SNOW:  kevinr | 2005-06-13 15:39:50 -0400
- * fixed a couple small issues with the perldoc format
 
 ------------------------------------------------------------------------
-r3120 | kevinr | 2005-06-09 01:33:18 -0400 (Thu, 09 Jun 2005) | 3 lines
+r1296 | alexmv | 2004-07-30 15:59:24 -0400 (Fri, 30 Jul 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripAction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/EmailParser.pm
 
- r4110@SAD-GIRL-IN-SNOW:  kevinr | 2005-06-09 01:30:22 -0400
- * fixed the mis-typed perldoc tags
+ * Fix "Unrecognised line: foo@bar" caused by 5.8.0 not matching utf8
+   against regexps
 
 ------------------------------------------------------------------------
-r3119 | kevinr | 2005-06-09 01:32:41 -0400 (Thu, 09 Jun 2005) | 4 lines
+r1293 | leira | 2004-07-29 01:41:51 -0400 (Thu, 29 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripAction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/html/Elements/MyRequests
+   M /rt/branches/3.2-RELEASE/html/Elements/MyTickets
 
- r4107@SAD-GIRL-IN-SNOW:  kevinr | 2005-06-09 00:43:23 -0400
- * makes RT::ScripAction::Load return ($id, $message) instead of just $message,
- and adds perldoc for Load() to that effect.
+Make the TitleBox title a link to the same search, only not limited to 10.
 
 ------------------------------------------------------------------------
-r3116 | jesse | 2005-06-09 01:00:12 -0400 (Thu, 09 Jun 2005) | 4 lines
+r1292 | jesse | 2004-07-28 20:08:11 -0400 (Wed, 28 Jul 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
-
- r19701@hualien:  jesse | 2005-06-09 00:58:09 -0400
- * Bumping to 3.4.3pre1
- 
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/Makefile.in
+   M /rt/branches/3.2-RELEASE/README
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.fcgi.in
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.scgi.in
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.svc.in
+   M /rt/branches/3.2-RELEASE/bin/rt-crontool.in
+   M /rt/branches/3.2-RELEASE/bin/rt-mailgate.in
+   M /rt/branches/3.2-RELEASE/bin/rt.in
+   M /rt/branches/3.2-RELEASE/bin/standalone_httpd.in
+   M /rt/branches/3.2-RELEASE/bin/webmux.pl.in
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/AddCustomFieldValue
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/CreateUserCalled
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomField
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomFieldValues
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomFields
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditQueueWatchers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditScrip
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditScrips
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditTemplates
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditUserComments
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/GroupTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ListGlobalCustomFields
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ListGlobalScrips
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ModifyTemplate
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/QueueRightsForUser
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/QueueTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectCustomFieldType
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectGroups
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyGroup
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyQueue
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyUser
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectNewGroupMembers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectRights
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScrip
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScripAction
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScripCondition
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectSingleOrMultiple
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectStage
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectTemplate
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectUsers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SystemTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ToolTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/UserTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/CustomField.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/CustomFields.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Scrip.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Scrips.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Template.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Templates.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/Members.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/CustomField.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/CustomFields.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/People.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Scrip.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Scrips.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Template.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Templates.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Tools/Configuration.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Tools/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Users/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Users/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/index.html
+   M /rt/branches/3.2-RELEASE/html/Approvals/Display.html
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/Approve
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/PendingMyApproval
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/ShowDependency
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Approvals/index.html
+   M /rt/branches/3.2-RELEASE/html/Elements/BevelBoxRaisedEnd
+   M /rt/branches/3.2-RELEASE/html/Elements/BevelBoxRaisedStart
+   M /rt/branches/3.2-RELEASE/html/Elements/Callback
+   M /rt/branches/3.2-RELEASE/html/Elements/Checkbox
+   M /rt/branches/3.2-RELEASE/html/Elements/CreateTicket
+   M /rt/branches/3.2-RELEASE/html/Elements/EditLinks
+   M /rt/branches/3.2-RELEASE/html/Elements/Error
+   M /rt/branches/3.2-RELEASE/html/Elements/Footer
+   M /rt/branches/3.2-RELEASE/html/Elements/GotoTicket
+   M /rt/branches/3.2-RELEASE/html/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/Elements/ListActions
+   M /rt/branches/3.2-RELEASE/html/Elements/Login
+   M /rt/branches/3.2-RELEASE/html/Elements/Menu
+   M /rt/branches/3.2-RELEASE/html/Elements/MessageBox
+   M /rt/branches/3.2-RELEASE/html/Elements/MyRequests
+   M /rt/branches/3.2-RELEASE/html/Elements/MyTickets
+   M /rt/branches/3.2-RELEASE/html/Elements/PageLayout
+   M /rt/branches/3.2-RELEASE/html/Elements/QueryString
+   M /rt/branches/3.2-RELEASE/html/Elements/QuickCreate
+   M /rt/branches/3.2-RELEASE/html/Elements/Quicksearch
+   M /rt/branches/3.2-RELEASE/html/Elements/Refresh
+   M /rt/branches/3.2-RELEASE/html/Elements/ScrubHTML
+   M /rt/branches/3.2-RELEASE/html/Elements/Section
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectAttachmentField
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectBoolean
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectCustomFieldOperator
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectCustomFieldValue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDate
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDateRelation
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDateType
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectEqualityOperator
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectGroups
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectLang
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectLinkType
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectMatch
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectNewTicketQueue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectOwner
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectQueue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectResultsPerPage
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectSortOrder
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectStatus
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectTicketSortBy
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectTicketTypes
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectUsers
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectWatcherType
+   M /rt/branches/3.2-RELEASE/html/Elements/SetupSessionCookie
+   M /rt/branches/3.2-RELEASE/html/Elements/ShowLink
+   M /rt/branches/3.2-RELEASE/html/Elements/ShowLinks
+   M /rt/branches/3.2-RELEASE/html/Elements/SimpleSearch
+   M /rt/branches/3.2-RELEASE/html/Elements/Submit
+   M /rt/branches/3.2-RELEASE/html/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Elements/TicketList
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBox
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBoxEnd
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBoxStart
+   M /rt/branches/3.2-RELEASE/html/NoAuth/Logout.html
+   M /rt/branches/3.2-RELEASE/html/NoAuth/Reminder.html
+   M /rt/branches/3.2-RELEASE/html/NoAuth/webrt.css
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/queue/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/queue/ns
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/attachments
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/history
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/links
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/user/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/user/ns
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/NoAuth/mail-gateway
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/autohandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/dhandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/logout
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/search/dhandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/search/ticket
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/comment
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/link
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/merge
+   M /rt/branches/3.2-RELEASE/html/Search/Build.html
+   M /rt/branches/3.2-RELEASE/html/Search/Bulk.html
+   M /rt/branches/3.2-RELEASE/html/Search/Edit.html
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/BuildFormatString
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/DisplayOptions
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/EditFormat
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/EditSearches
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/NewListActions
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickBasics
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickCFs
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickCriteria
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SearchPrivacy
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectAndOr
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectLinks
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectPersonType
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectSearchObject
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectSearchesForObjects
+   M /rt/branches/3.2-RELEASE/html/Search/Results.html
+   M /rt/branches/3.2-RELEASE/html/Search/Results.rdf
+   M /rt/branches/3.2-RELEASE/html/Search/Results.tsv
+   M /rt/branches/3.2-RELEASE/html/SelfService/Attachment/dhandler
+   M /rt/branches/3.2-RELEASE/html/SelfService/Closed.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Create.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Display.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/GotoTicket
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/MyRequests
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/SelfService/Error.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Prefs.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Update.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/index.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Attachment/dhandler
+   M /rt/branches/3.2-RELEASE/html/Ticket/Create.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Display.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/AddWatchers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/BulkLinks
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditBasics
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomField
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomFields
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditDates
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditPeople
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditWatchers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/FindAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/LoadTextAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/PreviewScrips
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowBasics
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowCustomFields
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowDates
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowDependencies
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowGroupMembers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowHistory
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMemberOf
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMembers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMessageHeaders
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMessageStanza
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowPeople
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowReferences
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowRequestor
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowSummary
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowTransactionAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowUserEntry
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Ticket/History.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyAll.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyDates.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyLinks.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyPeople.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ShowEmailRecord.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Update.html
+   M /rt/branches/3.2-RELEASE/html/Tools/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Tools/MyDay.html
+   M /rt/branches/3.2-RELEASE/html/Tools/Offline.html
+   M /rt/branches/3.2-RELEASE/html/User/Delegation.html
+   M /rt/branches/3.2-RELEASE/html/User/Elements/DelegateRights
+   M /rt/branches/3.2-RELEASE/html/User/Elements/GroupTabs
+   M /rt/branches/3.2-RELEASE/html/User/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/User/Groups/Members.html
+   M /rt/branches/3.2-RELEASE/html/User/Groups/Modify.html
+   M /rt/branches/3.2-RELEASE/html/User/Groups/index.html
+   M /rt/branches/3.2-RELEASE/html/User/Prefs.html
+   M /rt/branches/3.2-RELEASE/html/autohandler
+   M /rt/branches/3.2-RELEASE/html/index.html
+   M /rt/branches/3.2-RELEASE/html/l
+   M /rt/branches/3.2-RELEASE/lib/RT/ACE.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACE_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACL_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/AutoOpen.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Autoreply.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/EscalatePriority.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Notify.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/NotifyAsComment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/RecordComment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/RecordCorrespondence.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/ResolveMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SendEmail.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SetPriority.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/UserDefined.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachments.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachments_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attribute.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attribute_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attributes.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Base.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMember.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMember_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMembers_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/AnyTransaction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/BeforeDue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/Overdue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/OwnerChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/PriorityChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/PriorityExceeds.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/QueueChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/StatusChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/UserDefined.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CurrentUser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomField.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFields.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFields_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Date.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/EmailParser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Group.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMember.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMember_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMembers_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Group_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Groups.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Groups_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Handle.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/cs.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/i_default.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/CLI.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Auth/GnuPG.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Auth/MailFrom.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/REST.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web/Handler.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Link.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Link_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Links.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Links_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principal.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principal_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principals.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principals_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Record.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrip.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripAction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripAction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripActions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripActions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripCondition.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripCondition_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripConditions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripConditions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrip_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrips.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrips_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/ActiveTicketsInQueue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/FromSQL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/SearchBuilder.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/System.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Template.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Template_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Templates.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Templates_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transaction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transactions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transactions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI/base.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI/fsck_com_rt.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/User.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/User_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Users.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Users_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT.pm.in
+   M /rt/branches/3.2-RELEASE/sbin/extract-message-catalog
+   M /rt/branches/3.2-RELEASE/sbin/extract_pod_tests
+   M /rt/branches/3.2-RELEASE/sbin/factory
+   M /rt/branches/3.2-RELEASE/sbin/license_tag
+   M /rt/branches/3.2-RELEASE/sbin/regression_harness
+   M /rt/branches/3.2-RELEASE/sbin/rt-setup-database.in
+   M /rt/branches/3.2-RELEASE/sbin/rt-test-dependencies.in
+
+ ----------------------------------------------------------------------
+ r8303@tinbook:  jesse | 2004-07-28T23:59:45.883318Z
+ 
+ Removed the extra newlines we inserted after the copyright block, since it adds extra newlines to the mason pages, which can break some parsing.
+ 
+ ----------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r1290 | huberth | 2004-07-28 14:39:36 -0400 (Wed, 28 Jul 2004) | 7 lines
+Changed paths:
+   M /rt/branches/3.2-RELEASE/html/Search/Results.tsv
+
+RT-Ticket: 5899
+RT-Status: resolved
 
-------------------------------------------------------------------------
-r3094 | kevinr | 2005-06-08 18:44:39 -0400 (Wed, 08 Jun 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/rt-mailgate.in
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/NoAuth/mail-gateway
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email/Auth/MailFrom.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/06mailgateway.t
+ * html/Search/Results.tsv now works with custom fields that have line breaks
+   within them.
 
- r4080@sad-girl-in-snow:  kevinr | 2005-06-08 18:35:07 -0400
- * Applied Ruslan Zakirov's ext-mailgate patch, which allows you to take or 
- resolve tickets by e-mail.
 
 ------------------------------------------------------------------------
-r3085 | kevinr | 2005-06-07 19:29:11 -0400 (Tue, 07 Jun 2005) | 3 lines
+r1289 | huberth | 2004-07-28 14:35:38 -0400 (Wed, 28 Jul 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/3.2-RELEASE/etc/drop.Oracle
 
- r4043@SAD-GIRL-IN-SNOW:  kevinr | 2005-06-07 19:28:11 -0400
- * Added return format information to perldoc for Comment() and Correspond()
-
-------------------------------------------------------------------------
-r3084 | kevinr | 2005-06-07 19:28:29 -0400 (Tue, 07 Jun 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
+RT-Ticket: 5908
+RT-Status: resolved
 
- r3943@SAD-GIRL-IN-SNOW:  kevinr | 2005-06-02 16:12:07 -0400
- * Applied patch from Steve Turner to add a default callback to the Queue
- Admin page.
+ * drop.Oracle now drops the attributes table.
 
 ------------------------------------------------------------------------
-r3077 | alexmv | 2005-06-07 17:56:50 -0400 (Tue, 07 Jun 2005) | 3 lines
+r1288 | leira | 2004-07-28 00:04:12 -0400 (Wed, 28 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/mason_handler.svc.in
-   M /rt/branches/3.4-RELEASE/bin/rt-mailgate.in
-   M /rt/branches/3.4-RELEASE/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ACL_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/EscalatePriority.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/Generic.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attachments_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attributes_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CachedGroupMembers_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/Generic.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CurrentUser.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Date.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/GroupMember_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/GroupMembers_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Group_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Groups_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Handle.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Link_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Links_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Principals_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Queues_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearch.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearches.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripAction_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripActions_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripCondition_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripConditions_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Scrip_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Scrips_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Search/ActiveTicketsInQueue.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Search/FromSQL.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Search/Generic.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/SearchBuilder.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/System.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Templates_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transactions_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Users_Overlay.pm
+   M /rt/branches/3.2-RELEASE/html/Search/Build.html
 
- r4010@zoq-fot-pik:  chmrr | 2005-06-07 17:08:18 -0400
-  * Whitespace fixes for proper POD
+Handle 0 values properly.
 
 ------------------------------------------------------------------------
-r3073 | jesse | 2005-06-05 17:30:17 -0400 (Sun, 05 Jun 2005) | 3 lines
+r1286 | robert | 2004-07-26 15:15:12 -0400 (Mon, 26 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/etc/RT_Config.pm.in
-
+   M /
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay.pm
 
-* Updated EmailSubjectTagRegex documentation. Thanks to Phil Homewood for spotting it.
+ ----------------------------------------------------------------------
+ r1291@dog:  rspier | 2004-07-26T19:14:41.133769Z
+ 
+ Revert the last microoptimization.  It smells funny and will create problems with merging to 3.3
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r3070 | robert | 2005-06-03 23:36:50 -0400 (Fri, 03 Jun 2005) | 9 lines
+r1285 | robert | 2004-07-26 15:07:58 -0400 (Mon, 26 Jul 2004) | 18 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/configure.ac
+   M /
+   M /DBIx-SearchBuilder/trunk/SearchBuilder.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay.pm
 
- r3078@bear:  rspier | 2005-06-04T03:36:19.749340Z
- RT-Ticket: 6748
- RT-Status: resolved
- RT-Update: correspond
+ ----------------------------------------------------------------------
+ r1287@dog:  rspier | 2004-07-26T18:56:48.690023Z
  
- Fallback to $LOGNAME if $USER isn't defined for --with-my-user-group
+ [fsck.com #5879] - DBIx::SearchBuilder should treat 'IS' as case insensitive, since most databases do too.
+ ----------------------------------------------------------------------
+ r1288@dog:  rspier | 2004-07-26T19:00:50.217330Z
  
+ MicroOptimizations:
+ 	- if we're doing an IS NULL search already, there's no reason to do a $null_columns_ok
+ 	- use || instead of 'or' so we can short-circuit
+ ----------------------------------------------------------------------
+ r1289@dog:  rspier | 2004-07-26T19:06:54.604573Z
  
+ MicroOptimization/Cleanup:
+ 	- get rid of $null_columns_ok flag
+ 	- clean up logic, and use string compare instead of regexp
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r3059 | kevinr | 2005-06-02 16:17:31 -0400 (Thu, 02 Jun 2005) | 4 lines
+r1284 | leira | 2004-07-23 17:43:20 -0400 (Fri, 23 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Tools/Offline.html
 
- r3943@STRATTON-THREE-TWENTY-SEVEN:  kevinr | 2005-06-02 16:12:07 -0400
- * Applied patch from Steve Turner to add a default callback to the Queue
- Admin page.
+Reset string properly when uploading a template file.
 
 ------------------------------------------------------------------------
-r3057 | robert | 2005-06-02 00:15:13 -0400 (Thu, 02 Jun 2005) | 4 lines
+r1283 | jesse | 2004-07-23 17:23:10 -0400 (Fri, 23 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/AutoOpen.pm
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/etc/RT_Config.pm.in
+   A /rt/branches/3.2-RELEASE/html/NoAuth/images/autohandler
 
- r3073@bear:  rspier | 2005-06-02T04:14:40.726890Z
- Support for RT-Control: no-autoopen 
+ ----------------------------------------------------------------------
+ r8292@tinbook:  jesse | 2004-07-23T21:23:16.884303Z
  
+ RT now goes out of its way to display images, like the logo... even when users fail to configure their webserver correctly
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r3056 | glasser | 2005-06-01 18:39:36 -0400 (Wed, 01 Jun 2005) | 1 line
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-
-
-------------------------------------------------------------------------
-r3055 | glasser | 2005-06-01 18:39:12 -0400 (Wed, 01 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/t/regression/04send_email.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/20savedsearch.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/21query-builder.t
-
- r33654@tin-foil:  glasser | 2005-06-01 16:36:18 -0400
- Fix some test plans, mark some QB tests TODO
-
-------------------------------------------------------------------------
-r3054 | glasser | 2005-06-01 18:38:38 -0400 (Wed, 01 Jun 2005) | 6 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
-
- r33653@tin-foil:  glasser | 2005-06-01 15:19:20 -0400
- fixdeps wasn't working for me (it was trying to detar inside my MiniCPAN!);
- its code was "correct" but presumably one of the other 500 modules that were
- loaded confused CPAN.  (This bug happened both before and after the previous change.)
- Now just uses a system() call to install.
-
-------------------------------------------------------------------------
-r3053 | glasser | 2005-06-01 18:38:05 -0400 (Wed, 01 Jun 2005) | 3 lines
+r1282 | jesse | 2004-07-23 13:34:23 -0400 (Fri, 23 Jul 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
-
- r33652@tin-foil:  glasser | 2005-06-01 15:02:58 -0400
- A mini rewrite of testdeps: now it tells you at the bottom if it is missing anything
-
-------------------------------------------------------------------------
-r3052 | glasser | 2005-06-01 18:37:45 -0400 (Wed, 01 Jun 2005) | 3 lines
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/Makefile.in
+   M /rt/branches/3.2-RELEASE/README
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.fcgi.in
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.scgi.in
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.svc.in
+   M /rt/branches/3.2-RELEASE/bin/rt-crontool.in
+   M /rt/branches/3.2-RELEASE/bin/rt-mailgate.in
+   M /rt/branches/3.2-RELEASE/bin/rt.in
+   M /rt/branches/3.2-RELEASE/bin/standalone_httpd.in
+   M /rt/branches/3.2-RELEASE/bin/webmux.pl.in
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/AddCustomFieldValue
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/CreateUserCalled
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomField
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomFieldValues
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomFields
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditQueueWatchers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditScrip
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditScrips
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditTemplates
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditUserComments
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/GroupTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ListGlobalCustomFields
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ListGlobalScrips
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ModifyTemplate
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/QueueRightsForUser
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/QueueTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectCustomFieldType
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectGroups
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyGroup
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyQueue
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyUser
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectNewGroupMembers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectRights
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScrip
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScripAction
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScripCondition
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectSingleOrMultiple
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectStage
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectTemplate
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectUsers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SystemTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ToolTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/UserTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/CustomField.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/CustomFields.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Scrip.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Scrips.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Template.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Templates.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/Members.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/CustomField.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/CustomFields.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/People.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Scrip.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Scrips.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Template.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Templates.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Tools/Configuration.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Tools/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Users/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Users/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/index.html
+   M /rt/branches/3.2-RELEASE/html/Approvals/Display.html
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/Approve
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/PendingMyApproval
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/ShowDependency
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Approvals/index.html
+   M /rt/branches/3.2-RELEASE/html/Elements/BevelBoxRaisedEnd
+   M /rt/branches/3.2-RELEASE/html/Elements/BevelBoxRaisedStart
+   M /rt/branches/3.2-RELEASE/html/Elements/Callback
+   M /rt/branches/3.2-RELEASE/html/Elements/Checkbox
+   M /rt/branches/3.2-RELEASE/html/Elements/CreateTicket
+   M /rt/branches/3.2-RELEASE/html/Elements/EditLinks
+   M /rt/branches/3.2-RELEASE/html/Elements/Error
+   M /rt/branches/3.2-RELEASE/html/Elements/Footer
+   M /rt/branches/3.2-RELEASE/html/Elements/GotoTicket
+   M /rt/branches/3.2-RELEASE/html/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/Elements/ListActions
+   M /rt/branches/3.2-RELEASE/html/Elements/Login
+   M /rt/branches/3.2-RELEASE/html/Elements/Menu
+   M /rt/branches/3.2-RELEASE/html/Elements/MessageBox
+   M /rt/branches/3.2-RELEASE/html/Elements/MyRequests
+   M /rt/branches/3.2-RELEASE/html/Elements/MyTickets
+   M /rt/branches/3.2-RELEASE/html/Elements/PageLayout
+   M /rt/branches/3.2-RELEASE/html/Elements/QueryString
+   M /rt/branches/3.2-RELEASE/html/Elements/QuickCreate
+   M /rt/branches/3.2-RELEASE/html/Elements/Quicksearch
+   M /rt/branches/3.2-RELEASE/html/Elements/Refresh
+   M /rt/branches/3.2-RELEASE/html/Elements/ScrubHTML
+   M /rt/branches/3.2-RELEASE/html/Elements/Section
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectAttachmentField
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectBoolean
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectCustomFieldOperator
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectCustomFieldValue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDate
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDateRelation
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDateType
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectEqualityOperator
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectGroups
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectLang
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectLinkType
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectMatch
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectNewTicketQueue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectOwner
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectQueue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectResultsPerPage
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectSortOrder
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectStatus
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectTicketSortBy
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectTicketTypes
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectUsers
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectWatcherType
+   M /rt/branches/3.2-RELEASE/html/Elements/SetupSessionCookie
+   M /rt/branches/3.2-RELEASE/html/Elements/ShowLink
+   M /rt/branches/3.2-RELEASE/html/Elements/ShowLinks
+   M /rt/branches/3.2-RELEASE/html/Elements/SimpleSearch
+   M /rt/branches/3.2-RELEASE/html/Elements/Submit
+   M /rt/branches/3.2-RELEASE/html/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Elements/TicketList
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBox
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBoxEnd
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBoxStart
+   M /rt/branches/3.2-RELEASE/html/NoAuth/Logout.html
+   M /rt/branches/3.2-RELEASE/html/NoAuth/Reminder.html
+   M /rt/branches/3.2-RELEASE/html/NoAuth/webrt.css
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/queue/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/queue/ns
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/attachments
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/history
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/links
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/user/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/user/ns
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/NoAuth/mail-gateway
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/autohandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/dhandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/logout
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/search/dhandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/search/ticket
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/comment
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/link
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/merge
+   M /rt/branches/3.2-RELEASE/html/Search/Build.html
+   M /rt/branches/3.2-RELEASE/html/Search/Bulk.html
+   M /rt/branches/3.2-RELEASE/html/Search/Edit.html
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/BuildFormatString
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/DisplayOptions
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/EditFormat
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/EditSearches
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/NewListActions
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickBasics
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickCFs
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickCriteria
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SearchPrivacy
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectAndOr
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectLinks
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectPersonType
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectSearchObject
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectSearchesForObjects
+   M /rt/branches/3.2-RELEASE/html/Search/Results.html
+   M /rt/branches/3.2-RELEASE/html/Search/Results.rdf
+   M /rt/branches/3.2-RELEASE/html/Search/Results.tsv
+   M /rt/branches/3.2-RELEASE/html/SelfService/Attachment/dhandler
+   M /rt/branches/3.2-RELEASE/html/SelfService/Closed.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Create.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Display.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/GotoTicket
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/MyRequests
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/SelfService/Error.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Prefs.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Update.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/index.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Attachment/dhandler
+   M /rt/branches/3.2-RELEASE/html/Ticket/Create.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Display.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/AddWatchers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/BulkLinks
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditBasics
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomField
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomFields
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditDates
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditPeople
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditWatchers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/FindAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/LoadTextAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/PreviewScrips
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowBasics
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowCustomFields
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowDates
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowDependencies
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowGroupMembers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowHistory
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMemberOf
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMembers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMessageHeaders
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMessageStanza
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowPeople
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowReferences
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowRequestor
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowSummary
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowTransactionAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowUserEntry
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Ticket/History.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyAll.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyDates.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyLinks.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyPeople.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ShowEmailRecord.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Update.html
+   M /rt/branches/3.2-RELEASE/html/Tools/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Tools/MyDay.html
+   M /rt/branches/3.2-RELEASE/html/Tools/Offline.html
+   M /rt/branches/3.2-RELEASE/html/User/Delegation.html
+   M /rt/branches/3.2-RELEASE/html/User/Elements/DelegateRights
+   M /rt/branches/3.2-RELEASE/html/User/Elements/GroupTabs
+   M /rt/branches/3.2-RELEASE/html/User/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/User/Groups/Members.html
+   M /rt/branches/3.2-RELEASE/html/User/Groups/Modify.html
+   M /rt/branches/3.2-RELEASE/html/User/Groups/index.html
+   M /rt/branches/3.2-RELEASE/html/User/Prefs.html
+   M /rt/branches/3.2-RELEASE/html/autohandler
+   M /rt/branches/3.2-RELEASE/html/index.html
+   M /rt/branches/3.2-RELEASE/html/l
+   M /rt/branches/3.2-RELEASE/lib/RT/ACE.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACE_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACL_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/AutoOpen.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Autoreply.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/EscalatePriority.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Notify.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/NotifyAsComment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/RecordComment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/RecordCorrespondence.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/ResolveMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SendEmail.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SetPriority.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/UserDefined.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachments.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachments_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attribute.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attribute_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attributes.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Base.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMember.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMember_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMembers_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/AnyTransaction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/BeforeDue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/Overdue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/OwnerChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/PriorityChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/PriorityExceeds.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/QueueChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/StatusChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/UserDefined.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CurrentUser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomField.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFields.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFields_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Date.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/EmailParser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Group.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMember.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMember_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMembers_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Group_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Groups.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Groups_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Handle.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/cs.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/i_default.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/CLI.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Auth/GnuPG.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Auth/MailFrom.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/REST.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web/Handler.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Link.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Link_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Links.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Links_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principal.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principal_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principals.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principals_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Record.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrip.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripAction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripAction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripActions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripActions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripCondition.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripCondition_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripConditions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripConditions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrip_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrips.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrips_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/ActiveTicketsInQueue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/FromSQL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/SearchBuilder.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/System.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Template.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Template_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Templates.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Templates_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transaction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transactions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transactions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI/base.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI/fsck_com_rt.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/User.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/User_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Users.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Users_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT.pm.in
+   M /rt/branches/3.2-RELEASE/sbin/extract-message-catalog
+   M /rt/branches/3.2-RELEASE/sbin/extract_pod_tests
+   M /rt/branches/3.2-RELEASE/sbin/factory
+   M /rt/branches/3.2-RELEASE/sbin/license_tag
+   M /rt/branches/3.2-RELEASE/sbin/regression_harness
+   M /rt/branches/3.2-RELEASE/sbin/rt-setup-database.in
+   M /rt/branches/3.2-RELEASE/sbin/rt-test-dependencies.in
+
+
+ ----------------------------------------------------------------------
+ r8285@tinbook:  jesse | 2004-07-23T17:33:04.648260Z
+ 
+ Using single quotes makes the email address in the copyright not get mangled
+ ----------------------------------------------------------------------
+
+
+------------------------------------------------------------------------
+r1281 | autrijus | 2004-07-23 13:15:16 -0400 (Fri, 23 Jul 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
+   M /rt
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
 
- r33243@tin-foil:  glasser | 2005-05-27 17:08:38 -0400
- Add some hopefully correct comments to the head of Search/Build
+RT-Ticket: 5274 
+RT-Status: resolved
+RT-Update: correspond
+ 
+Apply Bart Duchesne's patch for correctly deleting old TCFV '0'
+when editing SingleValue TCFs.
 
 ------------------------------------------------------------------------
-r3051 | glasser | 2005-06-01 18:37:29 -0400 (Wed, 01 Jun 2005) | 4 lines
+r1280 | leira | 2004-07-22 23:04:27 -0400 (Thu, 22 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/t/regression/02basic_web.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/08web_cf_access.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/09record_cf_api.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/10merge.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/11-template-insert.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/12-search.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/13-attribute-tests.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/15cf_single_values_are_single.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/21query-builder.t
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectCustomFieldValue
 
- r33242@tin-foil:  glasser | 2005-05-27 14:08:19 -0400
- * Improved Query builder Tests
- * add plans to a bunch of other tests
+No value is NULL, not null.
 
 ------------------------------------------------------------------------
-r3050 | glasser | 2005-06-01 18:37:12 -0400 (Wed, 01 Jun 2005) | 1 line
+r1279 | leira | 2004-07-22 23:02:15 -0400 (Thu, 22 Jul 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt/branches/3.2-RELEASE/html/Search/Build.html
 
+RT-Ticket: 5880
+RT-Status: resolved
+RT-Action: correspond
+NULL values can now be chosen, and the TicketSQL query is constructed properly.
 
 ------------------------------------------------------------------------
-r3049 | glasser | 2005-06-01 18:36:55 -0400 (Wed, 01 Jun 2005) | 3 lines
+r1278 | leira | 2004-07-22 22:32:27 -0400 (Thu, 22 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-   M /rt/branches/3.4-RELEASE/bin/standalone_httpd.in
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Groups.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Queue-Tickets.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Queue-Transactions.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Users.html
-   M /rt/branches/3.4-RELEASE/html/Admin/index.html
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFieldValue_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Handler.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/URI/t.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/04send_email.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/20savedsearch.t
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/CreateTickets.pm
 
- r33110@tin-foil:  glasser | 2005-05-26 13:33:06 -0400
- Undo 'make license-tag' change; jesse should do this later though
+Fill in the default queue if one was specified.
 
 ------------------------------------------------------------------------
-r3048 | glasser | 2005-06-01 18:36:40 -0400 (Wed, 01 Jun 2005) | 3 lines
+r1277 | leira | 2004-07-22 22:30:36 -0400 (Thu, 22 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/QueryBuilder/Tree.pm
+   M /rt/branches/3.2-RELEASE/html/Tools/Offline.html
 
- r33109@tin-foil:  glasser | 2005-05-26 12:02:13 -0400
- More docs and refactoring on QueryBuilder::Tree
+If a template file is uploaded, clear out the old template first (as before).
 
 ------------------------------------------------------------------------
-r3047 | glasser | 2005-06-01 18:36:24 -0400 (Wed, 01 Jun 2005) | 12 lines
+r1276 | jesse | 2004-07-22 15:08:32 -0400 (Thu, 22 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/QueryBuilder/Tree.pm
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/html/l
 
- r33108@tin-foil:  glasser | 2005-05-26 02:12:48 -0400
- rt-ticket: 6568
- rt-update: correspond
- 
-   * Better fix to Query Builder; in addition to refactoring most of the code which got
-     information out of the tree, prune away childless AND/ORs, fixing the bug from ticket #6568.
- 
- Also get rid of the reaction to the "Clear" action, which I don't think exists, and which 
- I think is incorrect, since the root is supposed to have one child (see where it is
- first created).
+ ----------------------------------------------------------------------
+ r8281@tinbook:  jesse | 2004-07-22T19:08:48.451578Z
  
+ * The "/l" component now does all its work in the init block
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r3046 | glasser | 2005-06-01 18:35:53 -0400 (Wed, 01 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/QueryBuilder/Tree.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/QueryBuilder.pm
-
- r33107@tin-foil:  glasser | 2005-05-26 01:56:25 -0400
- More Query Builder tree refactoring.
-
-------------------------------------------------------------------------
-r3045 | glasser | 2005-06-01 18:35:33 -0400 (Wed, 01 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
-   A /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/QueryBuilder
-   A /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/QueryBuilder/Tree.pm
-   A /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/QueryBuilder.pm
-
- r33106@tin-foil:  glasser | 2005-05-26 01:21:29 -0400
- Move stuff out from html/Search/Build.html into a module; refactor some of the code there.
-
-------------------------------------------------------------------------
-r3044 | glasser | 2005-06-01 18:35:14 -0400 (Wed, 01 Jun 2005) | 3 lines
+r1272 | jesse | 2004-07-21 21:04:55 -0400 (Wed, 21 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-   M /rt/branches/3.4-RELEASE/bin/standalone_httpd.in
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Groups.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Queue-Tickets.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Queue-Transactions.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Users.html
-   M /rt/branches/3.4-RELEASE/html/Admin/index.html
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFieldValue_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Handler.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/URI/t.pm
-
- r33105@tin-foil:  glasser | 2005-05-26 00:02:36 -0400
- Run 'make license-tag'
-
-------------------------------------------------------------------------
-r3043 | glasser | 2005-06-01 18:34:56 -0400 (Wed, 01 Jun 2005) | 5 lines
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/Makefile.in
+   M /rt/branches/3.2-RELEASE/README
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.fcgi.in
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.scgi.in
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.svc.in
+   M /rt/branches/3.2-RELEASE/bin/rt-crontool.in
+   M /rt/branches/3.2-RELEASE/bin/rt-mailgate.in
+   M /rt/branches/3.2-RELEASE/bin/rt.in
+   M /rt/branches/3.2-RELEASE/bin/standalone_httpd.in
+   M /rt/branches/3.2-RELEASE/bin/webmux.pl.in
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/AddCustomFieldValue
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/CreateUserCalled
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomField
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomFieldValues
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomFields
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditQueueWatchers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditScrip
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditScrips
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditTemplates
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditUserComments
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/GroupTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ListGlobalCustomFields
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ListGlobalScrips
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ModifyTemplate
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/QueueRightsForUser
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/QueueTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectCustomFieldType
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectGroups
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyGroup
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyQueue
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyUser
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectNewGroupMembers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectRights
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScrip
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScripAction
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScripCondition
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectSingleOrMultiple
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectStage
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectTemplate
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectUsers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SystemTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ToolTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/UserTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/CustomField.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/CustomFields.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Scrip.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Scrips.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Template.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Templates.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/Members.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/CustomField.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/CustomFields.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/People.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Scrip.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Scrips.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Template.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Templates.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Tools/Configuration.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Tools/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Users/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Users/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/index.html
+   M /rt/branches/3.2-RELEASE/html/Approvals/Display.html
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/Approve
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/PendingMyApproval
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/ShowDependency
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Approvals/index.html
+   M /rt/branches/3.2-RELEASE/html/Elements/BevelBoxRaisedEnd
+   M /rt/branches/3.2-RELEASE/html/Elements/BevelBoxRaisedStart
+   M /rt/branches/3.2-RELEASE/html/Elements/Callback
+   M /rt/branches/3.2-RELEASE/html/Elements/Checkbox
+   M /rt/branches/3.2-RELEASE/html/Elements/CreateTicket
+   M /rt/branches/3.2-RELEASE/html/Elements/EditLinks
+   M /rt/branches/3.2-RELEASE/html/Elements/Error
+   M /rt/branches/3.2-RELEASE/html/Elements/Footer
+   M /rt/branches/3.2-RELEASE/html/Elements/GotoTicket
+   M /rt/branches/3.2-RELEASE/html/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/Elements/ListActions
+   M /rt/branches/3.2-RELEASE/html/Elements/Login
+   M /rt/branches/3.2-RELEASE/html/Elements/Menu
+   M /rt/branches/3.2-RELEASE/html/Elements/MessageBox
+   M /rt/branches/3.2-RELEASE/html/Elements/MyRequests
+   M /rt/branches/3.2-RELEASE/html/Elements/MyTickets
+   M /rt/branches/3.2-RELEASE/html/Elements/PageLayout
+   M /rt/branches/3.2-RELEASE/html/Elements/QueryString
+   M /rt/branches/3.2-RELEASE/html/Elements/QuickCreate
+   M /rt/branches/3.2-RELEASE/html/Elements/Quicksearch
+   M /rt/branches/3.2-RELEASE/html/Elements/Refresh
+   M /rt/branches/3.2-RELEASE/html/Elements/ScrubHTML
+   M /rt/branches/3.2-RELEASE/html/Elements/Section
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectAttachmentField
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectBoolean
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectCustomFieldOperator
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectCustomFieldValue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDate
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDateRelation
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDateType
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectEqualityOperator
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectGroups
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectLang
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectLinkType
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectMatch
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectNewTicketQueue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectOwner
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectQueue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectResultsPerPage
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectSortOrder
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectStatus
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectTicketSortBy
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectTicketTypes
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectUsers
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectWatcherType
+   M /rt/branches/3.2-RELEASE/html/Elements/SetupSessionCookie
+   M /rt/branches/3.2-RELEASE/html/Elements/ShowLink
+   M /rt/branches/3.2-RELEASE/html/Elements/ShowLinks
+   M /rt/branches/3.2-RELEASE/html/Elements/SimpleSearch
+   M /rt/branches/3.2-RELEASE/html/Elements/Submit
+   M /rt/branches/3.2-RELEASE/html/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Elements/TicketList
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBox
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBoxEnd
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBoxStart
+   M /rt/branches/3.2-RELEASE/html/NoAuth/Logout.html
+   M /rt/branches/3.2-RELEASE/html/NoAuth/Reminder.html
+   M /rt/branches/3.2-RELEASE/html/NoAuth/webrt.css
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/queue/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/queue/ns
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/attachments
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/history
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/links
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/user/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/user/ns
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/NoAuth/mail-gateway
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/autohandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/dhandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/logout
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/search/dhandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/search/ticket
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/comment
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/link
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/merge
+   M /rt/branches/3.2-RELEASE/html/Search/Build.html
+   M /rt/branches/3.2-RELEASE/html/Search/Bulk.html
+   M /rt/branches/3.2-RELEASE/html/Search/Edit.html
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/BuildFormatString
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/DisplayOptions
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/EditFormat
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/EditSearches
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/NewListActions
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickBasics
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickCFs
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickCriteria
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SearchPrivacy
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectAndOr
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectLinks
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectPersonType
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectSearchObject
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectSearchesForObjects
+   M /rt/branches/3.2-RELEASE/html/Search/Results.html
+   M /rt/branches/3.2-RELEASE/html/Search/Results.rdf
+   M /rt/branches/3.2-RELEASE/html/Search/Results.tsv
+   M /rt/branches/3.2-RELEASE/html/SelfService/Attachment/dhandler
+   M /rt/branches/3.2-RELEASE/html/SelfService/Closed.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Create.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Display.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/GotoTicket
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/MyRequests
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/SelfService/Error.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Prefs.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Update.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/index.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Attachment/dhandler
+   M /rt/branches/3.2-RELEASE/html/Ticket/Create.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Display.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/AddWatchers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/BulkLinks
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditBasics
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomField
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomFields
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditDates
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditPeople
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditWatchers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/FindAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/LoadTextAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/PreviewScrips
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowBasics
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowCustomFields
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowDates
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowDependencies
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowGroupMembers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowHistory
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMemberOf
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMembers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMessageHeaders
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMessageStanza
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowPeople
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowReferences
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowRequestor
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowSummary
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowTransactionAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowUserEntry
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Ticket/History.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyAll.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyDates.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyLinks.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyPeople.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ShowEmailRecord.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Update.html
+   M /rt/branches/3.2-RELEASE/html/Tools/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Tools/MyDay.html
+   M /rt/branches/3.2-RELEASE/html/Tools/Offline.html
+   M /rt/branches/3.2-RELEASE/html/User/Delegation.html
+   M /rt/branches/3.2-RELEASE/html/User/Elements/DelegateRights
+   M /rt/branches/3.2-RELEASE/html/User/Elements/GroupTabs
+   M /rt/branches/3.2-RELEASE/html/User/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/User/Groups/Members.html
+   M /rt/branches/3.2-RELEASE/html/User/Groups/Modify.html
+   M /rt/branches/3.2-RELEASE/html/User/Groups/index.html
+   M /rt/branches/3.2-RELEASE/html/User/Prefs.html
+   M /rt/branches/3.2-RELEASE/html/autohandler
+   M /rt/branches/3.2-RELEASE/html/index.html
+   M /rt/branches/3.2-RELEASE/html/l
+   M /rt/branches/3.2-RELEASE/lib/RT/ACE.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACE_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACL_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/AutoOpen.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Autoreply.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/EscalatePriority.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Notify.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/NotifyAsComment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/RecordComment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/RecordCorrespondence.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/ResolveMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SendEmail.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SetPriority.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/UserDefined.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachments.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachments_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attribute.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attribute_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attributes.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Base.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMember.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMember_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMembers_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/AnyTransaction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/BeforeDue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/Overdue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/OwnerChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/PriorityChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/PriorityExceeds.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/QueueChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/StatusChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/UserDefined.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CurrentUser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomField.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFields.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFields_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Date.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/EmailParser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Group.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMember.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMember_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMembers_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Group_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Groups.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Groups_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Handle.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/cs.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/i_default.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/CLI.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Auth/GnuPG.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Auth/MailFrom.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/REST.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web/Handler.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Link.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Link_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Links.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Links_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principal.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principal_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principals.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principals_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Record.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrip.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripAction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripAction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripActions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripActions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripCondition.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripCondition_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripConditions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripConditions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrip_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrips.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrips_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/ActiveTicketsInQueue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/FromSQL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/SearchBuilder.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/System.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Template.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Template_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Templates.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Templates_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transaction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transactions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transactions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI/base.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI/fsck_com_rt.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/User.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/User_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Users.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Users_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT.pm.in
+   M /rt/branches/3.2-RELEASE/sbin/extract-message-catalog
+   M /rt/branches/3.2-RELEASE/sbin/extract_pod_tests
+   M /rt/branches/3.2-RELEASE/sbin/factory
+   M /rt/branches/3.2-RELEASE/sbin/license_tag
+   M /rt/branches/3.2-RELEASE/sbin/regression_harness
+   M /rt/branches/3.2-RELEASE/sbin/rt-setup-database.in
+   M /rt/branches/3.2-RELEASE/sbin/rt-test-dependencies.in
+
+ ----------------------------------------------------------------------
+ r8267@tinbook:  jesse | 2004-07-22T01:01:02.633960Z
+ 
+ Making license blocks fold away
+ ----------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r1271 | autrijus | 2004-07-21 20:52:53 -0400 (Wed, 21 Jul 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
-   A /rt/branches/3.4-RELEASE/lib/t/regression/21query-builder.t
+   M /rt
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
 
- r33104@tin-foil:  glasser | 2005-05-25 23:53:28 -0400
- Fix mistake in the function I just made
+ ----------------------------------------------------------------------
+ r6204@not:  autrijus | 2004-07-22T00:52:38.207887Z
  
- Add a bit of testing of the query builder.
-
-------------------------------------------------------------------------
-r3042 | glasser | 2005-06-01 18:34:38 -0400 (Wed, 01 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
-
- r33103@tin-foil:  glasser | 2005-05-25 22:24:07 -0400
- And remove the old functionality too.
-
-------------------------------------------------------------------------
-r3041 | glasser | 2005-06-01 18:33:51 -0400 (Wed, 01 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
-
- r33102@tin-foil:  glasser | 2005-05-25 22:22:53 -0400
- build_array was being called twice for two totally disconnected reasons.  Split one out.
-
-------------------------------------------------------------------------
-r3040 | glasser | 2005-06-01 18:32:34 -0400 (Wed, 01 Jun 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
-
- r33101@tin-foil:  glasser | 2005-05-25 21:05:02 -0400
- Attempt to add parentheses to the clauses select list, in Query Builder.
+ * Switch $Ticket->AddCustomFieldValue to use $cf->LoadByNameAndQueue for
+   forward compatibility.
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r3039 | glasser | 2005-06-01 18:32:16 -0400 (Wed, 01 Jun 2005) | 3 lines
+r1270 | autrijus | 2004-07-21 20:39:33 -0400 (Wed, 21 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
+   M /rt
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
 
- r33100@tin-foil:  glasser | 2005-05-25 20:21:43 -0400
- Mini refactoring of Tree->SQL/HTML function
+ ----------------------------------------------------------------------
+ r6200@not:  autrijus | 2004-07-22T00:37:31.494556Z
+ 
+ * $Ticket->AddCustomFieldValue now takes FIELD as Name.
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2998 | kevinr | 2005-05-31 21:08:40 -0400 (Tue, 31 May 2005) | 7 lines
+r1266 | jesse | 2004-07-20 17:30:05 -0400 (Tue, 20 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/no.po
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/bin/rt-crontool.in
+   M /rt/branches/3.2-RELEASE/configure.ac
+   A /rt/branches/3.2-RELEASE/lib/RT/Action/RecordComment.pm
+   A /rt/branches/3.2-RELEASE/lib/RT/Action/RecordCorrespondence.pm
+   A /rt/branches/3.2-RELEASE/lib/RT/Search/FromSQL.pm
+   M /rt/branches/3.2-RELEASE/lib/t/02regression.t.in
+   A /rt/branches/3.2-RELEASE/lib/t/05cronsupport.pl.in
 
- r3841@SAD-GIRL-IN-SNOW:  kevinr | 2005-05-31 21:07:42 -0400
- RT-Ticket: 6669
- RT-Status: resolved
- RT-Action: correspond
+ ----------------------------------------------------------------------
+ r8258@tinbook:  jesse | 2004-07-20T21:24:03.019565Z
  
- * Fixed the mysteriously-absent '1' in the Norwegian po.
+ Crontool additions to support scripted notifications [Tara Andrews, for BPS]
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2997 | kevinr | 2005-05-31 20:38:19 -0400 (Tue, 31 May 2005) | 7 lines
+r1264 | autrijus | 2004-07-19 22:56:01 -0400 (Mon, 19 Jul 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
+   M /rt
+   M /rt/branches/3.2-RELEASE/html/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/Elements/SetupSessionCookie
+   M /rt/branches/3.2-RELEASE/html/NoAuth/webrt.css
+   M /rt/branches/3.3-TESTING/html/Download/Tabular/dhandler
+   M /rt/branches/PLATANO-EXPERIMENTAL/docs/design_docs/ruleset-workflow.txt
 
- r3010@SAD-GIRL-IN-SNOW:  kevinr | 2005-05-31 18:10:17 -0400
- RT-Ticket: 6423
- RT-Status: resolve
- RT-Action: correspond
  
- * Fixed a line I broke in revision 3008 -- vi removed the '%1'.
-
-------------------------------------------------------------------------
-r2996 | kevinr | 2005-05-31 20:35:39 -0400 (Tue, 31 May 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/cs.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/da.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/de.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/es.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fi.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/he.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/hu.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/it.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ja.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/nl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/no.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pt_br.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ru.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_tw.po
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
-
- r3009@SAD-GIRL-IN-SNOW:  kevinr | 2005-05-31 17:52:48 -0400
- RT-Ticket: 6669
- RT-Status: resolved
- RT-Action: correspond
+ r6188@not:  autrijus | 2004-07-20T02:52:39.146361Z
  
- * Fixed an extra space in lib/RT/Transaction_Overlay.pm and propagated the 
- change to the po files, as per Brandon Pulsipher's suggestion.
-
-------------------------------------------------------------------------
-r2995 | kevinr | 2005-05-31 20:34:40 -0400 (Tue, 31 May 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/Modify.html
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/cs.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/da.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/de.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/es.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fi.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/he.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/hu.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/it.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ja.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/nl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/no.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pt_br.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ru.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_tw.po
-
- r3008@SAD-GIRL-IN-SNOW:  kevinr | 2005-05-31 17:05:08 -0400
- RT-Ticket: 6423
- RT-Status: resolve
- RT-Action: correspond
  
- * Corrected a typo in Admin/Queues/Modify.html and propagated it to all the
- po files, as per Angelo Turetta's suggestion.
-
-------------------------------------------------------------------------
-r2994 | kevinr | 2005-05-31 16:11:31 -0400 (Tue, 31 May 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Error
-
- r3004@sad-girl-in-snow:  kevinr | 2005-05-31 15:52:19 -0400
- RT-Ticket: 6684
- RT-Status: resolve
- RT-Action: correspond
  
- html/Elements/Error should not continue, and has been changed to add the
- standard footer element on %cleanup.
-
-------------------------------------------------------------------------
-r2993 | kevinr | 2005-05-31 16:10:33 -0400 (Tue, 31 May 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-
- r2967@sad-girl-in-snow:  kevinr | 2005-05-25 18:37:20 -0400
- * Added a comma where a compound sentence wanted it.
-
-------------------------------------------------------------------------
-r2992 | kevinr | 2005-05-31 16:10:01 -0400 (Tue, 31 May 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-
- r2965@sad-girl-in-snow:  kevinr | 2005-05-25 17:47:26 -0400
- * changed "e-mail" back to "email"
- * removed discussion of pre-5.8.3 perl versions
-
-------------------------------------------------------------------------
-r2974 | jesse | 2005-05-29 19:28:58 -0400 (Sun, 29 May 2005) | 9 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Results.html
-
- r17981@hualien:  jesse | 2005-05-29 19:26:59 -0400
-  r17979@hualien:  jesse | 2005-05-29 19:21:59 -0400
-  RT-Ticket: 6741
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  * Sort order wasn't preserved for the "in memory" saved search. --Phil Homewood
  
-
-------------------------------------------------------------------------
-r2968 | jesse | 2005-05-25 22:46:40 -0400 (Wed, 25 May 2005) | 5 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
-
- r17717@hualien:  jesse | 2005-05-25 22:43:35 -0400
- * Better in-reply-to when replying to a message generated via the webui
- * Now only hang onto the first four and the last six References headers.
  
 
 ------------------------------------------------------------------------
-r2967 | jesse | 2005-05-25 22:45:46 -0400 (Wed, 25 May 2005) | 7 lines
+r1263 | huberth | 2004-07-19 15:54:49 -0400 (Mon, 19 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDate
 
- r17705@hualien:  jesse | 2005-05-25 01:17:11 -0400
- RT-Ticket: 6627
- RT-Status: resolved
- RT-Update: correspond
- 
- * Updated German translation -- David Schmit
+ * Generalized Elements/SelectDate slightly, to allow for a differently-sized textbox.
 
 ------------------------------------------------------------------------
-r2966 | jesse | 2005-05-25 22:45:39 -0400 (Wed, 25 May 2005) | 8 lines
+r1262 | jesse | 2004-07-19 13:29:56 -0400 (Mon, 19 Jul 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/Makefile.in
+   M /rt/branches/3.2-RELEASE/README
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.fcgi.in
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.scgi.in
+   M /rt/branches/3.2-RELEASE/bin/mason_handler.svc.in
+   M /rt/branches/3.2-RELEASE/bin/rt-crontool.in
+   M /rt/branches/3.2-RELEASE/bin/rt-mailgate.in
+   M /rt/branches/3.2-RELEASE/bin/rt.in
+   M /rt/branches/3.2-RELEASE/bin/standalone_httpd.in
+   M /rt/branches/3.2-RELEASE/bin/webmux.pl.in
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/AddCustomFieldValue
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/CreateUserCalled
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomField
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomFieldValues
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditCustomFields
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditQueueWatchers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditScrip
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditScrips
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditTemplates
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/EditUserComments
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/GroupTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ListGlobalCustomFields
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ListGlobalScrips
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ModifyTemplate
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/QueueRightsForUser
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/QueueTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectCustomFieldType
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectGroups
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyGroup
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyQueue
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectModifyUser
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectNewGroupMembers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectRights
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScrip
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScripAction
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectScripCondition
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectSingleOrMultiple
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectStage
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectTemplate
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SelectUsers
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/SystemTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/ToolTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Elements/UserTabs
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/CustomField.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/CustomFields.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Scrip.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Scrips.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Template.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/Templates.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Global/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/Members.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Groups/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/CustomField.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/CustomFields.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/GroupRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/People.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Scrip.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Scrips.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Template.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/Templates.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/UserRights.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Queues/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Tools/Configuration.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Tools/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Users/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Admin/Users/index.html
+   M /rt/branches/3.2-RELEASE/html/Admin/index.html
+   M /rt/branches/3.2-RELEASE/html/Approvals/Display.html
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/Approve
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/PendingMyApproval
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/ShowDependency
+   M /rt/branches/3.2-RELEASE/html/Approvals/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Approvals/index.html
+   M /rt/branches/3.2-RELEASE/html/Elements/BevelBoxRaisedEnd
+   M /rt/branches/3.2-RELEASE/html/Elements/BevelBoxRaisedStart
+   M /rt/branches/3.2-RELEASE/html/Elements/Callback
+   M /rt/branches/3.2-RELEASE/html/Elements/Checkbox
+   M /rt/branches/3.2-RELEASE/html/Elements/CreateTicket
+   M /rt/branches/3.2-RELEASE/html/Elements/EditLinks
+   M /rt/branches/3.2-RELEASE/html/Elements/Error
+   M /rt/branches/3.2-RELEASE/html/Elements/Footer
+   M /rt/branches/3.2-RELEASE/html/Elements/GotoTicket
+   M /rt/branches/3.2-RELEASE/html/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/Elements/ListActions
+   M /rt/branches/3.2-RELEASE/html/Elements/Login
+   M /rt/branches/3.2-RELEASE/html/Elements/Menu
+   M /rt/branches/3.2-RELEASE/html/Elements/MessageBox
+   M /rt/branches/3.2-RELEASE/html/Elements/MyRequests
+   M /rt/branches/3.2-RELEASE/html/Elements/MyTickets
+   M /rt/branches/3.2-RELEASE/html/Elements/PageLayout
+   M /rt/branches/3.2-RELEASE/html/Elements/QueryString
+   M /rt/branches/3.2-RELEASE/html/Elements/QuickCreate
+   M /rt/branches/3.2-RELEASE/html/Elements/Quicksearch
+   M /rt/branches/3.2-RELEASE/html/Elements/Refresh
+   M /rt/branches/3.2-RELEASE/html/Elements/ScrubHTML
+   M /rt/branches/3.2-RELEASE/html/Elements/Section
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectAttachmentField
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectBoolean
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectCustomFieldOperator
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectCustomFieldValue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDate
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDateRelation
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectDateType
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectEqualityOperator
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectGroups
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectLang
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectLinkType
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectMatch
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectNewTicketQueue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectOwner
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectQueue
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectResultsPerPage
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectSortOrder
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectStatus
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectTicketSortBy
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectTicketTypes
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectUsers
+   M /rt/branches/3.2-RELEASE/html/Elements/SelectWatcherType
+   M /rt/branches/3.2-RELEASE/html/Elements/SetupSessionCookie
+   M /rt/branches/3.2-RELEASE/html/Elements/ShowLink
+   M /rt/branches/3.2-RELEASE/html/Elements/ShowLinks
+   M /rt/branches/3.2-RELEASE/html/Elements/SimpleSearch
+   M /rt/branches/3.2-RELEASE/html/Elements/Submit
+   M /rt/branches/3.2-RELEASE/html/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Elements/TicketList
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBox
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBoxEnd
+   M /rt/branches/3.2-RELEASE/html/Elements/TitleBoxStart
+   M /rt/branches/3.2-RELEASE/html/NoAuth/Logout.html
+   M /rt/branches/3.2-RELEASE/html/NoAuth/Reminder.html
+   M /rt/branches/3.2-RELEASE/html/NoAuth/webrt.css
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/queue/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/queue/ns
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/attachments
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/history
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/ticket/links
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/user/default
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/Forms/user/ns
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/NoAuth/mail-gateway
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/autohandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/dhandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/logout
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/search/dhandler
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/search/ticket
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/comment
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/link
+   M /rt/branches/3.2-RELEASE/html/REST/1.0/ticket/merge
+   M /rt/branches/3.2-RELEASE/html/Search/Build.html
+   M /rt/branches/3.2-RELEASE/html/Search/Bulk.html
+   M /rt/branches/3.2-RELEASE/html/Search/Edit.html
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/BuildFormatString
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/DisplayOptions
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/EditFormat
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/EditSearches
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/NewListActions
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickBasics
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickCFs
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/PickCriteria
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SearchPrivacy
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectAndOr
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectLinks
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectPersonType
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectSearchObject
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/SelectSearchesForObjects
+   M /rt/branches/3.2-RELEASE/html/Search/Results.html
+   M /rt/branches/3.2-RELEASE/html/Search/Results.rdf
+   M /rt/branches/3.2-RELEASE/html/Search/Results.tsv
+   M /rt/branches/3.2-RELEASE/html/SelfService/Attachment/dhandler
+   M /rt/branches/3.2-RELEASE/html/SelfService/Closed.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Create.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Display.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/GotoTicket
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/Header
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/MyRequests
+   M /rt/branches/3.2-RELEASE/html/SelfService/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/SelfService/Error.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Prefs.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/Update.html
+   M /rt/branches/3.2-RELEASE/html/SelfService/index.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Attachment/dhandler
+   M /rt/branches/3.2-RELEASE/html/Ticket/Create.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Display.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/AddWatchers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/BulkLinks
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditBasics
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomField
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditCustomFields
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditDates
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditPeople
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/EditWatchers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/FindAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/LoadTextAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/PreviewScrips
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowBasics
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowCustomFields
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowDates
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowDependencies
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowGroupMembers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowHistory
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMemberOf
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMembers
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMessageHeaders
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowMessageStanza
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowPeople
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowReferences
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowRequestor
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowSummary
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowTransactionAttachments
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/ShowUserEntry
+   M /rt/branches/3.2-RELEASE/html/Ticket/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Ticket/History.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Modify.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyAll.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyDates.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyLinks.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ModifyPeople.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/ShowEmailRecord.html
+   M /rt/branches/3.2-RELEASE/html/Ticket/Update.html
+   M /rt/branches/3.2-RELEASE/html/Tools/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/Tools/MyDay.html
+   M /rt/branches/3.2-RELEASE/html/Tools/Offline.html
+   M /rt/branches/3.2-RELEASE/html/User/Delegation.html
+   M /rt/branches/3.2-RELEASE/html/User/Elements/DelegateRights
+   M /rt/branches/3.2-RELEASE/html/User/Elements/GroupTabs
+   M /rt/branches/3.2-RELEASE/html/User/Elements/Tabs
+   M /rt/branches/3.2-RELEASE/html/User/Groups/Members.html
+   M /rt/branches/3.2-RELEASE/html/User/Groups/Modify.html
+   M /rt/branches/3.2-RELEASE/html/User/Groups/index.html
+   M /rt/branches/3.2-RELEASE/html/User/Prefs.html
+   M /rt/branches/3.2-RELEASE/html/autohandler
+   M /rt/branches/3.2-RELEASE/html/index.html
+   M /rt/branches/3.2-RELEASE/html/l
+   M /rt/branches/3.2-RELEASE/lib/RT/ACE.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACE_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ACL_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/AutoOpen.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Autoreply.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/EscalatePriority.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/Notify.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/NotifyAsComment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/ResolveMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SendEmail.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SetPriority.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/UserDefined.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachment.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachments.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attachments_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attribute.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attribute_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attributes.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Base.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMember.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMember_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CachedGroupMembers_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/AnyTransaction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/BeforeDue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/Overdue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/OwnerChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/PriorityChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/PriorityExceeds.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/QueueChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/StatusChange.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Condition/UserDefined.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CurrentUser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomField.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFieldValues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFields.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/CustomFields_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Date.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/EmailParser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Group.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMember.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMember_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMembers.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/GroupMembers_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Group_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Groups.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Groups_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Handle.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/cs.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/i_default.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/CLI.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Auth/GnuPG.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Auth/MailFrom.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/REST.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web/Handler.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Link.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Link_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Links.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Links_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principal.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principal_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principals.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Principals_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Queues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Record.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrip.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripAction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripAction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripActions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripActions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripCondition.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripCondition_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripConditions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/ScripConditions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrip_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrips.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Scrips_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/ActiveTicketsInQueue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Search/Generic.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/SearchBuilder.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/System.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Template.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Template_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Templates.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Templates_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValue.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValue_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValues.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/TicketCustomFieldValues_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transaction.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transactions.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Transactions_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI/base.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI/fsck_com_rt.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/URI.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/User.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/User_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Users.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Users_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT.pm.in
+   M /rt/branches/3.2-RELEASE/sbin/extract-message-catalog
+   M /rt/branches/3.2-RELEASE/sbin/extract_pod_tests
+   M /rt/branches/3.2-RELEASE/sbin/factory
+   M /rt/branches/3.2-RELEASE/sbin/license_tag
+   M /rt/branches/3.2-RELEASE/sbin/regression_harness
+   M /rt/branches/3.2-RELEASE/sbin/rt-setup-database.in
+   M /rt/branches/3.2-RELEASE/sbin/rt-test-dependencies.in
+
+ ----------------------------------------------------------------------
+ r8239@tinbook:  jesse | 2004-07-19T16:54:11.660605Z
+ 
+ 
+ ----------------------------------------------------------------------
+ r8240@tinbook:  jesse | 2004-07-19T17:01:43.322617Z
+ 
+ Retagging the source code with the updated submission policy
+ ----------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r1258 | jesse | 2004-07-16 13:13:42 -0400 (Fri, 16 Jul 2004) | 7 lines
+Changed paths:
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/html/Elements/TicketList
+   M /rt/branches/3.2-RELEASE/html/Search/Build.html
+   M /rt/branches/3.2-RELEASE/html/Search/Results.html
+   M /rt/branches/3.2-RELEASE/sbin/license_tag
 
- r17704@hualien:  jesse | 2005-05-25 00:59:29 -0400
- RT-Ticket: 6654
- RT-Status: resolved
- RT-Update: correspond 
+ ----------------------------------------------------------------------
+ r8222@tinbook:  jesse | 2004-07-16T17:09:30.264982Z
  
- * Updated Italian translation from Angelo Turetta
+ Web UI: Fixed bug which prevented unlimited searches
+ ----------------------------------------------------------------------
  
-
+ Core: License tagger preliminary updates
 ------------------------------------------------------------------------
-r2965 | jesse | 2005-05-25 22:45:32 -0400 (Wed, 25 May 2005) | 9 lines
+r1257 | autrijus | 2004-07-15 20:58:55 -0400 (Thu, 15 Jul 2004) | 11 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt
+   M /rt/branches/3.2-RELEASE/bin/standalone_httpd.in
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web/Handler.pm
+   M /rt/branches/README.LAYOUT
 
- r17703@hualien:  jesse | 2005-05-25 00:55:10 -0400
- RT-Ticket: 6653
- RT-Status: resolved
- RT-Update: correspond
- 
- * Small localization fix from Angelo Turetta 
+ ----------------------------------------------------------------------
+ r6136@not:  autrijus | 2004-07-15T21:53:07.355306Z
  
+ * revert the inadvertant change and merge wordings from cvs.html
+ ----------------------------------------------------------------------
+ r6137@not:  autrijus | 2004-07-15T22:04:22.132548Z
  
+ * Make standalone_httpd use $RT::Mason::Handler like other mason_handler progs
+ * Eliminate -w warning emitted from Handler.pm.
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2964 | jesse | 2005-05-25 22:45:25 -0400 (Wed, 25 May 2005) | 9 lines
+r1256 | alexmv | 2004-07-15 17:18:42 -0400 (Thu, 15 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
+   M /rt/branches/3.2-RELEASE/bin/standalone_httpd.in
 
- r17684@hualien:  jesse | 2005-05-24 18:18:21 -0400
- RT-Ticket: 6713
- RT-Status: resolved
- RT-Update: correspond
- 
- * Text::WikiFormat is a dependency. And should have been in 3.4.2
- 
- 
+ * Handlers are in RT::Interface::Web::Handler now
 
 ------------------------------------------------------------------------
-r2963 | jesse | 2005-05-25 22:45:17 -0400 (Wed, 25 May 2005) | 3 lines
+r1254 | jesse | 2004-07-15 15:08:23 -0400 (Thu, 15 Jul 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-
- r17682@hualien:  jesse | 2005-05-24 12:27:55 -0400
- * Wikitext fields weren't properly escaping HTML
+   M /rt/branches/3.2-RELEASE/releng.cnf
 
+This be 3.2.1
 ------------------------------------------------------------------------
-r2961 | glasser | 2005-05-25 19:58:06 -0400 (Wed, 25 May 2005) | 15 lines
+r1253 | jesse | 2004-07-15 15:03:26 -0400 (Thu, 15 Jul 2004) | 13 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/html/Search/Elements/DisplayOptions
 
- r33096@tin-foil:  glasser | 2005-05-25 19:56:11 -0400
- RT-Ticket: 6568
+ ----------------------------------------------------------------------
+ r8220@tinbook:  jesse | 2004-07-15T19:02:55.020727Z
+ 
+ RT-Ticket: 5891
  RT-Status: open
- RT-Update: correspond
+ RT-Action: correspond
  
- * Simple fix to Query Builder to prevent a crash in situations involving
-   the creation of AND/ORs with no children. A fix that treats the cause
-   and not the symptom is planned.  Currently, it may sometimes do "unexpected things"
-   with your ADD, but it is at least in a state that the user can recover from.
+ Interim measure to only list sortable fields in the "Sort display by" 
+ options.
  
- Specifically, for Danial's it works as expected; for Tim's example, it gives an incorrect
- error message (in the context of the QB page, not a Mason crash thing) but the select
- box is in a good state.
  
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2960 | kevinr | 2005-05-25 18:38:43 -0400 (Wed, 25 May 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-
- r2967@SAD-GIRL-IN-SNOW:  kevinr | 2005-05-25 18:37:20 -0400
- * Added a comma where a compound sentence wanted it.
-
-------------------------------------------------------------------------
-r2959 | kevinr | 2005-05-25 17:49:43 -0400 (Wed, 25 May 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-
- r2965@SAD-GIRL-IN-SNOW:  kevinr | 2005-05-25 17:47:26 -0400
- * changed "e-mail" back to "email"
- * removed discussion of pre-5.8.3 perl versions
-
-------------------------------------------------------------------------
-r2958 | kevinr | 2005-05-25 16:47:14 -0400 (Wed, 25 May 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-
- r2950@SAD-GIRL-IN-SNOW:  kevinr | 2005-05-25 16:39:58 -0400
- * fixed a bunch of typoes in the README
-
-------------------------------------------------------------------------
-r2957 | jesse | 2005-05-25 01:25:06 -0400 (Wed, 25 May 2005) | 7 lines
+r1251 | jesse | 2004-07-14 16:32:25 -0400 (Wed, 14 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/PreviewScrips
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/de.po
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/releng.cnf
 
- r17705@hualien:  jesse | 2005-05-25 01:17:11 -0400
- RT-Ticket: 6627
- RT-Status: resolved
- RT-Update: correspond
+ ----------------------------------------------------------------------
+ r3399@tinbook:  jesse | 2004-07-14T20:23:59.757938Z
  
- * Updated German translation -- David Schmit
+ Bumping to 3.2.1rc4
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2956 | jesse | 2005-05-25 01:24:55 -0400 (Wed, 25 May 2005) | 8 lines
+r1250 | jesse | 2004-07-14 16:31:47 -0400 (Wed, 14 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/it.po
+   M /rt/branches/3.2-RELEASE
 
- r17704@hualien:  jesse | 2005-05-25 00:59:29 -0400
- RT-Ticket: 6654
- RT-Status: resolved
- RT-Update: correspond 
+ ----------------------------------------------------------------------
+ r3398@tinbook:  jesse | 2004-07-14T19:59:24.627023Z
  
- * Updated Italian translation from Angelo Turetta
  
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2955 | jesse | 2005-05-25 01:24:46 -0400 (Wed, 25 May 2005) | 9 lines
+r1249 | jesse | 2004-07-14 16:30:36 -0400 (Wed, 14 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/DisplayOptions
+   M /rt/branches/3.2-RELEASE
 
- r17703@hualien:  jesse | 2005-05-25 00:55:10 -0400
- RT-Ticket: 6653
- RT-Status: resolved
- RT-Update: correspond
- 
- * Small localization fix from Angelo Turetta 
+ ----------------------------------------------------------------------
+ r3397@tinbook:  jesse | 2004-07-14T19:44:51.378312Z
  
  
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2954 | jesse | 2005-05-24 18:21:27 -0400 (Tue, 24 May 2005) | 9 lines
+r1248 | jesse | 2004-07-14 15:32:50 -0400 (Wed, 14 Jul 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
+   M /rt/branches/3.2-RELEASE
+   M /rt/branches/3.2-RELEASE/bin/rt-crontool.in
 
- r17684@hualien:  jesse | 2005-05-24 18:18:21 -0400
- RT-Ticket: 6713
- RT-Status: resolved
- RT-Update: correspond
- 
- * Text::WikiFormat is a dependency. And should have been in 3.4.2
+ ----------------------------------------------------------------------
+ r3390@tinbook:  jesse | 2004-07-14T19:30:37.426202Z
  
+ RT-Ticket: 5886
+ RT-Action: correspond
+ RT-Status: resolved
  
+ Updated rt-crontool to pass in CurrentUser when creating new actions and 
+ searches..
 
 ------------------------------------------------------------------------
-r2953 | jesse | 2005-05-24 18:21:07 -0400 (Tue, 24 May 2005) | 3 lines
+r1246 | autrijus | 2004-07-14 15:24:16 -0400 (Wed, 14 Jul 2004) | 9 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/ShowCustomFieldWikitext
-
- r17682@hualien:  jesse | 2005-05-24 12:27:55 -0400
- * Wikitext fields weren't properly escaping HTML
-
-------------------------------------------------------------------------
-r2945 | kevinr | 2005-05-24 13:53:43 -0400 (Tue, 24 May 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
+   M /rt
+   M /rt/branches/3.2-RELEASE/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Record.pm
 
- r2945@sad-girl-in-snow:  kevinr | 2005-05-24 13:51:57 -0400
- * Updated README to note that RT works with Oracle versions >=9.2
+ ----------------------------------------------------------------------
+ r6049@not:  autrijus | 2004-07-14T19:18:50.831922Z
+ 
+ * Implement singular-attribute APIs: FirstAttribute, DeleteAttribute
+   and SetAttribute.
+ * Attributes->DeleteEntry can now unconditionally delete all attributes
+   with the matching name.
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2936 | jesse | 2005-05-23 15:30:36 -0400 (Mon, 23 May 2005) | 7 lines
+r1242 | jesse | 2004-07-14 14:15:13 -0400 (Wed, 14 Jul 2004) | 15 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
+   M /rt/branches/3.2-RELEASE
+   D /rt/branches/3.2-RELEASE/html/Search/Elements/TicketRow
+   M /rt/branches/3.2-RELEASE/lib/RT/Record.pm
 
- r17673@hualien:  jesse | 2005-05-23 15:27:11 -0400
- RT-Ticket: 6459
+ ----------------------------------------------------------------------
+ r3377@tinbook:  jesse | 2004-07-14T05:07:22.409809Z
+ 
+ TicketRow was a vestigal file from RT 3.0
+ ----------------------------------------------------------------------
+ r3378@tinbook:  jesse | 2004-07-14T18:11:31.705353Z
+ 
+ RT-Ticket: 5885
  RT-Status: resolved
+ RT-Action: correspond
  
- * Updates to the _AddLink return values from Todd Chapman.
+ Reverting an overzealous warning added post 3.2.0
  
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2935 | jesse | 2005-05-23 15:30:26 -0400 (Mon, 23 May 2005) | 4 lines
+r1240 | alexmv | 2004-07-14 11:34:00 -0400 (Wed, 14 Jul 2004) | 9 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/RT_Config.pm.in
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SendEmail.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Links_Overlay.pm
 
- r17672@hualien:  jesse | 2005-05-23 15:22:51 -0400
- * Switch the default WebURL to "localhost" to make the regression suite pass
-   more cleanly
+RT-Ticket: 5882
+RT-Status: resolved
+RT-Action: correspond
 
-------------------------------------------------------------------------
-r2934 | jesse | 2005-05-23 15:30:16 -0400 (Mon, 23 May 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/EmailParser.pm
+ * Skip links whose base or target is local and the endpoint is a
+   deleted ticket
+ * Typo fix in comment in RT::Action::SendMail
 
- r17671@hualien:  jesse | 2005-05-23 14:21:54 -0400
- * Since EmailParser _might_ be used out of Interface::Email context, require Interface::Email.
 
 ------------------------------------------------------------------------
-r2933 | jesse | 2005-05-23 15:30:02 -0400 (Mon, 23 May 2005) | 3 lines
+r1239 | alexmv | 2004-07-14 11:15:20 -0400 (Wed, 14 Jul 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/EmailParser.pm
+   M /rt/branches/3.2-RELEASE/lib/RT/Action/SendEmail.pm
 
- r17670@hualien:  jesse | 2005-05-23 13:48:34 -0400
-  * RT::EmailParser->ParseTicketId was deprecated but that was not clear. Also, the code was out of date
+ * Fix error of "No recipients" if FriendlyToLine is set, but all
+   recipients are masked
 
 ------------------------------------------------------------------------
-r2932 | glasser | 2005-05-23 13:04:38 -0400 (Mon, 23 May 2005) | 3 lines
+r1238 | alexmv | 2004-07-14 09:22:38 -0400 (Wed, 14 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/URI/fsck_com_rt.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/URI/t.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/02basic_web.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/03web_compiliation_errors.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/06mailgateway.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/07acl.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/08web_cf_access.t
+   M /rt/branches/3.2-RELEASE/lib/RT/I18N/de.po
 
-Allow for base URL to be changed when doing regressions.
-(And kind of allow for Organization to be changed, except the mailgate
-test will still bite it if you do.)
-------------------------------------------------------------------------
-r2909 | glasser | 2005-05-22 17:03:29 -0400 (Sun, 22 May 2005) | 1 line
-Changed paths:
-   M /rt/branches/3.4-RELEASE/etc/RT_SiteConfig.pm
+RT-Ticket: 5887
+RT-Status: resolved
+RT-Action: correspond
+
+ * de grammar fix, patch from pape-rt@inf.fu-berlin.de applied
 
-Put an obviously fake instead of possibly wrong path in an example command.`
 ------------------------------------------------------------------------
-r2887 | jesse | 2005-05-16 22:09:21 -0400 (Mon, 16 May 2005) | 3 lines
+r1234 | jesse | 2004-07-14 00:45:56 -0400 (Wed, 14 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
+   M /rt/branches/3.2-RELEASE/releng.cnf
 
- r16893@hualien:  jesse | 2005-05-16 18:04:08 -0400
- * Better creation of in-reply-to/references headers on web-ased reply
+Bumping 3.2.1rc3
 
 ------------------------------------------------------------------------
-r2886 | jesse | 2005-05-16 17:49:47 -0400 (Mon, 16 May 2005) | 4 lines
+r1229 | autrijus | 2004-07-13 15:39:33 -0400 (Tue, 13 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/PageLayout
+   M /rt
+   M /rt/branches/3.2-RELEASE/lib/RT/Interface/Web/Handler.pm
 
- r16891@hualien:  jesse | 2005-05-16 22:48:02 +0100
- * Adding a new "top of page" callback
+ ----------------------------------------------------------------------
+ r6043@not:  autrijus | 2004-07-13T19:37:47.955054Z
  
+ * Apache2Handler also needs args_method => CGI for file uploads to work.
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2880 | jesse | 2005-05-13 10:25:08 -0400 (Fri, 13 May 2005) | 3 lines
+r1225 | jesse | 2004-07-13 15:05:48 -0400 (Tue, 13 Jul 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFieldValues_Overlay.pm
-
- r16761@hualien:  jesse | 2005-05-13 15:22:22 +0100
- * Ruslan found a debugging statement we had accidentally committed
+   A /rt/branches/3.2-RELEASE (from /rt/branches/rt-3.1:1224)
+   D /rt/branches/rt-3.1
 
+Moving RT 3.1 from branch to a 3.2-RELEASE branch
 ------------------------------------------------------------------------
-r2879 | jesse | 2005-05-12 20:04:44 -0400 (Thu, 12 May 2005) | 3 lines
+r1221 | leira | 2004-07-13 14:14:06 -0400 (Tue, 13 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFieldValue_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFieldValues_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Elements/PickBasics
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCFs
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCriteria
 
- r16510@hualien:  jesse | 2005-05-12 17:44:00 +0100
- * Fix on the plane was wrong. sigh
+Fix formatting of Basics and CFs in the PickCriteria component (a precursor to fixing the values of things inside of these components).
 
 ------------------------------------------------------------------------
-r2864 | jesse | 2005-05-11 20:06:23 -0400 (Wed, 11 May 2005) | 3 lines
+r1220 | leira | 2004-07-13 12:36:33 -0400 (Tue, 13 Jul 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFieldValue_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r16468@hualien:  jesse | 2005-05-11 15:34:43 +0100
- * CustomFieldValues fix had a typo
+RT-Ticket: 5881
+RT-Status: resolved
+RT-Action: correspond
 
-------------------------------------------------------------------------
-r2863 | jesse | 2005-05-11 20:06:12 -0400 (Wed, 11 May 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm
+This is a different problem than the one reported in #5801: this one seems to be regarding the and/or radio buttons on the query builder page, not the toggle button.
 
- r16462@hualien:  jesse | 2005-05-11 15:30:30 +0100
- * Try harder to set a proper In-reply-to: header
+It's now fixed.
 
 ------------------------------------------------------------------------
-r2862 | jesse | 2005-05-11 20:06:01 -0400 (Wed, 11 May 2005) | 3 lines
+r1218 | jesse | 2004-07-12 23:02:17 -0400 (Mon, 12 Jul 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/lib/RT/CustomFieldValue_Overlay.pm
-
- r16461@hualien:  jesse | 2005-05-11 15:23:33 +0100
- * Custom field values can now be integers
+   M /rt/branches/rt-3.1/releng.cnf
 
+Bumping to 3.2.1rc2
 ------------------------------------------------------------------------
-r2861 | robert | 2005-05-10 01:54:35 -0400 (Tue, 10 May 2005) | 5 lines
+r1217 | jesse | 2004-07-12 22:59:34 -0400 (Mon, 12 Jul 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web/Handler.pm
 
- r2875@bear:  rspier | 2005-05-10T05:54:13.875334Z
- quick and dirty fix (ok, not so quick, and not really so dirty)
- for the recursive CreateTickets dataloss issue.
- 
 
 ------------------------------------------------------------------------
-r2856 | jesse | 2005-05-09 21:52:39 -0400 (Mon, 09 May 2005) | 6 lines
+r1216 | jesse | 2004-07-12 22:52:28 -0400 (Mon, 12 Jul 2004) | 14 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/hu.po
-   M /rt/branches/3.4-RELEASE/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1
 
- r16376@hualien:  jesse | 2005-05-09 21:51:14 -0400
-  r16373@hualien:  jesse | 2005-05-09 21:43:59 -0400
-  * Queue name case changes were accidentally generating a "Name Conflict" error
-  
+ ----------------------------------------------------------------------
+ r3350@tinbook:  jesse | 2004-07-13T01:51:31.179491Z
  
-
-------------------------------------------------------------------------
-r2855 | jesse | 2005-05-09 21:52:31 -0400 (Mon, 09 May 2005) | 1 line
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-
-
-------------------------------------------------------------------------
-r2854 | jesse | 2005-05-09 21:52:24 -0400 (Mon, 09 May 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFields_Overlay.pm
-
- r15829@hualien:  jesse | 2005-05-06 16:06:12 -0400
- * Make sure that disabled custom fields aren't listed in Queue CF listings.
  
-
-------------------------------------------------------------------------
-r2833 | glasser | 2005-05-05 22:44:56 -0400 (Thu, 05 May 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
-
-Require modern version of XML::RSS (versions prior to 1.02 do not 
-encode their output properly; 1.02 and 1.05 have the same prereqs
-but 1.05 fixes some other bugs)
-------------------------------------------------------------------------
-r2831 | jesse | 2005-05-04 13:16:54 -0400 (Wed, 04 May 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
-
- r15792@hualien:  jesse | 2005-05-04 13:14:49 -0400
- * This is 3.4.2
-
-------------------------------------------------------------------------
-r2829 | robert | 2005-05-03 23:52:32 -0400 (Tue, 03 May 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/initialdata
-
- r2835@bear:  rspier | 2005-05-04T03:51:48.597852Z
- fix typo in initialdata related to approval rejection
+ ----------------------------------------------------------------------
+ r3351@tinbook:  jesse | 2004-07-13T02:19:57.407844Z
  
-
-------------------------------------------------------------------------
-r2820 | jesse | 2005-05-02 13:40:54 -0400 (Mon, 02 May 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
-
- r14639@hualien:  jesse | 2005-05-02 13:30:18 -0400
- * This be 3.4.2rc2
-
-------------------------------------------------------------------------
-r2819 | jesse | 2005-05-02 13:25:35 -0400 (Mon, 02 May 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/SelfService/Elements/Tabs
-
- r14637@hualien:  jesse | 2005-05-02 13:24:05 -0400
- * Patch to SelfService UI to not display a preferences page unless the current user (ie all unprivileged users) has the right to do so.
  
-
-------------------------------------------------------------------------
-r2817 | jesse | 2005-04-29 13:11:27 -0400 (Fri, 29 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Ticket/Update.html
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
-
- r14626@hualien:  jesse | 2005-04-29 13:06:57 -0400
- * Message threading improvements suggested by Florian Weimer
-
-------------------------------------------------------------------------
-r2815 | jesse | 2005-04-29 00:12:18 -0400 (Fri, 29 Apr 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Ticket/Update.html
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
-
- r14617@hualien:  jesse | 2005-04-28 22:56:56 -0400
- * Enabled proper message threading with RT
+ ----------------------------------------------------------------------
+ r3352@tinbook:  jesse | 2004-07-13T02:37:05.067120Z
  
+ DefaultHandlerArgs is now lazy-evaluated, to more accurately emulate the old behaviour
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2814 | jesse | 2005-04-29 00:12:11 -0400 (Fri, 29 Apr 2005) | 4 lines
+r1214 | autrijus | 2004-07-12 21:35:23 -0400 (Mon, 12 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
+   M /rt
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
 
- r14616@hualien:  jesse | 2005-04-28 22:56:19 -0400
- * Added a todo notice
+ ----------------------------------------------------------------------
+ r6007@not:  autrijus | 2004-07-13T01:35:37.162027Z
  
+ * Oops, forgot to load the Handler module.
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2813 | jesse | 2005-04-29 00:12:04 -0400 (Fri, 29 Apr 2005) | 1 line
+r1213 | autrijus | 2004-07-12 21:03:09 -0400 (Mon, 12 Jul 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-
+   M /rt
+   M /rt/branches/rt-3.1/bin/mason_handler.fcgi.in
+   M /rt/branches/rt-3.1/bin/mason_handler.scgi.in
+   M /rt/branches/rt-3.1/bin/mason_handler.svc.in
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   A /rt/branches/rt-3.1/lib/RT/Interface/Web
+   A /rt/branches/rt-3.1/lib/RT/Interface/Web/Handler.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
 
-------------------------------------------------------------------------
-r2812 | jesse | 2005-04-29 00:11:00 -0400 (Fri, 29 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Footer
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/cs.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/da.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/de.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/en.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/es.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fi.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/he.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/hu.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/it.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ja.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/nl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/no.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pt_br.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ru.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_tw.po
+ ----------------------------------------------------------------------
+ r5999:  autrijus | 2004-07-13T00:35:02.795788Z
 
- r14017@hualien:  jesse | 2005-04-21 21:07:47 -0400
- Loc updates
+ * Refactor all web handler creation and initialization logic away from
+   RT::Interface::Web, webmux and mason_handle scripts, into a new module
+   "RT::Interface::Web::Handler".
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2807 | jesse | 2005-04-25 22:33:14 -0400 (Mon, 25 Apr 2005) | 2 lines
+r1211 | huberth | 2004-07-12 18:05:38 -0400 (Mon, 12 Jul 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
 
-* Correct comments in config file. "RTLogoURL" is actually LogoURL.   --Allison Randal
+ * Updated RT::Interface::Web to make bulk removals of watchers work.
 
 ------------------------------------------------------------------------
-r2792 | jesse | 2005-04-20 11:32:54 -0400 (Wed, 20 Apr 2005) | 9 lines
+r1210 | jesse | 2004-07-12 16:26:29 -0400 (Mon, 12 Jul 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/hu.po
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/html/Admin/Elements/ToolTabs
+   M /rt/branches/rt-3.1/html/Elements/EditLinks
+   M /rt/branches/rt-3.1/html/Elements/ShowLinks
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Edit.html
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email/Auth/GnuPG.pm
 
- r13994@hualien:  jesse | 2005-04-20 11:31:44 -0400
- RT-Ticket: 6620
- RT-Status: resolved
- RT-Update: correspond
- 
- * Hungarian translation had an incorrect Content-Type. Reported upstream from 
-   Debian.
- 
-
-------------------------------------------------------------------------
-r2791 | jesse | 2005-04-19 22:00:57 -0400 (Tue, 19 Apr 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/RT_Config.pm.in
-   M /rt/branches/3.4-RELEASE/etc/RT_SiteConfig.pm
+Better listings of tickets with a subject of "0"
 
- r13990@hualien:  jesse | 2005-04-19 22:00:14 -0400
- * Canonicalized => to , in the configuration file
-   They mean the same thing, but consistency is good.
 
 ------------------------------------------------------------------------
-r2783 | jesse | 2005-04-19 17:05:21 -0400 (Tue, 19 Apr 2005) | 9 lines
+r1209 | autrijus | 2004-07-12 16:22:48 -0400 (Mon, 12 Jul 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/t/regression/01ticket_link_searching.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/19-rtname.t
+   M /rt
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.SQLite
 
- r13834@hualien:  jesse | 2005-04-19 17:03:40 -0400
- RT-Ticket: 6617
- RT-Status: resolve
- RT-Update: correspond
- 
- Removed some spurious use lib lines from the test suite. Thanks to Dave Rolsky.
- 
+ ----------------------------------------------------------------------
+ r5990@not:  autrijus | 2004-07-12T20:22:03.588615Z
  
+ * Let the cf param in Ticket->CustomFieldValues be optional,
+   so we can get Atom tests to work.
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2782 | jesse | 2005-04-19 14:19:29 -0400 (Tue, 19 Apr 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
+r1206 | jesse | 2004-07-12 14:00:53 -0400 (Mon, 12 Jul 2004) | 1 line
+Changed paths:
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/README
+   M /rt/branches/rt-3.1/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/etc/acl.Pg
+   M /rt/branches/rt-3.1/etc/acl.mysql
+   M /rt/branches/rt-3.1/etc/schema.Informix
+   M /rt/branches/rt-3.1/etc/schema.Oracle
+   M /rt/branches/rt-3.1/etc/schema.Pg
+   M /rt/branches/rt-3.1/etc/schema.SQLite
+   M /rt/branches/rt-3.1/etc/schema.Sybase
+   M /rt/branches/rt-3.1/etc/schema.mysql
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.Oracle
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.Pg
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.SQLite
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.mysql
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/schema.Pg
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/schema.mysql
+   D /rt/branches/rt-3.1/etc/upgrade/3.3.0
+   D /rt/branches/rt-3.1/html/Admin/CustomFields
+   M /rt/branches/rt-3.1/html/Admin/Elements/AddCustomFieldValue
+   D /rt/branches/rt-3.1/html/Admin/Elements/CustomFieldTabs
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomFieldValues
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomFields
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditScrip
+   M /rt/branches/rt-3.1/html/Admin/Elements/GroupTabs
+   M /rt/branches/rt-3.1/html/Admin/Elements/Header
+   D /rt/branches/rt-3.1/html/Admin/Elements/ObjectCustomFields
+   D /rt/branches/rt-3.1/html/Admin/Elements/PickCustomFields
+   D /rt/branches/rt-3.1/html/Admin/Elements/PickObjects
+   M /rt/branches/rt-3.1/html/Admin/Elements/QueueTabs
+   D /rt/branches/rt-3.1/html/Admin/Elements/SelectCustomFieldLookupType
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectCustomFieldType
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectRights
+   M /rt/branches/rt-3.1/html/Admin/Elements/SystemTabs
+   M /rt/branches/rt-3.1/html/Admin/Elements/Tabs
+   M /rt/branches/rt-3.1/html/Admin/Elements/UserTabs
+   A /rt/branches/rt-3.1/html/Admin/Global/CustomField.html (from /rt/branches/rt-3.1/html/Admin/Global/CustomField.html:1200)
+   A /rt/branches/rt-3.1/html/Admin/Global/CustomFields.html (from /rt/branches/rt-3.1/html/Admin/Global/CustomFields.html:1200)
+   M /rt/branches/rt-3.1/html/Admin/Global/Templates.html
+   M /rt/branches/rt-3.1/html/Admin/Global/index.html
+   D /rt/branches/rt-3.1/html/Admin/Groups/CustomFields.html
+   D /rt/branches/rt-3.1/html/Admin/Groups/History.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/Modify.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/index.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/CustomField.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/CustomFields.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/Modify.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/People.html
+   D /rt/branches/rt-3.1/html/Admin/Users/CustomFields.html
+   D /rt/branches/rt-3.1/html/Admin/Users/History.html
+   D /rt/branches/rt-3.1/html/Admin/Users/Memberships.html
+   M /rt/branches/rt-3.1/html/Admin/Users/Modify.html
+   M /rt/branches/rt-3.1/html/Admin/Users/index.html
+   M /rt/branches/rt-3.1/html/Admin/index.html
+   D /rt/branches/rt-3.1/html/Download
+   D /rt/branches/rt-3.1/html/Elements/EditCustomField
+   D /rt/branches/rt-3.1/html/Elements/EditCustomFieldBinary
+   D /rt/branches/rt-3.1/html/Elements/EditCustomFieldFreeform
+   D /rt/branches/rt-3.1/html/Elements/EditCustomFieldImage
+   D /rt/branches/rt-3.1/html/Elements/EditCustomFieldSelect
+   D /rt/branches/rt-3.1/html/Elements/EditCustomFieldText
+   M /rt/branches/rt-3.1/html/Elements/Header
+   M /rt/branches/rt-3.1/html/Elements/SelectGroups
+   M /rt/branches/rt-3.1/html/Elements/SelectUsers
+   M /rt/branches/rt-3.1/html/Elements/SetupSessionCookie
+   D /rt/branches/rt-3.1/html/Elements/ShowCustomFieldImage
+   D /rt/branches/rt-3.1/html/Elements/ShowCustomFields
+   D /rt/branches/rt-3.1/html/Elements/ShowMemberships
+   M /rt/branches/rt-3.1/html/Elements/Submit
+   M /rt/branches/rt-3.1/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/html/Search/Bulk.html
+   M /rt/branches/rt-3.1/html/Search/Elements/PickBasics
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCFs
+   D /rt/branches/rt-3.1/html/Search/Elements/SelectGroup
+   M /rt/branches/rt-3.1/html/Search/Elements/SelectPersonType
+   M /rt/branches/rt-3.1/html/SelfService/Closed.html
+   M /rt/branches/rt-3.1/html/SelfService/Display.html
+   M /rt/branches/rt-3.1/html/Ticket/Create.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditCustomFields
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditPeople
+   M /rt/branches/rt-3.1/html/Ticket/Elements/FindAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/LoadTextAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowCustomFields
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowRequestor
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/rt-3.1/html/Ticket/Modify.html
+   M /rt/branches/rt-3.1/html/Ticket/ModifyAll.html
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
+   M /rt/branches/rt-3.1/html/User/Prefs.html
+   M /rt/branches/rt-3.1/html/autohandler
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Base.pm
+   M /rt/branches/rt-3.1/lib/RT/CurrentUser.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomField.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFields_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Group_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Groups_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/cs.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/de.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/en.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/es.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/fr.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/he.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/it.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ja.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/nl.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/pt_br.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ru.po
+   M /rt/branches/rt-3.1/lib/RT/I18N.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Link_Overlay.pm
+   D /rt/branches/rt-3.1/lib/RT/ObjectCustomField.pm
+   D /rt/branches/rt-3.1/lib/RT/ObjectCustomFieldValue.pm
+   D /rt/branches/rt-3.1/lib/RT/ObjectCustomFieldValue_Overlay.pm
+   D /rt/branches/rt-3.1/lib/RT/ObjectCustomFieldValues.pm
+   D /rt/branches/rt-3.1/lib/RT/ObjectCustomFieldValues_Overlay.pm
+   D /rt/branches/rt-3.1/lib/RT/ObjectCustomField_Overlay.pm
+   D /rt/branches/rt-3.1/lib/RT/ObjectCustomFields.pm
+   D /rt/branches/rt-3.1/lib/RT/ObjectCustomFields_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/SearchBuilder.pm
+   M /rt/branches/rt-3.1/lib/RT/StyleGuide.pod
+   M /rt/branches/rt-3.1/lib/RT/System.pm
+   M /rt/branches/rt-3.1/lib/RT/Template_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT.pm.in
+   M /rt/branches/rt-3.1/releng.cnf
+   M /rt/branches/rt-3.1/sbin/extract-message-catalog
+   D /rt/branches/rt-3.1/sbin/rt-dump-database.in
+   D /rt/branches/rt-3.1/spec
+
+Reverting change 1201, which was improperly merged from a dev branch
+------------------------------------------------------------------------
+r1204 | jesse | 2004-07-12 13:13:35 -0400 (Mon, 12 Jul 2004) | 6 lines
+Changed paths:
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
- r13264@hualien:  jesse | 2005-04-19 14:15:54 -0400
- RT-Ticket: 6616
- RT-Status: resolved
- RT-Update: correspond
- 
- * Added a new HasPassword method to the RT user object
+ ----------------------------------------------------------------------
+ r2127@tinbook:  jesse | 2004-07-12T17:10:45.849934Z
  
+ Backing out change that altered the "Queue" method on Tickets. Updating Record::Update to be smarter about altering foriegn key rows
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2779 | tla | 2005-04-19 00:45:48 -0400 (Tue, 19 Apr 2005) | 2 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/Queue_Overlay.pm
-
-fix the perldoc
-
-------------------------------------------------------------------------
-r2771 | jesse | 2005-04-18 01:10:20 -0400 (Mon, 18 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/html/Elements/EditCustomFieldWikitext
-   A /rt/branches/3.4-RELEASE/html/Elements/ShowCustomFieldWikitext
-   M /rt/branches/3.4-RELEASE/html/Elements/ShowCustomFields
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
-
- r13240@hualien:  jesse | 2005-04-18 01:07:43 -0400
- * Added Wikitext custom field type
-
-------------------------------------------------------------------------
-r2768 | jesse | 2005-04-18 00:16:42 -0400 (Mon, 18 Apr 2005) | 1 line
+r1203 | jesse | 2004-07-12 02:13:41 -0400 (Mon, 12 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/releng.cnf
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/Generic.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/Generic.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripAction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripCondition_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
-3.4.2rc1
-------------------------------------------------------------------------
-r2749 | jesse | 2005-04-17 21:58:26 -0400 (Sun, 17 Apr 2005) | 9 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/Modify.html
+ ----------------------------------------------------------------------
+ r2125@tinbook:  jesse | 2004-07-12T05:19:50.016366Z
+ 
+ A bunch more work to prepare for roundtrippable comma-delimited files (vitix)
+ ----------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r1202 | jesse | 2004-07-11 23:11:43 -0400 (Sun, 11 Jul 2004) | 6 lines
+Changed paths:
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+
+ ----------------------------------------------------------------------
+ r2123@tinbook:  jesse | 2004-07-12T03:10:11.198817Z
+ 
+ Offline ticket creation from delimited textfiles signficantly improved
+ ----------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r1201 | jesse | 2004-07-10 02:05:15 -0400 (Sat, 10 Jul 2004) | 201 lines
+Changed paths:
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/README
+   M /rt/branches/rt-3.1/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/etc/acl.Pg
+   M /rt/branches/rt-3.1/etc/acl.mysql
+   M /rt/branches/rt-3.1/etc/schema.Informix
+   M /rt/branches/rt-3.1/etc/schema.Oracle
+   M /rt/branches/rt-3.1/etc/schema.Pg
+   M /rt/branches/rt-3.1/etc/schema.SQLite
+   M /rt/branches/rt-3.1/etc/schema.Sybase
+   M /rt/branches/rt-3.1/etc/schema.mysql
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.Oracle
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.Pg
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.SQLite
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.mysql
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/schema.Pg
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/schema.mysql
+   A /rt/branches/rt-3.1/etc/upgrade/3.3.0
+   A /rt/branches/rt-3.1/etc/upgrade/3.3.0/acl.Informix
+   A /rt/branches/rt-3.1/etc/upgrade/3.3.0/acl.Oracle
+   A /rt/branches/rt-3.1/etc/upgrade/3.3.0/acl.Pg
+   A /rt/branches/rt-3.1/etc/upgrade/3.3.0/acl.SQLite
+   A /rt/branches/rt-3.1/etc/upgrade/3.3.0/acl.mysql
+   A /rt/branches/rt-3.1/etc/upgrade/3.3.0/schema.Pg
+   A /rt/branches/rt-3.1/etc/upgrade/3.3.0/schema.mysql
+   A /rt/branches/rt-3.1/html/Admin/CustomFields
+   A /rt/branches/rt-3.1/html/Admin/CustomFields/GroupRights.html
+   A /rt/branches/rt-3.1/html/Admin/CustomFields/Modify.html
+   A /rt/branches/rt-3.1/html/Admin/CustomFields/Objects.html
+   A /rt/branches/rt-3.1/html/Admin/CustomFields/UserRights.html
+   A /rt/branches/rt-3.1/html/Admin/CustomFields/index.html
+   M /rt/branches/rt-3.1/html/Admin/Elements/AddCustomFieldValue
+   A /rt/branches/rt-3.1/html/Admin/Elements/CustomFieldTabs
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomFieldValues
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomFields
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditScrip
+   M /rt/branches/rt-3.1/html/Admin/Elements/GroupTabs
+   M /rt/branches/rt-3.1/html/Admin/Elements/Header
+   A /rt/branches/rt-3.1/html/Admin/Elements/ObjectCustomFields
+   A /rt/branches/rt-3.1/html/Admin/Elements/PickCustomFields
+   A /rt/branches/rt-3.1/html/Admin/Elements/PickObjects
+   M /rt/branches/rt-3.1/html/Admin/Elements/QueueTabs
+   A /rt/branches/rt-3.1/html/Admin/Elements/SelectCustomFieldLookupType
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectCustomFieldType
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectRights
+   M /rt/branches/rt-3.1/html/Admin/Elements/SystemTabs
+   M /rt/branches/rt-3.1/html/Admin/Elements/Tabs
+   M /rt/branches/rt-3.1/html/Admin/Elements/UserTabs
+   D /rt/branches/rt-3.1/html/Admin/Global/CustomField.html
+   D /rt/branches/rt-3.1/html/Admin/Global/CustomFields.html
+   M /rt/branches/rt-3.1/html/Admin/Global/Templates.html
+   M /rt/branches/rt-3.1/html/Admin/Global/index.html
+   A /rt/branches/rt-3.1/html/Admin/Groups/CustomFields.html
+   A /rt/branches/rt-3.1/html/Admin/Groups/History.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/Modify.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/index.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/CustomField.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/CustomFields.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/Modify.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/People.html
+   A /rt/branches/rt-3.1/html/Admin/Users/CustomFields.html
+   A /rt/branches/rt-3.1/html/Admin/Users/History.html
+   A /rt/branches/rt-3.1/html/Admin/Users/Memberships.html
+   M /rt/branches/rt-3.1/html/Admin/Users/Modify.html
+   M /rt/branches/rt-3.1/html/Admin/Users/index.html
+   M /rt/branches/rt-3.1/html/Admin/index.html
+   A /rt/branches/rt-3.1/html/Download
+   A /rt/branches/rt-3.1/html/Download/CustomFieldValue
+   A /rt/branches/rt-3.1/html/Download/CustomFieldValue/dhandler
+   A /rt/branches/rt-3.1/html/Download/Tabular
+   A /rt/branches/rt-3.1/html/Download/Tabular/dhandler
+   A /rt/branches/rt-3.1/html/Elements/EditCustomField
+   A /rt/branches/rt-3.1/html/Elements/EditCustomFieldBinary
+   A /rt/branches/rt-3.1/html/Elements/EditCustomFieldFreeform
+   A /rt/branches/rt-3.1/html/Elements/EditCustomFieldImage
+   A /rt/branches/rt-3.1/html/Elements/EditCustomFieldSelect
+   A /rt/branches/rt-3.1/html/Elements/EditCustomFieldText
+   M /rt/branches/rt-3.1/html/Elements/Header
+   M /rt/branches/rt-3.1/html/Elements/SelectGroups
+   M /rt/branches/rt-3.1/html/Elements/SelectUsers
+   M /rt/branches/rt-3.1/html/Elements/SetupSessionCookie
+   A /rt/branches/rt-3.1/html/Elements/ShowCustomFieldImage
+   A /rt/branches/rt-3.1/html/Elements/ShowCustomFields
+   A /rt/branches/rt-3.1/html/Elements/ShowMemberships
+   M /rt/branches/rt-3.1/html/Elements/Submit
+   M /rt/branches/rt-3.1/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/html/Search/Bulk.html
+   M /rt/branches/rt-3.1/html/Search/Elements/PickBasics
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCFs
+   A /rt/branches/rt-3.1/html/Search/Elements/SelectGroup
+   M /rt/branches/rt-3.1/html/Search/Elements/SelectPersonType
+   M /rt/branches/rt-3.1/html/SelfService/Closed.html
+   M /rt/branches/rt-3.1/html/SelfService/Display.html
+   M /rt/branches/rt-3.1/html/Ticket/Create.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditCustomFields
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditPeople
+   M /rt/branches/rt-3.1/html/Ticket/Elements/FindAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/LoadTextAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowCustomFields
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowRequestor
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/rt-3.1/html/Ticket/Modify.html
+   M /rt/branches/rt-3.1/html/Ticket/ModifyAll.html
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
+   M /rt/branches/rt-3.1/html/User/Prefs.html
+   M /rt/branches/rt-3.1/html/autohandler
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Base.pm
+   M /rt/branches/rt-3.1/lib/RT/CurrentUser.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomField.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFields_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Group_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Groups_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/cs.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/de.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/en.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/es.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/fr.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/he.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/it.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ja.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/nl.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/pt_br.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ru.po
+   M /rt/branches/rt-3.1/lib/RT/I18N.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Link_Overlay.pm
+   A /rt/branches/rt-3.1/lib/RT/ObjectCustomField.pm
+   A /rt/branches/rt-3.1/lib/RT/ObjectCustomFieldValue.pm
+   A /rt/branches/rt-3.1/lib/RT/ObjectCustomFieldValue_Overlay.pm
+   A /rt/branches/rt-3.1/lib/RT/ObjectCustomFieldValues.pm
+   A /rt/branches/rt-3.1/lib/RT/ObjectCustomFieldValues_Overlay.pm
+   A /rt/branches/rt-3.1/lib/RT/ObjectCustomField_Overlay.pm
+   A /rt/branches/rt-3.1/lib/RT/ObjectCustomFields.pm
+   A /rt/branches/rt-3.1/lib/RT/ObjectCustomFields_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/SearchBuilder.pm
+   M /rt/branches/rt-3.1/lib/RT/StyleGuide.pod
+   M /rt/branches/rt-3.1/lib/RT/System.pm
+   M /rt/branches/rt-3.1/lib/RT/Template_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT.pm.in
+   M /rt/branches/rt-3.1/releng.cnf
+   M /rt/branches/rt-3.1/sbin/extract-message-catalog
+   A /rt/branches/rt-3.1/sbin/rt-dump-database.in
+   A /rt/branches/rt-3.1/spec
+   A /rt/branches/rt-3.1/spec/schema.txt
 
- r13207@hualien:  jesse | 2005-04-17 21:57:31 -0400
- RT-Ticket: 6597
- RT-Status: resolved
- RT-Update correspond 
+ ----------------------------------------------------------------------
+ r2112@tinbook:  jesse | 2004-07-10T04:32:28.577645Z
  
- * CanonicalizeUserInfo didn't work right from RT's WebUI.
-   Fixed by Dave Rolsky.
+  ----------------------------------------------------------------------
+  r1996@tinbook:  jesse | 2004-06-28T03:08:01.495343Z
+  
+   ----------------------------------------------------------------------
+   r1769@tinbook:  jesse | 2004-06-01T20:22:38.640731Z
+   
+   
+   ----------------------------------------------------------------------
+   r1902@tinbook:  jesse | 2004-06-17T01:08:53.996154Z
+   
+   
+   ----------------------------------------------------------------------
+   r1991@tinbook:  jesse | 2004-06-28T02:03:57.669851Z
+   
+   
+   ----------------------------------------------------------------------
+   r1992@tinbook:  jesse | 2004-06-28T02:19:36.386707Z
+   
+   Pulling forward from RT 3.1
+   
+   
+   ----------------------------------------------------------------------
+   r1993@tinbook:  jesse | 2004-06-28T03:06:56.930396Z
+   
+   Merging forward from 3.1
+   ----------------------------------------------------------------------
+  
+  ----------------------------------------------------------------------
+  r1998@tinbook:  jesse | 2004-06-28T03:10:54.232175Z
+  
+   ----------------------------------------------------------------------
+   r1997@tinbook:  jesse | 2004-06-28T03:10:36.434329Z
+   
+   Bumping to 3.3.4
+   ----------------------------------------------------------------------
+  
+  ----------------------------------------------------------------------
+  r2058@tinbook:  autrijus | 2004-07-05T16:56:22.344051Z
+  
+   ----------------------------------------------------------------------
+   r5899@not:  autrijus | 2004-07-05T15:13:55.850880Z
+   
+   * correct the documentation for CreateTickets; it was still referring
+     to the archaic "Approvals" queue and "Approval" type, whereas now we're
+     using "___Approvals" and "approval" now.
+   ----------------------------------------------------------------------
+  
+  ----------------------------------------------------------------------
+  r2059@tinbook:  autrijus | 2004-07-05T19:43:17.347835Z
+  
+   ----------------------------------------------------------------------
+   r5913@not:  autrijus | 2004-07-05T19:41:37.720057Z
+   
+   * add rt-dump-database, a tool to dump config data to initialdata format.
+   ----------------------------------------------------------------------
+  
+  ----------------------------------------------------------------------
  
-
-------------------------------------------------------------------------
-r2748 | jesse | 2005-04-17 21:58:19 -0400 (Sun, 17 Apr 2005) | 11 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/TicketList
-
- r13206@hualien:  jesse | 2005-04-17 21:54:10 -0400
-  r13204@hualien:  jesse | 2005-04-17 21:52:15 -0400
- RT-Ticket: 6603
- RT-Status: resolved
- RT-Update: correspond
+ ----------------------------------------------------------------------
+ r2113@tinbook:  jesse | 2004-07-10T04:40:37.142269Z
+ 
+  ----------------------------------------------------------------------
+  r2012@tinbook:  jesse | 2004-06-28T21:51:20.545520Z
+  
+  Fixed bugs in CreateTickets (Approvals) system, both preexisting and introduced in 3.2.0rc3
+  ----------------------------------------------------------------------
+  r2014@tinbook:  jesse | 2004-06-29T02:46:58.362406Z
+  
+  
+  ----------------------------------------------------------------------
+  r2015@tinbook:  jesse | 2004-06-29T02:47:32.464100Z
+  
+  3.2.0rc4
+  ----------------------------------------------------------------------
+  r2022@tinbook:  jesse | 2004-06-29T17:50:48.925379Z
+  
+  
+  ----------------------------------------------------------------------
+  r2023@tinbook:  jesse | 2004-06-29T17:55:34.408001Z
+  
+  RT-Ticket: 5787
+  RT-Status: resolved
+  RT-UpdateType: correspond
+  
+  Added ticket absolute urls for the various actions one can take on searches.
+  
+  ----------------------------------------------------------------------
+  r2030@tinbook:  jesse | 2004-06-30T04:36:01.943950Z
+  
+  Bumping to 3.2.0
+  ----------------------------------------------------------------------
+  r2067@tinbook:  jesse | 2004-07-06T20:25:17.528316Z
+  
+  
+  ----------------------------------------------------------------------
+  r2068@tinbook:  jesse | 2004-07-06T20:59:43.336929Z
+  
+  Explicit 'Bookmark this search' functionality has been added back to RT 3.2
+  
+  ----------------------------------------------------------------------
+  r2070@tinbook:  jesse | 2004-07-06T21:13:17.298878Z
+  
+  RT-Ticket: 5815
+  RT-Status: resolved
+  RT-Update-Type: correspond
+  
+  RT now advises users about how to set the DBA and DBA Password when upgrading
+  
+  ----------------------------------------------------------------------
+  r2072@tinbook:  jesse | 2004-07-06T22:04:15.878370Z
   
- * RT used to report an improper total number of pages if the number of 
-   results found was evenly divisible by the number of rows per page
+   * "Negative" Ticket searches (for all tickets which don't have a
+   certain custom field value) now find tickets which have _no_ custom
+   field value for that ticket.
   
+   * Custom Field searches should now work better with non-ascii
+   custom field names. (Needs user verification)
+  ----------------------------------------------------------------------
+  r2095@tinbook:  jesse | 2004-07-09T17:06:56.744260Z
+  
+  
+  ----------------------------------------------------------------------
+  r2096@tinbook:  jesse | 2004-07-09T17:55:13.811842Z
+  
+  RT-Ticket: 5800
+  RT-Status: resolved
+  
+  RT now stores sent messages in the database as utf-8.
+  
+  ----------------------------------------------------------------------
+  r2098@tinbook:  jesse | 2004-07-09T19:19:39.944163Z
+  
+  Fixups to Attributes to work with lack of access, rather than just falling over.
+  
+  ----------------------------------------------------------------------
+  r2099@tinbook:  jesse | 2004-07-09T19:21:06.127719Z
+  
+  By default, use verbose mode for reporting missing modules.
+  ----------------------------------------------------------------------
+  r2100@tinbook:  jesse | 2004-07-09T19:25:51.061318Z
+  
+  Added a note about the fact that you'll be happier if you blow away your old RT
+  instance.
+  ----------------------------------------------------------------------
+  r2101@tinbook:  jesse | 2004-07-09T19:27:27.455452Z
+  
+  Fixing tests to conform to linda"s fixed code
+  ----------------------------------------------------------------------
+  r2102@tinbook:  jesse | 2004-07-09T19:29:51.316623Z
+  
+  (Merging 3.0 to 3.2)
+  
+   ----------------------------------------------------------------------
+   r2081@tinbook:  huberth | 2004-07-08T16:28:17.266000Z
+   
+   RT-Ticket: 5773
+   RT-Status: resolved
+   
+    * DBIx::SearchBuilder dependency bumped from 0.97 to 1.01.
+   ----------------------------------------------------------------------
+   r2089@tinbook:  alexmv | 2004-07-08T19:40:10.002177Z
+   
+    * @ARGV _is_ allowed to be empty; it is $search which must not be.
+      Thanks to jdwitt at the domain of software.umn.edu for the catch.
+   
+   ----------------------------------------------------------------------
+  
+  ----------------------------------------------------------------------
+  r2103@tinbook:  jesse | 2004-07-09T19:39:27.276636Z
+  
+  Updated French translation from sebastien.person@easter-eggs.com 
+  ----------------------------------------------------------------------
+  r2105@tinbook:  jesse | 2004-07-09T20:58:36.771281Z
+  
+  Made recording outgoing email optional.
+  Stopped recording attachments multiple times.
+  
+  
+  ----------------------------------------------------------------------
+  r2106@tinbook:  jesse | 2004-07-09T21:00:30.401132Z
+  
+  
+  ----------------------------------------------------------------------
+  r2107@tinbook:  jesse | 2004-07-09T21:00:41.498447Z
+  
+  Removing debugging output
+  ----------------------------------------------------------------------
+  r2110@tinbook:  jesse | 2004-07-10T04:20:46.424456Z
+  
+  Message catalogs updated
+  ----------------------------------------------------------------------
+ 
+ ----------------------------------------------------------------------
+ r2114@tinbook:  jesse | 2004-07-10T06:03:00.790969Z
  
+ Custom field searching now works again on 3.3
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2746 | jesse | 2005-04-17 21:45:07 -0400 (Sun, 17 Apr 2005) | 9 lines
+r1200 | jesse | 2004-07-10 00:25:45 -0400 (Sat, 10 Jul 2004) | 21 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/cs.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/da.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/de.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/en.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/en_malkovich.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/es.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/fi.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/fr.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/he.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/hu.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/it.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ja.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/nl.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/no.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/pt_br.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ru.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/zh_cn.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/zh_tw.po
 
- r13195@hualien:  jesse | 2005-04-17 21:36:13 -0400
- RT-Ticket: 6491
- RT-Status: resolved
- RT-Updated: correspond
+ ----------------------------------------------------------------------
+ r2105@tinbook:  jesse | 2004-07-09T20:58:36.771281Z
  
- * Bumped the Postgres dependency to 1.41 to get around the 
-   broken 1.40 release
+ Made recording outgoing email optional.
+ Stopped recording attachments multiple times.
  
-
-------------------------------------------------------------------------
-r2745 | jesse | 2005-04-17 21:45:00 -0400 (Sun, 17 Apr 2005) | 9 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/CollectionAsTable/Row
-
- r13194@hualien:  jesse | 2005-04-17 21:31:40 -0400
- RT-Ticket: 6522
- RT-Status: resolved
- RT-Update: correspond
  
- * Newlines in CustomFields are now displayed in TicketList results
+ ----------------------------------------------------------------------
+ r2106@tinbook:  jesse | 2004-07-09T21:00:30.401132Z
  
  
-
-------------------------------------------------------------------------
-r2744 | jesse | 2005-04-17 21:44:50 -0400 (Sun, 17 Apr 2005) | 7 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/SetupSessionCookie
-
- r13193@hualien:  jesse | 2005-04-17 21:26:35 -0400
- RT-Ticket: 6657
- RT-Status: resolved
+ ----------------------------------------------------------------------
+ r2107@tinbook:  jesse | 2004-07-09T21:00:41.498447Z
  
- * Better error message when the sessions table or sessions dir isn't writable
+ Removing debugging output
+ ----------------------------------------------------------------------
+ r2110@tinbook:  jesse | 2004-07-10T04:20:46.424456Z
  
+ Message catalogs updated
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2743 | jesse | 2005-04-17 21:44:37 -0400 (Sun, 17 Apr 2005) | 6 lines
+r1199 | jesse | 2004-07-09 15:41:38 -0400 (Fri, 09 Jul 2004) | 27 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ru.po
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/UPGRADING
+   M /rt/branches/rt-3.1/bin/rt-crontool.in
+   M /rt/branches/rt-3.1/lib/RT/Attribute_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/fr.po
+   M /rt/branches/rt-3.1/lib/t/03web.pl.in
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- r13192@hualien:  jesse | 2005-04-17 21:23:22 -0400
- RT-Ticket: 6517
- RT-Update: correspond
+ ----------------------------------------------------------------------
+ r2098@tinbook:  jesse | 2004-07-09T19:19:39.944163Z
  
- * New Russian translation from Andrew Kornilov
-
-------------------------------------------------------------------------
-r2742 | jesse | 2005-04-17 21:44:23 -0400 (Sun, 17 Apr 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Ticket/Modify.html
-
- r13191@hualien:  jesse | 2005-04-17 21:10:17 -0400
- RT-Ticket: 6589
- RT-Status: resolved
- RT-Update: correspond
+ Fixups to Attributes to work with lack of access, rather than just falling over.
  
- * Quieted a deprecation warning -- Dmitry Sivachenko <mitya@cavia.pp.ru>
+ ----------------------------------------------------------------------
+ r2099@tinbook:  jesse | 2004-07-09T19:21:06.127719Z
  
-
-------------------------------------------------------------------------
-r2741 | jesse | 2005-04-17 21:44:10 -0400 (Sun, 17 Apr 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/da.po
-
- r13190@hualien:  jesse | 2005-04-17 21:08:55 -0400
- RT-Ticket: 6585
- RT-Status: resolved
- RT-Update: correspond
+ By default, use verbose mode for reporting missing modules.
+ ----------------------------------------------------------------------
+ r2100@tinbook:  jesse | 2004-07-09T19:25:51.061318Z
  
- * Updated Danish translation from Jonas Nielsen
+ Added a note about the fact that you'll be happier if you blow away your old RT
+ instance.
+ ----------------------------------------------------------------------
+ r2101@tinbook:  jesse | 2004-07-09T19:27:27.455452Z
  
+ Fixing tests to conform to linda"s fixed code
+ ----------------------------------------------------------------------
+ r2103@tinbook:  jesse | 2004-07-09T19:39:27.276636Z
 
-------------------------------------------------------------------------
-r2740 | jesse | 2005-04-17 21:43:53 -0400 (Sun, 17 Apr 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/es.po
-
- r13189@hualien:  jesse | 2005-04-17 21:05:49 -0400
- RT-Ticket: 6583
+ RT-Ticket: 5822
  RT-Status: resolved
- RT-Update: correspond
- 
- * Fixed typos in Spanish translation
  
+ Updated French translation from sebastien.person@easter-eggs.com 
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2739 | jesse | 2005-04-17 21:43:44 -0400 (Sun, 17 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditQueueWatchers
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditScrips
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditTemplates
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/PickCustomFields
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/PickObjects
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/QueueRightsForUser
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/Members.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/index.html
-   M /rt/branches/3.4-RELEASE/html/Elements/Checkbox
-   M /rt/branches/3.4-RELEASE/html/Elements/EditLinks
-   M /rt/branches/3.4-RELEASE/html/Search/Bulk.html
-   M /rt/branches/3.4-RELEASE/html/SelfService/Update.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/Create.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/EditWatchers
-   M /rt/branches/3.4-RELEASE/html/Ticket/Update.html
-   M /rt/branches/3.4-RELEASE/html/User/Elements/DelegateRights
-   M /rt/branches/3.4-RELEASE/html/User/Groups/Members.html
-
- r13188@hualien:  jesse | 2005-04-17 20:58:19 -0400
- * Checkbox fields need a "value" or they are ignored
-
-------------------------------------------------------------------------
-r2738 | jesse | 2005-04-17 20:26:15 -0400 (Sun, 17 Apr 2005) | 11 lines
+r1198 | jesse | 2004-07-09 13:55:43 -0400 (Fri, 09 Jul 2004) | 14 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/12-search.t
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
 
- r13186@hualien:  jesse | 2005-04-17 20:24:41 -0400
- RT-Ticket: 6562
- RT-Status: resolved
- RT-Update: correspond
+ ----------------------------------------------------------------------
+ r2095@tinbook:  jesse | 2004-07-09T17:06:56.744260Z
  
- * Patch from Tom Yu to allow negative CF searching and better
-   multi-CF search.
  
- * Bumped SearchBuilder dependency to new version
+ ----------------------------------------------------------------------
+ r2096@tinbook:  jesse | 2004-07-09T17:55:13.811842Z
  
-
-------------------------------------------------------------------------
-r2634 | tla | 2005-04-15 17:21:25 -0400 (Fri, 15 Apr 2005) | 2 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearch.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/20savedsearch.t
-
-Added ability to update name as well as search parameters.
-
-------------------------------------------------------------------------
-r2631 | jesse | 2005-04-15 16:52:22 -0400 (Fri, 15 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearch.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/12-search.t
-
- r12950@hualien:  jesse | 2005-04-15 16:47:32 -0400
- * Cleaned up search tests
-
-------------------------------------------------------------------------
-r2629 | jesse | 2005-04-15 15:29:18 -0400 (Fri, 15 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm
-
- r12944@hualien:  jesse | 2005-04-15 15:28:01 -0400
- * Fixed Module::Refresh handling for standalone_httpd
-
-------------------------------------------------------------------------
-r2626 | jesse | 2005-04-14 16:36:14 -0400 (Thu, 14 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/SelfService/Display.html
-
- r12790@hualien:  jesse | 2005-04-14 15:07:03 -0400
- * Fix support for uploading attachmends in selfservice.  -- HC Chien
-
-------------------------------------------------------------------------
-r2624 | tla | 2005-04-13 13:42:51 -0400 (Wed, 13 Apr 2005) | 2 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/SelectSearchesForObjects
-
-Change to exclude saved searches meant for things other than tickets.
-
-------------------------------------------------------------------------
-r2623 | tla | 2005-04-13 13:32:41 -0400 (Wed, 13 Apr 2005) | 2 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearch.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearches.pm
-
-Skeletal inline tests, to make autogen happy.
-
-------------------------------------------------------------------------
-r2622 | tla | 2005-04-13 12:27:38 -0400 (Wed, 13 Apr 2005) | 2 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearch.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearches.pm
-
-Lost a curly brace somewhere.  Also noted location of tests for both files.
-
-------------------------------------------------------------------------
-r2620 | autrijus | 2005-04-13 11:19:54 -0400 (Wed, 13 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/Modify.html
-
-* Never mind my last change -- I saw "VALUE = 1" and trigger-happily
-  inferred that it should default to CHECKED.  Which is, of course,
-  not the case.  Reverted.
-------------------------------------------------------------------------
-r2619 | autrijus | 2005-04-13 08:13:01 -0400 (Wed, 13 Apr 2005) | 5 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/Modify.html
-
-* VALUE="1" does not work on checkboxes; this renders the
-  default True setting on the "Set to Privliged" checkbox
-  in the "New User" screen useless, so new users are defaulted
-  to unprivileged even though the code shows that they are
-  intended to be so.
-------------------------------------------------------------------------
-r2617 | tla | 2005-04-12 21:52:54 -0400 (Tue, 12 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearch.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearches.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/20savedsearch.t
-
-Added delete method & localized strings in SavedSearch
-Made SavedSearches::LimitByPrivacy safe to call multiple times
-
-------------------------------------------------------------------------
-r2609 | tla | 2005-04-12 15:59:07 -0400 (Tue, 12 Apr 2005) | 2 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearch.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearches.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/20savedsearch.t
-
-Made SavedSearches work, added error messages to SavedSearch, updated tests
-
-------------------------------------------------------------------------
-r2608 | tla | 2005-04-12 15:29:25 -0400 (Tue, 12 Apr 2005) | 2 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearch.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/20savedsearch.t
-
-SavedSearch now shinily tested.  API also changed somewhat.
-
-------------------------------------------------------------------------
-r2607 | tla | 2005-04-11 14:47:03 -0400 (Mon, 11 Apr 2005) | 2 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/SavedSearch.pm
-   A /rt/branches/3.4-RELEASE/lib/RT/SavedSearches.pm
-
-Semi-tested, semi-working checkpoint.  Formal tests to follow shortly.
-
-------------------------------------------------------------------------
-r2603 | tla | 2005-04-10 19:51:56 -0400 (Sun, 10 Apr 2005) | 2 lines
-Changed paths:
-   A /rt/branches/3.4-RELEASE/lib/RT/SavedSearch.pm
-
-UNTESTED first cut at a saved search lib wrapper.
-
-------------------------------------------------------------------------
-r2602 | tla | 2005-04-10 19:51:16 -0400 (Sun, 10 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
-
-Upped version dependency of DBIx::SearchBuilder to 1.24 for unique records
-feature in CustomFields.
-
-------------------------------------------------------------------------
-r2601 | tla | 2005-04-10 19:49:31 -0400 (Sun, 10 Apr 2005) | 5 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
-
-User_Overlay: added OwnGroups method to get a collection of groups of which
-the user is a member.
-Record: revamped ObjectTypeStr according to suggestions.
-
-
-------------------------------------------------------------------------
-r2592 | jesse | 2005-04-06 15:27:58 -0400 (Wed, 06 Apr 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/DisplayOptions
-
- r11940@hualien:  jesse | 2005-04-07 03:23:40 +0800
- * Search "Order By" needed a more greedy matching operation; too many values were selected
-
-------------------------------------------------------------------------
-r2589 | jesse | 2005-04-06 14:58:41 -0400 (Wed, 06 Apr 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/CollectionAsTable/Header
-   M /rt/branches/3.4-RELEASE/html/Elements/TicketList
-
- r11936@hualien:  jesse | 2005-04-07 02:54:28 +0800
- RT-Ticket: 6590
+ RT-Ticket: 5800
  RT-Status: resolved
- RT-Update: correspond
  
- resorting the search by clicking on a header no longer resets the format string
+ RT now stores sent messages in the database as utf-8.
  
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2588 | jesse | 2005-04-06 13:50:56 -0400 (Wed, 06 Apr 2005) | 3 lines
+r1197 | alexmv | 2004-07-09 12:05:24 -0400 (Fri, 09 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/12-search.t
-
- r11933@hualien:  jesse | 2005-04-07 01:49:50 +0800
- Half way through custom field search fixes
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
-------------------------------------------------------------------------
-r2586 | tla | 2005-04-04 04:28:02 -0400 (Mon, 04 Apr 2005) | 2 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/html/Elements/EditLinks
+RT-Ticket: 5821
+RT-Status: resolved
+RT-Action: correspond
 
-Add a callback for the use of RTFM
+ * Workaround for Mozilla 1.7 and Firefix 0.9.1 rendering bug
 
 ------------------------------------------------------------------------
-r2584 | tla | 2005-04-04 04:18:22 -0400 (Mon, 04 Apr 2005) | 3 lines
+r1196 | alexmv | 2004-07-09 10:56:03 -0400 (Fri, 09 Jul 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-
-Add a simple sub to return the object class with the RT::Lib:: prefix
-stripped off.  Useful for displaying, e.g., "Ticket #35" or "Article #3".
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/html/Search/Results.rdf
 
-------------------------------------------------------------------------
-r2582 | tla | 2005-04-03 15:35:23 -0400 (Sun, 03 Apr 2005) | 2 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/URI/t.pm
+RT-Ticket: 5838
+RT-Status: resolved
+RT-Update: correspond
 
-Get rid of LocalURIPrefix test.  Would make this DTRT if I knew what TRT was.
+ * Fix webmux.pl to not pass xml files through (xml's content-type is
+   application/xml not text/xml)
 
-------------------------------------------------------------------------
-r2557 | tla | 2005-04-01 23:16:13 -0500 (Fri, 01 Apr 2005) | 2 lines
-Changed paths:
-   A /rt/branches/3.4-RELEASE/lib/RT/URI/t.pm
+ * Fix outgoing content-type of results.rdf
 
-A scheme which allows "t:123" URIs, for ticket specification.
 
 ------------------------------------------------------------------------
-r2552 | jesse | 2005-04-01 04:18:10 -0500 (Fri, 01 Apr 2005) | 3 lines
+r1195 | leira | 2004-07-09 08:02:21 -0400 (Fri, 09 Jul 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/Makefile.in
+   M /rt/branches/rt-3.1/html/Elements/Quicksearch
 
- r10907@hualien:  jesse | 2005-04-01 17:15:55 +0800
- * Added "make depends" as an alias for "make fixdeps" for Autrijus
+RT-Ticket: 5808
+RT-Status: resolved
+RT-Action: correspond
+Applied the patch from bobg@uic.edu, which puts $RT::WebPath into QuickSearch URLS.
 
 ------------------------------------------------------------------------
-r2543 | jesse | 2005-03-31 03:50:11 -0500 (Thu, 31 Mar 2005) | 3 lines
+r1194 | leira | 2004-07-09 07:33:10 -0400 (Fri, 09 Jul 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/RT_Config.pm.in
-
- r10781@hualien:  jesse | 2005-03-31 16:49:00 +0800
- * Fixes to seph's rtname regex
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
-------------------------------------------------------------------------
-r2542 | robert | 2005-03-30 23:03:13 -0500 (Wed, 30 Mar 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/config.layout
+RT-Ticket: 5814
+RT-Status: resolved
+RT-Action: correspond
+New clauses are now on the top level by default, so blank lines won't appear unless you move something down a level on purpose (in which case, they're needed).
 
- r2579@dog:  rspier | 2005-03-30 19:58:06 -0800
- RT-Ticket: 6572
- RT-Status: resolved
- RT-Update: correspond
- 
- Remove second FHS layout
- 
+Toggling AND/OR now works correctly at all levels.
 
 ------------------------------------------------------------------------
-r2541 | tla | 2005-03-30 19:20:44 -0500 (Wed, 30 Mar 2005) | 3 lines
+r1189 | huberth | 2004-07-08 13:32:37 -0400 (Thu, 08 Jul 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/html/Elements/EditCustomField
-   M /rt/branches/3.4-RELEASE/html/Elements/EditCustomFieldText
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
-Fixes so that custom fields will pay attention to defaults, when the defaults
-are specified.
+RT-Ticket: 5690
+RT-Status: resolved
 
+ * rt-test-dependencies now only tells you which modules are not present or
+   up-to-date, unless you specify the -v (--verbose) flag on the command line.
 ------------------------------------------------------------------------
-r2537 | jesse | 2005-03-30 09:44:40 -0500 (Wed, 30 Mar 2005) | 9 lines
+r1183 | jesse | 2004-07-06 18:04:28 -0400 (Tue, 06 Jul 2004) | 11 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/RT_Config.pm.in
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/19-rtname.t
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
 
- r10696@hualien:  jesse | 2005-03-30 18:19:21 +0800
- RT-Ticket: 6544
- RT-Status: resolved
- RT-Update: correspond
+ ----------------------------------------------------------------------
+ r2072@tinbook:  jesse | 2004-07-06T22:04:15.878370Z
  
- * More graceful handling for historical $rtname tags
-     -- From seph
+  * "Negative" Ticket searches (for all tickets which don't have a
+  certain custom field value) now find tickets which have _no_ custom
+  field value for that ticket.
  
+  * Custom Field searches should now work better with non-ascii
+  custom field names. (Needs user verification)
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2526 | jesse | 2005-03-28 05:25:03 -0500 (Mon, 28 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectOwner
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/BuildFormatString
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/DisplayOptions
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/EditFormat
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/PickBasics
-
- r10271@hualien:  jesse | 2005-03-28 15:49:42 +0800
- * A bunch of minor search query builder cleanup and loc improvements
-
-------------------------------------------------------------------------
-r2523 | jesse | 2005-03-27 12:08:05 -0500 (Sun, 27 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Attachment_Overlay.pm
-
- r10258@hualien:  jesse | 2005-03-27 12:05:27 -0500
- * Record Message-Id when creating attachment records
-
-------------------------------------------------------------------------
-r2522 | jesse | 2005-03-27 04:14:15 -0500 (Sun, 27 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/CurrentUser.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-
- r10231@hualien:  jesse | 2005-03-27 17:12:44 +0800
- * More fixes for status messages broken in this morning's commit
-
-------------------------------------------------------------------------
-r2521 | jesse | 2005-03-27 02:40:16 -0500 (Sun, 27 Mar 2005) | 4 lines
+r1182 | jesse | 2004-07-06 17:14:33 -0400 (Tue, 06 Jul 2004) | 11 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Header
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/Makefile.in
 
- r10229@hualien:  jesse | 2005-03-27 15:39:30 +0800
- * Added ALT text for BPS corporate logo -- Suggested by Jedi during YAPC.TW 2005
+ ----------------------------------------------------------------------
+ r2070@tinbook:  jesse | 2004-07-06T21:13:17.298878Z
  
-
-------------------------------------------------------------------------
-r2520 | jesse | 2005-03-27 02:01:20 -0500 (Sun, 27 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Login
-
- r10227@hualien:  jesse | 2005-03-27 15:00:51 +0800
- * Explicitly give the login box an id/name so passwords are not saved on user edit pages
-
-------------------------------------------------------------------------
-r2519 | jesse | 2005-03-27 01:43:55 -0500 (Sun, 27 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/RT_SiteConfig.pm
-
- r10225@hualien:  jesse | 2005-03-27 14:43:25 +0800
- * SiteConfig typofix
-
-------------------------------------------------------------------------
-r2518 | jesse | 2005-03-27 01:33:43 -0500 (Sun, 27 Mar 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/RT_SiteConfig.pm
-
- r10223@hualien:  jesse | 2005-03-27 14:33:12 +0800
- RT-Ticket: 6566
+ RT-Ticket: 5815
  RT-Status: resolved
- RT-Update: correspond
+ RT-Update-Type: correspond
  
- * Added a bit of documentation to RT_SiteConfig.pm -- Thanks to David Glasser
+ RT now advises users about how to set the DBA and DBA Password when upgrading
  
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2517 | jesse | 2005-03-27 01:16:07 -0500 (Sun, 27 Mar 2005) | 7 lines
+r1181 | jesse | 2004-07-06 17:01:04 -0400 (Tue, 06 Jul 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Search/Results.html
 
- r10221@hualien:  jesse | 2005-03-27 14:15:36 +0800
- RT-Ticket: 6565
- RT-Status: resolved
- RT-Update: correspond
  
- * Overhauled README to be more correct, friendly and a bit cleaner
+ ----------------------------------------------------------------------
+ r2068@tinbook:  jesse | 2004-07-06T20:59:43.336929Z
+ 
+ Explicit 'Bookmark this search' functionality has been added back to RT 3.2
+ 
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2516 | jesse | 2005-03-27 00:21:35 -0500 (Sun, 27 Mar 2005) | 3 lines
+r1178 | alexmv | 2004-07-02 13:13:35 -0400 (Fri, 02 Jul 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/sbin/rt-setup-database.in
 
- r10211@hualien:  jesse | 2005-03-27 13:18:07 +0800
- * Updated RT::Transaction to return better Foo changed from "bar" to "baz" messages
+RT-Ticket: 5810
+RT-Status: resolved
+RT-Update: correspond
 
-------------------------------------------------------------------------
-r2515 | jesse | 2005-03-27 00:21:16 -0500 (Sun, 27 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
+ * InnoDB check must be done at database initialization, not configure;
+   we can't assume anything about the DSN until then.
 
- r10210@hualien:  jesse | 2005-03-27 13:17:02 +0800
- * Updated RT::Ticket->_Set to return more appropriate status messages
 
 ------------------------------------------------------------------------
-r2514 | jesse | 2005-03-27 00:20:57 -0500 (Sun, 27 Mar 2005) | 4 lines
+r1175 | alexmv | 2004-07-01 10:13:24 -0400 (Thu, 01 Jul 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
 
- r10209@hualien:  jesse | 2005-03-27 13:16:31 +0800
- * Updated RT::User regression tests to not expect a pristine database
- * Updated RT::User->_Set to return more apropriate results messages (no more listing the actor)
-
-------------------------------------------------------------------------
-r2513 | jesse | 2005-03-27 00:20:37 -0500 (Sun, 27 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
+RT-Ticket: 5777
+RT-Status: reolved
+RT-Update: correspond
 
- r10208@hualien:  jesse | 2005-03-27 13:14:57 +0800
- * Fixing tests to not depend on a deprecated API
+ * Look to form parameters for over-riding defaults on drop-downs
 
 ------------------------------------------------------------------------
-r2512 | jesse | 2005-03-27 00:20:19 -0500 (Sun, 27 Mar 2005) | 3 lines
+r1174 | alexmv | 2004-07-01 09:54:18 -0400 (Thu, 01 Jul 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/CachedGroupMember_Overlay.pm
+   M /rt/branches/rt-3.1/html/Elements/QuickCreate
 
- r10207@hualien:  jesse | 2005-03-27 13:13:26 +0800
- * Bugfixes to CachedGroupMember->SetDisabled unmasked by the RT::Record fixes
+RT-Ticket: 5797
+RT-Status: resolved
 
-------------------------------------------------------------------------
-r2511 | jesse | 2005-03-27 00:20:00 -0500 (Sun, 27 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/Modify.html
-   M /rt/branches/3.4-RELEASE/html/Elements/MessageBox
-   M /rt/branches/3.4-RELEASE/html/NoAuth/webrt.css
-   M /rt/branches/3.4-RELEASE/html/User/Prefs.html
+ * Don't provide a bogus null queue, or default to the (nonexistant)
+   "Todo" queue.
 
- r10206@hualien:  jesse | 2005-03-27 13:11:53 +0800
- Improvements to big textareas to make sure they don't force browser windows to scroll.
 
 ------------------------------------------------------------------------
-r2510 | jesse | 2005-03-27 00:19:40 -0500 (Sun, 27 Mar 2005) | 3 lines
+r1173 | alexmv | 2004-07-01 09:40:57 -0400 (Thu, 01 Jul 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/index.html
+   M /rt/branches/rt-3.1/README
+   M /rt/branches/rt-3.1/configure.ac
 
- r10205@hualien:  jesse | 2005-03-27 13:10:21 +0800
- * Slightly better introductory text on user and queue listings
+RT-Ticket: 5799
+RT-Status: resolved
+RT-Action: correspond
 
-------------------------------------------------------------------------
-r2509 | jesse | 2005-03-27 00:19:20 -0500 (Sun, 27 Mar 2005) | 6 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
+ * Explicitly require InnoDB if using MySQL
 
- r10204@hualien:  jesse | 2005-03-27 13:08:01 +0800
- * Improved generic messages returned by RT::Record->_Set()
- * Corrected RT::Record->_Set to return a Class::ReturnValue, rather than butchering it
-   into an array. (This means that RT::Ticket->SetPriority can now be evaluated in boolean
-   or list context, like it was supposed to be)
 
 ------------------------------------------------------------------------
-r2508 | jesse | 2005-03-27 00:19:01 -0500 (Sun, 27 Mar 2005) | 3 lines
+r1171 | jesse | 2004-06-30 00:36:18 -0400 (Wed, 30 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
-
- r10203@hualien:  jesse | 2005-03-27 13:01:43 +0800
- * Corrected HTTP::Server::Simple dependencies
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/README
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/releng.cnf
 
-------------------------------------------------------------------------
-r2501 | jesse | 2005-03-23 21:29:28 -0500 (Wed, 23 Mar 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Ticket/Update.html
-
- r9584@hualien:  jesse | 2005-03-24 10:28:28 +0800
- RT-Ticket: 6558
- RT-Status: resolved
- RT-Update: correspond
- 
- * Removed an extra </td> tag. Thanks to Steve Turner
+ ----------------------------------------------------------------------
+ r2030@tinbook:  jesse | 2004-06-30T04:36:01.943950Z
  
+ Bumping to 3.2.0
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2488 | jesse | 2005-03-22 10:16:55 -0500 (Tue, 22 Mar 2005) | 5 lines
+r1170 | jesse | 2004-06-29 13:55:58 -0400 (Tue, 29 Jun 2004) | 11 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Search/Results.html
 
- r9555@hualien:  jesse | 2005-03-22 22:15:24 +0800
- * Properly set binmode for the standalone_httpd server. This makes
-   UTF8 text that could be misinterpreted as Latin1 behave correctly.
+ ----------------------------------------------------------------------
+ r2023@tinbook:  jesse | 2004-06-29T17:55:34.408001Z
  
-
-------------------------------------------------------------------------
-r2487 | jesse | 2005-03-21 12:10:03 -0500 (Mon, 21 Mar 2005) | 5 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/standalone_httpd.in
-   M /rt/branches/3.4-RELEASE/bin/webmux.pl.in
-   M /rt/branches/3.4-RELEASE/html/NoAuth/images/autohandler
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Handler.pm
-   A /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Standalone.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/02basic_web.t
-   D /rt/branches/3.4-RELEASE/lib/t/regression/03basic_web.t
-   A /rt/branches/3.4-RELEASE/lib/t/regression/03web_compiliation_errors.t
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
-
- r9502@hualien:  jesse | 2005-03-22 01:07:59 +0800
- * Refactored standalone_httpd to use HTTP::Server::Simple::Mason
- * Moved some configuration from webmux.pl to RT::Interface::Web::Handler
- * Split apart some of the web tests for better isolation
-
-------------------------------------------------------------------------
-r2477 | jesse | 2005-03-16 03:09:00 -0500 (Wed, 16 Mar 2005) | 7 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
-
- r8808@hualien:  jesse | 2005-03-16 03:07:57 -0500
- RT-Ticket: 6537
+ RT-Ticket: 5787
  RT-Status: resolved
+ RT-UpdateType: correspond
  
- Explicit transaction description for changed passwords
+ Added ticket absolute urls for the various actions one can take on searches.
  
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2476 | jesse | 2005-03-16 03:08:55 -0500 (Wed, 16 Mar 2005) | 1 line
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-
-
-------------------------------------------------------------------------
-r2475 | jesse | 2005-03-16 03:08:32 -0500 (Wed, 16 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/index.html
-
- r8746@hualien:  jesse | 2005-03-15 01:07:30 -0500
- Refactored the top-level admin menu to make it easier to add and remove options
-
-------------------------------------------------------------------------
-r2474 | alexmv | 2005-03-16 02:53:59 -0500 (Wed, 16 Mar 2005) | 3 lines
+r1169 | alexmv | 2004-06-29 10:25:46 -0400 (Tue, 29 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
+   D /rt/branches/rt-3.1/html/Elements/ViewUser
 
- * Users and groups can have transactions; ShowTicket isn't needed to
-   see these
+ * Remove vestigal file (used by 3.0's user preferences interface)
 
 ------------------------------------------------------------------------
-r2354 | jesse | 2005-03-14 02:22:36 -0500 (Mon, 14 Mar 2005) | 4 lines
+r1168 | alexmv | 2004-06-29 07:41:37 -0400 (Tue, 29 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditCustomFields
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/PickCustomFields
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Groups.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Queue-Tickets.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Queue-Transactions.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Users.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/CustomFields.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/CustomFields.html
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/DisplayOptions
 
- r8456@hualien:  jesse | 2005-03-14 02:20:50 -0500
- Overhaul of custom field editing code to make it easier to add custom fields 
- for new object types
+ * Allow user to choose if the sort is ascending or descending
 
 ------------------------------------------------------------------------
-r2353 | jesse | 2005-03-14 01:38:58 -0500 (Mon, 14 Mar 2005) | 3 lines
+r1167 | alexmv | 2004-06-29 07:13:37 -0400 (Tue, 29 Jun 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/DisplayOptions
 
- r8453@hualien:  jesse | 2005-03-14 01:37:00 -0500
- Hilighted menu options are now the right size
-
-------------------------------------------------------------------------
-r2350 | jesse | 2005-03-14 01:31:33 -0500 (Mon, 14 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/NoAuth/webrt.css
+ * Make it more clear that defaults spring from Builder.html, not
+   DisplayOptions
 
- r8450@hualien:  jesse | 2005-03-14 01:30:59 -0500
- Slight style cleanup to page actions. 
 
 ------------------------------------------------------------------------
-r2343 | jesse | 2005-03-11 20:17:02 -0500 (Fri, 11 Mar 2005) | 5 lines
+r1166 | alexmv | 2004-06-29 07:11:12 -0400 (Tue, 29 Jun 2004) | 16 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Scrips_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/EditSearches
 
- r6769@hualien:  jesse | 2005-03-11 20:16:42 -0500
- Now when running scrips on a disabled queue, run global scrips as well as per-queue scrips.
- 
- 
+RT-Ticket: 5720
+RT-Status: resolved
+RT-Update: correspond
 
-------------------------------------------------------------------------
-r2332 | jesse | 2005-03-09 17:25:25 -0500 (Wed, 09 Mar 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
+ * Saved searches now store "order by" and "rows per page" (#5720)
 
- r6651@hualien:  jesse | 2005-03-09 17:23:54 -0500
- RT-Ticket: 6459
- RT-Status: resolved
- RT-Update: correspond
- 
- Sanity fixes for _AddLink's API from Todd Chapman
- 
+ * Fixed bug where Format was not being correctly displayed after
+   loading from session or save (#5780)
 
-------------------------------------------------------------------------
-r2313 | jesse | 2005-03-07 16:03:05 -0500 (Mon, 07 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/Objects.html
+ * Consolidate code (one section for defaults)
 
- r6568@hualien:  jesse | 2005-03-07 16:01:44 -0500
- Adding support for selecting custom fields for RTFM objects
+ * Use only one <form> per page instead of three
 
-------------------------------------------------------------------------
-r2306 | jesse | 2005-03-06 17:33:52 -0500 (Sun, 06 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/CollectionAsTable/Row
+ * Save a database hit on checking for dirty searches
 
- r6473@hualien:  jesse | 2005-03-06 16:04:46 -0500
- Small cleanups to print out less hardcoded style information (introduced by the pull-up from 3.2)
 
 ------------------------------------------------------------------------
-r2305 | jesse | 2005-03-06 17:33:46 -0500 (Sun, 06 Mar 2005) | 9 lines
+r1164 | jesse | 2004-06-28 22:49:46 -0400 (Mon, 28 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/releng.cnf
 
- r6465@hualien:  jesse | 2005-03-06 15:00:29 -0500
-  r6450@hualien:  jesse | 2005-03-06 12:44:27 -0500
-  RT-Ticket: 6496
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Content-Transfer-Encoding should have been '8bit' not '8-bit'
+ ----------------------------------------------------------------------
+ r2015@tinbook:  jesse | 2004-06-29T02:47:32.464100Z
  
+ 3.2.0rc4
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2304 | jesse | 2005-03-06 17:33:37 -0500 (Sun, 06 Mar 2005) | 7 lines
+r1163 | jesse | 2004-06-28 17:52:11 -0400 (Mon, 28 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/aclocal.m4
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowTransactionAttachments
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r6464@hualien:  jesse | 2005-03-06 15:00:23 -0500
-  r6371@hualien:  jesse | 2005-03-05 19:29:35 -0500
-   r3963@hualien (orig r2142):  jesse | 2005-01-30 12:45:15 -0500
-   When we can't load a user by email address, make sure we can't load that user by name before returning an error
-  
+ ----------------------------------------------------------------------
+ r2012@tinbook:  jesse | 2004-06-28T21:51:20.545520Z
  
+ Fixed bugs in CreateTickets (Approvals) system, both preexisting and introduced in 3.2.0rc3
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2303 | jesse | 2005-03-06 17:33:17 -0500 (Sun, 06 Mar 2005) | 10 lines
+r1157 | jesse | 2004-06-27 22:01:15 -0400 (Sun, 27 Jun 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
-
- r6462@hualien:  jesse | 2005-03-06 14:57:07 -0500
-  r4715@hualien:  jesse | 2005-02-15 12:34:54 -0500
-  RT-Ticket: 6443
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Ticket Searches on AdminCc would fail on non-mysql databases due to a case error
-  
- 
+   M /rt/branches/rt-3.1/releng.cnf
 
+Bumping releng.cnf to 3.2.0rc3
 ------------------------------------------------------------------------
-r2302 | jesse | 2005-03-06 17:33:10 -0500 (Sun, 06 Mar 2005) | 7 lines
+r1156 | jesse | 2004-06-27 19:05:17 -0400 (Sun, 27 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/lib/RT/I18N/pl.po
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomField
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditScrip
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditTemplates
+   M /rt/branches/rt-3.1/html/Admin/Global/GroupRights.html
+   M /rt/branches/rt-3.1/html/Admin/Global/Template.html
+   M /rt/branches/rt-3.1/html/Admin/Global/UserRights.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/GroupRights.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/Members.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/Modify.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/UserRights.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/GroupRights.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/Modify.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/Template.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/UserRights.html
+   M /rt/branches/rt-3.1/html/Admin/Users/Modify.html
+   M /rt/branches/rt-3.1/html/Approvals/index.html
+   M /rt/branches/rt-3.1/html/Search/Bulk.html
+   M /rt/branches/rt-3.1/html/SelfService/Prefs.html
+   M /rt/branches/rt-3.1/html/Ticket/Display.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowAttachments
+   M /rt/branches/rt-3.1/html/Ticket/ModifyAll.html
+   M /rt/branches/rt-3.1/html/Ticket/ModifyDates.html
+   M /rt/branches/rt-3.1/html/Ticket/ModifyLinks.html
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
+   M /rt/branches/rt-3.1/html/User/Delegation.html
+   M /rt/branches/rt-3.1/html/User/Groups/Members.html
+   M /rt/branches/rt-3.1/html/User/Groups/Modify.html
+   M /rt/branches/rt-3.1/html/User/Prefs.html
+   M /rt/branches/rt-3.1/html/autohandler
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Templates_Overlay.pm
 
- r6461@hualien:  jesse | 2005-03-06 14:57:03 -0500
-  r4070@hualien:  jesse | 2005-02-03 11:22:59 -0500
-  Polish Translation from Piotr Sliwa
-  
-  
+ ----------------------------------------------------------------------
+ r1989@tinbook:  jesse | 2004-06-27T22:59:41.380683Z
  
+ Pulling forward post-3.0.11 fixes from RT 3.0 branch
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2301 | jesse | 2005-03-06 17:33:00 -0500 (Sun, 06 Mar 2005) | 13 lines
+r1155 | jesse | 2004-06-27 18:41:30 -0400 (Sun, 27 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Admin/Elements/UserTabs
 
- r6459@hualien:  jesse | 2005-03-06 14:55:49 -0500
-  r3935@hualien:  jesse | 2005-01-26 12:15:42 -0500
-  RT-Ticket: 6378
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Added a flag to allow tools to use the RT API to search for deleted tickets.
-  (Ruslan)
-  
-  
-  
+ ----------------------------------------------------------------------
+ r1987@tinbook:  jesse | 2004-06-27T22:39:09.485514Z
  
+ Removing "MemberOf" from the list of user tabs, since it doesn't exist.
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2300 | jesse | 2005-03-06 17:32:39 -0500 (Sun, 06 Mar 2005) | 17 lines
+r1152 | jesse | 2004-06-26 18:47:04 -0400 (Sat, 26 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r6457@hualien:  jesse | 2005-03-06 14:55:20 -0500
-  r2575@hualien:  jesse | 2005-01-06 17:15:39 -0500
-  RT-Ticket: 6327
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Users who had "DeleteTicket" but not "ModifyTicket" could not delete tickets.
-  
-  This is introduced because "Ticket::SetStatus" checks the ACL but 
-  forgets to tell "Ticket::_Set" NOT to check (which does check again, but 
-  only against the 'ModifyTicket' right, and thus denies the change).
-  
-      Thanks to Ruediger Riediger
-  
-  
- 
+Updating CreateTickets.pm to be more portable and useful.
 
 ------------------------------------------------------------------------
-r2299 | jesse | 2005-03-06 17:32:31 -0500 (Sun, 06 Mar 2005) | 11 lines
+r1151 | autrijus | 2004-06-26 16:38:48 -0400 (Sat, 26 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
+   M /rt
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
 
- r6456@hualien:  jesse | 2005-03-06 14:55:05 -0500
-  r2573@hualien:  jesse | 2005-01-06 17:10:02 -0500
-  RT-Ticket: 6322
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  New French translation from robitail@iro.umontreal.ca 
-  
-  
+ ----------------------------------------------------------------------
+ r5783@not:  autrijus | 2004-06-26T20:38:49.152776Z
  
+ * backport utf8 fixes for TicketSQL strings from 3.3
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2298 | jesse | 2005-03-06 17:32:18 -0500 (Sun, 06 Mar 2005) | 19 lines
+r1149 | huberth | 2004-06-26 01:43:00 -0400 (Sat, 26 Jun 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/CollectionAsTable/ParseFormat
-   M /rt/branches/3.4-RELEASE/html/Elements/CollectionAsTable/Row
-   M /rt/branches/3.4-RELEASE/html/Elements/RT__Ticket/ColumnMap
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
 
- r6454@hualien:  jesse | 2005-03-06 14:53:48 -0500
-  r2568@hualien:  jesse | 2005-01-06 16:57:40 -0500
-  RT-Ticket: 6336
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  
-  The attribute "align" in COLUMN_MAP wasn't usable, because it could not be
-  used for a complete column, so I added a /ALIGN:.. section in 
-  CollectionAsTable/ParseFormat and use it in Row.
-  
-  There also was a minor error to be corrected, since the old variant of 
-  ParseFormat did not allow more than one /ANYTHING:... to be use (in my 
-  example /TITLE:.../ALIGN:...)  --Dirk Pape
-  
-  
-  
- 
+RT-Ticket: 5318
+RT-Status: resolved
 
+ * The Reply/Comment dropdown box now defaults to Comment unless the user
+   has clicked Reply.
 ------------------------------------------------------------------------
-r2297 | jesse | 2005-03-06 17:32:12 -0500 (Sun, 06 Mar 2005) | 11 lines
+r1143 | jesse | 2004-06-25 12:43:50 -0400 (Fri, 25 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/NoAuth/mail-gateway
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/autohandler
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/releng.cnf
 
- r6453@hualien:  jesse | 2005-03-06 14:53:44 -0500
-  r2567@hualien:  jesse | 2005-01-06 16:37:01 -0500
-  RT-Ticket: 6338
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Force UTF8 content type on replies from RT's REST interface (Thanks to Dirk Pape)
-  
-  
+ ----------------------------------------------------------------------
+ r1971@tinbook:  jesse | 2004-06-25T16:34:00.998988Z
  
+ Bumping to 3.2.0rc2
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2296 | jesse | 2005-03-06 17:32:05 -0500 (Sun, 06 Mar 2005) | 7 lines
+r1142 | alexmv | 2004-06-24 16:50:11 -0400 (Thu, 24 Jun 2004) | 11 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   M /rt/branches/rt-3.1/lib/RT/SearchBuilder.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
 
- r6452@hualien:  jesse | 2005-03-06 14:53:41 -0500
-  r2514@hualien:  jesse | 2004-12-29 14:43:06 -0500
-  Updated Attachment import code to take database-specific lob encoding into account
-  
-  
- 
 
-------------------------------------------------------------------------
-r2286 | jesse | 2005-03-05 20:11:59 -0500 (Sat, 05 Mar 2005) | 1 line
-Changed paths:
-   M /rt/branches/3.4-RELEASE
+ * Tickets::ItemsArrayRef needs to exist, and step though the contents to
+   ensure access control; code dropped back in
 
+ * However, it should provide ordered results; factor out sorting from
+   overridden RT::SearchBuilder's ItemsArrayRef into ItemsOrderBy and
+   call that in Tickets::ItemsArrayRef
 
-------------------------------------------------------------------------
-r2285 | jesse | 2005-03-05 20:11:52 -0500 (Sat, 05 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/docs/design_docs/realflow.txt
-   A /rt/branches/3.4-RELEASE/docs/design_docs/rt-mvc
+ * Invalidate ItemMap if ItemsArray is invalidated
 
- r6290@hualien:  jesse | 2005-03-05 19:06:54 -0500
- random design docs
 
 ------------------------------------------------------------------------
-r2281 | jesse | 2005-03-05 17:06:33 -0500 (Sat, 05 Mar 2005) | 8 lines
+r1141 | alexmv | 2004-06-24 03:48:39 -0400 (Thu, 24 Jun 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ACL_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/GroupMember_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Group_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Principal_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/18stale_delegations_cleanup.t
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
 
- r6277@hualien:  jesse | 2005-03-05 17:06:08 -0500
- RT-Ticket: 6184
- RT-Status: resolved
- RT-Update: correspond
- 
- Much better coverage of delegation revocation when users' group memberships are changed - Mike Whitson (BPS)
- 
+ * Further changes to keep sort order
 
-------------------------------------------------------------------------
-r2280 | jesse | 2005-03-05 16:10:34 -0500 (Sat, 05 Mar 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
+ * Remove RT::Tickets_Overlay::ItemsArrayRef, which seemed to only
+   duplicate the effect of RT::SearchBuilder but without the OrderBy
+   feature.
 
- r6272@hualien:  jesse | 2005-03-05 16:08:36 -0500
- Better support for loading custom fields by name
 
 ------------------------------------------------------------------------
-r2275 | mwhitson | 2005-03-03 13:55:06 -0500 (Thu, 03 Mar 2005) | 6 lines
+r1140 | alexmv | 2004-06-23 17:33:28 -0400 (Wed, 23 Jun 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/ACE_Overlay.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/17multiple_deleg_revocation.t
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Edit.html
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
 
-RT-Ticket: 6482
-RT-Status: resolved
-RT-Update: correspond
-Fix incorrect loop exit test in RT::ACE::_Delete such that multiply delegated ACEs are all
-cleaned up when the parent ACE is revoked.
+ * Maintain Order and OrderBy across more links -- most importantly,
+   the "prev/next" ones
 
 ------------------------------------------------------------------------
-r2274 | mwhitson | 2005-03-03 12:34:13 -0500 (Thu, 03 Mar 2005) | 5 lines
+r1138 | alexmv | 2004-06-22 19:37:54 -0400 (Tue, 22 Jun 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/lib/RT/Group_Overlay.pm
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
 
-rt-ticket: 6450
-rt-status: resolved
-rt-update: correspond
-Correct inaccurate POD for RT::Group::MembersObj and DeepMembersObj.
+ * Fix first/prev/next/last buttons (only show once, reparent to sensible place)
+ * Add "show results" link whenever there is a search
 
 ------------------------------------------------------------------------
-r2271 | jesse | 2005-03-01 15:24:42 -0500 (Tue, 01 Mar 2005) | 3 lines
+r1136 | alexmv | 2004-06-22 17:17:44 -0400 (Tue, 22 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r6108@hualien:  jesse | 2005-03-01 15:20:28 -0500
- * 'LimitLinkedFrom' in RT::Tickets didn't work due to a typo. Fixed.
+ * Oops.  Should make sure to store state before forwarding to results.
 
 ------------------------------------------------------------------------
-r2266 | jesse | 2005-02-27 19:02:44 -0500 (Sun, 27 Feb 2005) | 3 lines
+r1135 | alexmv | 2004-06-22 17:16:41 -0400 (Tue, 22 Jun 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r6061@hualien:  jesse | 2005-02-27 18:58:48 -0500
- RT::Transaction->Delete implemented. (for RTFM)
+ * Do the search _after_ any modifications are passed in -- this
+   allows executing searches from a (relatively) simple URL.
 
 ------------------------------------------------------------------------
-r2263 | jesse | 2005-02-24 17:52:18 -0500 (Thu, 24 Feb 2005) | 3 lines
+r1133 | huberth | 2004-06-22 16:31:04 -0400 (Tue, 22 Jun 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
 
- r5948@hualien:  jesse | 2005-02-24 16:47:52 -0500
- Custom Field API extension and cleanup to allow new objects to use custom fields. (No backwards-incompat changes)
-
-------------------------------------------------------------------------
-r2262 | jesse | 2005-02-24 17:51:53 -0500 (Thu, 24 Feb 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/index.html
+RT-Ticket: 5149
+RT-Status: resolved
 
- r5947@hualien:  jesse | 2005-02-24 16:46:11 -0500
- Refactoring Custom Field admin UI for extensibility
+* Transactions previously were ordered only by time of creation, and were 
+  displayed in an arbitrary order otherwise.  They are now sorted first by
+  time of creation and next by transaction ID.
 
 ------------------------------------------------------------------------
-r2261 | jesse | 2005-02-24 17:51:28 -0500 (Thu, 24 Feb 2005) | 3 lines
+r1132 | alexmv | 2004-06-22 16:21:52 -0400 (Tue, 22 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/ObjectCustomFields
-
- r5946@hualien:  jesse | 2005-02-24 16:44:28 -0500
- Refactoring Custom Field admin UI for extensibility
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
-------------------------------------------------------------------------
-r2260 | jesse | 2005-02-24 17:51:01 -0500 (Thu, 24 Feb 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditCustomFields
+RT-Ticket: 5767
+RT-Update: correspond
+RT-Status: resolved
 
- r5945@hualien:  jesse | 2005-02-24 16:43:36 -0500
- Minor stylistic cleanups for web components
+ * Fix copy/paste error -- the web group isn't a user, it's a _group_.
 
 ------------------------------------------------------------------------
-r2259 | jesse | 2005-02-24 17:01:23 -0500 (Thu, 24 Feb 2005) | 3 lines
+r1131 | alexmv | 2004-06-22 16:15:47 -0400 (Tue, 22 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/PickCustomFields
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Elements/BuildFormatString
 
- r5944@hualien:  jesse | 2005-02-24 16:43:05 -0500
- Minor stylistic cleanups for web components
+ * Add CreatedBy (AKA Creator) column
 
 ------------------------------------------------------------------------
-r2258 | jesse | 2005-02-24 17:00:58 -0500 (Thu, 24 Feb 2005) | 4 lines
+r1130 | alexmv | 2004-06-22 16:11:54 -0400 (Tue, 22 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/16-transaction_cf_tests.t
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
- r5943@hualien:  jesse | 2005-02-24 16:42:01 -0500
- Upgraded a private _LookupTypes method to a public CustomFieldUpdateTypes method to make it easier to ad  custom fields to other objects
- 
+ * Remove duplicate hash entries from _ClassAccessible
 
 ------------------------------------------------------------------------
-r2257 | jesse | 2005-02-24 16:50:52 -0500 (Thu, 24 Feb 2005) | 3 lines
+r1129 | alexmv | 2004-06-22 15:43:21 -0400 (Tue, 22 Jun 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/configure.ac
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Elements/BuildFormatString
 
- r5942@hualien:  jesse | 2005-02-24 16:31:48 -0500
-     * Have the configure script default to the web group for the RT group if no rt group exists or is specified
+RT-Ticket: 5765
+RT-Status: resolved
+RT-Update: correspond
 
-------------------------------------------------------------------------
-r2254 | jesse | 2005-02-24 15:13:10 -0500 (Thu, 24 Feb 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/configure.ac
+ * Add LastUpdatedBy as a possible column
 
- r5932@hualien:  jesse | 2005-02-24 15:09:27 -0500
- Robert added new functionality to support autodetection of RT and Web users in ./configure
- 
 
 ------------------------------------------------------------------------
-r2249 | jesse | 2005-02-22 16:39:49 -0500 (Tue, 22 Feb 2005) | 4 lines
+r1128 | jesse | 2004-06-22 15:40:41 -0400 (Tue, 22 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/16-transaction_cf_tests.t
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditScrips
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditTemplates
 
- r5747@hualien:  jesse | 2005-02-22T21:33:09.438624Z
- Better transaction UpdateCustomFields API
- 
+RT-Ticket: 2584
+RT-Status: open
 
-------------------------------------------------------------------------
-r2238 | jesse | 2005-02-15 12:36:54 -0500 (Tue, 15 Feb 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
+The previous patch wasn't valid mason. I'd also like to do something a little more elegant. (Perhaps we should do it at the API level, not the UI level)
 
- r4714@hualien:  jesse | 2005-02-15T17:34:26.880496Z
- RT-Ticket: 6443
- RT-Status: resolved
- RT-Update: correspond
- 
- Ticket Searches on AdminCc would fail on non-mysql databases due to a case error
- 
 
 ------------------------------------------------------------------------
-r2235 | jesse | 2005-02-15 11:57:54 -0500 (Tue, 15 Feb 2005) | 4 lines
+r1127 | alexmv | 2004-06-22 14:49:51 -0400 (Tue, 22 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.17/content
 
- r4711@hualien:  jesse | 2005-02-15T16:19:52.970993Z
- Bumping to 3.4.1
- 
-
-------------------------------------------------------------------------
-r2234 | jesse | 2005-02-15 11:57:44 -0500 (Tue, 15 Feb 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
+RT-Ticket: 5764
+RT-Status: resolved
+RT-Update: correspond
 
- r4710@hualien:  jesse | 2005-02-15T16:18:22.880530Z
- Updated 2.0 upgrade instructions
+ * Fix missing paren
 
 ------------------------------------------------------------------------
-r2233 | jesse | 2005-02-14 11:17:52 -0500 (Mon, 14 Feb 2005) | 4 lines
+r1125 | jesse | 2004-06-21 15:39:29 -0400 (Mon, 21 Jun 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   D /rt/branches/3.4-RELEASE/lib/RT/I18N/en_malkovich.po
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/README
+   M /rt/branches/rt-3.1/UPGRADING
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/releng.cnf
 
- r4703@hualien:  jesse | 2005-02-14T15:56:23.506986Z
- Removed broken Malkovich translation
+ ----------------------------------------------------------------------
+ r1949@tinbook:  jesse | 2004-06-21T18:09:01.019869Z
  
-
-------------------------------------------------------------------------
-r2232 | jesse | 2005-02-14 11:17:43 -0500 (Mon, 14 Feb 2005) | 5 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/de.po
-
- r4702@hualien:  jesse | 2005-02-14T15:56:02.798500Z
- Updated German translation from Torsten Brumm
  
+ ----------------------------------------------------------------------
+ r1950@tinbook:  jesse | 2004-06-21T19:36:16.853567Z
  
+ Bumping to RT 3.2.0rc1
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2231 | jesse | 2005-02-13 23:43:57 -0500 (Sun, 13 Feb 2005) | 5 lines
+r1124 | alexmv | 2004-06-21 05:19:56 -0400 (Mon, 21 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/BuildFormatString
+   M /rt/branches/rt-3.1/html/Search/Elements/EditFormat
+   M /rt/branches/rt-3.1/html/Search/Elements/EditSearches
 
- r4697@hualien:  jesse | 2005-02-14T04:42:05.489259Z
- * Standalone HTTP Daemon now deals properly with unicode input/output
- 
- 
+ * Search cleanup
 
 ------------------------------------------------------------------------
-r2230 | jesse | 2005-02-13 23:43:44 -0500 (Sun, 13 Feb 2005) | 9 lines
+r1123 | jesse | 2004-06-21 00:36:40 -0400 (Mon, 21 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/it.po
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Elements/ScrubHTML
 
- r4696@hualien:  jesse | 2005-02-14T04:06:07.158818Z
- RT-Ticket: 6429
- RT-Update: correspond
- RT-Status: resolved
- 
- Updated Italian translation from Angelo Turetta. Thanks!
- 
+ ----------------------------------------------------------------------
+ r1946@tinbook:  jesse | 2004-06-21T04:35:49.516410Z
  
+ Be more conservative about what href tags we display in scrubbed html
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2229 | jesse | 2005-02-13 23:43:33 -0500 (Sun, 13 Feb 2005) | 5 lines
+r1120 | robert | 2004-06-20 02:25:23 -0400 (Sun, 20 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/CollectionAsTable/Row
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/configure.ac
 
- r4695@hualien:  jesse | 2005-02-14T04:04:07.657861Z
- Fix for issues with words with Umlauts in search result listings
- 
+ ----------------------------------------------------------------------
+ r607@bear:  rspier | 2004-06-20T06:25:04.273677Z
  
+ 'RT' should always be UC
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2228 | jesse | 2005-02-13 22:39:44 -0500 (Sun, 13 Feb 2005) | 5 lines
+r1116 | alexmv | 2004-06-18 15:23:03 -0400 (Fri, 18 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/lib/t/00smoke.t.in
 
- r4692@hualien:  jesse | 2005-02-14T03:38:09.047131Z
- Disabled automatic clearing of mason component cache on start with FastCGI. It doesn't work properly in the multiprocess
- environment.
- 
+ * Exclude the .pm config files in etc/
 
 ------------------------------------------------------------------------
-r2227 | jesse | 2005-02-13 22:39:37 -0500 (Sun, 13 Feb 2005) | 4 lines
+r1115 | alexmv | 2004-06-18 14:56:12 -0400 (Fri, 18 Jun 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/rt-crontool.in
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCFs
 
- r4691@hualien:  jesse | 2005-02-14T03:37:15.362723Z
- The crontool was using local and system libs in the wrong order
- 
+ * CustomField->QueueObj is defined; checking for glocal fields should
+   be done with CustomField->QueueObj->id
 
 ------------------------------------------------------------------------
-r2226 | jesse | 2005-02-13 22:32:27 -0500 (Sun, 13 Feb 2005) | 4 lines
+r1113 | leira | 2004-06-18 12:22:37 -0400 (Fri, 18 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/UserRights.html
+   M /rt/branches/rt-3.1/html/Elements/TicketList
 
- r4689@hualien:  jesse | 2005-02-14T03:30:20.309679Z
- A typo prevented users from being able to revoke other users'  rights on custom fields
- 
+RT-Ticket: 5478
+RT-Status: resolved
+RT-Update: correspond
 
-------------------------------------------------------------------------
-r2224 | jesse | 2005-02-11 16:52:07 -0500 (Fri, 11 Feb 2005) | 1 line
-Changed paths:
-   M /rt/branches/3.4-RELEASE/README
+We now pay attention to the longest row when parsing the header, and pad the rows for the entries if necessary, so that the shadings continues all the way across.
 
-README typo fix
 ------------------------------------------------------------------------
-r2223 | jesse | 2005-02-10 22:04:55 -0500 (Thu, 10 Feb 2005) | 5 lines
+r1111 | jesse | 2004-06-18 01:50:41 -0400 (Fri, 18 Jun 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/Forms/ticket/attachments
-
- r4683@hualien:  jesse | 2005-02-11T03:00:33.383809Z
- Use the "OriginalContent" rather than our encoded one. this might make cli attachment downloads work better
- 
- 
+   M /rt/branches/rt-3.1/releng.cnf
 
+Bumping to 3.1.17 (yes, we skipped 3.1.16)
 ------------------------------------------------------------------------
-r2221 | jesse | 2005-02-10 17:11:33 -0500 (Thu, 10 Feb 2005) | 10 lines
+r1110 | jesse | 2004-06-18 01:45:58 -0400 (Fri, 18 Jun 2004) | 14 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/README
+   M /rt/branches/rt-3.1/bin/mason_handler.scgi.in
+   D /rt/branches/rt-3.1/bin/rt-commit-handler.in
+   M /rt/branches/rt-3.1/bin/rt-crontool.in
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT.pm.in
 
- r4678@hualien:  jesse | 2005-02-10T22:10:29.492739Z
- RT-Ticket: 6406
- RT-Status: resolved
- RT-Update: correspond
- 
- Query builder fixes for sites with multiple identically named custom fields
+ ----------------------------------------------------------------------
+ r1918@tinbook:  jesse | 2004-06-18T02:59:32.811556Z
  
+ Starting to refactor CGI/Apache handler code to reduce duplication
+ ----------------------------------------------------------------------
+ r1919@tinbook:  jesse | 2004-06-18T03:03:37.413121Z
  
+ Add back mason data_dir support
+ ----------------------------------------------------------------------
+ r1920@tinbook:  jesse | 2004-06-18T03:27:07.080772Z
  
+ Removed the rest of SetGID from the RT core.
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2220 | jesse | 2005-02-10 16:34:23 -0500 (Thu, 10 Feb 2005) | 9 lines
+r1108 | alexmv | 2004-06-17 20:32:09 -0400 (Thu, 17 Jun 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/cs.po
+   M /rt/branches/rt-3.1/html/Ticket/ModifyAll.html
 
- r4676@hualien:  jesse | 2005-02-10T21:33:19.355354Z
- RT-Ticket: 6364
- RT-Status: resolved
- RT-Update: corerspond
- 
- Updated Czech translation
- 
- 
-
-------------------------------------------------------------------------
-r2219 | jesse | 2005-02-10 16:25:22 -0500 (Thu, 10 Feb 2005) | 11 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/Makefile.in
-   M /rt/branches/3.4-RELEASE/docs/design_docs/cvs_integration
-   M /rt/branches/3.4-RELEASE/docs/design_docs/link-definitions.txt
-   M /rt/branches/3.4-RELEASE/html/Search/Bulk.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/Tabs
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/cs.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/da.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/de.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/en_malkovich.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/es.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fi.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/he.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/hu.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/it.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ja.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/nl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/no.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pt_br.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ru.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_tw.po
-   M /rt/branches/3.4-RELEASE/lib/RT/Scrip_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT.pm.in
-
- r4673@hualien:  jesse | 2005-02-10T21:24:02.076922Z
- RT-Ticket: 6379
- RT-Status: resolved
- RT-Update: correspond
- 
- Correct a common spelling error:
- perl -pi.bak -e's/seperat/separat/g; s/Seperat/Separat/g;' $(find .)
- 
- 
- 
+RT-Ticket: 5746
+RT-Status: resolved
+RT-Update: correspond
 
-------------------------------------------------------------------------
-r2218 | jesse | 2005-02-10 16:25:10 -0500 (Thu, 10 Feb 2005) | 5 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFieldValue_Overlay.pm
-
- r4672@hualien:  jesse | 2005-02-10T21:19:40.639192Z
- Fixes to handle large text custom fields gracefully
- 
- 
+ * Apply patch from 5746 to fix bug where attachments to jumbo were
+   ignored
 
 ------------------------------------------------------------------------
-r2217 | jesse | 2005-02-10 16:15:16 -0500 (Thu, 10 Feb 2005) | 9 lines
+r1107 | alexmv | 2004-06-17 20:13:46 -0400 (Thu, 17 Jun 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/hu.po
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
 
- r4669@hualien:  jesse | 2005-02-10T21:11:24.084088Z
- RT-Ticket: 6418
- RT-Status: resolved
- RT-Update: correspond
- 
- Applied new hungarian translation
- 
- 
+RT-Ticket: 5753
+RT-Status: resolved
+RT-Update: correspond
+
+ * RT::Record objects are not always tickets; do introspection to find
+   out what kind of object we're updating, and use that to generate
+   the log message
 
 ------------------------------------------------------------------------
-r2216 | jesse | 2005-02-10 16:15:06 -0500 (Thu, 10 Feb 2005) | 3 lines
+r1104 | leira | 2004-06-17 15:39:21 -0400 (Thu, 17 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/Forms/ticket/history
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditScrips
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditTemplates
 
- r4668@hualien:  jesse | 2005-02-10T20:54:30.684091Z
- removed effective ticket from history listing
+RT-Ticket: 2584
+RT-Status: resolved
+RT-Action: comment
+
+The Templates page now says how many scrips each template is being used by, and if you delete a template that's in use, the actions at the top warn you that you've done so.
 
 ------------------------------------------------------------------------
-r2198 | jesse | 2005-02-08 12:27:46 -0500 (Tue, 08 Feb 2005) | 4 lines
+r1103 | leira | 2004-06-17 15:08:04 -0400 (Thu, 17 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/RT__Ticket/ColumnMap
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditQueueWatchers
+   M /rt/branches/rt-3.1/html/Admin/Queues/People.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditWatchers
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
- r4644@hualien:  jesse | 2005-02-08T17:26:39.133201Z
- "Status" in ticket listings is now localized
- 
+RT-Ticket: 3240
+RT-Status: resolved
+RT-Action: comment
+
+Everything but Transaction type is now "DeleteWatcher" rather than "DelWatcher".
 
 ------------------------------------------------------------------------
-r2196 | jesse | 2005-02-07 12:22:50 -0500 (Mon, 07 Feb 2005) | 9 lines
+r1102 | leira | 2004-06-17 14:10:41 -0400 (Thu, 17 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectStage
+   M /rt/branches/rt-3.1/etc/initialdata
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.17
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.17/content
+   A /rt/branches/rt-3.1/lib/RT/Condition/PriorityChange.pm
 
- r4103@hualien:  jesse | 2005-02-07T17:21:04.911429Z
- RT-Ticket: 6417
- RT-Status: resolved
- RT-Update: correspond
- 
- Only show the TransactionBatch scrip stage if TransactionBatch
- scrips are enabled.  --Dave Rolsky
- 
+RT-Ticket: 4355
+RT-Status: resolved
+RT-Action: comment
+
+Added new "On Priority Change" condition and "Notify Ccs" and "NotifyCcs as Comment" action.
 
 ------------------------------------------------------------------------
-r2195 | jesse | 2005-02-07 12:22:15 -0500 (Mon, 07 Feb 2005) | 10 lines
+r1101 | jesse | 2004-06-17 14:10:32 -0400 (Thu, 17 Jun 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectScripAction
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectScripCondition
-   M /rt/branches/3.4-RELEASE/html/Elements/Submit
-   M /rt/branches/3.4-RELEASE/html/Ticket/Display.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowMessageStanza
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowTransaction
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/Tabs
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/bin/mason_handler.fcgi.in
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- r4102@hualien:  jesse | 2005-02-07T17:20:01.069833Z
- RT-Ticket: 6415
- RT-Status: resolved
- RT-Update: correspond
- 
- A bunch of small fixes to avoid minor warnings in the RT code. --Dave Rolsky
  
+ ----------------------------------------------------------------------
+ r1916@tinbook:  jesse | 2004-06-17T18:09:53.277305Z
  
+ Starting to move away from SetGID fastcgi support. Switched to using mason's "memory cache" instead of the "file cache" for mason template files. This should have a very minimal performance impact and reduce user confusion'
  
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2194 | jesse | 2005-02-04 11:03:39 -0500 (Fri, 04 Feb 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/index.html
-   M /rt/branches/3.4-RELEASE/html/Elements/ShowMemberships
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowMemberOf
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowReferences
-
- r4082@hualien:  jesse | 2005-02-04T16:03:07.513522Z
- Fixing some links that broke when RT was not installed at the server root
-
-------------------------------------------------------------------------
-r2193 | jesse | 2005-02-03 12:27:23 -0500 (Thu, 03 Feb 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectOwner
-
- r4075@hualien:  jesse | 2005-02-03T17:27:08.548583Z
- SelectOwner was displaying "Nobody" twice due to smarter backend code that broke the not-so-smart frontend. Fixed the frontend.
- 
-
-------------------------------------------------------------------------
-r2150 | jesse | 2005-02-01 09:42:31 -0500 (Tue, 01 Feb 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
-
- r3972@hualien:  jesse | 2005-02-01T14:36:00.190124Z
- 3.4.0
-
-------------------------------------------------------------------------
-r2149 | jesse | 2005-02-01 09:42:14 -0500 (Tue, 01 Feb 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
-
- r3971@hualien:  jesse | 2005-02-01T14:35:45.436824Z
- Bumping SearchBuilder dependency to 1.21
- 
-
-------------------------------------------------------------------------
-r2148 | jesse | 2005-02-01 09:41:54 -0500 (Tue, 01 Feb 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-
- r3970@hualien:  jesse | 2005-02-01T14:21:00.328018Z
- Merge reverted a date in the README
-
-------------------------------------------------------------------------
-r2147 | jesse | 2005-02-01 09:20:40 -0500 (Tue, 01 Feb 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/Makefile.in
-   M /rt/branches/3.4-RELEASE/README
-   M /rt/branches/3.4-RELEASE/bin/mason_handler.fcgi.in
-   M /rt/branches/3.4-RELEASE/bin/mason_handler.scgi.in
-   M /rt/branches/3.4-RELEASE/bin/mason_handler.svc.in
-   M /rt/branches/3.4-RELEASE/bin/rt-crontool.in
-   M /rt/branches/3.4-RELEASE/bin/rt-mailgate.in
-   M /rt/branches/3.4-RELEASE/bin/rt.in
-   M /rt/branches/3.4-RELEASE/bin/standalone_httpd.in
-   M /rt/branches/3.4-RELEASE/bin/webmux.pl.in
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/GroupRights.html
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/Modify.html
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/Objects.html
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/UserRights.html
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/AddCustomFieldValue
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/CreateUserCalled
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/CustomFieldTabs
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditCustomField
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditCustomFieldValues
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditCustomFields
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditQueueWatchers
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditScrip
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditScrips
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditTemplates
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/EditUserComments
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/GlobalCustomFieldTabs
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/GroupTabs
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/Header
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/ListGlobalCustomFields
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/ListGlobalScrips
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/ModifyTemplate
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/ObjectCustomFields
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/PickCustomFields
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/PickObjects
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/QueueRightsForUser
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/QueueTabs
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectCustomFieldLookupType
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectCustomFieldType
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectGroups
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectModifyGroup
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectModifyQueue
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectModifyUser
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectNewGroupMembers
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectRights
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectScrip
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectScripAction
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectScripCondition
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectSingleOrMultiple
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectStage
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectTemplate
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SelectUsers
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/SystemTabs
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/Tabs
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/ToolTabs
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/UserTabs
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Groups.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Queue-Tickets.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Queue-Transactions.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/Users.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/CustomFields/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/GroupRights.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/Scrip.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/Scrips.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/Template.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/Templates.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/UserRights.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Global/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/CustomFields.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/GroupRights.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/History.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/Members.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/Modify.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/UserRights.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Groups/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/CustomField.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/CustomFields.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/GroupRights.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/Modify.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/People.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/Scrip.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/Scrips.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/Template.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/Templates.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/UserRights.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Queues/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Tools/Configuration.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Tools/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/CustomFields.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/History.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/Memberships.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/Modify.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Users/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/autohandler
-   M /rt/branches/3.4-RELEASE/html/Admin/index.html
-   M /rt/branches/3.4-RELEASE/html/Approvals/Display.html
-   M /rt/branches/3.4-RELEASE/html/Approvals/Elements/Approve
-   M /rt/branches/3.4-RELEASE/html/Approvals/Elements/PendingMyApproval
-   M /rt/branches/3.4-RELEASE/html/Approvals/Elements/ShowDependency
-   M /rt/branches/3.4-RELEASE/html/Approvals/Elements/Tabs
-   M /rt/branches/3.4-RELEASE/html/Approvals/index.html
-   M /rt/branches/3.4-RELEASE/html/Download/CustomFieldValue/dhandler
-   M /rt/branches/3.4-RELEASE/html/Download/Tabular/dhandler
-   M /rt/branches/3.4-RELEASE/html/Elements/BevelBoxRaisedEnd
-   M /rt/branches/3.4-RELEASE/html/Elements/BevelBoxRaisedStart
-   M /rt/branches/3.4-RELEASE/html/Elements/Callback
-   M /rt/branches/3.4-RELEASE/html/Elements/Checkbox
-   M /rt/branches/3.4-RELEASE/html/Elements/CollectionAsTable/Header
-   M /rt/branches/3.4-RELEASE/html/Elements/CollectionAsTable/ParseFormat
-   M /rt/branches/3.4-RELEASE/html/Elements/CollectionAsTable/Row
-   M /rt/branches/3.4-RELEASE/html/Elements/CreateTicket
-   M /rt/branches/3.4-RELEASE/html/Elements/EditCustomField
-   M /rt/branches/3.4-RELEASE/html/Elements/EditCustomFieldBinary
-   M /rt/branches/3.4-RELEASE/html/Elements/EditCustomFieldFreeform
-   M /rt/branches/3.4-RELEASE/html/Elements/EditCustomFieldImage
-   M /rt/branches/3.4-RELEASE/html/Elements/EditCustomFieldSelect
-   M /rt/branches/3.4-RELEASE/html/Elements/EditCustomFieldText
-   M /rt/branches/3.4-RELEASE/html/Elements/EditLinks
-   M /rt/branches/3.4-RELEASE/html/Elements/Error
-   M /rt/branches/3.4-RELEASE/html/Elements/Footer
-   M /rt/branches/3.4-RELEASE/html/Elements/GotoTicket
-   M /rt/branches/3.4-RELEASE/html/Elements/Header
-   M /rt/branches/3.4-RELEASE/html/Elements/ListActions
-   M /rt/branches/3.4-RELEASE/html/Elements/Login
-   M /rt/branches/3.4-RELEASE/html/Elements/Menu
-   M /rt/branches/3.4-RELEASE/html/Elements/MessageBox
-   M /rt/branches/3.4-RELEASE/html/Elements/MyRequests
-   M /rt/branches/3.4-RELEASE/html/Elements/MyTickets
-   M /rt/branches/3.4-RELEASE/html/Elements/PageLayout
-   M /rt/branches/3.4-RELEASE/html/Elements/QueryString
-   M /rt/branches/3.4-RELEASE/html/Elements/QuickCreate
-   M /rt/branches/3.4-RELEASE/html/Elements/Quicksearch
-   M /rt/branches/3.4-RELEASE/html/Elements/RT__Ticket/ColumnMap
-   M /rt/branches/3.4-RELEASE/html/Elements/Refresh
-   M /rt/branches/3.4-RELEASE/html/Elements/ScrubHTML
-   M /rt/branches/3.4-RELEASE/html/Elements/Section
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectAttachmentField
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectBoolean
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectCustomFieldOperator
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectCustomFieldValue
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectDate
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectDateRelation
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectDateType
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectEqualityOperator
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectGroups
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectLang
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectLinkType
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectMatch
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectNewTicketQueue
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectOwner
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectQueue
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectResultsPerPage
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectSortOrder
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectStatus
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectTicketSortBy
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectTicketTypes
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectUsers
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectWatcherType
-   M /rt/branches/3.4-RELEASE/html/Elements/SetupSessionCookie
-   M /rt/branches/3.4-RELEASE/html/Elements/ShowCustomFieldImage
-   M /rt/branches/3.4-RELEASE/html/Elements/ShowCustomFields
-   M /rt/branches/3.4-RELEASE/html/Elements/ShowLink
-   M /rt/branches/3.4-RELEASE/html/Elements/ShowLinks
-   M /rt/branches/3.4-RELEASE/html/Elements/ShowMemberships
-   M /rt/branches/3.4-RELEASE/html/Elements/SimpleSearch
-   M /rt/branches/3.4-RELEASE/html/Elements/Submit
-   M /rt/branches/3.4-RELEASE/html/Elements/Tabs
-   M /rt/branches/3.4-RELEASE/html/Elements/TicketList
-   M /rt/branches/3.4-RELEASE/html/Elements/TitleBox
-   M /rt/branches/3.4-RELEASE/html/Elements/TitleBoxEnd
-   M /rt/branches/3.4-RELEASE/html/Elements/TitleBoxStart
-   M /rt/branches/3.4-RELEASE/html/NoAuth/Logout.html
-   M /rt/branches/3.4-RELEASE/html/NoAuth/Reminder.html
-   M /rt/branches/3.4-RELEASE/html/NoAuth/webrt.css
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/Forms/queue/default
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/Forms/queue/ns
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/Forms/ticket/attachments
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/Forms/ticket/default
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/Forms/ticket/history
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/Forms/ticket/links
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/Forms/user/default
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/Forms/user/ns
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/NoAuth/mail-gateway
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/autohandler
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/dhandler
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/logout
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/search/dhandler
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/search/ticket
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/ticket/comment
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/ticket/link
-   M /rt/branches/3.4-RELEASE/html/REST/1.0/ticket/merge
-   M /rt/branches/3.4-RELEASE/html/Search/Build.html
-   M /rt/branches/3.4-RELEASE/html/Search/Bulk.html
-   M /rt/branches/3.4-RELEASE/html/Search/Edit.html
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/BuildFormatString
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/DisplayOptions
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/EditFormat
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/EditQuery
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/EditSearches
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/NewListActions
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/PickBasics
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/PickCFs
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/PickCriteria
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/SearchPrivacy
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/SelectAndOr
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/SelectGroup
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/SelectLinks
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/SelectPersonType
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/SelectSearchObject
-   M /rt/branches/3.4-RELEASE/html/Search/Elements/SelectSearchesForObjects
-   M /rt/branches/3.4-RELEASE/html/Search/Results.html
-   M /rt/branches/3.4-RELEASE/html/Search/Results.rdf
-   M /rt/branches/3.4-RELEASE/html/Search/Results.tsv
-   M /rt/branches/3.4-RELEASE/html/SelfService/Attachment/dhandler
-   M /rt/branches/3.4-RELEASE/html/SelfService/Closed.html
-   M /rt/branches/3.4-RELEASE/html/SelfService/Create.html
-   M /rt/branches/3.4-RELEASE/html/SelfService/CreateTicketInQueue.html
-   M /rt/branches/3.4-RELEASE/html/SelfService/Display.html
-   M /rt/branches/3.4-RELEASE/html/SelfService/Elements/GotoTicket
-   M /rt/branches/3.4-RELEASE/html/SelfService/Elements/Header
-   M /rt/branches/3.4-RELEASE/html/SelfService/Elements/MyRequests
-   M /rt/branches/3.4-RELEASE/html/SelfService/Elements/Tabs
-   M /rt/branches/3.4-RELEASE/html/SelfService/Error.html
-   M /rt/branches/3.4-RELEASE/html/SelfService/Prefs.html
-   M /rt/branches/3.4-RELEASE/html/SelfService/Update.html
-   M /rt/branches/3.4-RELEASE/html/SelfService/index.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/Attachment/dhandler
-   M /rt/branches/3.4-RELEASE/html/Ticket/Create.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/Display.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/AddWatchers
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/BulkLinks
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/EditBasics
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/EditCustomField
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/EditCustomFields
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/EditDates
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/EditPeople
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/EditWatchers
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/FindAttachments
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/LoadTextAttachments
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/PreviewScrips
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowAttachments
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowBasics
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowCustomFields
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowDates
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowDependencies
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowGroupMembers
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowHistory
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowMemberOf
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowMembers
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowMessageHeaders
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowMessageStanza
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowPeople
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowReferences
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowRequestor
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowSummary
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowTransaction
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowTransactionAttachments
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowUserEntry
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/Tabs
-   M /rt/branches/3.4-RELEASE/html/Ticket/History.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/Modify.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/ModifyAll.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/ModifyDates.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/ModifyLinks.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/ModifyPeople.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/ShowEmailRecord.html
-   M /rt/branches/3.4-RELEASE/html/Ticket/Update.html
-   M /rt/branches/3.4-RELEASE/html/Tools/Elements/Tabs
-   M /rt/branches/3.4-RELEASE/html/Tools/MyDay.html
-   M /rt/branches/3.4-RELEASE/html/Tools/Offline.html
-   M /rt/branches/3.4-RELEASE/html/User/Delegation.html
-   M /rt/branches/3.4-RELEASE/html/User/Elements/DelegateRights
-   M /rt/branches/3.4-RELEASE/html/User/Elements/GroupTabs
-   M /rt/branches/3.4-RELEASE/html/User/Elements/Tabs
-   M /rt/branches/3.4-RELEASE/html/User/Groups/Members.html
-   M /rt/branches/3.4-RELEASE/html/User/Groups/Modify.html
-   M /rt/branches/3.4-RELEASE/html/User/Groups/index.html
-   M /rt/branches/3.4-RELEASE/html/User/Prefs.html
-   M /rt/branches/3.4-RELEASE/html/autohandler
-   M /rt/branches/3.4-RELEASE/html/index.html
-   M /rt/branches/3.4-RELEASE/html/l
-   M /rt/branches/3.4-RELEASE/lib/RT/ACE.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ACL.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ACL_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/AutoOpen.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/Autoreply.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/EscalatePriority.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/Generic.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/Notify.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/NotifyAsComment.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/RecordComment.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/RecordCorrespondence.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/ResolveMembers.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/SetPriority.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Action/UserDefined.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attachment.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attachments.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attachments_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attribute.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attribute_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attributes.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Attributes_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Base.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CachedGroupMember.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CachedGroupMember_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CachedGroupMembers.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CachedGroupMembers_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/AnyTransaction.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/BeforeDue.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/Generic.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/Overdue.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/OwnerChange.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/PriorityChange.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/PriorityExceeds.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/QueueChange.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/StatusChange.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Condition/UserDefined.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CurrentUser.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFieldValue.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFieldValues.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFieldValues_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFields.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Date.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/EmailParser.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Group.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/GroupMember.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/GroupMember_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/GroupMembers.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/GroupMembers_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Group_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Groups.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Groups_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Handle.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/cs.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/i_default.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/CLI.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email/Auth/GnuPG.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email/Auth/MailFrom.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email/Filter/SpamAssassin.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/REST.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web/Handler.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Link.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Link_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Links.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Links_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomField.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFieldValue.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFieldValue_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFieldValues.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFieldValues_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomField_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFields.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ObjectCustomFields_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Principal.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Principal_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Principals.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Principals_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Queue.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Queues.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Queues_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Scrip.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripAction.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripAction_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripActions.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripActions_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripCondition.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripCondition_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripConditions.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/ScripConditions_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Scrip_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Scrips.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Scrips_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Search/ActiveTicketsInQueue.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Search/FromSQL.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Search/Generic.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/SearchBuilder.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/System.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Template.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Template_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Templates.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Templates_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay_SQL.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transaction_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transactions.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transactions_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/URI/base.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/URI/fsck_com_rt.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/URI.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/User.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/User_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Users.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Users_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT.pm.in
-   M /rt/branches/3.4-RELEASE/sbin/extract-message-catalog
-   M /rt/branches/3.4-RELEASE/sbin/extract_pod_tests
-   M /rt/branches/3.4-RELEASE/sbin/factory
-   M /rt/branches/3.4-RELEASE/sbin/regression_harness
-   M /rt/branches/3.4-RELEASE/sbin/rt-dump-database.in
-   M /rt/branches/3.4-RELEASE/sbin/rt-setup-database.in
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
-
- r3962@hualien:  jesse | 2005-02-01T14:05:26.980011Z
- reran license tagger
-
-------------------------------------------------------------------------
-r2146 | jesse | 2005-02-01 09:13:05 -0500 (Tue, 01 Feb 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/cs.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/da.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/de.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/en_malkovich.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/es.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fi.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/fr.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/he.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/hu.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/it.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ja.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/nl.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/no.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/pt_br.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/ru.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.4-RELEASE/lib/RT/I18N/zh_tw.po
-   M /rt/branches/3.4-RELEASE/sbin/license_tag
-
- r3961@hualien:  jesse | 2005-02-01T14:03:42.493372Z
- Message catalogs updated
-
-------------------------------------------------------------------------
-r2145 | jesse | 2005-02-01 09:12:39 -0500 (Tue, 01 Feb 2005) | 3 lines
+r1098 | leira | 2004-06-17 13:00:37 -0400 (Thu, 17 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-
- r3960@hualien:  jesse | 2005-02-01T13:59:42.556416Z
- Tiny readme style fixes
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email.pm
 
-------------------------------------------------------------------------
-r2144 | jesse | 2005-02-01 09:11:23 -0500 (Tue, 01 Feb 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/upgrade/3.3.0/schema.Oracle
-   M /rt/branches/3.4-RELEASE/etc/upgrade/3.3.0/schema.Pg
+RT-Ticket: 3035
+RT-Status: resolved
+RT-Action: comment
 
- r3959@hualien:  jesse | 2005-02-01T13:55:00.555573Z
- Removing index changes from upgrade process that could break upgrades for some users
+RT::Interface::Email now knows whether it's trying to create a user on ticket creation or reply, and gives an appropriate error message about which right is lacking.
 
 ------------------------------------------------------------------------
-r2131 | jesse | 2005-01-22 14:43:46 -0500 (Sat, 22 Jan 2005) | 3 lines
+r1097 | leira | 2004-06-17 10:01:58 -0400 (Thu, 17 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
-
- r3924@hualien:  jesse | 2005-01-22T19:34:52.453359Z
- Bumped to 3.4.0rc6
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowGroupMembers
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowUserEntry
 
-------------------------------------------------------------------------
-r2123 | jesse | 2005-01-22 11:57:23 -0500 (Sat, 22 Jan 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
+RT-Ticket: 4121
+RT-Status: resolved
+RT-Action: comment
 
- r3910@hualien:  jesse | 2005-01-22T16:06:58.731752Z
- Custom field searches should only search on values that haven't been deleted
- 
+<br> moved to ShowGroupMembers rather than ShowUserEntry.
 
 ------------------------------------------------------------------------
-r2122 | jesse | 2005-01-22 11:57:11 -0500 (Sat, 22 Jan 2005) | 3 lines
+r1096 | leira | 2004-06-17 09:36:47 -0400 (Thu, 17 Jun 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/15cf_single_values_are_single.t
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditScrip
 
- r3909@hualien:  jesse | 2005-01-22T15:42:46.936767Z
- Bullet-proofing for custom fields with a set but limited number of values
+RT-Ticket: 2583
+RT-Status: resolved
+RT-Action: comment
 
-------------------------------------------------------------------------
-r2121 | jesse | 2005-01-22 11:57:01 -0500 (Sat, 22 Jan 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
+I moved the Fields for user-defined conditions and actions down, as recommended.  This creates new strings for the message catalog, but doesn't change any old ones.
 
- r3907@hualien:  jesse | 2005-01-22T14:48:14.100308Z
- TicketSQL search fixes, especially to Custom field operations
- 
+I also made some more of the labels CSS classes.
 
 ------------------------------------------------------------------------
-r2120 | jesse | 2005-01-22 11:53:50 -0500 (Sat, 22 Jan 2005) | 4 lines
+r1093 | alexmv | 2004-06-16 21:08:55 -0400 (Wed, 16 Jun 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/RT__Ticket/ColumnMap
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r3904@hualien:  jesse | 2005-01-22T13:00:19.775653Z
- The column map callback was broken by performance work
- 
+ * Only insert a default "requestor" line if a default value was
+   passed in; this makes the regression suite happy again.
 
 ------------------------------------------------------------------------
-r2119 | jesse | 2005-01-22 06:26:14 -0500 (Sat, 22 Jan 2005) | 9 lines
+r1092 | jesse | 2004-06-16 20:52:13 -0400 (Wed, 16 Jun 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/etc/upgrade/3.3.0/content
-   A /rt/branches/3.4-RELEASE/etc/upgrade/3.3.11/acl.Oracle
-   A /rt/branches/3.4-RELEASE/etc/upgrade/3.3.11/acl.Pg
-   A /rt/branches/3.4-RELEASE/etc/upgrade/3.3.11/acl.SQLite
-   A /rt/branches/3.4-RELEASE/etc/upgrade/3.3.11/acl.mysql
-   A /rt/branches/3.4-RELEASE/etc/upgrade/3.3.11/content
-   A /rt/branches/3.4-RELEASE/etc/upgrade/3.3.11/schema.Oracle
-   A /rt/branches/3.4-RELEASE/etc/upgrade/3.3.11/schema.SQLite
-   M /rt/branches/3.4-RELEASE/sbin/rt-setup-database.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/bin/rt-crontool.in
+   M /rt/branches/rt-3.1/etc/acl.mysql
+   M /rt/branches/rt-3.1/html/Admin/Elements/UserTabs
+   M /rt/branches/rt-3.1/html/Admin/Users/Modify.html
+   M /rt/branches/rt-3.1/html/Elements/Header
+   M /rt/branches/rt-3.1/html/REST/1.0/NoAuth/mail-gateway
+   M /rt/branches/rt-3.1/html/Ticket/Create.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowDates
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowHistory
+   M /rt/branches/rt-3.1/lib/RT/Action/EscalatePriority.pm
+   M /rt/branches/rt-3.1/lib/RT/CurrentUser.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email.pm
+   M /rt/branches/rt-3.1/lib/RT/Link_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT.pm.in
 
- r3902@hualien:  jesse | 2005-01-22T11:21:43.212477Z
- RT-Ticket: 6366
- RT-Update: correspond
  
- Cleaned up the upgrade procedure to give better messages on success. Added content so it won't bomb out on errors for the 3.4 upgrades.
- (We could have altered the script to not error out on missing content, but that would obscure errors where the user flubbed the path.
+ ----------------------------------------------------------------------
+ r1835@debian:  jesse | 2004-06-17T08:42:54.935871Z
+ r1837@debian:  jesse | 2004-06-17T09:51:45.205797Z
  
+ Merged forward from 3.0
  
 
 ------------------------------------------------------------------------
-r2116 | jesse | 2005-01-19 17:20:57 -0500 (Wed, 19 Jan 2005) | 4 lines
+r1091 | leira | 2004-06-16 18:16:35 -0400 (Wed, 16 Jun 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/configure.ac
+   A /rt/branches/rt-3.1/html/Ticket/Elements/ShowGroupMembers
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowPeople
+   A /rt/branches/rt-3.1/html/Ticket/Elements/ShowUserEntry
 
- r3893@hualien:  jesse | 2005-01-19T18:39:39.850646Z
- Updated version number used by development builds to note that this is the 3.4 series
- 
-
-------------------------------------------------------------------------
-r2115 | jesse | 2005-01-19 17:20:48 -0500 (Wed, 19 Jan 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Attachment_Overlay.pm
+RT-Ticket: 4121
+RT-Status: resolved
+RT-Update: comment
 
- r3892@hualien:  jesse | 2005-01-19T18:38:38.233900Z
- Added better error checking for attachment insertion failure. (This unmasked more instances of oracle brokenness)
- 
+The ShowPeople component now displays each user on its own line, including the username, and the email address if it exists and isn't the same as the username.
 
-------------------------------------------------------------------------
-r2114 | jesse | 2005-01-19 17:20:39 -0500 (Wed, 19 Jan 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/t/regression/03basic_web.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/06mailgateway.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/09record_cf_api.t
-
- r3891@hualien:  jesse | 2005-01-19T18:31:15.604733Z
- Minor formatting cleanups to tests
- 
 
 ------------------------------------------------------------------------
-r2113 | jesse | 2005-01-18 10:46:48 -0500 (Tue, 18 Jan 2005) | 6 lines
+r1088 | huberth | 2004-06-16 17:30:28 -0400 (Wed, 16 Jun 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/SelectOwner
-   M /rt/branches/3.4-RELEASE/lib/RT/Users_Overlay.pm
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- r3885@hualien:  jesse | 2005-01-18T15:02:02.574134Z
- Reimplemented RT::Users->WhoHaveRights to remove O(n^2) SQL calls. (That means it's faster now)
- Reimplemented SelectOwner widget to take advantage of the new WhoHaveRights
- 
- 
-
-------------------------------------------------------------------------
-r2112 | jesse | 2005-01-18 10:46:21 -0500 (Tue, 18 Jan 2005) | 8 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/CustomField_Overlay.pm
+RT-Ticket: 5717
+RT-Status: resolved
 
- r3884@hualien:  jesse | 2005-01-18T14:59:19.630164Z
- RT-Ticket: 6352
- RT-Status: resolved
- RT-Update: correspond
- 
- Fix an invalid custom field acl check
- 
+XML::RSS added to sbin/rt-test-dependencies.in
 
 ------------------------------------------------------------------------
-r2109 | tla | 2005-01-17 20:53:10 -0500 (Mon, 17 Jan 2005) | 4 lines
+r1086 | alexmv | 2004-06-16 14:49:43 -0400 (Wed, 16 Jun 2004) | 12 lines
 Changed paths:
-   A /rt/branches/3.4-RELEASE/lib/t/create_data.pl
-
-A script to automate testing data creation.  Requires a new CPAN module,
-Text::Lorem.  Work in progress.
+   M /rt/branches/rt-3.1/html/Elements/SelectOwner
+   M /rt/branches/rt-3.1/html/Elements/SelectStatus
+   M /rt/branches/rt-3.1/html/SelfService/Display.html
+   M /rt/branches/rt-3.1/html/SelfService/Update.html
+   M /rt/branches/rt-3.1/html/Ticket/Create.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditBasics
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditPeople
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
+   M /rt/branches/rt-3.1/html/Tools/MyDay.html
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
 
+RT-Ticket: 3800
+RT-Status: resolved
+RT-Update: correspond
 
-------------------------------------------------------------------------
-r2072 | jesse | 2005-01-13 02:02:25 -0500 (Thu, 13 Jan 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/README
+ * Update the "-" line in Owner and Status drop-downs to be more
+   descriptive in several cases, taking the form "Nobody (Unchanged)";
+   this allows it to become the default without losing information.
 
-Removed a reference to NIS
+ * Fixed the border cases where owner or status were attempted to be
+   set to "" by accident
 
 
 ------------------------------------------------------------------------
-r2071 | jesse | 2005-01-12 18:39:03 -0500 (Wed, 12 Jan 2005) | 3 lines
+r1072 | jesse | 2004-06-14 20:08:15 -0400 (Mon, 14 Jun 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/docs/rt3-schema-relationships.dot
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
 
-RT3.4 schema diagram corrected and updated.
+RT-Ticket: 5712
 
+It turns out that MIME::Parser has a lame, non-obvious default for tempfile reuse.
+Perhaps code-hits will fix our problem.
 
-------------------------------------------------------------------------
-r2070 | jesse | 2005-01-11 18:58:03 -0500 (Tue, 11 Jan 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE/README
-
-Readme update to note that manual installation of Apache::DBI may be required.
 
 
 ------------------------------------------------------------------------
-r2069 | zev | 2005-01-11 18:49:19 -0500 (Tue, 11 Jan 2005) | 3 lines
+r1063 | jesse | 2004-06-14 00:36:22 -0400 (Mon, 14 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE/Makefile.in
-   M /rt/branches/3.4-RELEASE/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
 
-Fixed spelling and grammar mistakes in etc/RT_Config.pm.in
-Added some documentation and fixed whitespace in Makefile.in
+ ----------------------------------------------------------------------
+ r1794@debian:  jesse | 2004-06-14T13:40:18.744831Z
+ 
+ Another attempt at fixing the taint bug
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2065 | jesse | 2005-01-11 00:02:58 -0500 (Tue, 11 Jan 2005) | 5 lines
+r1056 | jesse | 2004-06-12 12:12:30 -0400 (Sat, 12 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email.pm
 
- r2678@hualien:  jesse | 2005-01-11T06:37:57.777661Z
- Bumped to rc5
- 
+ ----------------------------------------------------------------------
+ r1788@debian:  jesse | 2004-06-13T01:05:11.245221Z
  
+ Autogenerated error email is now properly marked as Precedence: buil
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2064 | jesse | 2005-01-10 23:54:09 -0500 (Mon, 10 Jan 2005) | 6 lines
+r1039 | leira | 2004-06-09 11:56:31 -0400 (Wed, 09 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/14merge.t
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r2669@hualien:  jesse | 2005-01-11T06:23:33.161490Z
- Merging tickets with the same link could cause postgres to complain. Fixed. merged.
- 
- 
- 
+Support default Requestor when creating tickets (will be set if no Requestor is set in the template).
 
 ------------------------------------------------------------------------
-r2060 | jesse | 2005-01-08 18:46:21 -0500 (Sat, 08 Jan 2005) | 3 lines
+r1036 | alexmv | 2004-06-08 18:19:30 -0400 (Tue, 08 Jun 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
+   M /rt/branches/rt-3.1/lib/RT/I18N/no.po
+
+RT-Ticket: 5628
+RT-Action: correspond
+RT-Status: resolve
 
- r2642@hualien:  jesse | 2005-01-08T23:42:31.639282Z
- 3.4.0rc4
+ * Applied <ronny.pettersen@edb.com>'s patches (finally, after running
+   in circles for a while)
 
 ------------------------------------------------------------------------
-r2059 | jesse | 2005-01-08 18:44:03 -0500 (Sat, 08 Jan 2005) | 9 lines
+r1035 | alexmv | 2004-06-08 16:27:03 -0400 (Tue, 08 Jun 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-   M /rt/branches/3.4-RELEASE/lib/RT/Attributes_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/13-attribute-tests.t
-   M /rt/branches/3.4-RELEASE/sbin/rt-test-dependencies.in
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
 
- r2640@hualien:  jesse | 2005-01-08T23:32:05.453370Z
- Kevin Chen reported issues with Attributes not being properly deleted from the 
- ticket update screen. Alex Vandiver wrote new tests to illustrate the behaviour.
- 
- This unearthed bugs in RT's attribute handling as well as DBIx::SearchBuilder.
- 
- 
- 
+RT-Ticket: 5712
+RT-Action: correspond
 
-------------------------------------------------------------------------
-r2055 | jesse | 2005-01-07 22:40:01 -0500 (Fri, 07 Jan 2005) | 4 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
+ * Fix =head1 NAME
 
- r2633@hualien:  jesse | 2005-01-08T03:37:18.260832Z
- Bumping to 3.4.0rc3
- 
+ * This _should_ fix the problems caused by running under taint mode,
+   but I have no way of testing this at present.
 
 ------------------------------------------------------------------------
-r2054 | jesse | 2005-01-07 22:39:55 -0500 (Fri, 07 Jan 2005) | 5 lines
+r1030 | leira | 2004-06-07 19:38:32 -0400 (Mon, 07 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
-   A /rt/branches/3.4-RELEASE/lib/t/regression/12-search.t
+   M /rt/branches/rt-3.1/lib/t/03web.pl.in
 
- r2632@hualien:  jesse | 2005-01-08T03:36:49.431347Z
- Revision 1977 was a bogus merge. Revert that. Add new tests to catch the failing behaviour
- 
- 
+One simple search test, and many comments about future tests to write.
 
 ------------------------------------------------------------------------
-r2045 | jesse | 2005-01-06 16:01:06 -0500 (Thu, 06 Jan 2005) | 5 lines
+r1029 | alexmv | 2004-06-07 17:50:37 -0400 (Mon, 07 Jun 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- r2555@hualien:  jesse | 2005-01-06T20:56:22.389566Z
- Bumping to rc2
- 
- 
+RT-Ticket: 5619
+RT-Action: correspond
+RT-Status: resolved
 
-------------------------------------------------------------------------
-r2044 | jesse | 2005-01-06 16:00:57 -0500 (Thu, 06 Jan 2005) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/t/regression/04send_email.t
-   M /rt/branches/3.4-RELEASE/lib/t/regression/06mailgateway.t
+ * Re-indent
 
- r2543@hualien:  jesse | 2005-01-06T07:08:12.346569Z
- no longer hardcode paths in tests
+ * Use getpwnam and getgrnam to check for existance of users and
+   groups that were chosen during configure; this might belong better
+   in configure.ac, but my perl-fu is better than my autoconf-fu
 
 ------------------------------------------------------------------------
-r2041 | jesse | 2005-01-05 00:34:02 -0500 (Wed, 05 Jan 2005) | 3 lines
+r1028 | leira | 2004-06-07 16:57:36 -0400 (Mon, 07 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Record.pm
-   M /rt/branches/3.4-RELEASE/lib/t/regression/03basic_web.t
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r2539@hualien:  jesse | 2005-01-05T05:31:36.967112Z
- Better handling of Content that comes out of the database as utf8 (Such as with DBD::Oracle 1.16)
+Remove debugging statements.
 
 ------------------------------------------------------------------------
-r2040 | jesse | 2005-01-04 00:18:06 -0500 (Tue, 04 Jan 2005) | 3 lines
+r1027 | leira | 2004-06-07 16:56:19 -0400 (Mon, 07 Jun 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r2530@hualien:  jesse | 2005-01-04T05:15:35.757280Z
- a couple fixes for better handling ticket links on merge
+- Value of entry aggregator always comes from the node's parent
+- Set the parent's entry aggregator when adding a clause to a grouping
+- It matters if the value of the node is a reference, not the node itself
 
 ------------------------------------------------------------------------
-r2039 | jesse | 2005-01-04 00:17:52 -0500 (Tue, 04 Jan 2005) | 4 lines
+r1020 | alexmv | 2004-06-07 14:39:09 -0400 (Mon, 07 Jun 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/lib/t/regression/11-template-insert.t
+   M /rt/branches/rt-3.1/etc/schema.mysql
 
- r2528@hualien:  jesse | 2005-01-03T19:54:59.819442Z
- Added a test for a regression tickled by DBD::Oracle 1.16
- 
+RT-Ticket: 5648
+RT-Action: comment
+
+ * Removed some unneeded indices, as per the above ticket
 
 ------------------------------------------------------------------------
-r2038 | jesse | 2005-01-04 00:17:42 -0500 (Tue, 04 Jan 2005) | 5 lines
+r1008 | jesse | 2004-06-06 19:05:02 -0400 (Sun, 06 Jun 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/upgrade/3.3.0/schema.mysql
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Elements/TicketList
 
- r2527@hualien:  jesse | 2005-01-03T19:52:28.164258Z
- Updated mysql schema upgrades to cope with ancient RT 3 instances which didn't have indexes we expect
- 
+ ----------------------------------------------------------------------
+ r1802@tinbook:  jesse | 2004-06-06T23:05:04.113555Z
  
+ Fixing html for search paging AGAIN
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2037 | jesse | 2005-01-04 00:17:29 -0500 (Tue, 04 Jan 2005) | 4 lines
+r1005 | leira | 2004-06-04 14:45:01 -0400 (Fri, 04 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/upgrade/3.3.0/schema.mysql
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
 
- r2526@hualien:  jesse | 2005-01-03T19:21:48.180206Z
- Workaround for missing mysql indexes
- 
+CreateTickets should pass in link arguments to the Create Method, rather than making the links separatedly after the fact.  That way, OnCreate Scrips can know about links made at ticket creation.
 
 ------------------------------------------------------------------------
-r2036 | jesse | 2005-01-03 14:14:54 -0500 (Mon, 03 Jan 2005) | 5 lines
+r1004 | alexmv | 2004-06-03 21:54:54 -0400 (Thu, 03 Jun 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/etc/upgrade/3.3.0/schema.Oracle
+   D /rt/branches/rt-3.1/html/Admin/Elements/ModifyQueue
+   D /rt/branches/rt-3.1/html/Admin/Elements/ModifyUser
+   M /rt/branches/rt-3.1/html/Admin/Users/Modify.html
+   D /rt/branches/rt-3.1/html/Admin/Users/Prefs.html
+   M /rt/branches/rt-3.1/html/Elements/TitleBoxStart
+   M /rt/branches/rt-3.1/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/SelfService/Display.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowSummary
+   M /rt/branches/rt-3.1/html/User/Prefs.html
+   M /rt/branches/rt-3.1/html/index.html
+
+ * Introduce boxcontainer class; this is to be applied on td's that
+   contain columns of titleboxes
+ * Cull three vestigal files
 
- r2524@hualien:  jesse | 2005-01-03T19:12:32.074066Z
- Oracle schema upgrades
- 
- 
 
 ------------------------------------------------------------------------
-r2034 | jesse | 2004-12-29 15:41:21 -0500 (Wed, 29 Dec 2004) | 5 lines
+r1001 | alexmv | 2004-06-03 01:38:00 -0400 (Thu, 03 Jun 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/GroupRights.html
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/Modify.html
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/Objects.html
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/UserRights.html
-   M /rt/branches/3.4-RELEASE/html/Admin/CustomFields/index.html
-   M /rt/branches/3.4-RELEASE/html/Admin/Elements/CustomFieldTabs
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/html/Elements/EditLinks
+   M /rt/branches/rt-3.1/html/REST/1.0/ticket/link
+   M /rt/branches/rt-3.1/html/Search/Bulk.html
+   M /rt/branches/rt-3.1/html/Ticket/Create.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowSummary
+   M /rt/branches/rt-3.1/html/Ticket/ModifyAll.html
+   M /rt/branches/rt-3.1/html/Ticket/ModifyLinks.html
+   M /rt/branches/rt-3.1/lib/RT/I18N/cs.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/da.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/de.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/en_malkovich.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/es.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/fi.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/fr.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/he.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/hu.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/it.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ja.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/nl.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/no.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/pt_br.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ru.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/zh_cn.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/zh_tw.po
+   M /rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
 
- r2520@hualien:  jesse | 2004-12-29T20:39:43.707258Z
- Custom field tab hilighting fixes.
- 
- 
+RT-Ticket: 1961
+RT-Status: closed
+RT-Action: comment
 
-------------------------------------------------------------------------
-r2033 | jesse | 2004-12-29 14:45:54 -0500 (Wed, 29 Dec 2004) | 5 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Handle.pm
+ * Standardize on "links" instead of "relationships".  This affects
+   the localizations, some of which (cs, da, es, he, hu, it, ja, nl,
+   no, pt_br, zh_cn, zh_tw) had different translations of "Links" vs
+   "Relationships".
 
- r2516@hualien:  jesse | 2004-12-29T19:44:09.437463Z
- Slightly updated encoding support for oracle
- 
- 
 
 ------------------------------------------------------------------------
-r2032 | jesse | 2004-12-29 14:45:43 -0500 (Wed, 29 Dec 2004) | 4 lines
+r997 | leira | 2004-06-02 13:24:23 -0400 (Wed, 02 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/UPGRADING
+   M /rt/branches/rt-3.1/UPGRADING
 
- r2507@hualien:  jesse | 2004-12-23T22:31:20.362197Z
- Note about "OwnTickets" for Superusers
- 
+Refer to the README for the details.
 
 ------------------------------------------------------------------------
-r2030 | robert | 2004-12-28 01:37:51 -0500 (Tue, 28 Dec 2004) | 3 lines
+r996 | leira | 2004-06-02 13:09:20 -0400 (Wed, 02 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/configure.ac
+   M /rt/branches/rt-3.1/UPGRADING
 
- r2033@dog:  rspier | 2004-12-27 22:36:08 -0800
- RT 6331: configure spitting chmod errors
+Patch from Robrt to add more info to UPGRADING file.  Ticket #5116.
 
 ------------------------------------------------------------------------
-r2029 | robert | 2004-12-28 01:37:47 -0500 (Tue, 28 Dec 2004) | 3 lines
+r995 | leira | 2004-06-02 13:04:15 -0400 (Wed, 02 Jun 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+
+Patch from Todd Chapman <todd@chaka.net> (ticket #5405) to allow passing of ticket type into CreateTicket.
 
- r2032@dog:  rspier | 2004-12-27 22:24:34 -0800
- fix css errors
+This doesn't change the UI, it just accepts the value in Web.pm.
 
 ------------------------------------------------------------------------
-r2028 | robert | 2004-12-28 01:37:37 -0500 (Tue, 28 Dec 2004) | 4 lines
+r994 | alexmv | 2004-06-01 16:02:28 -0400 (Tue, 01 Jun 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Elements/Header
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- r2031@dog:  rspier | 2004-12-27 21:46:34 -0800
- Only show the refresh tag if the refresh time is > 0.
- (Mozilla will perform a refresh=1 for refresh=-1)
+Passing empty import list when loading Module::Versions::Report
+bypasses the END block (undocumented feature).  There is no reason to
+not give empty import lists to every use, either.
 
 ------------------------------------------------------------------------
-r2027 | robert | 2004-12-28 01:37:32 -0500 (Tue, 28 Dec 2004) | 3 lines
+r993 | jesse | 2004-06-01 15:52:47 -0400 (Tue, 01 Jun 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/configure.ac
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
+   M /rt/branches/rt-3.1/lib/t/02regression.t.in
 
- r2030@dog:  rspier | 2004-12-27 21:05:44 -0800
- Whitespace tweak: use tabs consistently
+Merge forward from RT 3.0
 
 ------------------------------------------------------------------------
-r2025 | jesse | 2004-12-22 02:06:35 -0500 (Wed, 22 Dec 2004) | 5 lines
+r985 | jesse | 2004-05-31 21:47:18 -0400 (Mon, 31 May 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/etc/schema.Oracle
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
- r2504@hualien:  jesse | 2004-12-22T07:05:58.453205Z
- Oracle schema updates
- 
+ ----------------------------------------------------------------------
+ r1740@debian:  jesse | 2004-06-01T10:51:04.922413Z
  
+ Removing duplicate merged code
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2024 | jesse | 2004-12-21 17:11:39 -0500 (Tue, 21 Dec 2004) | 7 lines
+r984 | jesse | 2004-05-31 21:45:11 -0400 (Mon, 31 May 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/html/Ticket/Elements/ShowHistory
-   M /rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.4-RELEASE/lib/RT/Transactions_Overlay.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/html/Search/Bulk.html
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
- r2500@hualien:  jesse | 2004-12-21T22:06:43.378557Z
- Refactored RT's logic that limits sets of transactions to tickets to make it easier to reuse.
- Fixed bugs in searches for transactions related to multiple tickets.
+ ----------------------------------------------------------------------
+ r1735@debian:  jesse | 2004-06-01T10:41:57.961517Z
  
  
+ ----------------------------------------------------------------------
+ r1737@debian:  jesse | 2004-06-01T10:45:15.986227Z
  
+ Merging from 3.0
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2021 | jesse | 2004-12-21 00:32:15 -0500 (Tue, 21 Dec 2004) | 5 lines
+r979 | jesse | 2004-05-29 01:49:03 -0400 (Sat, 29 May 2004) | 14 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   A /rt/branches/3.4-RELEASE/lib/t/regression/10merge.t
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/configure.ac
+   A /rt/branches/rt-3.1/etc/acl.Sybase
+   A /rt/branches/rt-3.1/etc/schema.Sybase
+   M /rt/branches/rt-3.1/lib/RT/Handle.pm
+   M /rt/branches/rt-3.1/lib/RT.pm.in
+   M /rt/branches/rt-3.1/releng.cnf
+   M /rt/branches/rt-3.1/sbin/rt-setup-database.in
 
- r2498@hualien:  jesse | 2004-12-21T05:27:21.459146Z
- Added a new regression test to validate some possibly bogus behaviour about merging tickets
+ ----------------------------------------------------------------------
+ r1706@tinbook:  jesse | 2004-05-28T02:10:56.309297Z
  
  
-
-------------------------------------------------------------------------
-r2019 | jesse | 2004-12-20 21:44:53 -0500 (Mon, 20 Dec 2004) | 6 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Tickets_Overlay.pm
-
- r2494@hualien:  jesse | 2004-12-21T02:40:37.522278Z
- Added back a 'package' declaration to Tickets_Overlay to enable automatic reload.
+ ----------------------------------------------------------------------
+ r1711@tinbook:  jesse | 2004-05-28T02:47:49.277131Z
  
  
+ ----------------------------------------------------------------------
+ r1735@tinbook:  jesse | 2004-05-29T05:43:52.525083Z
  
+ First pass at sybase support. incomplete
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2018 | jesse | 2004-12-20 18:53:18 -0500 (Mon, 20 Dec 2004) | 4 lines
+r976 | leira | 2004-05-28 10:14:56 -0400 (Fri, 28 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/bin/mason_handler.fcgi.in
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- r2492@hualien:  jesse | 2004-12-20T23:49:03.808597Z
- The FastCGI handler was missing a small bit of code to enable the devel mode "Module::Reload" feature.
- 
+Use Tree::Simple for the Query builder.
 
 ------------------------------------------------------------------------
-r2017 | jesse | 2004-12-20 18:33:50 -0500 (Mon, 20 Dec 2004) | 5 lines
+r974 | robert | 2004-05-28 00:48:02 -0400 (Fri, 28 May 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/t/regression/08web_cf_access.t
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
- r2489@hualien:  jesse | 2004-12-20T23:27:06.068915Z
- Inhibit a warning in 08_web_Cf_access.t
+ ----------------------------------------------------------------------
+ r552@bear:  rspier | 2004-05-28T04:46:48.454586Z
  
+  [fsck.com #5639] SearchBuilder doesn't properly paginate initial searc\
+ hes  
  
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2015 | jesse | 2004-12-20 13:43:27 -0500 (Mon, 20 Dec 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   D /rt/branches/3.4-RELEASE/HOWTO
-
- r2485@hualien:  jesse | 2004-12-20T18:38:03.341344Z
- Blew away outdated releng documentation
-
-------------------------------------------------------------------------
-r2014 | jesse | 2004-12-20 13:42:57 -0500 (Mon, 20 Dec 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/README
-
- r2484@hualien:  jesse | 2004-12-20T18:37:10.098322Z
- minor readme updates
-
-------------------------------------------------------------------------
-r2013 | jesse | 2004-12-20 13:42:45 -0500 (Mon, 20 Dec 2004) | 3 lines
+r968 | jesse | 2004-05-27 23:36:15 -0400 (Thu, 27 May 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/releng.cnf
-
- r2483@hualien:  jesse | 2004-12-20T18:35:10.597227Z
- updated releng.cnf to point to the new branch
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
 
+Reversing a debug message
 ------------------------------------------------------------------------
-r2012 | jesse | 2004-12-20 13:25:47 -0500 (Mon, 20 Dec 2004) | 3 lines
+r967 | jesse | 2004-05-27 23:35:16 -0400 (Thu, 27 May 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.4-RELEASE
-   M /rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
-
- r2478@hualien:  jesse | 2004-12-20T18:18:05.386331Z
- The last merge had a missing brace
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
+   M /rt/branches/rt-3.1/releng.cnf
 
+Bumping to 3.1.16
 ------------------------------------------------------------------------
-r2010 | jesse | 2004-12-20 13:07:34 -0500 (Mon, 20 Dec 2004) | 2 lines
+r964 | jesse | 2004-05-27 22:25:13 -0400 (Thu, 27 May 2004) | 1 line
 Changed paths:
-   A /rt/branches/3.4-RELEASE (from /rt/branches/3.3-TESTING:2009)
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/releng.cnf
 
-Moving the 3.3 testing branch to the 3.4 release branch in anticipation of a release candidate later today
 
 ------------------------------------------------------------------------
-r2009 | jesse | 2004-12-20 12:30:49 -0500 (Mon, 20 Dec 2004) | 11 lines
+r963 | jesse | 2004-05-27 21:44:09 -0400 (Thu, 27 May 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/autohandler
+   M /rt/branches/rt-3.1
+   D /rt/branches/rt-3.1/html/Developer
+   D /rt/branches/rt-3.1/html/Scope
 
- r2472@hualien:  jesse | 2004-12-20T17:04:02.657029Z
-  r2464@hualien:  jesse | 2004-12-17T23:04:58.188494Z
-  Security:
-      * Fixed a case where catastrophic failure of the logging infrastructure 
-        on initial login could result in a failing login attempt could
-        result in a valid remote session. -- Reported by Tom Yu
-  
-  
-  
+ ----------------------------------------------------------------------
+ r1688@debian:  jesse | 2004-05-28T10:45:24.148694Z
  
+ Yanking tools that were pulled out into separate distributions
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2008 | jesse | 2004-12-20 12:30:35 -0500 (Mon, 20 Dec 2004) | 8 lines
+r954 | autrijus | 2004-05-26 06:12:38 -0400 (Wed, 26 May 2004) | 20 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/REST/1.0/search/ticket
+   M /rt
+   M /rt/branches/rt-3.1/lib/RT/I18N/zh_cn.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/zh_tw.po
+   M /rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po
+   M /rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po
+   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
 
- r2471@hualien:  jesse | 2004-12-20T17:04:02.035738Z
-  r2460@hualien:  jesse | 2004-12-17T20:24:25.107579Z
-  REST UI for listing tickets was missing a newline, resulting in a malformed 
-  response
-  
-  
+ ----------------------------------------------------------------------
+ r4757@not:  autrijus | 2004-05-11T06:13:28.139589Z
  
-
-------------------------------------------------------------------------
-r2007 | jesse | 2004-12-20 12:30:22 -0500 (Mon, 20 Dec 2004) | 11 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Users_Overlay.pm
-
- r2470@hualien:  jesse | 2004-12-20T17:04:01.318822Z
-  r1984@hualien:  jesse | 2004-12-09T07:16:39.436509Z
-  RT-Ticket: 6296
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Removed a spurious =>, Thanks to Todd Chapman
-  
-  
+ * Chinese translation for 3.2 final.
+ ----------------------------------------------------------------------
+ r5211@not:  autrijus | 2004-05-26T10:07:40.959072Z
  
-
-------------------------------------------------------------------------
-r2006 | jesse | 2004-12-20 12:30:06 -0500 (Mon, 20 Dec 2004) | 6 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-
- r2469@hualien:  jesse | 2004-12-20T16:35:42.953265Z
-  r1983@hualien:  jesse | 2004-12-09T07:15:23.115403Z
-  
-  
+ * FreezeThaw fails badly when encoding structures with mixed unicode
+   and byte string contents.  Switch to Storable+Base64 which deals
+   with this gracefully.
  
-
-------------------------------------------------------------------------
-r2002 | jesse | 2004-12-16 16:01:40 -0500 (Thu, 16 Dec 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   D /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue_Overlay.pm
-   D /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues_Overlay.pm
-
- r2447@hualien:  jesse | 2004-12-16T20:55:51.733392Z
- Removed two more unused files. Thanks to Ruslan for spotting this.
+ ----------------------------------------------------------------------
+ r5212@not:  autrijus | 2004-05-26T10:09:36.398305Z
  
+ * EscapeUTF8 should preserve the byte/unicode flag of the original
+   string.  Otherwise, silent promotion on AutoFlush=>0 can corrupt
+   pages with both byte and unicode string contents.
+   (Reported by: LCamel and jihuang from foundry)
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r2000 | jesse | 2004-12-15 18:00:06 -0500 (Wed, 15 Dec 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/t/regression/01ticket_link_searching.t
-
- r2442@hualien:  jesse | 2004-12-15T22:55:54.557052Z
- Clkao found a logic bug in the negative link searching
-
-------------------------------------------------------------------------
-r1998 | jesse | 2004-12-14 18:45:10 -0500 (Tue, 14 Dec 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/releng.cnf
-
- r2440@hualien:  jesse | 2004-12-14T23:39:15.304049Z
- bumping to 3.3.16
-
-------------------------------------------------------------------------
-r1997 | jesse | 2004-12-14 14:40:49 -0500 (Tue, 14 Dec 2004) | 9 lines
+r944 | jesse | 2004-05-24 00:01:33 -0400 (Mon, 24 May 2004) | 14 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/schema.Oracle
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/html/Admin/Elements/ToolTabs
+   M /rt/branches/rt-3.1/html/Elements/EditLinks
+   M /rt/branches/rt-3.1/html/Elements/ShowLinks
+   M /rt/branches/rt-3.1/html/Search/Edit.html
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email/Auth/GnuPG.pm
+   M /rt/branches/rt-3.1/releng.cnf
 
- r2437@hualien:  jesse | 2004-12-14T19:37:11.516896Z
- RT-Ticket: 6316
- RT-Status: resolved
- RT-Update: correspond
+ ----------------------------------------------------------------------
+ r1669@tinbook:  jesse | 2004-05-24T02:17:41.959105Z
  
- Added a patch to enable ObjectCustomFields for Oracle from Steve Turner at MIT. We're still short an oracle upgrade path.
  
+ ----------------------------------------------------------------------
+ r1672@tinbook:  jesse | 2004-05-24T03:09:05.156817Z
  
-
-------------------------------------------------------------------------
-r1996 | autrijus | 2004-12-14 10:36:27 -0500 (Tue, 14 Dec 2004) | 6 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-
- r6687@not:  autrijus | 2004-12-14T15:31:58.474155Z
- * In HTML::Mason 1.18 or above, Apache2 support is native if
-   Apache::Request (libapreq2) is installed.
  
+ ----------------------------------------------------------------------
+ r1673@tinbook:  jesse | 2004-05-24T03:59:43.181766Z
  
+ Bumping to 3.1.16
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1995 | jesse | 2004-12-14 04:54:20 -0500 (Tue, 14 Dec 2004) | 8 lines
+r940 | jesse | 2004-05-23 22:28:44 -0400 (Sun, 23 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/Makefile.in
-   M /rt/branches/3.3-TESTING/configure.ac
-   A /rt/branches/3.3-TESTING/lib/t/00smoke.t
-   D /rt/branches/3.3-TESTING/lib/t/00smoke.t.in
-   D /rt/branches/3.3-TESTING/lib/t/01harness.t.in
-   D /rt/branches/3.3-TESTING/lib/t/02regression.t.in
-   D /rt/branches/3.3-TESTING/lib/t/03web.pl.in
-   D /rt/branches/3.3-TESTING/lib/t/04_send_email.pl.in
-   D /rt/branches/3.3-TESTING/lib/t/05cronsupport.pl.in
-   D /rt/branches/3.3-TESTING/lib/t/06mailgateway.pl.in
-   D /rt/branches/3.3-TESTING/lib/t/07acl.pl.in
-   D /rt/branches/3.3-TESTING/lib/t/08web_cf.pl.in
-   D /rt/branches/3.3-TESTING/lib/t/regression/00placeholder
-   A /rt/branches/3.3-TESTING/lib/t/regression/03basic_web.t
-   A /rt/branches/3.3-TESTING/lib/t/regression/04send_email.t
-   A /rt/branches/3.3-TESTING/lib/t/regression/05cronsupport.t
-   A /rt/branches/3.3-TESTING/lib/t/regression/06mailgateway.t
-   A /rt/branches/3.3-TESTING/lib/t/regression/07acl.t
-   A /rt/branches/3.3-TESTING/lib/t/regression/08web_cf_access.t
-   A /rt/branches/3.3-TESTING/lib/t/regression/09record_cf_api.t
-   A /rt/branches/3.3-TESTING/lib/t/setup_regression.t
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Groups_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
+   A /rt/branches/rt-3.1/lib/t/data/rt-send-cc
+   M /rt/branches/rt-3.1/releng.cnf
 
- r2434@hualien:  jesse | 2004-12-14T09:50:12.895761Z
- Test suite refactored to use 'prove' rather than one big ball of tests. 
- This makes it much easier to run individual test scripts and gets us a nice pretty output.
- 
-     Ruslan pushed me into this.
- 
- 
+Merge forward from 3.0
 
 ------------------------------------------------------------------------
-r1994 | jesse | 2004-12-14 04:54:04 -0500 (Tue, 14 Dec 2004) | 3 lines
+r937 | leira | 2004-05-19 18:31:10 -0400 (Wed, 19 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/configure.ac
-   D /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue.pm
-   D /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT.pm.in
-   M /rt/branches/3.3-TESTING/lib/t/regression/01ticket_link_searching.t
-   M /rt/branches/3.3-TESTING/sbin/extract_pod_tests
+   M /rt/branches/rt-3.1/bin/rt.in
 
- r2433@hualien:  jesse | 2004-12-14T09:25:34.132509Z
- Removing TicketCustomFieldValue files leftover from 3.2
+added "my" where needed in list function
 
 ------------------------------------------------------------------------
-r1993 | jesse | 2004-12-14 02:36:04 -0500 (Tue, 14 Dec 2004) | 5 lines
+r936 | leira | 2004-05-19 18:30:50 -0400 (Wed, 19 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   A /rt/branches/3.3-TESTING/lib/t/regression/01ticket_link_searching.t
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCFs
 
- r2431@hualien:  jesse | 2004-12-14T07:32:22.983998Z
- And now we have _tests_ for the link searching. 
- 
- 
+CFs with spaces in the name need to have the whole thing quoted.
 
 ------------------------------------------------------------------------
-r1992 | jesse | 2004-12-14 02:25:03 -0500 (Tue, 14 Dec 2004) | 3 lines
+r935 | leira | 2004-05-19 12:26:11 -0400 (Wed, 19 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCFs
 
- r2428@hualien:  jesse | 2004-12-14T07:21:15.616305Z
- Adding support for searching on tickets which have no relationships of a given type  (Such as "HasMember IS NULL") for clkao
+Don't try to check for the Queue's name if there isn't a queue to begin with.
 
 ------------------------------------------------------------------------
-r1990 | jesse | 2004-12-13 23:50:29 -0500 (Mon, 13 Dec 2004) | 3 lines
+r929 | leira | 2004-05-19 00:47:56 -0400 (Wed, 19 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/releng.cnf
+   M /rt/branches/rt-3.1/html/Ticket/Create.html
 
- r2423@hualien:  jesse | 2004-12-14T04:46:07.648245Z
- 3.3.15
+Remove Debug field.
 
 ------------------------------------------------------------------------
-r1989 | jesse | 2004-12-13 23:48:14 -0500 (Mon, 13 Dec 2004) | 3 lines
+r927 | leira | 2004-05-19 00:39:55 -0400 (Wed, 19 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r2419@hualien:  jesse | 2004-12-14T04:42:37.099863Z
- More fixes for working with Transaction Custom Fields
+Combine two forms that need to be the same.
 
 ------------------------------------------------------------------------
-r1988 | jesse | 2004-12-13 21:42:15 -0500 (Mon, 13 Dec 2004) | 3 lines
+r925 | leira | 2004-05-19 00:07:41 -0400 (Wed, 19 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r2413@hualien:  jesse | 2004-12-14T02:38:06.428282Z
- RT::Transaction->CustomFieldValues can now accept named arguments
+Comment out the Advanced button again.
 
 ------------------------------------------------------------------------
-r1987 | mwhitson | 2004-12-13 18:15:35 -0500 (Mon, 13 Dec 2004) | 6 lines
+r922 | leira | 2004-05-18 23:31:21 -0400 (Tue, 18 May 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/Modify.html
-   M /rt/branches/3.3-TESTING/html/User/Groups/Modify.html
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
-rt-ticket: 6315
-rt-status: resolved
-rt-update: correspond
+Improvements to moving items in the query.
 
-Relabeled 'Create' submit buttons to 'Save Changes' in group modification pages.
+Make things into separate forms.
 
 ------------------------------------------------------------------------
-r1986 | jesse | 2004-12-12 23:13:42 -0500 (Sun, 12 Dec 2004) | 3 lines
+r921 | leira | 2004-05-18 23:26:06 -0400 (Tue, 18 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/SelfService/Display.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Update.html
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r2411@hualien:  jesse | 2004-12-13T04:10:03.842079Z
- self service ui html beautification, selfservice customfield editing
+Improvements for empty fields and fields with no ID.
 
 ------------------------------------------------------------------------
-r1983 | jesse | 2004-12-10 13:55:22 -0500 (Fri, 10 Dec 2004) | 8 lines
+r919 | jesse | 2004-05-17 22:18:24 -0400 (Mon, 17 May 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/UPGRADING
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
-
- r2000@hualien:  jesse | 2004-12-10T18:55:08.662227Z
- RT-Ticket: 6304
- RT-Status: resolved
- RT-Update: correspond
- 
- ModifyObjectCustomFieldValues was too long. It's been changed to "ModifyCustomField"
- 
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/html/Admin/Elements/ToolTabs
+   M /rt/branches/rt-3.1/html/Elements/EditLinks
+   M /rt/branches/rt-3.1/html/Elements/ShowLinks
+   M /rt/branches/rt-3.1/html/Search/Edit.html
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email/Auth/GnuPG.pm
 
+Merge tickts
 ------------------------------------------------------------------------
-r1982 | jesse | 2004-12-10 00:19:36 -0500 (Fri, 10 Dec 2004) | 8 lines
+r917 | jesse | 2004-05-17 20:16:38 -0400 (Mon, 17 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/configure.ac
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-   M /rt/branches/3.3-TESTING/lib/t/02regression.t.in
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/configure.ac
 
- r1998@hualien:  jesse | 2004-12-10T05:18:47.952532Z
- Ruslan handed us a suite of tests. Some of those tests failed, demonstrating a couple of API issues with CustomFields.
- 
- This led to more API bulletproofing and a SearchBuilder bump
- 
- 
- 
+Merge tickets flowing upstream
 
 ------------------------------------------------------------------------
-r1980 | jesse | 2004-12-09 02:33:58 -0500 (Thu, 09 Dec 2004) | 29 lines
+r916 | jesse | 2004-05-17 16:52:59 -0400 (Mon, 17 May 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldFreeform
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/lib/t/04_send_email.pl.in
 
- r1990@hualien:  jesse | 2004-12-09T07:32:26.670652Z
- This actually covers several bugs in the custom field processing in 3.3.
- 12. Each time I fixed a bug, another one was uncovered. I think I've 
- finished now.
- 
- You can see the problems if you create a ticket with "Enter multiple 
- values", "Fill in one text area" and "upload a file" CFs. The go to the 
- Basics page, don't change anything and hit submit. All hell breaks loose 
-  -
- 
- 1) the multi-value & text area fields get screwed up.
- 2) a message appears telling you the file upload CF has been deleted, 
- although it apparently hasn't.
- 
- Here's the idea behind what I did:
- 
- - Multi-value CFs should be stored with no \n or \r characters. 
- - Fill-in-a-text-area CFs should have \r removed before storing in 
-   the database (but \n should remain).
- 
- There are a couple of other related changes - free form multi value CFs 
- are no longer identified by type "FreeformMultiple". Also there's a 
- "next if" statement in the wrong place which was causing the file upload 
- bug.
- 
- 	--Steve Turner
+ ----------------------------------------------------------------------
+ r1597@debian:  jesse | 2004-05-18T05:37:49.734434Z
  
  
-
-------------------------------------------------------------------------
-r1979 | jesse | 2004-12-09 02:32:46 -0500 (Thu, 09 Dec 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-
- r1989@hualien:  jesse | 2004-12-09T07:31:07.292798Z
- Typo fix
+ ----------------------------------------------------------------------
+ r1599@debian:  jesse | 2004-05-18T05:51:45.332470Z
  
+ Merge forward from 3.0
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1978 | jesse | 2004-12-09 02:21:52 -0500 (Thu, 09 Dec 2004) | 9 lines
+r908 | jesse | 2004-05-17 01:49:16 -0400 (Mon, 17 May 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1
 
- r1986@hualien:  jesse | 2004-12-09T07:20:03.552482Z
- RT-Ticket: 6295
- RT-Status: resolved
- RT-Update: correspond
- 
- Removed a "die" from a code path that should never be hit but doesn't need to die.  Thanks to Todd Chapman
+ ----------------------------------------------------------------------
+ r1588@debian:  jesse | 2004-05-17T14:52:29.235868Z
  
  
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1977 | jesse | 2004-12-09 02:20:17 -0500 (Thu, 09 Dec 2004) | 7 lines
+r907 | jesse | 2004-05-17 01:48:11 -0400 (Mon, 17 May 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/html/Admin/Elements/ToolTabs
+   M /rt/branches/rt-3.1/html/Elements/EditLinks
+   M /rt/branches/rt-3.1/html/Elements/ShowLinks
+   M /rt/branches/rt-3.1/html/Search/Edit.html
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email/Auth/GnuPG.pm
 
- r1982@hualien:  jesse | 2004-12-09T07:09:56.419805Z
- Slightly more refactoring of Record->CustomFieldValues designed to restore older
- behaviour.
- 
- 
- 
 
 ------------------------------------------------------------------------
-r1975 | jesse | 2004-12-09 02:05:51 -0500 (Thu, 09 Dec 2004) | 5 lines
+r906 | jesse | 2004-05-17 01:47:20 -0400 (Mon, 17 May 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/mason_handler.fcgi.in
-   M /rt/branches/3.3-TESTING/bin/mason_handler.scgi.in
-   M /rt/branches/3.3-TESTING/bin/mason_handler.svc.in
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
-
- r1980@hualien:  jesse | 2004-12-09T07:05:41.787599Z
- Refactored post-http handling code into lib/RT/Interface/Web/Handler.pm 
- 
- 
+   M /rt/branches/rt-3.1/html/Elements/MyTickets
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
+Removing unused code from TicketsSQL
 ------------------------------------------------------------------------
-r1974 | jesse | 2004-12-08 20:05:42 -0500 (Wed, 08 Dec 2004) | 19 lines
+r862 | jesse | 2004-05-10 18:40:16 -0400 (Mon, 10 May 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Group_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/t/06mailgateway.pl.in
-   M /rt/branches/3.3-TESTING/lib/t/07acl.pl.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Elements/MyTickets
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r1978@hualien:  jesse | 2004-12-09T01:05:21.233709Z
- Core:
- 
- * Promoted ACL cache invalidation to a public method.
- 
- Web:
- 
- * Web UI now invalidates ACL cache after each HTTP hit. This means 
-   more consistent ACL checks at the expense marginally more database lookups
- 
- Test Suite:
- 
- * Removed delays from the test suite which were there to deal with the ACL 
-   cache. The test suite now completes in approximately one minute on my 
-   laptop.
- 
- 
- 
 
 ------------------------------------------------------------------------
-r1972 | jesse | 2004-12-07 21:40:10 -0500 (Tue, 07 Dec 2004) | 3 lines
+r861 | leira | 2004-05-10 18:17:03 -0400 (Mon, 10 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/releng.cnf
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r9533@tinbook:  jesse | 2004-12-08T02:40:01.308641Z
- Bumping to 3.3.14
+Set default queue more robustly.
 
 ------------------------------------------------------------------------
-r1971 | jesse | 2004-12-07 21:38:14 -0500 (Tue, 07 Dec 2004) | 7 lines
+r857 | jesse | 2004-05-09 14:26:49 -0400 (Sun, 09 May 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-
- r9530@tinbook:  jesse | 2004-12-08T02:38:06.660707Z
- Refactored RT::Record->CustomFieldValues to be more careful to not 
- accidentally load all ticket custom field values when asked for a 
- bogus custom field.  Thanks to Ruslan for a pointer to the bug.
- 
- 
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
+Fixing some tests from linda; autoconf optimization
 ------------------------------------------------------------------------
-r1968 | jesse | 2004-12-07 20:35:22 -0500 (Tue, 07 Dec 2004) | 4 lines
+r850 | jesse | 2004-05-06 21:01:34 -0400 (Thu, 06 May 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/html/Admin/Queues/Scrip.html
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT.pm.in
+
+Merging forward from rt 3.0
+------------------------------------------------------------------------
+r847 | jesse | 2004-05-06 19:45:24 -0400 (Thu, 06 May 2004) | 6 lines
+Changed paths:
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/html/Admin/Groups/index.html
+   M /rt/branches/rt-3.1/html/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Ticket/Create.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowHistory
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMembers_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Date.pm
+   M /rt/branches/rt-3.1/lib/RT/GroupMembers_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Groups_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/cs.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/de.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/es.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/fr.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/he.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/it.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ja.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/nl.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/no.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/pt_br.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ru.po
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Principal_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT.pm.in
 
- r9525@tinbook:  jesse | 2004-12-08T01:29:33.251334Z
- Pulling forward query optimization from 3.2
+ ----------------------------------------------------------------------
+ r1481@tinbook:  jesse | 2004-05-06T23:43:45.027502Z
  
+ Merging RT 3.0.11rc1 forward
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1967 | jesse | 2004-12-07 20:33:35 -0500 (Tue, 07 Dec 2004) | 36 lines
+r846 | leira | 2004-05-06 17:00:19 -0400 (Thu, 06 May 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r9524@tinbook:  jesse | 2004-12-07T22:51:16.647524Z
-  r9522@tinbook:  jesse | 2004-12-07T22:47:20.573617Z
-  RT-Ticket: 6286
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Searching on Ticket data  and Transaction content caused horribly pessimal searches.
-  
-  OLD
-  
-  mysql> explain SELECT DISTINCT main.* FROM Tickets main , Transactions Transactions_1, Attachments Attachments_2  WHERE ((main.EffectiveId = main.id)) AND ((main.Status != 'deleted')) AND ((main.Type = 'ticket')) AND ((main.Subject LIKE '%subject/content SQL test%')OR ( (Attachments_2.Content LIKE '%subject/content SQL test%')AND(Attachments_2.TransactionId = Transactions_1.id)AND(main.id = Transactions_1.Ticket) ) );
-  +----------------+-------+-----------------------+---------------+---------+------+------+------------------------------------+
-  | table          | type  | possible_keys         | key           | key_len | ref  | rows | Extra                              |
-  +----------------+-------+-----------------------+---------------+---------+------+------+------------------------------------+
-  | main           | ALL   | PRIMARY               | NULL          |    NULL | NULL |   30 | Using where; Using temporary       |
-  | Attachments_2  | ALL   | Attachments2          | NULL          |    NULL | NULL |   22 | Using where; Distinct              |
-  | Transactions_1 | index | PRIMARY,Transactions1 | Transactions1 |       4 | NULL |   73 | Using where; Using index; Distinct |
-  +----------------+-------+-----------------------+---------------+---------+------+------+------------------------------------+
-  3 rows in set (0.00 sec)
-  
-  NEW
-  
-  mysql> explain SELECT DISTINCT main.* FROM ((Tickets main  LEFT JOIN Transactions Transactions_1  ON ( main.id = Transactions_1.Ticket))  LEFT JOIN Attachments Attachments_2  ON ( Transactions_1.id = Attachments_2.TransactionId))   WHERE ((main.EffectiveId = main.id)) AND ((main.Status != 'deleted')) AND ((main.Type = 'ticket')) AND ((main.Subject LIKE '%subject/content SQL test%')OR ( (Attachments_2.Content LIKE '%subject/content SQL test%') ) );
-  +----------------+------+---------------+---------------+---------+-------------------+------+------------------------------+
-  | table          | type | possible_keys | key           | key_len | ref               | rows | Extra                        |
-  +----------------+------+---------------+---------------+---------+-------------------+------+------------------------------+
-  | main           | ALL  | NULL          | NULL          |    NULL | NULL              |   30 | Using where; Using temporary |
-  | Transactions_1 | ref  | Transactions1 | Transactions1 |       4 | main.id           |    1 | Using index; Distinct        |
-  | Attachments_2  | ref  | Attachments2  | Attachments2  |       4 | Transactions_1.id |    1 | Using where; Distinct        |
-  +----------------+------+---------------+---------------+---------+-------------------+------+------------------------------+
-  3 rows in set (0.03 sec)
-  
-  
-  
- 
+- Allow selection of a default queue
+- Be more generous about fields padded with spaces
+- Be more generous about field names
+- Put ENDOFCONTENT at the end of content
 
 ------------------------------------------------------------------------
-r1965 | jesse | 2004-12-07 15:16:58 -0500 (Tue, 07 Dec 2004) | 4 lines
+r839 | jesse | 2004-05-05 23:53:04 -0400 (Wed, 05 May 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Build.html
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
 
- r9519@tinbook:  jesse | 2004-12-07T20:14:22.950883Z
- The "toggle AND/OR" button in the query builder broke in 3.3.10 or so. Reported by Wilson Chow
  
-
-------------------------------------------------------------------------
-r1963 | jesse | 2004-12-06 15:13:15 -0500 (Mon, 06 Dec 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/releng.cnf
-
- r9514@tinbook:  jesse | 2004-12-06T20:08:56.717991Z
- Bumping to 3.3.13
-
-------------------------------------------------------------------------
-r1962 | autrijus | 2004-12-06 12:49:23 -0500 (Mon, 06 Dec 2004) | 1 line
-Changed paths:
-   M /rt/branches/3.3-TESTING
-
-
-------------------------------------------------------------------------
-r1961 | autrijus | 2004-12-06 12:48:46 -0500 (Mon, 06 Dec 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/docs/design_docs/3.3-schema-redesign.txt
-
- r6348@not:  autrijus | 2004-12-06T17:45:43.194394Z
- * Fix an incorrect description of OCFs
-
-------------------------------------------------------------------------
-r1960 | jesse | 2004-12-06 02:11:55 -0500 (Mon, 06 Dec 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/SelfService/Create.html
-   A /rt/branches/3.3-TESTING/html/SelfService/CreateTicketInQueue.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Display.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/Tabs
-
- r9505@tinbook:  jesse | 2004-12-06T07:11:01.358418Z
- SelfService: Added support for setting custom fields on creation and viewing custom fields the user has the right to see.
+ ----------------------------------------------------------------------
+ r839@tinbook:  jesse | 2004-05-06T03:51:01.771468Z
  
+ #5620: RT 3.1.14 Bug - Can't Update Scrips in Web UI  -- UpdateRecordObject wasn't passing all the required parameters
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1959 | jesse | 2004-12-06 02:11:21 -0500 (Mon, 06 Dec 2004) | 5 lines
+r838 | jesse | 2004-05-05 20:33:31 -0400 (Wed, 05 May 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldFreeform
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldSelect
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldText
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Elements/Refresh
+   M /rt/branches/rt-3.1/html/Elements/SelectMatch
+   M /rt/branches/rt-3.1/html/Elements/SelectNewTicketQueue
+   M /rt/branches/rt-3.1/html/Elements/SelectQueue
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- r9504@tinbook:  jesse | 2004-12-06T07:10:00.587141Z
- Removing duplicated code.
+ ----------------------------------------------------------------------
+ r1069@Jesse-Vincents-Computer:  jesse | 2004-05-06T00:32:58.883200Z
  
+ A number of small fixes to play better wtih SQLite
+ ----------------------------------------------------------------------
  
-
 ------------------------------------------------------------------------
-r1958 | jesse | 2004-12-06 00:50:07 -0500 (Mon, 06 Dec 2004) | 4 lines
+r832 | jesse | 2004-05-05 14:13:16 -0400 (Wed, 05 May 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/etc/constraints.mysql
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
+
+A bit of work to the mysql constraints. Mysql changed its expectations
+
+------------------------------------------------------------------------
+r775 | jesse | 2004-04-29 22:17:23 -0400 (Thu, 29 Apr 2004) | 7 lines
+Changed paths:
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
+
+ ----------------------------------------------------------------------
+ r1395@debian:  jesse | 2004-04-30T11:16:57.160412Z
+ 
+ Fixing RT::Transactions to better honor the trnansaction ACLs
+ 
+ ----------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r774 | jesse | 2004-04-29 18:26:36 -0400 (Thu, 29 Apr 2004) | 1 line
+Changed paths:
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/HOWTO/README
+   M /rt/branches/rt-3.1/HOWTO/change.txt
+   M /rt/branches/rt-3.1/HOWTO/release.txt
+   M /rt/branches/rt-3.1/HOWTO/version-control.txt
+   M /rt/branches/rt-3.1/aclocal.m4
+   M /rt/branches/rt-3.1/bin/mason_handler.svc.in
+   M /rt/branches/rt-3.1/bin/rt-commit-handler.in
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/docs/Security
+   M /rt/branches/rt-3.1/docs/design_docs/acls
+   M /rt/branches/rt-3.1/docs/design_docs/approval_notices
+   M /rt/branches/rt-3.1/docs/design_docs/approval_template
+   M /rt/branches/rt-3.1/docs/design_docs/cf_search
+   M /rt/branches/rt-3.1/docs/design_docs/cli_spec
+   M /rt/branches/rt-3.1/docs/design_docs/cvs_integration
+   M /rt/branches/rt-3.1/docs/design_docs/delegation
+   M /rt/branches/rt-3.1/docs/design_docs/evil_plans
+   M /rt/branches/rt-3.1/docs/design_docs/groups_notes
+   M /rt/branches/rt-3.1/docs/design_docs/link-definitions.txt
+   M /rt/branches/rt-3.1/docs/design_docs/recursive_group_membership_algorithm
+   M /rt/branches/rt-3.1/docs/design_docs/rql_parser_machine.graphviz
+   M /rt/branches/rt-3.1/docs/design_docs/string-extraction-guide.txt
+   M /rt/branches/rt-3.1/docs/design_docs/ticket_templates
+   M /rt/branches/rt-3.1/docs/design_docs/users
+   M /rt/branches/rt-3.1/docs/rt3-schema-relationships.dot
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/etc/RT_SiteConfig.pm
+   M /rt/branches/rt-3.1/etc/acl.Informix
+   M /rt/branches/rt-3.1/etc/acl.Oracle
+   M /rt/branches/rt-3.1/etc/constraints.mysql
+   M /rt/branches/rt-3.1/etc/drop.Informix
+   M /rt/branches/rt-3.1/etc/drop.Oracle
+   M /rt/branches/rt-3.1/etc/initialdata
+   M /rt/branches/rt-3.1/etc/rt.spec
+   M /rt/branches/rt-3.1/html/Admin/Elements/AddCustomFieldValue
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomField
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomFieldValues
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomFields
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditQueueWatchers
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditScrips
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditTemplates
+   M /rt/branches/rt-3.1/html/Admin/Elements/ListGlobalCustomFields
+   M /rt/branches/rt-3.1/html/Admin/Elements/QueueRightsForUser
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectCustomFieldType
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectGroups
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectModifyGroup
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectNewGroupMembers
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectRights
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectScripAction
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectScripCondition
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectSingleOrMultiple
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectUsers
+   M /rt/branches/rt-3.1/html/Admin/Global/CustomField.html
+   M /rt/branches/rt-3.1/html/Admin/Global/CustomFields.html
+   M /rt/branches/rt-3.1/html/Admin/Global/Scrip.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/GroupRights.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/Members.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/Modify.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/UserRights.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/index.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/CustomField.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/CustomFields.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/Scrip.html
+   M /rt/branches/rt-3.1/html/Approvals/Display.html
+   M /rt/branches/rt-3.1/html/Approvals/Elements/Approve
+   M /rt/branches/rt-3.1/html/Approvals/Elements/PendingMyApproval
+   M /rt/branches/rt-3.1/html/Approvals/Elements/ShowDependency
+   M /rt/branches/rt-3.1/html/Approvals/Elements/Tabs
+   M /rt/branches/rt-3.1/html/Approvals/index.html
+   M /rt/branches/rt-3.1/html/Elements/BevelBoxRaisedEnd
+   M /rt/branches/rt-3.1/html/Elements/BevelBoxRaisedStart
+   M /rt/branches/rt-3.1/html/Elements/CreateTicket
+   M /rt/branches/rt-3.1/html/Elements/GotoTicket
+   M /rt/branches/rt-3.1/html/Elements/Menu
+   M /rt/branches/rt-3.1/html/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Elements/MyTickets
+   M /rt/branches/rt-3.1/html/Elements/PageLayout
+   M /rt/branches/rt-3.1/html/Elements/Quicksearch
+   M /rt/branches/rt-3.1/html/Elements/Refresh
+   M /rt/branches/rt-3.1/html/Elements/SelectAttachmentField
+   M /rt/branches/rt-3.1/html/Elements/SelectCustomFieldOperator
+   M /rt/branches/rt-3.1/html/Elements/SelectCustomFieldValue
+   M /rt/branches/rt-3.1/html/Elements/SelectGroups
+   M /rt/branches/rt-3.1/html/Elements/SelectLinkType
+   M /rt/branches/rt-3.1/html/Elements/SelectResultsPerPage
+   M /rt/branches/rt-3.1/html/Elements/SelectSortOrder
+   M /rt/branches/rt-3.1/html/Elements/SelectTicketSortBy
+   M /rt/branches/rt-3.1/html/Elements/SelectTicketTypes
+   M /rt/branches/rt-3.1/html/Elements/ViewUser
+   M /rt/branches/rt-3.1/html/NoAuth/images/back_home.gif
+   M /rt/branches/rt-3.1/html/NoAuth/images/bplogo.gif
+   M /rt/branches/rt-3.1/html/NoAuth/images/favicon.png
+   M /rt/branches/rt-3.1/html/NoAuth/images/head_requestracker.gif
+   M /rt/branches/rt-3.1/html/NoAuth/images/rt.jpg
+   M /rt/branches/rt-3.1/html/NoAuth/images/space.gif
+   M /rt/branches/rt-3.1/html/NoAuth/images/spacer.gif
+   M /rt/branches/rt-3.1/html/NoAuth/images/squares_blue.gif
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/queue/default
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/queue/ns
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/ticket/attachments
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/ticket/links
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/user/default
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/user/ns
+   M /rt/branches/rt-3.1/html/REST/1.0/NoAuth/mail-gateway
+   M /rt/branches/rt-3.1/html/REST/1.0/logout
+   M /rt/branches/rt-3.1/html/REST/1.0/search/dhandler
+   M /rt/branches/rt-3.1/html/REST/1.0/ticket/comment
+   M /rt/branches/rt-3.1/html/REST/1.0/ticket/link
+   M /rt/branches/rt-3.1/html/REST/1.0/ticket/merge
+   M /rt/branches/rt-3.1/html/Search/Elements/TicketRow
+   M /rt/branches/rt-3.1/html/SelfService/Attachment/dhandler
+   M /rt/branches/rt-3.1/html/SelfService/Closed.html
+   M /rt/branches/rt-3.1/html/SelfService/Elements/Tabs
+   M /rt/branches/rt-3.1/html/SelfService/index.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/BulkLinks
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditCustomField
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditCustomFields
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowCustomFields
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowMessageHeaders
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowRequestor
+   M /rt/branches/rt-3.1/html/User/Delegation.html
+   M /rt/branches/rt-3.1/html/User/Elements/DelegateRights
+   M /rt/branches/rt-3.1/html/User/Elements/GroupTabs
+   M /rt/branches/rt-3.1/html/User/Elements/Tabs
+   M /rt/branches/rt-3.1/html/User/Groups/Members.html
+   M /rt/branches/rt-3.1/html/User/Groups/Modify.html
+   M /rt/branches/rt-3.1/html/User/Groups/index.html
+   M /rt/branches/rt-3.1/html/l
+   M /rt/branches/rt-3.1/install-sh
+   M /rt/branches/rt-3.1/lib/RT/ACE_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ACL_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/EscalatePriority.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/ResolveMembers.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/SetPriority.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/UserDefined.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachments_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMember.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMember_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMembers.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMembers_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/AnyTransaction.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/BeforeDue.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/Overdue.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/OwnerChange.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/PriorityExceeds.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/QueueChange.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/StatusChange.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/UserDefined.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomField.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFieldValue.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFieldValues.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFieldValues_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFields.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFields_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Date.pm
+   M /rt/branches/rt-3.1/lib/RT/GroupMember_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/GroupMembers_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Groups_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/cs.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/cs.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/de.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/en.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/es.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/he.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/i_default.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/it.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ja.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/nl.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/no.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/pt_br.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ru.po
+   M /rt/branches/rt-3.1/lib/RT/Interface/CLI.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/REST.pm
+   M /rt/branches/rt-3.1/lib/RT/Link.pm
+   M /rt/branches/rt-3.1/lib/RT/Link_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Links.pm
+   M /rt/branches/rt-3.1/lib/RT/Links_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Principal.pm
+   M /rt/branches/rt-3.1/lib/RT/Principals.pm
+   M /rt/branches/rt-3.1/lib/RT/Principals_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Queues_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripAction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripActions_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripCondition_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripConditions_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrip_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Search/ActiveTicketsInQueue.pm
+   M /rt/branches/rt-3.1/lib/RT/Search/Generic.pm
+   M /rt/branches/rt-3.1/lib/RT/System.pm
+   M /rt/branches/rt-3.1/lib/RT/Templates_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValue.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValues.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValues_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/URI/base.pm
+   M /rt/branches/rt-3.1/lib/RT/URI/fsck_com_rt.pm
+   M /rt/branches/rt-3.1/lib/RT.pm.in
+   M /rt/branches/rt-3.1/lib/t/00smoke.t.in
+   M /rt/branches/rt-3.1/lib/t/01harness.t.in
+   M /rt/branches/rt-3.1/lib/t/02regression.t.in
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/dir
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg1
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg2
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg3
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg4
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg5
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg6
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg7
+   M /rt/branches/rt-3.1/lib/t/data/multipart-alternative-with-umlaut
+   M /rt/branches/rt-3.1/lib/t/data/multipart-report
+   M /rt/branches/rt-3.1/lib/t/data/nested-mime-sample
+   M /rt/branches/rt-3.1/lib/t/data/nested-rfc-822
+   M /rt/branches/rt-3.1/lib/t/data/new-ticket-from-iso-8859-1
+   M /rt/branches/rt-3.1/lib/t/data/new-ticket-from-iso-8859-1-full
+   M /rt/branches/rt-3.1/lib/t/data/russian-subject-no-content-type
+   M /rt/branches/rt-3.1/lib/t/data/text-html-in-russian
+   M /rt/branches/rt-3.1/lib/t/data/text-html-with-umlaut
+   M /rt/branches/rt-3.1/lib/t/regression/00placeholder
+   M /rt/branches/rt-3.1/lib/t/regression/mime_tests
+   M /rt/branches/rt-3.1/m4/rt_enable_layout.m4
+   M /rt/branches/rt-3.1/m4/rt_expand_var.m4
+   M /rt/branches/rt-3.1/m4/rt_layout.m4
+   M /rt/branches/rt-3.1/m4/rt_subst_expanded_arg.m4
+   M /rt/branches/rt-3.1/sbin/extract-message-catalog
+   M /rt/branches/rt-3.1/sbin/extract_pod_tests
+   M /rt/branches/rt-3.1/sbin/factory
+   M /rt/branches/rt-3.1/sbin/regression_harness
+
+
+------------------------------------------------------------------------
+r773 | jesse | 2004-04-29 18:22:42 -0400 (Thu, 29 Apr 2004) | 1 line
+Changed paths:
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
+
+Trying to beat  a taint bug into the ground
+------------------------------------------------------------------------
+r772 | leira | 2004-04-29 15:42:46 -0400 (Thu, 29 Apr 2004) | 2 lines
+Changed paths:
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCFs
+
+Add CFs to the query.
+
+------------------------------------------------------------------------
+r771 | robert | 2004-04-29 13:24:24 -0400 (Thu, 29 Apr 2004) | 5 lines
+Changed paths:
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
 
- r9498@tinbook:  jesse | 2004-12-06T05:49:22.962399Z
- Fixing CustomField->LoadByName for the case where no such custom field exists.
- 
+     Subject: "Subject LIKE 'patch' OR content LIKE 'patch'" generates bad SQL
 
-------------------------------------------------------------------------
-r1957 | jesse | 2004-12-05 16:58:31 -0500 (Sun, 05 Dec 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
+     Joins must come _after_ the limit condition. (Yes, it shouldn't have to be that way, but it's necessary because the primary EA for a subclause must the first one.  Another way to fix this might be to pass the EA's into the first Join.. but that seems wrong.. since we're trying to keep Join's abstracted out.)
 
- r9495@tinbook:  jesse | 2004-12-05T21:57:36.434513Z
- Refactored RT::Record->CustomFieldValues to accept cf names and convert them to ids. (Based on a patch by Tara Andrews)
- 
 
 ------------------------------------------------------------------------
-r1956 | jesse | 2004-12-05 16:58:06 -0500 (Sun, 05 Dec 2004) | 6 lines
+r770 | leira | 2004-04-28 23:27:54 -0400 (Wed, 28 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
- r9451@tinbook:  jesse | 2004-12-03T22:42:17.243639Z
-  r9450@tinbook:  jesse | 2004-12-03T22:39:34.093758Z
-  Refactoring to use the API to determine if a ticket is being closed, rather than looking at a hardcoded status.  -- Stephen Quinney
-  
- 
+Fixed borken tests.
 
 ------------------------------------------------------------------------
-r1953 | jesse | 2004-12-03 17:25:07 -0500 (Fri, 03 Dec 2004) | 13 lines
+r769 | leira | 2004-04-28 23:17:51 -0400 (Wed, 28 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
- r9447@tinbook:  jesse | 2004-12-03T22:23:11.115990Z
- RT-Ticket: 6291
- RT-Status: resolved
- RT-Update: correspond
- 
- 
- Altered Transaction->Value to only show data about custom field transactions if the user
- has the right to see that custom field. This automatically limits the Transaction list
- to exclude custom field transactions the user shouldn't see.
- 
- 
- 
+commented out non-working code
 
 ------------------------------------------------------------------------
-r1952 | tla | 2004-12-02 18:16:17 -0500 (Thu, 02 Dec 2004) | 5 lines
+r768 | leira | 2004-04-28 23:06:25 -0400 (Wed, 28 Apr 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
-If First is undef on account of there not being a custom field of that
-name, the Content() method cannot be called on it, so check for mere
-existence before we try.
+Added new tests:
 
+- "id = <n> OR HasMember = <n>"
+- "Subject LIKE 'foo' OR Content LIKE 'foo'"
 
 ------------------------------------------------------------------------
-r1949 | jesse | 2004-11-29 13:32:05 -0500 (Mon, 29 Nov 2004) | 5 lines
+r765 | jesse | 2004-04-28 14:21:53 -0400 (Wed, 28 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/SelfService/Update.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditBasics
-   M /rt/branches/3.3-TESTING/html/Ticket/Update.html
-   M /rt/branches/3.3-TESTING/html/Tools/MyDay.html
+   M /rt/branches/rt-3.1/html/Ticket/ShowEmailRecord.html
 
- r9437@tinbook:  jesse | 2004-11-29T18:33:10.692247Z
- Small localization fixes for  "Status" (Unchanged) messages
- 
- 
+Removing an unneeded bit of escaping
 
 ------------------------------------------------------------------------
-r1948 | jesse | 2004-11-29 01:24:52 -0500 (Mon, 29 Nov 2004) | 3 lines
+r764 | root | 2004-04-28 02:11:40 -0400 (Wed, 28 Apr 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/upgrade/3.3.11/schema.Pg
-   M /rt/branches/3.3-TESTING/etc/upgrade/3.3.11/schema.mysql
-   M /rt/branches/3.3-TESTING/sbin/rt-setup-database.in
-
- r9435@tinbook:  jesse | 2004-11-29T06:26:08.317066Z
- More postgres upgrade fixes
+   M /rt/branches/rt-3.1/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowMessageHeaders
+   M /rt/branches/rt-3.1/html/Ticket/ShowEmailRecord.html
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
 
+Additional support for standalone httpd
 ------------------------------------------------------------------------
-r1946 | jesse | 2004-11-28 22:25:19 -0500 (Sun, 28 Nov 2004) | 3 lines
+r762 | root | 2004-04-28 00:34:37 -0400 (Wed, 28 Apr 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
-
- r9432@tinbook:  jesse | 2004-11-29T03:26:44.094679Z
- Custom field API backward-compatibility improvements
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/html/Ticket/Create.html
 
+More work on the standalone http server
 ------------------------------------------------------------------------
-r1943 | jesse | 2004-11-27 02:34:16 -0500 (Sat, 27 Nov 2004) | 1 line
+r759 | jesse | 2004-04-27 18:30:19 -0400 (Tue, 27 Apr 2004) | 11 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
 
+----------------------------------------------------------------------
+r969@Jesse-Vincents-Computer:  jesse | 2004-04-27T04:27:57.713354Z
 
-------------------------------------------------------------------------
-r1942 | jesse | 2004-11-27 02:34:09 -0500 (Sat, 27 Nov 2004) | 5 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
 
- r9422@tinbook:  jesse | 2004-11-27T07:33:36.170661Z
-  r9420@tinbook:  jesse | 2004-11-27T07:31:22.860069Z
-  Refactored ColumnMap to remove use of a deprecated API
- 
+----------------------------------------------------------------------
+r970@Jesse-Vincents-Computer:  jesse | 2004-04-27T22:30:10.046486Z
 
-------------------------------------------------------------------------
-r1941 | jesse | 2004-11-27 01:38:00 -0500 (Sat, 27 Nov 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Row
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
+Taint handling to better handle incoming mail
 
- r9414@tinbook:  jesse | 2004-11-27T06:29:04.667691Z
- Multiple fixes to search result display
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1937 | jesse | 2004-11-26 22:49:33 -0500 (Fri, 26 Nov 2004) | 3 lines
+r755 | jesse | 2004-04-27 03:51:56 -0400 (Tue, 27 Apr 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/releng.cnf
-
- r9411@tinbook:  jesse | 2004-11-27T03:48:14.141183Z
- Bumping to 3.3.12
+   M /rt/branches/rt-3.1/etc/schema.SQLite
 
+Adding
 ------------------------------------------------------------------------
-r1934 | jesse | 2004-11-24 11:15:39 -0500 (Wed, 24 Nov 2004) | 3 lines
+r753 | jesse | 2004-04-26 22:59:24 -0400 (Mon, 26 Apr 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/upgrade/3.3.11/schema.Pg
-
- r9348@tinbook:  jesse | 2004-11-24T16:15:50.210159Z
- 3.3.11 upgrade schema for postgres depended on features not supported by postgres. fixed. -- Mathieu Sauve-Frankel
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/UPGRADING
 
+----------------------------------------------------------------------
+r2190@tinbook:  jesse | 2004-04-27T02:58:52.104408Z
+
+reverting a conflict
+
+----------------------------------------------------------------------
+
+------------------------------------------------------------------------
+r752 | jesse | 2004-04-26 20:03:04 -0400 (Mon, 26 Apr 2004) | 6 lines
+Changed paths:
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/HOWTO/README
+   M /rt/branches/rt-3.1/HOWTO/change.txt
+   M /rt/branches/rt-3.1/HOWTO/release.txt
+   M /rt/branches/rt-3.1/HOWTO/version-control.txt
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/UPGRADING
+   M /rt/branches/rt-3.1/aclocal.m4
+   M /rt/branches/rt-3.1/bin/mason_handler.fcgi.in
+   M /rt/branches/rt-3.1/bin/mason_handler.scgi.in
+   M /rt/branches/rt-3.1/bin/mason_handler.svc.in
+   M /rt/branches/rt-3.1/bin/rt-commit-handler.in
+   M /rt/branches/rt-3.1/docs/Security
+   M /rt/branches/rt-3.1/docs/design_docs/acls
+   M /rt/branches/rt-3.1/docs/design_docs/approval_notices
+   M /rt/branches/rt-3.1/docs/design_docs/approval_template
+   M /rt/branches/rt-3.1/docs/design_docs/cf_search
+   M /rt/branches/rt-3.1/docs/design_docs/cli_spec
+   M /rt/branches/rt-3.1/docs/design_docs/cvs_integration
+   M /rt/branches/rt-3.1/docs/design_docs/delegation
+   M /rt/branches/rt-3.1/docs/design_docs/evil_plans
+   M /rt/branches/rt-3.1/docs/design_docs/groups_notes
+   M /rt/branches/rt-3.1/docs/design_docs/link-definitions.txt
+   M /rt/branches/rt-3.1/docs/design_docs/recursive_group_membership_algorithm
+   M /rt/branches/rt-3.1/docs/design_docs/rql_parser_machine.graphviz
+   M /rt/branches/rt-3.1/docs/design_docs/string-extraction-guide.txt
+   M /rt/branches/rt-3.1/docs/design_docs/ticket_templates
+   M /rt/branches/rt-3.1/docs/design_docs/users
+   M /rt/branches/rt-3.1/docs/rt3-schema-relationships.dot
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/etc/RT_SiteConfig.pm
+   M /rt/branches/rt-3.1/etc/acl.Informix
+   M /rt/branches/rt-3.1/etc/acl.Oracle
+   M /rt/branches/rt-3.1/etc/constraints.mysql
+   M /rt/branches/rt-3.1/etc/drop.Informix
+   M /rt/branches/rt-3.1/etc/drop.Oracle
+   M /rt/branches/rt-3.1/etc/initialdata
+   M /rt/branches/rt-3.1/etc/rt.spec
+   M /rt/branches/rt-3.1/html/Admin/Elements/AddCustomFieldValue
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomField
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomFieldValues
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditCustomFields
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditQueueWatchers
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditScrips
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditTemplates
+   M /rt/branches/rt-3.1/html/Admin/Elements/ListGlobalCustomFields
+   M /rt/branches/rt-3.1/html/Admin/Elements/QueueRightsForUser
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectCustomFieldType
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectGroups
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectModifyGroup
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectNewGroupMembers
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectRights
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectScripAction
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectScripCondition
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectSingleOrMultiple
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectUsers
+   M /rt/branches/rt-3.1/html/Admin/Global/CustomField.html
+   M /rt/branches/rt-3.1/html/Admin/Global/CustomFields.html
+   M /rt/branches/rt-3.1/html/Admin/Global/Scrip.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/GroupRights.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/Members.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/Modify.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/UserRights.html
+   M /rt/branches/rt-3.1/html/Admin/Groups/index.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/CustomField.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/CustomFields.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/Scrip.html
+   M /rt/branches/rt-3.1/html/Approvals/Display.html
+   M /rt/branches/rt-3.1/html/Approvals/Elements/Approve
+   M /rt/branches/rt-3.1/html/Approvals/Elements/PendingMyApproval
+   M /rt/branches/rt-3.1/html/Approvals/Elements/ShowDependency
+   M /rt/branches/rt-3.1/html/Approvals/Elements/Tabs
+   M /rt/branches/rt-3.1/html/Approvals/index.html
+   M /rt/branches/rt-3.1/html/Elements/BevelBoxRaisedEnd
+   M /rt/branches/rt-3.1/html/Elements/BevelBoxRaisedStart
+   M /rt/branches/rt-3.1/html/Elements/CreateTicket
+   M /rt/branches/rt-3.1/html/Elements/GotoTicket
+   M /rt/branches/rt-3.1/html/Elements/Menu
+   M /rt/branches/rt-3.1/html/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Elements/MyTickets
+   M /rt/branches/rt-3.1/html/Elements/PageLayout
+   M /rt/branches/rt-3.1/html/Elements/Quicksearch
+   M /rt/branches/rt-3.1/html/Elements/Refresh
+   M /rt/branches/rt-3.1/html/Elements/SelectAttachmentField
+   M /rt/branches/rt-3.1/html/Elements/SelectCustomFieldOperator
+   M /rt/branches/rt-3.1/html/Elements/SelectCustomFieldValue
+   M /rt/branches/rt-3.1/html/Elements/SelectGroups
+   M /rt/branches/rt-3.1/html/Elements/SelectLinkType
+   M /rt/branches/rt-3.1/html/Elements/SelectResultsPerPage
+   M /rt/branches/rt-3.1/html/Elements/SelectSortOrder
+   M /rt/branches/rt-3.1/html/Elements/SelectTicketSortBy
+   M /rt/branches/rt-3.1/html/Elements/SelectTicketTypes
+   M /rt/branches/rt-3.1/html/Elements/ViewUser
+   M /rt/branches/rt-3.1/html/NoAuth/images/back_home.gif
+   M /rt/branches/rt-3.1/html/NoAuth/images/bplogo.gif
+   M /rt/branches/rt-3.1/html/NoAuth/images/favicon.png
+   M /rt/branches/rt-3.1/html/NoAuth/images/head_requestracker.gif
+   M /rt/branches/rt-3.1/html/NoAuth/images/rt.jpg
+   M /rt/branches/rt-3.1/html/NoAuth/images/space.gif
+   M /rt/branches/rt-3.1/html/NoAuth/images/spacer.gif
+   M /rt/branches/rt-3.1/html/NoAuth/images/squares_blue.gif
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/queue/default
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/queue/ns
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/ticket/attachments
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/ticket/links
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/user/default
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/user/ns
+   M /rt/branches/rt-3.1/html/REST/1.0/NoAuth/mail-gateway
+   M /rt/branches/rt-3.1/html/REST/1.0/logout
+   M /rt/branches/rt-3.1/html/REST/1.0/search/dhandler
+   M /rt/branches/rt-3.1/html/REST/1.0/ticket/comment
+   M /rt/branches/rt-3.1/html/REST/1.0/ticket/link
+   M /rt/branches/rt-3.1/html/REST/1.0/ticket/merge
+   M /rt/branches/rt-3.1/html/Search/Elements/TicketRow
+   M /rt/branches/rt-3.1/html/SelfService/Attachment/dhandler
+   M /rt/branches/rt-3.1/html/SelfService/Closed.html
+   M /rt/branches/rt-3.1/html/SelfService/Elements/Tabs
+   M /rt/branches/rt-3.1/html/SelfService/index.html
+   M /rt/branches/rt-3.1/html/Ticket/Display.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/BulkLinks
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditCustomField
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditCustomFields
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowCustomFields
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowMessageHeaders
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowRequestor
+   M /rt/branches/rt-3.1/html/User/Delegation.html
+   M /rt/branches/rt-3.1/html/User/Elements/DelegateRights
+   M /rt/branches/rt-3.1/html/User/Elements/GroupTabs
+   M /rt/branches/rt-3.1/html/User/Elements/Tabs
+   M /rt/branches/rt-3.1/html/User/Groups/Members.html
+   M /rt/branches/rt-3.1/html/User/Groups/Modify.html
+   M /rt/branches/rt-3.1/html/User/Groups/index.html
+   M /rt/branches/rt-3.1/html/index.html
+   M /rt/branches/rt-3.1/html/l
+   M /rt/branches/rt-3.1/install-sh
+   M /rt/branches/rt-3.1/lib/RT/ACE_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ACL_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/EscalatePriority.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/ResolveMembers.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/SetPriority.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/UserDefined.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachments_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMember.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMember_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMembers.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMembers_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/AnyTransaction.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/BeforeDue.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/Overdue.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/OwnerChange.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/PriorityExceeds.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/QueueChange.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/StatusChange.pm
+   M /rt/branches/rt-3.1/lib/RT/Condition/UserDefined.pm
+   M /rt/branches/rt-3.1/lib/RT/CurrentUser.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomField.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFieldValue.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFieldValues.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFieldValues_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFields.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFields_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Date.pm
+   M /rt/branches/rt-3.1/lib/RT/GroupMember_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/GroupMembers_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Group_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Groups_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Handle.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/cs.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/cs.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/de.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/en.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/es.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/he.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/i_default.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/it.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ja.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/nl.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/no.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/pt_br.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/ru.po
+   M /rt/branches/rt-3.1/lib/RT/Interface/CLI.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/REST.pm
+   M /rt/branches/rt-3.1/lib/RT/Link.pm
+   M /rt/branches/rt-3.1/lib/RT/Link_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Links.pm
+   M /rt/branches/rt-3.1/lib/RT/Links_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Principal.pm
+   M /rt/branches/rt-3.1/lib/RT/Principals.pm
+   M /rt/branches/rt-3.1/lib/RT/Principals_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Queues_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripAction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripActions_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripCondition_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripConditions_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrip_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Search/ActiveTicketsInQueue.pm
+   M /rt/branches/rt-3.1/lib/RT/Search/Generic.pm
+   M /rt/branches/rt-3.1/lib/RT/System.pm
+   M /rt/branches/rt-3.1/lib/RT/Templates_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValue.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValues.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValues_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/URI/base.pm
+   M /rt/branches/rt-3.1/lib/RT/URI/fsck_com_rt.pm
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT.pm.in
+   M /rt/branches/rt-3.1/lib/t/00smoke.t.in
+   M /rt/branches/rt-3.1/lib/t/01harness.t.in
+   M /rt/branches/rt-3.1/lib/t/02regression.t.in
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/dir
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg1
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg2
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg3
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg4
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg5
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg6
+   M /rt/branches/rt-3.1/lib/t/data/8859-15-message-series/msg7
+   M /rt/branches/rt-3.1/lib/t/data/multipart-alternative-with-umlaut
+   M /rt/branches/rt-3.1/lib/t/data/multipart-report
+   M /rt/branches/rt-3.1/lib/t/data/nested-mime-sample
+   M /rt/branches/rt-3.1/lib/t/data/nested-rfc-822
+   M /rt/branches/rt-3.1/lib/t/data/new-ticket-from-iso-8859-1
+   M /rt/branches/rt-3.1/lib/t/data/new-ticket-from-iso-8859-1-full
+   M /rt/branches/rt-3.1/lib/t/data/russian-subject-no-content-type
+   M /rt/branches/rt-3.1/lib/t/data/text-html-in-russian
+   M /rt/branches/rt-3.1/lib/t/data/text-html-with-umlaut
+   M /rt/branches/rt-3.1/lib/t/regression/00placeholder
+   M /rt/branches/rt-3.1/lib/t/regression/mime_tests
+   M /rt/branches/rt-3.1/m4/rt_enable_layout.m4
+   M /rt/branches/rt-3.1/m4/rt_expand_var.m4
+   M /rt/branches/rt-3.1/m4/rt_layout.m4
+   M /rt/branches/rt-3.1/m4/rt_subst_expanded_arg.m4
+   M /rt/branches/rt-3.1/sbin/extract-message-catalog
+   M /rt/branches/rt-3.1/sbin/extract_pod_tests
+   M /rt/branches/rt-3.1/sbin/factory
+   M /rt/branches/rt-3.1/sbin/regression_harness
+   M /rt/branches/rt-3.1/sbin/rt-setup-database.in
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
+
+ ----------------------------------------------------------------------
+ r2186@tinbook:  jesse | 2004-04-27T00:02:13.799636Z
+ 
+ Merging forward bugfixes from RT 3.0
+ ----------------------------------------------------------------------
+ 
+------------------------------------------------------------------------
+r748 | jesse | 2004-04-26 17:18:35 -0400 (Mon, 26 Apr 2004) | 1 line
+Changed paths:
+   M /rt/branches/rt-3.1/html/index.html
+
+Fixed the "error message page" on misconfigured webserver
 ------------------------------------------------------------------------
-r1933 | jesse | 2004-11-22 14:44:43 -0500 (Mon, 22 Nov 2004) | 11 lines
+r746 | autrijus | 2004-04-26 15:11:33 -0400 (Mon, 26 Apr 2004) | 7 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Attachment_Overlay.pm
+   M /rt
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.3/lib/RT/User_Overlay.pm
 
- r9335@tinbook:  jesse | 2004-11-22T19:44:48.685300Z
-  r9328@tinbook:  jesse | 2004-11-22T19:23:06.663299Z
-  RT-Ticket: 6187
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Refactored RT's core attachment processing logic to be a bit less baroque and to use new convenience methods. ths should prevent some mail header display strangeness folks were seeing.
-  
-  
+ ----------------------------------------------------------------------
+ r4176@not:  autrijus | 2004-04-26T19:09:53.594445Z
  
+ * switch password format from base64 to hex; maintaining legacy
+   compatibility by upgrading passwords in-place upon successful auth
+ ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1932 | jesse | 2004-11-22 14:44:28 -0500 (Mon, 22 Nov 2004) | 12 lines
+r740 | leira | 2004-04-26 14:40:07 -0400 (Mon, 26 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Admin/Users/Modify.html
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
 
- r9334@tinbook:  jesse | 2004-11-22T19:44:47.878500Z
-  r9324@tinbook:  jesse | 2004-11-22T18:44:30.383331Z
-  RT-Ticket: 6272
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  When updating comments and signature in the Administrative UI, RT won't introduce
-  extra newlines anymore. (Todd Chapman)
-  
-  
- 
+Don't try to parse an uploaded file if there's no file to parse.
 
 ------------------------------------------------------------------------
-r1931 | jesse | 2004-11-22 14:44:10 -0500 (Mon, 22 Nov 2004) | 12 lines
+r739 | leira | 2004-04-26 13:58:11 -0400 (Mon, 26 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransactionAttachments
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r9333@tinbook:  jesse | 2004-11-22T19:44:47.283026Z
-  r9322@tinbook:  jesse | 2004-11-22T18:41:02.001214Z
-  RT-Ticket: 6276
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Now honor the RT::MaxInlineBody configuration variable. Also, the Content-Disposition header.
-  We no longer display long attachments inline if they were marked as attachments.
-  
-  
- 
+Use better variable names.
 
 ------------------------------------------------------------------------
-r1930 | jesse | 2004-11-22 14:43:53 -0500 (Mon, 22 Nov 2004) | 12 lines
+r738 | leira | 2004-04-26 13:53:13 -0400 (Mon, 26 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowAttachments
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r9332@tinbook:  jesse | 2004-11-22T19:44:46.719948Z
-  r9320@tinbook:  jesse | 2004-11-22T18:13:24.717525Z
-  RT-Ticket: 6264
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Fix the "ShowAttachments" component to deal gracefully, even if called without a 
-  precached set of attachments.  From Rolf Grossmann.
-  
-  
- 
+Fix problems with the conversion to "Parents/Children" terminology.
 
 ------------------------------------------------------------------------
-r1929 | jesse | 2004-11-22 14:43:42 -0500 (Mon, 22 Nov 2004) | 11 lines
+r731 | jesse | 2004-04-23 02:06:14 -0400 (Fri, 23 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/index.html
 
- r9331@tinbook:  jesse | 2004-11-22T19:44:46.166158Z
-  r9316@tinbook:  jesse | 2004-11-22T17:59:32.163278Z
-  RT-Ticket: 6270
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Localized the "Status" field in the selfservice UI
-  
-  
- 
+Provide an error message when users fail to configure their webserver
 
 ------------------------------------------------------------------------
-r1928 | jesse | 2004-11-22 14:43:35 -0500 (Mon, 22 Nov 2004) | 11 lines
+r727 | jesse | 2004-04-22 01:29:34 -0400 (Thu, 22 Apr 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
+   M /rt/branches/rt-3.1/lib/RT/Template_Overlay.pm
 
- r9330@tinbook:  jesse | 2004-11-22T19:44:45.488990Z
-  r9272@tinbook:  jesse | 2004-11-16T16:29:54.673250Z
-  RT-Ticket: 6239
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Applied patch from Rudolph Pereira to allow email plugins to change ticket ID
+  ----------------------------------------------------------------------
+  r2126@tinbook:  jesse | 2004-04-22T05:29:11.407088Z
   
+  RT is now better about cleaning up tempfiles it creates
+  ----------------------------------------------------------------------
   
- 
-
 ------------------------------------------------------------------------
-r1926 | jesse | 2004-11-22 13:52:27 -0500 (Mon, 22 Nov 2004) | 18 lines
+r725 | leira | 2004-04-21 18:52:44 -0400 (Wed, 21 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+   M /rt/branches/rt-3.1/releng.cnf
 
- r9326@tinbook:  jesse | 2004-11-22T18:53:57.082454Z
- RT-Ticket: 6125
- RT-Status: resolved
- RT-Update: correspond
- 
- SpamAssasin mail plugin overhauled (Petter Reinholdtsen)
- 
- 	The current code wipe out the CurrentUser variable, and must be called
- 	first in the chain of plugins.  There is no good reason why it need to
- 	do this, so I propose to change it to keep the CurrentUser value.
- 	
- 	Here is a patch to change the argument handling, to pass
- 	$args{'Message'} to spamassasin, instead of the strange $item value.
- 	The patch also make sure CurrentUser and AuthLevel is passed through
- 	when no change is wanted.
- 
- 
+increase the release number
 
 ------------------------------------------------------------------------
-r1922 | jesse | 2004-11-22 13:05:08 -0500 (Mon, 22 Nov 2004) | 9 lines
+r724 | leira | 2004-04-21 18:52:09 -0400 (Wed, 21 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/docs/rt3-schema-relationships.dot
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
 
- r9318@tinbook:  jesse | 2004-11-22T18:06:38.935955Z
- RT-Ticket: 6269
- RT-Status: resolved
- RT-Update: correspond
- 
- RT3 schema diagram updated. (Todd Chapman)
- 
- 
+Add support for uploading template files.
 
 ------------------------------------------------------------------------
-r1920 | autrijus | 2004-11-22 08:19:30 -0500 (Mon, 22 Nov 2004) | 4 lines
+r723 | leira | 2004-04-21 18:51:37 -0400 (Wed, 21 Apr 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r5939@not:  autrijus | 2004-11-22T13:20:38.205298Z
- * the "Magic" on modify broke Image/Binary custom fields.
- 
+Support parsing of comma or tab-separated single-line templates.
 
-------------------------------------------------------------------------
-r1919 | jesse | 2004-11-22 02:25:42 -0500 (Mon, 22 Nov 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm
-
- r9313@tinbook:  jesse | 2004-11-22T07:26:55.423227Z
- Comments about redundant code
-
-------------------------------------------------------------------------
-r1918 | jesse | 2004-11-21 20:26:56 -0500 (Sun, 21 Nov 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
-
- r9310@tinbook:  jesse | 2004-11-22T01:26:40.004042Z
- fixes for the perl module downloading bit
+Added tests for this.
 
 ------------------------------------------------------------------------
-r1916 | jesse | 2004-11-18 11:00:17 -0500 (Thu, 18 Nov 2004) | 8 lines
+r722 | autrijus | 2004-04-21 18:32:19 -0400 (Wed, 21 Apr 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Search/Bulk.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomFields
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyAll.html
+   M /rt
+   M /rt/branches/rt-3.1/lib/RT/SearchBuilder.pm
+   M /rt/branches/rt-3.3/lib/RT/SearchBuilder.pm
 
- r9296@tinbook:  jesse | 2004-11-18T15:59:55.061638Z
- 
+ r4037@not:  autrijus | 2004-04-21T22:30:37.269510Z
  
- Ported Custom Field editing fixes from 3.2. Added a deprecated warning to a deprecated API.
- Cleaned up a tiny bit of formatting
+ * It turns out that for EMPTY => 1 to work, IS NULL needs to be OR'ed
+   to the other columns as well...
  
+ ----------------------------------------------------------------------
+ r4038@not:  autrijus | 2004-04-21T22:31:56.271421Z
  
+ * merge previous commit from 3.3 to 3.1.
 
 ------------------------------------------------------------------------
-r1915 | jesse | 2004-11-18 11:00:04 -0500 (Thu, 18 Nov 2004) | 1 line
+r720 | autrijus | 2004-04-21 15:02:49 -0400 (Wed, 21 Apr 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-
+   M /rt
+   M /rt/branches/rt-3.1/lib/RT/SearchBuilder.pm
 
-------------------------------------------------------------------------
-r1914 | jesse | 2004-11-18 10:59:05 -0500 (Thu, 18 Nov 2004) | 14 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/UPGRADING
-   M /rt/branches/3.3-TESTING/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
+ r4029@not:  autrijus | 2004-04-21T19:02:16.687603Z
 
- r9280@tinbook:  jesse | 2004-11-17T18:34:51.857756Z
- A bunch of CustomField related improvements. Autrijus is working on the new test suite. Coming "tomorrow"
- 
- 
- UPGRADING FROM 3.3.11 and earlier - Changes:
- 
- = Rights Changes =
- 
- Custom Fields now have an additional right "ModifyObjectCustomFieldValues". 
- This right governs whether a user can modify an object's custom field values
- for a particular custom field. This includes adding, deleting and changing values.
- 
- 
+ * cherry-pick merge previous commit from 3.3 to 3.1.
 
 ------------------------------------------------------------------------
-r1913 | autrijus | 2004-11-17 23:39:01 -0500 (Wed, 17 Nov 2004) | 4 lines
+r718 | jesse | 2004-04-21 01:27:08 -0400 (Wed, 21 Apr 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomField
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
 
- r5691@not:  autrijus | 2004-11-18T04:40:20.966758Z
- * Remove the unused and misleading chunks in EditCustomField.
+ ----------------------------------------------------------------------
+ r2118@tinbook:  jesse | 2004-04-21T05:26:40.003063Z
  
-
-------------------------------------------------------------------------
-r1912 | autrijus | 2004-11-17 06:29:10 -0500 (Wed, 17 Nov 2004) | 1 line
-Changed paths:
-   M /rt/branches/3.3-TESTING
-
-
-------------------------------------------------------------------------
-r1911 | autrijus | 2004-11-17 06:28:47 -0500 (Wed, 17 Nov 2004) | 7 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/autohandler
-
- r4462@not:  autrijus | 2004-11-17T11:21:48.719799Z
- * under MasonX::Apache2Handler, empty arguments sometimes got
-   passed in as unicode strings, so Encode::decode('utf8')
-   fails miserably.  We now explicitly check is_utf8() before
-   applying a decode; this is a better style anyway.
+ Fixing a regression - Don't show the text of all outgoing mail RT sends inline in ticket history
+ ----------------------------------------------------------------------
  
-
 ------------------------------------------------------------------------
-r1908 | jesse | 2004-11-16 07:32:40 -0500 (Tue, 16 Nov 2004) | 3 lines
+r716 | leira | 2004-04-21 01:21:32 -0400 (Wed, 21 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-
-Time::HiRes was improperly capitalized
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
 
+Keep persistent search data.
 
 ------------------------------------------------------------------------
-r1907 | jesse | 2004-11-15 16:19:49 -0500 (Mon, 15 Nov 2004) | 3 lines
+r715 | leira | 2004-04-21 01:16:53 -0400 (Wed, 21 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/html/Elements/Footer
-   M /rt/branches/3.3-TESTING/html/NoAuth/webrt.css
-   M /rt/branches/3.3-TESTING/html/autohandler
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
- r9270@tinbook:  jesse | 2004-11-15T21:17:01.591994Z
- Moved render time display out of an "if developer" block into a main-page div. Set up css to display it small and very de-emphasized
+Only try to load the Owner if one was specified.
 
 ------------------------------------------------------------------------
-r1906 | jesse | 2004-11-15 15:55:48 -0500 (Mon, 15 Nov 2004) | 5 lines
+r713 | jesse | 2004-04-20 23:29:39 -0400 (Tue, 20 Apr 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomField
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
- r9268@tinbook:  jesse | 2004-11-15T20:51:06.505734Z
- Disabled replaced Current a bit back
+ ----------------------------------------------------------------------
+ r2110@tinbook:  jesse | 2004-04-21T03:26:54.764726Z
  
+ Fixing a regression caused by the new logging of nonfatal ticket creation errors.
+ ----------------------------------------------------------------------
  
-
 ------------------------------------------------------------------------
-r1905 | jesse | 2004-11-15 15:45:02 -0500 (Mon, 15 Nov 2004) | 5 lines
+r696 | jesse | 2004-04-17 01:16:30 -0400 (Sat, 17 Apr 2004) | 12 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/html/Elements/ScrubHTML
+   M /rt/branches/rt-3.1/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
+   A /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransactionAttachments
 
- r9266@tinbook:  jesse | 2004-11-15T20:24:28.381430Z
- Previous merge forward clobbered 3.3 branch changes.
+ ----------------------------------------------------------------------
+ r1207@tinbook:  jesse | 2004-04-17T05:06:00.759861Z
  
+ Adding list tags to tags we don't scrub
+ ----------------------------------------------------------------------
+ r1208@tinbook:  jesse | 2004-04-17T05:11:59.291033Z
+ 
+ Rewrote ticket transaction display to show scrubbed html attachments and images
+ inline.
+ 
+ ----------------------------------------------------------------------
  
-
 ------------------------------------------------------------------------
-r1903 | jesse | 2004-11-15 13:58:26 -0500 (Mon, 15 Nov 2004) | 3 lines
+r694 | leira | 2004-04-15 00:56:36 -0400 (Thu, 15 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/cs.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/da.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/de.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/en.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/en_malkovich.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/es.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/fi.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/fr.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/he.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/hu.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/it.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/ja.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/nl.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/no.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/pt_br.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/ru.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/zh_tw.po
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r9260@tinbook:  jesse | 2004-11-15T18:58:48.392208Z
- Reran string extraction for loc
+Fix Query Builder menu highlighting.
 
 ------------------------------------------------------------------------
-r1902 | jesse | 2004-11-15 13:57:52 -0500 (Mon, 15 Nov 2004) | 3 lines
+r693 | leira | 2004-04-15 00:28:10 -0400 (Thu, 15 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/configure.ac
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
- r9259@tinbook:  jesse | 2004-11-15T17:21:40.789848Z
- Added the database dump tool to the list of executable things
+Pass back more verbose errors for offline ticket creation.
 
 ------------------------------------------------------------------------
-r1901 | jesse | 2004-11-15 12:13:51 -0500 (Mon, 15 Nov 2004) | 3 lines
+r692 | leira | 2004-04-14 23:55:46 -0400 (Wed, 14 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/lib/RT/I18N.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Elements/BuildFormatString
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
- r9257@tinbook:  jesse | 2004-11-15T17:13:44.237481Z
- Merging forward from RT 3.2 bugfixes
+Use Parents/Children instead of MemberOf/Members
 
 ------------------------------------------------------------------------
-r1898 | autrijus | 2004-11-15 04:43:23 -0500 (Mon, 15 Nov 2004) | 4 lines
+r691 | jesse | 2004-04-14 23:13:42 -0400 (Wed, 14 Apr 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/sbin/rt-dump-database.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Elements/TicketList
 
- r4175@not:  autrijus | 2004-11-15T09:44:43.225379Z
- * The XML-based dump format now finally round trips.
+ ----------------------------------------------------------------------
+ r1197@tinbook:  jesse | 2004-04-15T03:13:29.757548Z
  
-
-------------------------------------------------------------------------
-r1897 | autrijus | 2004-11-15 02:24:35 -0500 (Mon, 15 Nov 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/sbin/rt-dump-database.in
-
- r4166@not:  autrijus | 2004-11-15T07:25:55.961743Z
- * make "sbin/rt-dump-database 0" actually work.
+ Added a missing "'"
+ ----------------------------------------------------------------------
  
-
 ------------------------------------------------------------------------
-r1896 | autrijus | 2004-11-15 01:30:04 -0500 (Mon, 15 Nov 2004) | 4 lines
+r690 | jesse | 2004-04-14 22:55:16 -0400 (Wed, 14 Apr 2004) | 8 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/sbin/rt-dump-database.in
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   A /rt/branches/rt-3.1/html/Elements/QueryString
+   A /rt/branches/rt-3.1/html/Elements/ScrubHTML
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Edit.html
+   D /rt/branches/rt-3.1/html/Search/Elements/PickRestriction
+   D /rt/branches/rt-3.1/html/Search/Elements/TicketHeader
+   D /rt/branches/rt-3.1/html/Search/Elements/TicketHeaderCell
+   D /rt/branches/rt-3.1/html/Search/Listing.html
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- r4158@not:  autrijus | 2004-11-15T06:31:13.491985Z
- * Switch the rt-dump-database format from YAML to XML::Simple.
+ ----------------------------------------------------------------------
+ r1193@tinbook:  jesse | 2004-04-15T02:54:02.210797Z
  
-
-------------------------------------------------------------------------
-r1894 | autrijus | 2004-11-14 12:11:20 -0500 (Sun, 14 Nov 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/sbin/factory
-
- r4106@not:  autrijus | 2004-11-14T17:12:19.553522Z
- * Make sbin/factory safe from strict and warnings.
+ Some refactoring of how RT builds Search query URLs (now we escape things correctly)
+ Also, we now scrub the HTML from ticket listing formats to prevent XSS attacks
  
-
-------------------------------------------------------------------------
-r1893 | autrijus | 2004-11-14 09:23:53 -0500 (Sun, 14 Nov 2004) | 5 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-
- r4099@not:  autrijus | 2004-11-14T14:25:10.934431Z
- * It turns out that Apache::Log needs to be explicitly loaded
-   for MasonX::Apache2Handler to run.
+ ----------------------------------------------------------------------
  
-
 ------------------------------------------------------------------------
-r1892 | autrijus | 2004-11-14 01:02:18 -0500 (Sun, 14 Nov 2004) | 1 line
+r689 | leira | 2004-04-14 17:32:23 -0400 (Wed, 14 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
+   M /rt/branches/rt-3.1/html/Search/Elements/BuildFormatString
 
+Remove debugging statement.
 
 ------------------------------------------------------------------------
-r1891 | autrijus | 2004-11-14 01:01:46 -0500 (Sun, 14 Nov 2004) | 5 lines
+r688 | leira | 2004-04-14 17:31:47 -0400 (Wed, 14 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
+   M /rt/branches/rt-3.1/html/Search/Elements/BuildFormatString
+   M /rt/branches/rt-3.1/html/Search/Elements/EditFormat
 
- r4056@not:  autrijus | 2004-11-14T05:55:16.343169Z
- * The chown() syntax in Handler.pm was broken.
- * Also removed an unneccessary capturing parenthesis.
- 
+"Available Columns" is now multi-select.
 
 ------------------------------------------------------------------------
-r1890 | autrijus | 2004-11-14 01:01:21 -0500 (Sun, 14 Nov 2004) | 5 lines
+r687 | jesse | 2004-04-14 17:18:26 -0400 (Wed, 14 Apr 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectNewGroupMembers
+   M /rt/branches/rt-3.1/lib/RT/Users_Overlay.pm
 
- r4055@not:  autrijus | 2004-11-14T05:54:37.364789Z
- * Under static_source, we need to purge the component cache
-   each time we restart, so newer components may be reloaded.
+ ----------------------------------------------------------------------
+ r1152@tinbook:  jesse | 2004-04-07T15:34:08.391795Z
  
-
-------------------------------------------------------------------------
-r1889 | autrijus | 2004-11-14 01:00:58 -0500 (Sun, 14 Nov 2004) | 5 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-
- r3828@not:  autrijus | 2004-11-11T04:38:07.819422Z
- * Do not waste stat() calls on Callback elements.
- * If $RT::DevelMode is not set, do not refresh Callbacks cache at all.
+ fsck.com #5436: Adding new group members could be pathalogically slow due to a bogus query
  
-
 ------------------------------------------------------------------------
-r1888 | autrijus | 2004-11-14 01:00:32 -0500 (Sun, 14 Nov 2004) | 4 lines
+r684 | leira | 2004-04-14 03:38:15 -0400 (Wed, 14 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
+   M /rt/branches/rt-3.1/html/Search/Elements/DisplayOptions
 
- r3827@not:  autrijus | 2004-11-11T02:06:28.593023Z
- * only exclude normal files, not directories.
- 
+Use a dropdown for RowsPerPage rather than an input field.
 
 ------------------------------------------------------------------------
-r1887 | autrijus | 2004-11-14 01:00:09 -0500 (Sun, 14 Nov 2004) | 5 lines
+r683 | leira | 2004-04-14 03:37:27 -0400 (Wed, 14 Apr 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin
-   M /rt/branches/3.3-TESTING/etc
-   M /rt/branches/3.3-TESTING/lib
-   M /rt/branches/3.3-TESTING/lib/t
-   M /rt/branches/3.3-TESTING/sbin
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r3826@not:  autrijus | 2004-11-11T02:05:00.289897Z
- * set svn:ignore on directories to exclude generated files from
-   version control.
- 
+- Add And/Or Toggle button
+- Indent top-level items by default
 
 ------------------------------------------------------------------------
-r1884 | jesse | 2004-11-13 18:01:01 -0500 (Sat, 13 Nov 2004) | 1 line
+r681 | jesse | 2004-04-07 00:31:24 -0400 (Wed, 07 Apr 2004) | 11 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/releng.cnf
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Elements/EditSearches
 
-Bumping to 3.3.11
-------------------------------------------------------------------------
-r1882 | jesse | 2004-11-13 00:12:51 -0500 (Sat, 13 Nov 2004) | 10 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
-   D /rt/branches/3.3-TESTING/html/NoAuth/images/back_home.gif
-   D /rt/branches/3.3-TESTING/html/NoAuth/images/head_requestracker.gif
-   D /rt/branches/3.3-TESTING/html/NoAuth/images/rt.jpg
-   D /rt/branches/3.3-TESTING/html/NoAuth/images/spacer.gif
-   D /rt/branches/3.3-TESTING/html/NoAuth/images/squares_blue.gif
-   M /rt/branches/3.3-TESTING/lib/t/06mailgateway.pl.in
-
- r9222@tinbook:  jesse | 2004-11-13T03:09:38.303870Z
- Core:
- 
- * Removed images that weren't used anymore
- 
- Configuration:
- 
- * Fixed RTLogo configuration variable to actually display RT's logo.
+ ----------------------------------------------------------------------
+ r1149@tinbook:  jesse | 2004-04-07T03:22:40.938051Z
  
-
-------------------------------------------------------------------------
-r1881 | jesse | 2004-11-13 00:12:26 -0500 (Sat, 13 Nov 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/CustomFieldTabs
-
- r9221@tinbook:  jesse | 2004-11-13T02:43:58.587708Z
- No longer show the "Applies To" tab for user and group Custom Fields.
- 
-
-------------------------------------------------------------------------
-r1880 | jesse | 2004-11-13 00:11:58 -0500 (Sat, 13 Nov 2004) | 6 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-
- r9220@tinbook:  jesse | 2004-11-13T02:42:34.101313Z
- Those variables need to have the RT namespace.
+ Removed automatic button click on search name update
  
+ ----------------------------------------------------------------------
+ r1150@tinbook:  jesse | 2004-04-07T04:27:40.307929Z
  
+ Restored search paging functionality
+ ----------------------------------------------------------------------
  
-
 ------------------------------------------------------------------------
-r1879 | jesse | 2004-11-13 00:11:31 -0500 (Sat, 13 Nov 2004) | 4 lines
+r680 | jesse | 2004-04-06 23:18:18 -0400 (Tue, 06 Apr 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/html/Search/Results.html
 
- r9219@tinbook:  jesse | 2004-11-13T00:28:50.936425Z
- Made the automatic cache flushing configurable.
- 
-
-------------------------------------------------------------------------
-r1878 | jesse | 2004-11-13 00:11:00 -0500 (Sat, 13 Nov 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
+----------------------------------------------------------------------
+r1147@tinbook:  jesse | 2004-04-07T03:18:03.319827Z
 
- r9218@tinbook:  jesse | 2004-11-12T03:08:16.964082Z
- Refactored the column map to only initialize itself once, rather than every time it's called
- 
+Updating search results page
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1877 | autrijus | 2004-11-11 23:51:18 -0500 (Thu, 11 Nov 2004) | 5 lines
+r679 | jesse | 2004-04-06 22:53:21 -0400 (Tue, 06 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/Callback
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
 
- r3828@not:  autrijus | 2004-11-11T04:38:07.819422Z
- * Do not waste stat() calls on Callback elements.
- * If $RT::DevelMode is not set, do not refresh Callbacks cache at all.
- 
+Fixing links to ShowEmailRecord to not be relative
 
 ------------------------------------------------------------------------
-r1876 | autrijus | 2004-11-11 23:51:01 -0500 (Thu, 11 Nov 2004) | 4 lines
+r678 | jesse | 2004-04-06 22:50:30 -0400 (Tue, 06 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
+   M /rt/branches/rt-3.1/html/Ticket/ShowEmailRecord.html
 
- r3827@not:  autrijus | 2004-11-11T02:06:28.593023Z
- * only exclude normal files, not directories.
- 
+Fixing ShowEmailRecord's setting of ContentType
 
 ------------------------------------------------------------------------
-r1875 | autrijus | 2004-11-11 23:47:44 -0500 (Thu, 11 Nov 2004) | 5 lines
+r677 | jesse | 2004-04-06 22:44:18 -0400 (Tue, 06 Apr 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin
-   M /rt/branches/3.3-TESTING/etc
-   M /rt/branches/3.3-TESTING/lib
-   M /rt/branches/3.3-TESTING/lib/t
-   M /rt/branches/3.3-TESTING/sbin
-
- r3826@not:  autrijus | 2004-11-11T02:05:00.289897Z
- * set svn:ignore on directories to exclude generated files from
-   version control.
- 
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
 
-------------------------------------------------------------------------
-r1800 | autrijus | 2004-11-10 08:50:55 -0500 (Wed, 10 Nov 2004) | 5 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/lib/RT.pm.in
+loc_fuzzy is in RT::CurrentUser, not RT::Record
 
- r3590@not:  autrijus | 2004-11-10T13:52:05.548584Z
- * Flush cache at end of each request.
- * Defeat perlbug that mangles (caller(0))[1] wheneter $^P is set by Module::Refresh.
- 
 
 ------------------------------------------------------------------------
-r1796 | autrijus | 2004-11-10 08:15:51 -0500 (Wed, 10 Nov 2004) | 5 lines
+r676 | robert | 2004-04-06 22:41:02 -0400 (Tue, 06 Apr 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACL_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachments_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attribute_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attributes_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMember_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMembers_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Group_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Groups_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Link_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Links_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomField_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFields_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principals_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripAction_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripActions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripCondition_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripConditions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrips_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Template_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Templates_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transactions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Users_Overlay.pm
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
-
- r3588@not:  autrijus | 2004-11-10T13:16:02.416034Z
- * Module::Refresh is now enabled by default for all HTTPD handlers
-   when $RT::DevelMode is set to true.
- 
-
-------------------------------------------------------------------------
-r1789 | jesse | 2004-11-10 07:58:47 -0500 (Wed, 10 Nov 2004) | 12 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
-   M /rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm
-
- r9043@tinbook:  jesse | 2004-11-10T12:55:28.022711Z
-  r9040@tinbook:  jesse | 2004-11-10T12:52:28.271911Z
-  RT-Ticket: 4624
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Provide more control over how autogenerated mail gets sent out via RT.
-  
-  
-  
- 
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/html/autohandler
 
-------------------------------------------------------------------------
-r1788 | jesse | 2004-11-10 07:58:22 -0500 (Wed, 10 Nov 2004) | 5 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
+----------------------------------------------------------------------
+r370:  rspier | 2004-04-07T02:38:41.319440Z
 
- r9042@tinbook:  jesse | 2004-11-10T12:55:27.433932Z
-  r8971@tinbook:  jesse | 2004-11-10T02:24:26.255370Z
-  Fixed the MaxAttachmentSize variable name in comments. Thanks to Graham Dunn
- 
+ [fsck.com #5430] Make NoAuth configurable via config file 
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1786 | jesse | 2004-11-10 07:38:04 -0500 (Wed, 10 Nov 2004) | 3 lines
+r675 | jesse | 2004-04-06 22:13:23 -0400 (Tue, 06 Apr 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowRequestor
 
- r9037@tinbook:  jesse | 2004-11-10T12:38:52.925002Z
- * $ was missing on the DevelMode option
+----------------------------------------------------------------------
+r1129@tinbook:  jesse | 2004-04-07T02:12:47.859184Z
 
-------------------------------------------------------------------------
-r1779 | autrijus | 2004-11-10 05:09:04 -0500 (Wed, 10 Nov 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
-
- r3567@not:  autrijus | 2004-11-10T10:09:08.775089Z
- * Add Module::Refresh as a dependency.
- 
+We only want to show this box if the requestor is _NOT_ a privileged user
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1778 | autrijus | 2004-11-10 05:08:41 -0500 (Wed, 10 Nov 2004) | 4 lines
+r671 | jesse | 2004-04-05 22:43:02 -0400 (Mon, 05 Apr 2004) | 23 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
-
- r3566@not:  autrijus | 2004-11-10T10:08:56.876914Z
- * Under developer mode, do not let Mason cache object files on var/.
- 
-
-------------------------------------------------------------------------
-r1777 | autrijus | 2004-11-10 05:08:17 -0500 (Wed, 10 Nov 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/html/Elements/Callback
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/ParseFormat
-   M /rt/branches/3.3-TESTING/html/Elements/Header
-   M /rt/branches/3.3-TESTING/html/Elements/TicketList
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBoxStart
-   M /rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm
-   M /rt/branches/3.3-TESTING/lib/RT.pm.in
-
- r3565@not:  autrijus | 2004-11-10T10:08:34.482570Z
- * Various warning avoidance patches.
- 
-
-------------------------------------------------------------------------
-r1767 | jesse | 2004-11-09 21:01:21 -0500 (Tue, 09 Nov 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
-
- r8969@tinbook:  jesse | 2004-11-10T02:01:53.054185Z
- Fixing DeveloperlMode -> DevelMode.  Thanks to Reed Lowden for the catch.
- 
-
-------------------------------------------------------------------------
-r1766 | jesse | 2004-11-09 03:28:53 -0500 (Tue, 09 Nov 2004) | 8 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/Makefile.in
-   M /rt/branches/3.3-TESTING/README
-   M /rt/branches/3.3-TESTING/bin/mason_handler.fcgi.in
-   M /rt/branches/3.3-TESTING/bin/mason_handler.scgi.in
-   M /rt/branches/3.3-TESTING/bin/mason_handler.svc.in
-   M /rt/branches/3.3-TESTING/bin/rt-crontool.in
-   M /rt/branches/3.3-TESTING/bin/rt-mailgate.in
-   M /rt/branches/3.3-TESTING/bin/rt.in
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/Objects.html
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/AddCustomFieldValue
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/CreateUserCalled
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/CustomFieldTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFieldValues
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditQueueWatchers
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditScrip
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditScrips
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditTemplates
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditUserComments
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/GlobalCustomFieldTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/GroupTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/Header
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalScrips
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ModifyTemplate
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ObjectCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/PickCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/PickObjects
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/QueueRightsForUser
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/QueueTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectCustomFieldLookupType
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectCustomFieldType
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectGroups
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyGroup
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyQueue
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyUser
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectNewGroupMembers
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectScrip
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripAction
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripCondition
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectSingleOrMultiple
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectStage
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectTemplate
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectUsers
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SystemTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ToolTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/UserTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields/Groups.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields/Queue-Tickets.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields/Queue-Transactions.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields/Users.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Scrip.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Scrips.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Template.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Templates.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/CustomFields.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/History.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/Members.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/CustomField.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/CustomFields.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/People.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Scrip.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Scrips.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Template.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Templates.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Tools/Configuration.html
-   M /rt/branches/3.3-TESTING/html/Admin/Tools/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/CustomFields.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/History.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/Memberships.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/autohandler
-   M /rt/branches/3.3-TESTING/html/Admin/index.html
-   M /rt/branches/3.3-TESTING/html/Approvals/Display.html
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/Approve
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/PendingMyApproval
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/ShowDependency
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Approvals/index.html
-   M /rt/branches/3.3-TESTING/html/Download/CustomFieldValue/dhandler
-   M /rt/branches/3.3-TESTING/html/Download/Tabular/dhandler
-   M /rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedEnd
-   M /rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedStart
-   M /rt/branches/3.3-TESTING/html/Elements/Callback
-   M /rt/branches/3.3-TESTING/html/Elements/Checkbox
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Header
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/ParseFormat
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Row
-   M /rt/branches/3.3-TESTING/html/Elements/CreateTicket
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldBinary
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldFreeform
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldImage
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldSelect
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldText
-   M /rt/branches/3.3-TESTING/html/Elements/EditLinks
-   M /rt/branches/3.3-TESTING/html/Elements/Error
-   M /rt/branches/3.3-TESTING/html/Elements/Footer
-   M /rt/branches/3.3-TESTING/html/Elements/GotoTicket
-   M /rt/branches/3.3-TESTING/html/Elements/Header
-   M /rt/branches/3.3-TESTING/html/Elements/ListActions
-   M /rt/branches/3.3-TESTING/html/Elements/Login
-   M /rt/branches/3.3-TESTING/html/Elements/Menu
-   M /rt/branches/3.3-TESTING/html/Elements/MessageBox
-   M /rt/branches/3.3-TESTING/html/Elements/MyRequests
-   M /rt/branches/3.3-TESTING/html/Elements/MyTickets
-   M /rt/branches/3.3-TESTING/html/Elements/PageLayout
-   M /rt/branches/3.3-TESTING/html/Elements/QueryString
-   M /rt/branches/3.3-TESTING/html/Elements/QuickCreate
-   M /rt/branches/3.3-TESTING/html/Elements/Quicksearch
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
-   M /rt/branches/3.3-TESTING/html/Elements/Refresh
-   M /rt/branches/3.3-TESTING/html/Elements/ScrubHTML
-   M /rt/branches/3.3-TESTING/html/Elements/Section
-   M /rt/branches/3.3-TESTING/html/Elements/SelectAttachmentField
-   M /rt/branches/3.3-TESTING/html/Elements/SelectBoolean
-   M /rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldOperator
-   M /rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldValue
-   M /rt/branches/3.3-TESTING/html/Elements/SelectDate
-   M /rt/branches/3.3-TESTING/html/Elements/SelectDateRelation
-   M /rt/branches/3.3-TESTING/html/Elements/SelectDateType
-   M /rt/branches/3.3-TESTING/html/Elements/SelectEqualityOperator
-   M /rt/branches/3.3-TESTING/html/Elements/SelectGroups
-   M /rt/branches/3.3-TESTING/html/Elements/SelectLang
-   M /rt/branches/3.3-TESTING/html/Elements/SelectLinkType
-   M /rt/branches/3.3-TESTING/html/Elements/SelectMatch
-   M /rt/branches/3.3-TESTING/html/Elements/SelectNewTicketQueue
-   M /rt/branches/3.3-TESTING/html/Elements/SelectOwner
-   M /rt/branches/3.3-TESTING/html/Elements/SelectQueue
-   M /rt/branches/3.3-TESTING/html/Elements/SelectResultsPerPage
-   M /rt/branches/3.3-TESTING/html/Elements/SelectSortOrder
-   M /rt/branches/3.3-TESTING/html/Elements/SelectStatus
-   M /rt/branches/3.3-TESTING/html/Elements/SelectTicketSortBy
-   M /rt/branches/3.3-TESTING/html/Elements/SelectTicketTypes
-   M /rt/branches/3.3-TESTING/html/Elements/SelectUsers
-   M /rt/branches/3.3-TESTING/html/Elements/SelectWatcherType
-   M /rt/branches/3.3-TESTING/html/Elements/SetupSessionCookie
-   M /rt/branches/3.3-TESTING/html/Elements/ShowCustomFieldImage
-   M /rt/branches/3.3-TESTING/html/Elements/ShowCustomFields
-   M /rt/branches/3.3-TESTING/html/Elements/ShowLink
-   M /rt/branches/3.3-TESTING/html/Elements/ShowLinks
-   M /rt/branches/3.3-TESTING/html/Elements/ShowMemberships
-   M /rt/branches/3.3-TESTING/html/Elements/SimpleSearch
-   M /rt/branches/3.3-TESTING/html/Elements/Submit
-   M /rt/branches/3.3-TESTING/html/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Elements/TicketList
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBox
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBoxEnd
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBoxStart
-   M /rt/branches/3.3-TESTING/html/NoAuth/Logout.html
-   M /rt/branches/3.3-TESTING/html/NoAuth/Reminder.html
-   M /rt/branches/3.3-TESTING/html/NoAuth/webrt.css
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/default
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/ns
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/attachments
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/default
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/history
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/links
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/default
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/ns
-   M /rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway
-   M /rt/branches/3.3-TESTING/html/REST/1.0/autohandler
-   M /rt/branches/3.3-TESTING/html/REST/1.0/dhandler
-   M /rt/branches/3.3-TESTING/html/REST/1.0/logout
-   M /rt/branches/3.3-TESTING/html/REST/1.0/search/dhandler
-   M /rt/branches/3.3-TESTING/html/REST/1.0/search/ticket
-   M /rt/branches/3.3-TESTING/html/REST/1.0/ticket/comment
-   M /rt/branches/3.3-TESTING/html/REST/1.0/ticket/link
-   M /rt/branches/3.3-TESTING/html/REST/1.0/ticket/merge
-   M /rt/branches/3.3-TESTING/html/Search/Build.html
-   M /rt/branches/3.3-TESTING/html/Search/Bulk.html
-   M /rt/branches/3.3-TESTING/html/Search/Edit.html
-   M /rt/branches/3.3-TESTING/html/Search/Elements/BuildFormatString
-   M /rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditFormat
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditQuery
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditSearches
-   M /rt/branches/3.3-TESTING/html/Search/Elements/NewListActions
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickBasics
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SearchPrivacy
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectAndOr
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectGroup
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectLinks
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectPersonType
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchObject
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchesForObjects
-   M /rt/branches/3.3-TESTING/html/Search/Results.html
-   M /rt/branches/3.3-TESTING/html/Search/Results.rdf
-   M /rt/branches/3.3-TESTING/html/Search/Results.tsv
-   M /rt/branches/3.3-TESTING/html/SelfService/Attachment/dhandler
-   M /rt/branches/3.3-TESTING/html/SelfService/Closed.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Create.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Display.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/GotoTicket
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/Header
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/MyRequests
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/SelfService/Error.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Prefs.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Update.html
-   M /rt/branches/3.3-TESTING/html/SelfService/index.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Attachment/dhandler
-   M /rt/branches/3.3-TESTING/html/Ticket/Create.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Display.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/AddWatchers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/BulkLinks
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditBasics
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomFields
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditDates
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditPeople
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditWatchers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/FindAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/LoadTextAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/PreviewScrips
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowBasics
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowCustomFields
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDates
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDependencies
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowGroupMembers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowHistory
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMemberOf
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMembers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageHeaders
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageStanza
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowPeople
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowReferences
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowRequestor
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowSummary
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransaction
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransactionAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowUserEntry
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Ticket/History.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Modify.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyAll.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyDates.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyLinks.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyPeople.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ShowEmailRecord.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Update.html
-   M /rt/branches/3.3-TESTING/html/Tools/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Tools/MyDay.html
-   M /rt/branches/3.3-TESTING/html/Tools/Offline.html
-   M /rt/branches/3.3-TESTING/html/User/Delegation.html
-   M /rt/branches/3.3-TESTING/html/User/Elements/DelegateRights
-   M /rt/branches/3.3-TESTING/html/User/Elements/GroupTabs
-   M /rt/branches/3.3-TESTING/html/User/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/User/Groups/Members.html
-   M /rt/branches/3.3-TESTING/html/User/Groups/Modify.html
-   M /rt/branches/3.3-TESTING/html/User/Groups/index.html
-   M /rt/branches/3.3-TESTING/html/User/Prefs.html
-   M /rt/branches/3.3-TESTING/html/autohandler
-   M /rt/branches/3.3-TESTING/html/index.html
-   M /rt/branches/3.3-TESTING/html/l
-   M /rt/branches/3.3-TESTING/lib/RT/ACE.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACL_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/AutoOpen.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/Autoreply.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/EscalatePriority.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/Notify.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/NotifyAsComment.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/RecordComment.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/RecordCorrespondence.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/ResolveMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/SetPriority.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/UserDefined.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachment.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachments.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachments_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attribute.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attribute_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attributes.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attributes_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Base.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMember.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMember_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/AnyTransaction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/BeforeDue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/Overdue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/OwnerChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/PriorityChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/PriorityExceeds.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/QueueChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/StatusChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/UserDefined.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Date.pm
-   M /rt/branches/3.3-TESTING/lib/RT/EmailParser.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Group.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMember.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMembers_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Group_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Groups.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Groups_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Handle.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/cs.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/i_default.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/CLI.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/GnuPG.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/MailFrom.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email/Filter/SpamAssassin.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/REST.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Link.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Link_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Links.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Links_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomField.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomField_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFields.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFields_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principal.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principals.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principals_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripAction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripAction_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripActions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripActions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripCondition.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripCondition_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripConditions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripConditions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrips.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrips_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Search/ActiveTicketsInQueue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Search/FromSQL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Search/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/SearchBuilder.pm
-   M /rt/branches/3.3-TESTING/lib/RT/System.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Template.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Template_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Templates.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Templates_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transactions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transactions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/URI/base.pm
-   M /rt/branches/3.3-TESTING/lib/RT/URI/fsck_com_rt.pm
-   M /rt/branches/3.3-TESTING/lib/RT/URI.pm
-   M /rt/branches/3.3-TESTING/lib/RT/User.pm
-   M /rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Users.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Users_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT.pm.in
-   M /rt/branches/3.3-TESTING/lib/t/06mailgateway.pl.in
-   M /rt/branches/3.3-TESTING/sbin/extract-message-catalog
-   M /rt/branches/3.3-TESTING/sbin/extract_pod_tests
-   M /rt/branches/3.3-TESTING/sbin/factory
-   M /rt/branches/3.3-TESTING/sbin/license_tag
-   M /rt/branches/3.3-TESTING/sbin/regression_harness
-   M /rt/branches/3.3-TESTING/sbin/rt-dump-database.in
-   M /rt/branches/3.3-TESTING/sbin/rt-setup-database.in
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
-
- r8965@tinbook:  jesse | 2004-11-09T08:25:30.422838Z
- Updated license tagging and folding for license tagging
- 
- * No functionality changes
- 
- 
- 
-
-------------------------------------------------------------------------
-r1765 | jesse | 2004-11-09 02:55:47 -0500 (Tue, 09 Nov 2004) | 5 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
+   M /rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
 
- r8963@tinbook:  jesse | 2004-11-09T07:55:26.294077Z
- Just formatting changes. ran perltidy on HasRight.
+ ----------------------------------------------------------------------
+ r1224@debian:  jesse | 2004-04-04T07:42:26.326040Z
  
+ Removing the Project Managment prototype from RT 3.1
+ ----------------------------------------------------------------------
+ r1226@debian:  jesse | 2004-04-04T08:18:44.600308Z
  
-
-------------------------------------------------------------------------
-r1763 | jesse | 2004-11-09 00:46:40 -0500 (Tue, 09 Nov 2004) | 7 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
-
- r8959@tinbook:  jesse | 2004-11-09T05:47:13.371897Z
- Switched to using Cache::Simple::TimedExpiry for our ACL cache, rather 
- than our overly convoluted (and slower) ACL cache code in Prinicpal_Overlay.pm
+ fixed the scope to actually run 
+ ----------------------------------------------------------------------
+ r1227@debian:  jesse | 2004-04-04T08:19:14.490688Z
  
- SearchBuilder already depends on C::S::TE, so this isn't a new dep
+ Increasing apache restart timeouts
+ ----------------------------------------------------------------------
+ r1229@debian:  jesse | 2004-04-05T05:40:08.564866Z
  
-
-------------------------------------------------------------------------
-r1759 | jesse | 2004-11-08 23:58:09 -0500 (Mon, 08 Nov 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
-
- r8951@tinbook:  jesse | 2004-11-09T04:59:07.816904Z
- Fixed a comment about the static_source directive for mason. Thanks to matthewd
+ Announce a revision # in versions of rt checked out from svn
  
-
-------------------------------------------------------------------------
-r1758 | jesse | 2004-11-08 22:47:40 -0500 (Mon, 08 Nov 2004) | 16 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/configure.ac
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
-   M /rt/branches/3.3-TESTING/html/Elements/PageLayout
-   M /rt/branches/3.3-TESTING/html/Elements/TicketList
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBoxEnd
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowHistory
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
-
- r8942@tinbook:  jesse | 2004-11-08T17:22:08.032229Z
- Web:
-     * Switched back to manual buffer flushing, as this will
-       improve performance and help future-proof RT against a mason update
-     * Added several manual buffer flushing points to help with the user
-       experience during page display
-     * Switched to using mason's "static_source" directive, which stops mason
-       from trying to guess about which pages need to be reload from disk.
-       (Now you need to restart the webserver to see changes)
- Core:
-     * New  --with-developer-mode configuration flag. Right now, it just 
-       turns mason static_source off, but in the future, it will enable other
-       developer-only features.
+ ----------------------------------------------------------------------
+ r1235@debian:  jesse | 2004-04-06T11:42:03.605934Z
  
+ Adding access control checks on display of outgoing email messages
+ ----------------------------------------------------------------------
  
-
 ------------------------------------------------------------------------
-r1757 | jesse | 2004-11-08 22:47:13 -0500 (Mon, 08 Nov 2004) | 4 lines
+r669 | jesse | 2004-04-05 01:24:29 -0400 (Mon, 05 Apr 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Base.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Search/Results.tsv
 
- r8941@tinbook:  jesse | 2004-11-08T17:18:03.357715Z
- Added a bit of documentation to RT::Base; removed an unused line of code
- 
+----------------------------------------------------------------------
+r1082@tinbook:  jesse | 2004-04-05T05:23:41.170601Z
 
-------------------------------------------------------------------------
-r1753 | jesse | 2004-11-08 08:25:36 -0500 (Mon, 08 Nov 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-
- r8935@tinbook:  jesse | 2004-11-08T13:18:04.774918Z
- * Turning off the forking in standalone_httpd. It was never a win
+removing debugging output
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1752 | autrijus | 2004-11-08 07:53:51 -0500 (Mon, 08 Nov 2004) | 4 lines
+r668 | jesse | 2004-04-04 16:39:34 -0400 (Sun, 04 Apr 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/configure.ac
 
- r3280@not:  autrijus | 2004-11-08T12:13:28.529608Z
- * make kill -HUP work sanely.
+ ----------------------------------------------------------------------
+ r1229@debian:  jesse | 2004-04-05T05:40:08.564866Z
+ 
+ Announce a revision # in versions of rt checked out from svn
+ ----------------------------------------------------------------------
  
-
 ------------------------------------------------------------------------
-r1751 | autrijus | 2004-11-08 07:53:30 -0500 (Mon, 08 Nov 2004) | 1 line
+r667 | jesse | 2004-04-03 18:17:54 -0500 (Sat, 03 Apr 2004) | 10 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/html/Scope/Search.html
 
+----------------------------------------------------------------------
+r1226@debian:  jesse | 2004-04-04T08:18:44.600308Z
 
-------------------------------------------------------------------------
-r1750 | autrijus | 2004-11-08 07:53:00 -0500 (Mon, 08 Nov 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   D /rt/branches/3.3-TESTING/spec
+fixed the scope to actually run 
+----------------------------------------------------------------------
+r1227@debian:  jesse | 2004-04-04T08:19:14.490688Z
 
- r1748@not:  autrijus | 2004-11-08T08:29:17.162697Z
- * remove the now-empty spec/ directory.
- 
+Increasing apache restart timeouts
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1749 | autrijus | 2004-11-08 07:52:36 -0500 (Mon, 08 Nov 2004) | 4 lines
+r666 | jesse | 2004-04-03 17:42:34 -0500 (Sat, 03 Apr 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   A /rt/branches/3.3-TESTING/docs/design_docs/3.3-schema-redesign.txt
-   D /rt/branches/3.3-TESTING/spec/schema.txt
+   M /rt/branches/rt-3.1
+   D /rt/branches/rt-3.1/html/Projects
 
- r1747@not:  autrijus | 2004-11-08T08:28:53.206839Z
- * move the design spec from spec/ under the docs/design_docs/ space where it belongs.
- 
+----------------------------------------------------------------------
+r1224@debian:  jesse | 2004-04-04T07:42:26.326040Z
 
-------------------------------------------------------------------------
-r1748 | autrijus | 2004-11-08 07:52:03 -0500 (Mon, 08 Nov 2004) | 5 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/spec/schema.txt
-
- r1746@not:  autrijus | 2004-11-08T08:27:45.676219Z
- * V7 of redesign schema, incoporating many more comments and
-   the new, clkao-inspired fields.
- 
+Removing the Project Managment prototype from RT 3.1
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1744 | jesse | 2004-11-07 11:26:35 -0500 (Sun, 07 Nov 2004) | 8 lines
+r663 | jesse | 2004-04-02 16:22:00 -0500 (Fri, 02 Apr 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/configure.ac
-   M /rt/branches/3.3-TESTING/lib/t/02regression.t.in
-   A /rt/branches/3.3-TESTING/lib/t/08web_cf.pl.in
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
-
- r6237@tinbook:  jesse | 2004-11-07T16:27:42.200967Z
- New web-based testing for image custom field creation 
- (upload on create, display in search result listings)
- 
-         -Autrijus Tang
- 
- 
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   D /rt/branches/rt-3.1/lib/RT/Record_Overlay.pm
 
+Moving code from Record_Overlay to Record, where it should live
 ------------------------------------------------------------------------
-r1743 | jesse | 2004-11-07 10:10:03 -0500 (Sun, 07 Nov 2004) | 1 line
+r658 | leira | 2004-04-01 18:49:54 -0500 (Thu, 01 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.15
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.15/content
 
+Add data for upgrading new "on owner change" scrip.
 
 ------------------------------------------------------------------------
-r1742 | jesse | 2004-11-07 10:09:36 -0500 (Sun, 07 Nov 2004) | 5 lines
+r657 | leira | 2004-04-01 18:36:49 -0500 (Thu, 01 Apr 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Elements/BuildFormatString
+   M /rt/branches/rt-3.1/etc/initialdata
 
- r6225@tinbook:  jesse | 2004-11-07T14:44:15.591492Z
- Web
-     * Refactore BuildFormatString to simplify logic and improve reliability
- 
+New scrip: On Owner Change / Notify Owner / Template: Transaction
 
 ------------------------------------------------------------------------
-r1741 | jesse | 2004-11-07 10:09:14 -0500 (Sun, 07 Nov 2004) | 4 lines
+r649 | leira | 2004-03-31 14:33:44 -0500 (Wed, 31 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Header
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Row
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
-   M /rt/branches/3.3-TESTING/html/Elements/TicketList
-   M /rt/branches/3.3-TESTING/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r6201@tinbook:  jesse | 2004-11-07T05:35:22.316024Z
- Refactoring and restyling the Ticket List to present prettier tables with more human-readable names
- 
+Strip leading and trailing spaces from tags that aren't Content.
 
 ------------------------------------------------------------------------
-r1740 | jesse | 2004-11-07 10:08:50 -0500 (Sun, 07 Nov 2004) | 5 lines
+r646 | jesse | 2004-03-31 01:22:05 -0500 (Wed, 31 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectLinks
+   M /rt/branches/rt-3.1/releng.cnf
 
- r6200@tinbook:  jesse | 2004-11-07T05:32:56.068727Z
- Web: Fixed SelectLinks component to contain the right options and present the right human-readable names
- 
- 
+3.1.14
 
 ------------------------------------------------------------------------
-r1739 | jesse | 2004-11-07 10:08:29 -0500 (Sun, 07 Nov 2004) | 4 lines
+r644 | leira | 2004-03-31 00:28:17 -0500 (Wed, 31 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Elements/BuildFormatString
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditFormat
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowRequestor
+   M /rt/branches/rt-3.1/html/index.html
 
- r6199@tinbook:  jesse | 2004-11-07T05:30:58.330526Z
- Web UI: Refactored the logic which builds format strings to simplify code and present better human-readable names
- 
+New Callbacks, based on code from Masque.
 
 ------------------------------------------------------------------------
-r1738 | jesse | 2004-11-07 10:08:08 -0500 (Sun, 07 Nov 2004) | 3 lines
+r630 | jesse | 2004-03-28 07:18:18 -0500 (Sun, 28 Mar 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Header
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
-   M /rt/branches/3.3-TESTING/html/Elements/TicketList
-   M /rt/branches/3.3-TESTING/html/NoAuth/webrt.css
-   M /rt/branches/3.3-TESTING/html/Search/Results.html
-   M /rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
-
- r6198@tinbook:  jesse | 2004-11-07T04:18:22.934311Z
- Devel: Changed severity of calling Principal->HasRight without a Right
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/releng.cnf
 
+Bumping to 3.1.13 for release
 ------------------------------------------------------------------------
-r1737 | jesse | 2004-11-07 10:05:16 -0500 (Sun, 07 Nov 2004) | 4 lines
+r627 | jesse | 2004-03-27 23:04:08 -0500 (Sat, 27 Mar 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/Quicksearch
-
- r6197@tinbook:  jesse | 2004-11-07T03:38:25.380100Z
- Switching Quicksearch to use most standard CSS styles
- 
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/Makefile.in
+   A /rt/branches/rt-3.1/README.Oracle
+   M /rt/branches/rt-3.1/UPGRADING
+   M /rt/branches/rt-3.1/bin/mason_handler.fcgi.in
+   M /rt/branches/rt-3.1/bin/mason_handler.scgi.in
+   M /rt/branches/rt-3.1/bin/rt-crontool.in
+   M /rt/branches/rt-3.1/bin/rt-mailgate.in
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/config.layout
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/etc/schema.Informix
+   M /rt/branches/rt-3.1/etc/schema.Oracle
+   M /rt/branches/rt-3.1/etc/schema.SQLite
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditScrip
+   M /rt/branches/rt-3.1/html/Elements/Callback
+   M /rt/branches/rt-3.1/html/Elements/MessageBox
+   M /rt/branches/rt-3.1/html/Elements/SelectLang
+   M /rt/branches/rt-3.1/html/Elements/SelectMatch
+   M /rt/branches/rt-3.1/html/Elements/SelectWatcherType
+   M /rt/branches/rt-3.1/html/Elements/SetupSessionCookie
+   M /rt/branches/rt-3.1/html/Elements/SimpleSearch
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/ticket/default
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/ticket/history
+   M /rt/branches/rt-3.1/html/REST/1.0/autohandler
+   M /rt/branches/rt-3.1/html/REST/1.0/dhandler
+   M /rt/branches/rt-3.1/html/REST/1.0/search/ticket
+   M /rt/branches/rt-3.1/html/Search/Elements/PickRestriction
+   M /rt/branches/rt-3.1/html/SelfService/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Ticket/Attachment/dhandler
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowMessageStanza
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
+   M /rt/branches/rt-3.1/html/index.html
+   M /rt/branches/rt-3.1/lib/RT/Action/AutoOpen.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Base.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
+   M /rt/branches/rt-3.1/lib/RT/Group_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Handle.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/fi.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/fr.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/zh_cn.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/zh_tw.po
+   M /rt/branches/rt-3.1/lib/RT/I18N.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email/Auth/MailFrom.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Principal_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/StyleGuide.pod
+   M /rt/branches/rt-3.1/lib/RT/Template_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/URI.pm
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Users_Overlay.pm
+   M /rt/branches/rt-3.1/lib/t/03web.pl.in
+   M /rt/branches/rt-3.1/lib/t/04_send_email.pl.in
+   M /rt/branches/rt-3.1/sbin/license_tag
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
-------------------------------------------------------------------------
-r1736 | jesse | 2004-11-07 10:04:54 -0500 (Sun, 07 Nov 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
+----------------------------------------------------------------------
+r1191@tinbook:  jesse | 2004-03-28T04:02:36.130375Z
 
- r6196@tinbook:  jesse | 2004-11-07T03:37:32.303504Z
- Squash warnings when trying to check acls on nonexisten custom fields
- 
+Merging 3.0.10 forward to 3.1.
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1735 | jesse | 2004-11-07 10:04:23 -0500 (Sun, 07 Nov 2004) | 4 lines
+r626 | jesse | 2004-03-25 21:23:18 -0500 (Thu, 25 Mar 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-
- r6195@tinbook:  jesse | 2004-11-06T15:14:59.241373Z
- Better handling of Record deletion confirmation messages. (To go with new searchbuilder fixes)
- 
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/rt.in
 
+Removing a conflict generated by an incorrect commit
 ------------------------------------------------------------------------
-r1734 | autrijus | 2004-11-07 09:38:43 -0500 (Sun, 07 Nov 2004) | 6 lines
+r622 | jesse | 2004-03-25 10:33:23 -0500 (Thu, 25 Mar 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
-
-* In query builder, parse custom fields by name.
-* Generate all Link-type result cell callbacks from %LINKTYPEMAP.
-* Display custom field contents, separated by newlines.
-* For Image custom fields we also show a thumbnail.
-
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/releng.cnf
 
+Bumping to 3.1.12
 ------------------------------------------------------------------------
-r1731 | autrijus | 2004-11-07 09:32:12 -0500 (Sun, 07 Nov 2004) | 4 lines
+r621 | leira | 2004-03-25 10:21:44 -0500 (Thu, 25 Mar 2004) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/html/Search/Build.html
+   M /rt/branches/rt-3.1/lib/RT/Attachments_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Record_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/URI.pm
 
- r10263@not:  autrijus | 2004-11-07T14:15:05.153388Z
- * one loc fix.
- 
+Move AddLink/DeleteLink to the Record object.
+Support linking Queues.
 
 ------------------------------------------------------------------------
-r1730 | autrijus | 2004-11-07 09:30:22 -0500 (Sun, 07 Nov 2004) | 4 lines
+r620 | leira | 2004-03-25 10:20:13 -0500 (Thu, 25 Mar 2004) | 4 lines
 Changed paths:
-   M /rt
-   A /rt/branches/3.3-TESTING/html/Search/Elements/EditQuery
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditSearches
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickBasics
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectAndOr
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectPersonType
+   M /rt/branches/rt-3.1/html/Scope/Elements/ShowHistory
+   M /rt/branches/rt-3.1/html/Scope/Elements/ShowTransaction
+   M /rt/branches/rt-3.1/html/Ticket/Display.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/FindAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowHistory
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
 
- r10261@not:  autrijus | 2004-11-07T08:55:02.919657Z
- * loc and layout fixed.
- 
+ShowHeaders is now boolean.
 
-------------------------------------------------------------------------
-r1729 | autrijus | 2004-11-07 09:30:06 -0500 (Sun, 07 Nov 2004) | 6 lines
-Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/html/Search/Build.html
-
- r10260@not:  autrijus | 2004-11-07T08:54:20.330259Z
- * Query builder now acts on multiple clauses.
- * Close a potential XSS bug by escaping the clause naems.
- * Refactor the clause display component.
- 
+Allow Transactions, Attachments, etc. to take an optional  collection of tickets.
 
 ------------------------------------------------------------------------
-r1728 | autrijus | 2004-11-07 09:29:51 -0500 (Sun, 07 Nov 2004) | 5 lines
+r619 | leira | 2004-03-25 10:18:34 -0500 (Thu, 25 Mar 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Row
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
+   M /rt/branches/rt-3.1/html/Elements/EditLinks
 
- r10256@not:  autrijus | 2004-11-06T10:35:22.448152Z
- * Escape ColumnMap return values properly to prevent cross-site scripting
-   attack.  All HTML snippets are now returned as scalar references.
- 
+Make this component more flexible (new or modify).
 
 ------------------------------------------------------------------------
-r1727 | autrijus | 2004-11-07 09:28:27 -0500 (Sun, 07 Nov 2004) | 5 lines
+r618 | leira | 2004-03-25 10:17:28 -0500 (Thu, 25 Mar 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/Makefile.in
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectStage
 
- r10253@not:  autrijus | 2004-11-06T10:17:49.792085Z
- * "make initdb" now an alias of "make initialize-database".
- 
- 
+add a "disabled" stage
 
 ------------------------------------------------------------------------
-r1726 | autrijus | 2004-11-07 09:26:14 -0500 (Sun, 07 Nov 2004) | 5 lines
+r617 | leira | 2004-03-24 16:31:54 -0500 (Wed, 24 Mar 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/sbin/rt-setup-database.in
+   M /rt/branches/rt-3.1/lib/RT/Attachments_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
 
- r10252@not:  autrijus | 2004-11-06T10:17:41.433720Z
- * "make dropdb" on SQLite now works.
- 
- 
+Fixed a cut & paste error.
 
 ------------------------------------------------------------------------
-r1725 | autrijus | 2004-11-07 09:22:06 -0500 (Sun, 07 Nov 2004) | 5 lines
+r616 | leira | 2004-03-24 16:29:01 -0500 (Wed, 24 Mar 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFields.pm
-   M /rt/branches/3.3-TESTING/sbin/factory
+   M /rt/branches/rt-3.1/lib/RT/Attachments_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
 
- r10251@not:  autrijus | 2004-11-06T10:17:29.202899Z
- * fallouts from the OCFV schema change.
- 
- 
+Check Queue permissions, too.
 
 ------------------------------------------------------------------------
-r1724 | autrijus | 2004-11-07 09:17:03 -0500 (Sun, 07 Nov 2004) | 7 lines
+r615 | leira | 2004-03-24 16:22:30 -0500 (Wed, 24 Mar 2004) | 2 lines
 Changed paths:
-   M /rt
-   A /rt/branches/3.3-TESTING/etc/upgrade/3.3.11
-   A /rt/branches/3.3-TESTING/etc/upgrade/3.3.11/schema.Pg
-   A /rt/branches/3.3-TESTING/etc/upgrade/3.3.11/schema.mysql
+   M /rt/branches/rt-3.1/lib/RT/Attachments_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions_Overlay.pm
 
- r10242@not:  autrijus | 2004-11-06T06:59:58.274625Z
- * Schema changes for Pg, SQLite, mysql and Oracle.
- 
- r10243@not:  autrijus | 2004-11-06T07:00:15.865682Z
- * schema updater for Pg and mysql; Oracle comes later and SQLite is nontrivial.
- 
+Add a Next method that checks ACLs, so that we don't need to do it in the UI.
 
 ------------------------------------------------------------------------
-r1723 | autrijus | 2004-11-07 09:16:15 -0500 (Sun, 07 Nov 2004) | 4 lines
+r606 | jesse | 2004-03-19 11:52:58 -0500 (Fri, 19 Mar 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/etc/schema.Oracle
-   M /rt/branches/3.3-TESTING/etc/schema.Pg
-   M /rt/branches/3.3-TESTING/etc/schema.SQLite
-   M /rt/branches/3.3-TESTING/etc/schema.mysql
+   M /rt/branches/rt-3.1/releng.cnf
 
- r10242@not:  autrijus | 2004-11-06T06:59:58.274625Z
- * Schema changes for Pg, SQLite, mysql and Oracle.
- 
+Bumping to 3.0.11
 
 ------------------------------------------------------------------------
-r1721 | autrijus | 2004-11-05 06:43:18 -0500 (Fri, 05 Nov 2004) | 18 lines
+r605 | jesse | 2004-03-19 01:56:11 -0500 (Fri, 19 Mar 2004) | 5 lines
 Changed paths:
-   M /rt
-   M /rt/branches
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/html/Search/Bulk.html
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
 
-  r10186@not (orig r1718):  autrijus | 2004-11-05T08:56:10.440277Z
-  * Log::Dispatch wants ->warning, not ->warn.
- 
- r10196@not:  autrijus | 2004-11-05T11:41:58.476189Z
- * Fixes to standalone_httpd: 'protocol' was not defined, and query_string
-   may be undefined too.  (Supposedly fixed in HTTP::Server::Simple.)
- 
- r10197@not:  autrijus | 2004-11-05T11:42:20.621065Z
- * Remove outdated comment.
- 
- r10198@not:  autrijus | 2004-11-05T11:43:55.045510Z
- * Refactor getting-an-uploaded-file-into-cf into _UploadFile call
-   in Interface::Web; this unbreaks uploading a file cf on ticket creation.
- * The "CustomField-x" keys in $Ticket->Create now take hash references
-   that contain CFV fields, eg. LargeContent, ContentType, Value.
- 
+r1135@tinbook:  jesse | 2004-03-19T06:55:24.031783Z
 
+Factored out some attachment processing to ease future integration
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1718 | autrijus | 2004-11-05 03:56:10 -0500 (Fri, 05 Nov 2004) | 3 lines
+r604 | jesse | 2004-03-19 01:46:21 -0500 (Fri, 19 Mar 2004) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches
-   M /rt/branches/3.2-RELEASE
-   M /rt/branches/3.2-SYBASE-TESTING
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/PLATANO-EXPERIMENTAL-CSS
-   M /rt/branches/PLATANO-EXPERIMENTAL-CSS/etc/upgrade
-
-* Log::Dispatch wants ->warning, not ->warn.
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/lib/RT/Attribute_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CurrentUser.pm
 
+Fixes for running on postgres
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1716 | jesse | 2004-11-04 23:02:48 -0500 (Thu, 04 Nov 2004) | 5 lines
+r602 | leira | 2004-03-18 01:34:55 -0500 (Thu, 18 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/etc/acl.Pg
 
- r6175@tinbook:  jesse | 2004-11-05T02:17:24.427390Z
- Improved comments and folds in RT::Record
- 
- 
+Add Attributes table to the acl list for Postgres.
 
 ------------------------------------------------------------------------
-r1715 | jesse | 2004-11-04 23:02:27 -0500 (Thu, 04 Nov 2004) | 4 lines
+r601 | jesse | 2004-03-17 18:16:25 -0500 (Wed, 17 Mar 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-
- r6174@tinbook:  jesse | 2004-11-05T02:17:10.144816Z
- When uploading image custom fields, they're handled as file descriptors, rather than scalars. Our old logic assumed that any ref was an array. Now we check for array refs explicitly.
- 
+   M /rt/branches/rt-3.1/html/Search/Elements/SelectPersonType
 
+Allow searching for tickets based on user attributes other than 'EmailAddress'
 ------------------------------------------------------------------------
-r1714 | jesse | 2004-11-04 23:02:06 -0500 (Thu, 04 Nov 2004) | 4 lines
+r600 | leira | 2004-03-17 18:12:45 -0500 (Wed, 17 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r6173@tinbook:  jesse | 2004-11-05T02:14:56.442006Z
- Added a HUP handler for the standalone httpd (so you can kill -HUP it to reload)
- 
+We don't need to parse parts of the key, so don't pull it apart.
 
 ------------------------------------------------------------------------
-r1713 | jesse | 2004-11-04 23:01:23 -0500 (Thu, 04 Nov 2004) | 4 lines
+r598 | jesse | 2004-03-17 16:15:06 -0500 (Wed, 17 Mar 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/ShowCustomFields
-
- r6172@tinbook:  jesse | 2004-11-05T02:14:19.720658Z
- Improved list format for multiple custom field values
- 
+   M /rt/branches/rt-3.1/html/Elements/MessageBox
+   M /rt/branches/rt-3.1/html/Elements/SelectMatch
+   M /rt/branches/rt-3.1/html/Ticket/Create.html
+   M /rt/branches/rt-3.1/html/Ticket/Display.html
+   A /rt/branches/rt-3.1/html/Ticket/Elements/LoadTextAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowHistory
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/rt-3.1/html/Ticket/History.html
+   M /rt/branches/rt-3.1/html/User/Prefs.html
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
+   A /rt/branches/rt-3.1/lib/RT/I18N/da.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/fi.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/fr.po
+   A /rt/branches/rt-3.1/lib/RT/I18N/hu.po
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email/Auth/MailFrom.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
 
+Merging 3.0.10rc2 forward to 3.1.x
 ------------------------------------------------------------------------
-r1712 | jesse | 2004-11-04 23:00:28 -0500 (Thu, 04 Nov 2004) | 4 lines
+r595 | leira | 2004-03-17 01:10:21 -0500 (Wed, 17 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/CreateTicket
-   M /rt/branches/3.3-TESTING/html/Ticket/Create.html
+   M /rt/branches/rt-3.1/html/Admin/Queues/Modify.html
 
- r6171@tinbook:  jesse | 2004-11-05T02:14:02.424154Z
- More form Names to make testing easier
- 
+Include content properly when creating tickets from templates.
 
 ------------------------------------------------------------------------
-r1711 | jesse | 2004-11-04 22:59:53 -0500 (Thu, 04 Nov 2004) | 4 lines
+r594 | leira | 2004-03-17 01:07:22 -0500 (Wed, 17 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields
+   M /rt/branches/rt-3.1/html/Scope/Elements/ShowSummary
 
- r6170@tinbook:  jesse | 2004-11-04T08:33:12.626307Z
- Added a couple of form NAME elements, to ease testing
- 
+Links elements have moved to /Elements
 
 ------------------------------------------------------------------------
-r1710 | jesse | 2004-11-04 22:59:24 -0500 (Thu, 04 Nov 2004) | 6 lines
+r593 | leira | 2004-03-17 01:06:47 -0500 (Wed, 17 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
+   A /rt/branches/rt-3.1/html/Elements/EditLinks (from /rt/branches/rt-3.1/html/Ticket/Elements/EditLinks:558)
+   A /rt/branches/rt-3.1/html/Elements/ShowLink (from /rt/branches/rt-3.1/html/Ticket/Elements/ShowLink:554)
+   A /rt/branches/rt-3.1/html/Elements/ShowLinks (from /rt/branches/rt-3.1/html/Ticket/Elements/ShowLinks:554)
+   D /rt/branches/rt-3.1/html/Ticket/Elements/EditLinks
+   D /rt/branches/rt-3.1/html/Ticket/Elements/ShowLink
+   D /rt/branches/rt-3.1/html/Ticket/Elements/ShowLinks
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowSummary
+   M /rt/branches/rt-3.1/html/Ticket/ModifyAll.html
+   M /rt/branches/rt-3.1/html/Ticket/ModifyLinks.html
 
- r6169@tinbook:  jesse | 2004-11-04T08:32:13.034112Z
- Added a Delete method to RT::Record so we get proper messages on object deletion
-     --Autrijus
- 
- 
+Move links elements to /Elements from /Ticket/Elements
 
 ------------------------------------------------------------------------
-r1709 | jesse | 2004-11-01 00:55:09 -0500 (Mon, 01 Nov 2004) | 3 lines
+r592 | leira | 2004-03-17 01:04:58 -0500 (Wed, 17 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
 
- r6157@tinbook:  jesse | 2004-11-01T04:52:49.078521Z
- A patch from 3.2 accidentally cascaded forward
+Add a BeforeUpdateType callback.
 
 ------------------------------------------------------------------------
-r1708 | jesse | 2004-11-01 00:54:59 -0500 (Mon, 01 Nov 2004) | 11 lines
+r591 | leira | 2004-03-17 00:58:18 -0500 (Wed, 17 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrips_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
+   D /rt/branches/rt-3.1/html/Elements/ShadedBox
+   D /rt/branches/rt-3.1/html/Elements/ShadedInputRow
+   D /rt/branches/rt-3.1/html/Elements/ShadedRow
 
- r6156@tinbook:  jesse | 2004-11-01T04:47:06.225531Z
-  r6152@tinbook:  jesse | 2004-11-01T04:43:38.864654Z
-  RT-Ticket: 6230
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  New "batch transactions" core from Ruslan. This update makes it much easier to use stock conditions for bulk updates
-  
-  
- 
+These aren't used any more, so delete them.
 
 ------------------------------------------------------------------------
-r1707 | jesse | 2004-11-01 00:54:47 -0500 (Mon, 01 Nov 2004) | 12 lines
+r589 | jesse | 2004-03-17 00:36:39 -0500 (Wed, 17 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Bulk.html
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/SelfService/Display.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowHistory
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
 
- r6155@tinbook:  jesse | 2004-11-01T04:47:05.144200Z
-  r6151@tinbook:  jesse | 2004-11-01T04:42:20.034865Z
-  RT-Ticket: 6242
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  There were a couple of bugs in the bulk update page that broke ticket linking.
-  (Among other things, the custom fields update functionality was completely broken. It's been disabled pending a new implementation)
-  
-  
- 
+Comment/Update links were broken after a quicksearch
+----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1704 | jesse | 2004-10-31 22:49:50 -0500 (Sun, 31 Oct 2004) | 10 lines
+r586 | leira | 2004-03-16 19:29:14 -0500 (Tue, 16 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/PickCustomFields
+   M /rt/branches/rt-3.1/lib/RT/URI/fsck_com_rt.pm
 
- r6149@tinbook:  jesse | 2004-11-01T03:50:49.511535Z
- RT-Ticket: 6245
- RT-Status: resolved
- RT-Update: correspond
- 
- Global custom field editing in 3.3 had the wrong (hardcoded) URL target.
- 
- 
- 
+DTRT for ObjectType (and thus AsString).
 
 ------------------------------------------------------------------------
-r1699 | jesse | 2004-10-27 18:01:49 -0400 (Wed, 27 Oct 2004) | 5 lines
+r577 | jesse | 2004-03-15 13:29:09 -0500 (Mon, 15 Mar 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/releng.cnf
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Admin/Elements/ModifyQueue
+   M /rt/branches/rt-3.1/html/Admin/Queues/Modify.html
+   M /rt/branches/rt-3.1/html/Search/Bulk.html
+   M /rt/branches/rt-3.1/html/Ticket/ModifyAll.html
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
 
- r6127@tinbook:  jesse | 2004-10-27T22:02:28.387934Z
- Bumping to 3.3.10
- 
- 
+RT-Ticket: 5264
+RT-Status: resolved
 
-------------------------------------------------------------------------
-r1698 | jesse | 2004-10-27 04:06:56 -0400 (Wed, 27 Oct 2004) | 12 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-
- r6121@tinbook:  jesse | 2004-10-27T07:55:33.542549Z
-  r6115@tinbook:  jesse | 2004-10-27T07:51:39.957035Z
-  RT-Ticket: 6219
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Rebuilt RT::Tickets' watcher search logic to only use _one_ join to the users/groups table so as to create joins that can be computed in finite time. Theoretically, this makes watcher searching less powerful.  In practice, it makes watcher searching a lot more possible.
-  
-  
-  
- 
+Change 'correspond' to 'reply'
 
 ------------------------------------------------------------------------
-r1697 | jesse | 2004-10-27 04:06:29 -0400 (Wed, 27 Oct 2004) | 5 lines
+r565 | jesse | 2004-03-14 16:30:02 -0500 (Sun, 14 Mar 2004) | 1 line
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/TicketList
-
- r6120@tinbook:  jesse | 2004-10-27T07:55:32.882088Z
-  r6109@tinbook:  jesse | 2004-10-26T20:02:02.857695Z
-  Additional fixes for display of unlimited search results
- 
+   M /rt/branches/rt-3.1
+   M /rt/branches/rt-3.1/html/Ticket/ShowEmailRecord.html
 
+Pushing up ShowEmailRecord change
 ------------------------------------------------------------------------
-r1696 | jesse | 2004-10-27 04:05:52 -0400 (Wed, 27 Oct 2004) | 10 lines
+r557 | jesse | 2004-03-12 16:29:06 -0500 (Fri, 12 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/releng.cnf
 
- r6119@tinbook:  jesse | 2004-10-27T07:55:32.408440Z
-  r6046@tinbook:  jesse | 2004-10-19T05:21:18.567580Z
-  RT-Ticket: 6121
-  RT-Status: resolved
-  RT-Update: correspond
-  
-  Fixed the name of the template used to notify non-privilged users when their password is changed
-  
- 
+Bumping to 3.1.10 to make the release machinery happy
 
 ------------------------------------------------------------------------
-r1695 | jesse | 2004-10-27 04:05:26 -0400 (Wed, 27 Oct 2004) | 9 lines
+r555 | jesse | 2004-03-12 16:20:12 -0500 (Fri, 12 Mar 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/schema.Pg
-   M /rt/branches/3.3-TESTING/etc/upgrade/3.1.0/schema.Pg
+   M /rt/branches/rt-3.1/README
+   M /rt/branches/rt-3.1/html/Elements/Footer
+   M /rt/branches/rt-3.1/html/Elements/Login
+   M /rt/branches/rt-3.1/releng.cnf
 
- r6118@tinbook:  jesse | 2004-10-27T07:55:31.895658Z
-  r6007@tinbook:  jesse | 2004-10-14T21:47:50.297291Z
-  RT-Ticket: 6197
-  RT-Status: resolved
-  
-  Removed a comment from the PostgreSQL schema files, as some versions of postgres fail to parse it well.
-  
- 
+Bumping to 3.1.9.  
+Removing note about deprecated perl 5.6.1
 
-------------------------------------------------------------------------
-r1694 | jesse | 2004-10-27 04:05:10 -0400 (Wed, 27 Oct 2004) | 8 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Results.html
+Updated footer to shill for the company. 
 
- r6117@tinbook:  jesse | 2004-10-27T07:55:31.185793Z
-  r1994@tinbook:  jesse | 2004-10-12T23:37:37.775608Z
-  Improved "stickiness" of queries.
-  Next/Prev navigation should be more consistently available now.
-  Most recent query should be available more consistently.
-  
- 
 
 ------------------------------------------------------------------------
-r1692 | jesse | 2004-10-27 00:31:12 -0400 (Wed, 27 Oct 2004) | 4 lines
+r553 | jesse | 2004-03-12 00:39:17 -0500 (Fri, 12 Mar 2004) | 6 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Bulk.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Create.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowSummary
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyAll.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Update.html
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/README
 
- r6113@tinbook:  jesse | 2004-10-27T04:31:13.448231Z
- Added support for recording transaction custom fields on ticket creation.
- 
+RT-Ticket: 1
+RT-Status: resolved
 
-------------------------------------------------------------------------
-r1688 | jesse | 2004-10-23 18:05:14 -0400 (Sat, 23 Oct 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/releng.cnf
+This commit updates a date in the README. But really, it's here to test the new subversion integration.
 
- r6101@tinbook:  jesse | 2004-10-23T22:05:06.396023Z
- Bumping to 3.3.9
 
 ------------------------------------------------------------------------
-r1686 | jesse | 2004-10-23 17:50:32 -0400 (Sat, 23 Oct 2004) | 3 lines
+r551 | jesse | 2004-03-11 22:40:50 -0500 (Thu, 11 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/Header
-   M /rt/branches/3.3-TESTING/html/Elements/PageLayout
-   M /rt/branches/3.3-TESTING/html/Elements/SelectEqualityOperator
-   M /rt/branches/3.3-TESTING/html/Elements/SelectNewTicketQueue
-   M /rt/branches/3.3-TESTING/html/Elements/SelectOwner
-   M /rt/branches/3.3-TESTING/html/Elements/SelectStatus
-   M /rt/branches/3.3-TESTING/html/Search/Elements/BuildFormatString
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectGroup
+   M /rt/branches/rt-3.1/lib/RT/Condition/OwnerChange.pm
+   M /rt/branches/rt-3.1/lib/RT/Link_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/URI/fsck_com_rt.pm
 
- r6093@tinbook:  jesse | 2004-10-23T21:47:53.224532Z
- A bunch of tiny fixes to the web ui to avoid warnings about uninitialized variables.
+RT Links and URIs can now work with any RT object, not just tickets
 
 ------------------------------------------------------------------------
-r1685 | jesse | 2004-10-23 17:50:14 -0400 (Sat, 23 Oct 2004) | 3 lines
+r550 | leira | 2004-03-11 13:49:31 -0500 (Thu, 11 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/schema.SQLite
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r6092@tinbook:  jesse | 2004-10-23T21:46:47.129210Z
- Updated SQLite schema to current RT 3.3 versions
+Include content properly when creating tickets from templates.
 
 ------------------------------------------------------------------------
-r1684 | jesse | 2004-10-23 17:49:50 -0400 (Sat, 23 Oct 2004) | 3 lines
+r549 | jesse | 2004-03-11 13:43:31 -0500 (Thu, 11 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/ACL_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
 
- r6091@tinbook:  jesse | 2004-10-23T21:46:04.315427Z
- Better checking for ACL queries on undefined objects (to avoid a warning).
+Let users edit their own passwords
 
-------------------------------------------------------------------------
-r1683 | jesse | 2004-10-23 17:49:38 -0400 (Sat, 23 Oct 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-
- r6090@tinbook:  jesse | 2004-10-23T21:44:41.851286Z
- Fixed a warning when objects were created with no names
- 
 
 ------------------------------------------------------------------------
-r1682 | jesse | 2004-10-23 17:49:25 -0400 (Sat, 23 Oct 2004) | 4 lines
+r547 | leira | 2004-03-11 02:21:45 -0500 (Thu, 11 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
- r6089@tinbook:  jesse | 2004-10-23T21:43:19.939096Z
- Fixed message returned on password change to not include md5 hash of password
- 
+Make sure Priority is 0, not ''.
 
 ------------------------------------------------------------------------
-r1681 | jesse | 2004-10-23 17:48:13 -0400 (Sat, 23 Oct 2004) | 3 lines
+r542 | leira | 2004-03-10 23:40:10 -0500 (Wed, 10 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r6088@tinbook:  jesse | 2004-10-23T21:42:23.542584Z
- Bumped DBIx::SearchBuilder required version, for new SQLite support
+Fixes to offline upload (set Priority to 0 if it's '').
 
 ------------------------------------------------------------------------
-r1680 | jesse | 2004-10-21 13:20:05 -0400 (Thu, 21 Oct 2004) | 3 lines
+r535 | jesse | 2004-03-10 18:27:43 -0500 (Wed, 10 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/ACE.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachment.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachments.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attribute.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attributes.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMember.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Group.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMember.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Groups.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Link.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Links.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomField.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFields.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principal.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principals.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripAction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripActions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripCondition.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripConditions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrips.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Template.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Templates.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transactions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/User.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Users.pm
-   M /rt/branches/3.3-TESTING/sbin/factory
+   M /rt/branches/rt-3.1/html/Elements/Header
 
- r6077@tinbook:  jesse | 2004-10-21T17:20:26.237576Z
- Core: integrated new factory code to allow more datamodel metadata to be collected
+Turning off the html content type, as it broke IE display. (We want IE in 'Quirks' mode)
 
 ------------------------------------------------------------------------
-r1679 | jesse | 2004-10-21 13:19:45 -0400 (Thu, 21 Oct 2004) | 3 lines
+r522 | jesse | 2004-03-09 17:54:01 -0500 (Tue, 09 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
+   M /rt/branches/rt-3.1/html/NoAuth/webrt.css
 
- r6076@tinbook:  jesse | 2004-10-21T16:46:20.466296Z
- ACL: Fixed logic in an ACL query so that it returns failure when handed an invalid object, rather than trying a bogus SQL query and failing.
+#5179: provide a callback in the css stylesheet
 
-------------------------------------------------------------------------
-r1678 | jesse | 2004-10-20 19:27:13 -0400 (Wed, 20 Oct 2004) | 8 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-
- r6074@tinbook:  jesse | 2004-10-20T23:26:48.112240Z
- RT-Ticket: 5701
- RT-Status: resolved
- RT-Update: correspond
- 
- RT now prevents users from creating objects with 'Name' attributes that are numreric.
- 
 
 ------------------------------------------------------------------------
-r1677 | jesse | 2004-10-20 18:56:16 -0400 (Wed, 20 Oct 2004) | 9 lines
+r521 | jesse | 2004-03-09 17:48:55 -0500 (Tue, 09 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/html/Elements/SelectQueue
 
- r6071@tinbook:  jesse | 2004-10-20T22:56:43.545883Z
- RT-Ticket: 6192
- RT-Status: update
- 
- 
- Updated RT::Attachement::OriginalContent to use a better regexp for determining what's encoded and what's not.
- 
- 
+#5136: Save a queue load in SelectQueue in most cases
 
 ------------------------------------------------------------------------
-r1676 | jesse | 2004-10-20 18:55:57 -0400 (Wed, 20 Oct 2004) | 9 lines
+r520 | jesse | 2004-03-09 17:31:40 -0500 (Tue, 09 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/nl.po
+   M /rt/branches/rt-3.1/bin/rt.in
 
- r6070@tinbook:  jesse | 2004-10-20T22:51:44.854897Z
- RT-Ticket: 6123
- RT-Status: resolved 
- RT-Update: correspond
- 
- 
- Updated the dutch translation. (As the translation hadn't been applied for a bit, some translations didn't apply cleanly.)
- 
+#5091: Support for a minimal RT shell
 
-------------------------------------------------------------------------
-r1675 | jesse | 2004-10-20 18:34:32 -0400 (Wed, 20 Oct 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Admin/Tools/Configuration.html
-
- r6064@tinbook:  jesse | 2004-10-20T22:08:13.953728Z
- Fixed a typo
- 
 
 ------------------------------------------------------------------------
-r1674 | jesse | 2004-10-20 18:33:19 -0400 (Wed, 20 Oct 2004) | 9 lines
+r519 | jesse | 2004-03-09 17:24:09 -0500 (Tue, 09 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/html/REST/1.0/ticket/comment
 
- r6063@tinbook:  jesse | 2004-10-20T19:54:02.885732Z
- RT-Ticket: 6180
- RT-Status: resolved
- RT-Update: correspond
- 
- If you have changed $MinimumPasswordLength to be greater than 6, RT's "GenerateRandomPassword" method now takes that into account
- 
- 
+Adding an ommitted newline in a status message
 
 ------------------------------------------------------------------------
-r1673 | jesse | 2004-10-20 18:33:03 -0400 (Wed, 20 Oct 2004) | 9 lines
+r518 | jesse | 2004-03-09 17:23:02 -0500 (Tue, 09 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Admin/Tools/Configuration.html
+   M /rt/branches/rt-3.1/bin/rt.in
 
- r6062@tinbook:  jesse | 2004-10-20T19:46:00.816618Z
- RT-Ticket: 6188
- RT-Status: resolved
- RT-Update: correspond
- 
- RT squelches passwords in the configuration summary page. It no longer
- squleches "RT::MinimumPasswordLength" 
- 
+#5089: More preparation for the RT shell from AMS
 
 ------------------------------------------------------------------------
-r1672 | jesse | 2004-10-20 18:32:48 -0400 (Wed, 20 Oct 2004) | 3 lines
+r517 | jesse | 2004-03-09 17:19:03 -0500 (Tue, 09 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/html/REST/1.0/ticket/comment
 
- r6061@tinbook:  jesse | 2004-10-20T19:27:22.698792Z
- Minor cleanups to record.pm
+Let the user set status in comment or correspondence
 
 ------------------------------------------------------------------------
-r1671 | alexmv | 2004-10-20 15:51:36 -0400 (Wed, 20 Oct 2004) | 2 lines
+r516 | jesse | 2004-03-09 17:09:39 -0500 (Tue, 09 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1/bin/rt.in
 
-Remove wayward '+'
+#5088: CLI hacking from AMS to prepare for an interactive 'rt shell'
 
 ------------------------------------------------------------------------
-r1670 | jesse | 2004-10-20 15:20:19 -0400 (Wed, 20 Oct 2004) | 8 lines
+r515 | jesse | 2004-03-09 17:07:59 -0500 (Tue, 09 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/EmailParser.pm
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/ticket/attachments
 
- r6056@tinbook:  jesse | 2004-10-20T19:20:39.940786Z
- RT-Ticket: 5594
- RT-Status: resolved
- RT-UpdateType: correspond
- 
- EmailParser updates applied to RT 3.3 to fix subject lines that are encoded and multi-line
- 
+REST attachments API will now display attachments without filenames
 
-------------------------------------------------------------------------
-r1669 | jesse | 2004-10-20 15:19:59 -0400 (Wed, 20 Oct 2004) | 7 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
-   M /rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
-
- r6055@tinbook:  jesse | 2004-10-20T18:56:31.219026Z
- RT-Ticket: 5569
- RT-Status: resolved
- 
- Status is nowdefinablein the RT_Config file.
- 
 
 ------------------------------------------------------------------------
-r1666 | jesse | 2004-10-20 01:47:04 -0400 (Wed, 20 Oct 2004) | 9 lines
+r514 | jesse | 2004-03-09 16:54:51 -0500 (Tue, 09 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Header
-   M /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Row
-   M /rt/branches/3.3-TESTING/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/bin/rt.in
 
- r6051@tinbook:  jesse | 2004-10-20T05:39:54.597284Z
- RT-Ticket: 5837
- RT-Status: resolved
- RT-Update: correspond
- 
- Moved more ticket listing style to the CSS and out of the html, per the suggestion of Dirk Pape
- 
- 
+#5086:  providing support for rt ls -o
 
 ------------------------------------------------------------------------
-r1665 | jesse | 2004-10-20 01:46:54 -0400 (Wed, 20 Oct 2004) | 9 lines
+r512 | jesse | 2004-03-08 23:52:10 -0500 (Mon, 08 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/html/Admin/Users/Modify.html
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
 
- r6050@tinbook:  jesse | 2004-10-20T05:33:26.027966Z
- RT-Ticket: 5729
- RT-Status: resolved
- RT-Action: correspond
- 
- Patch fixes issue with multibyte characters escaping in URLs. --Ruslan
- 
- 
+A new hook for canonicalization of user information on initial create
 
-------------------------------------------------------------------------
-r1663 | jesse | 2004-10-19 01:23:26 -0400 (Tue, 19 Oct 2004) | 8 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/config.layout
-   M /rt/branches/3.3-TESTING/m4/rt_layout.m4
-
- r6048@tinbook:  jesse | 2004-10-19T05:24:15.256721Z
- RT-Ticket: 6198
- RT-Status: resolved
- RT-Update: correspond
- 
- Applied a patch to add an fhs-compliant RT layout and fix some of the layout parsing.
- 
 
 ------------------------------------------------------------------------
-r1661 | jesse | 2004-10-19 01:17:39 -0400 (Tue, 19 Oct 2004) | 8 lines
+r511 | leira | 2004-03-08 23:12:55 -0500 (Mon, 08 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/SelectOwner
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/BuildFormatString
+   M /rt/branches/rt-3.1/html/Search/Results.html
 
- r6044@tinbook:  jesse | 2004-10-19T05:18:31.025176Z
- RT-Ticket: 6154
- RT-Status: resolved
- RT-Update: reply
- 
- Owner listings now sort alphabetically
- 
+Add support for links & CFs.
 
 ------------------------------------------------------------------------
-r1660 | jesse | 2004-10-19 01:10:02 -0400 (Tue, 19 Oct 2004) | 8 lines
+r510 | jesse | 2004-03-08 20:41:00 -0500 (Mon, 08 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT.pm.in
+   M /rt/branches/rt-3.1/html/Elements/SelectQueue
+   M /rt/branches/rt-3.1/html/Search/Elements/PickBasics
+   M /rt/branches/rt-3.1/html/Search/Elements/PickRestriction
 
- r6042@tinbook:  jesse | 2004-10-19T05:10:45.782060Z
- RT-Ticket: 6199
- RT-Status: resolved
- RT-Update: correspond
- 
- Formatting fixes to RT.pm
- 
+Now the Search UI does Queue names instead of id
 
 ------------------------------------------------------------------------
-r1659 | jesse | 2004-10-18 13:47:29 -0400 (Mon, 18 Oct 2004) | 7 lines
+r507 | jesse | 2004-03-08 18:56:35 -0500 (Mon, 08 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/etc/initialdata
+   M /rt/branches/rt-3.1/bin/rt-mailgate.in
+   M /rt/branches/rt-3.1/releng.cnf
 
- r6039@tinbook:  jesse | 2004-10-18T17:48:14.238206Z
- RT-Ticket: 5336
- RT-Status: resolved
- 
- Approval template corrected
- 
+Bumping to 3.1.8
 
 ------------------------------------------------------------------------
-r1657 | jesse | 2004-10-15 14:25:31 -0400 (Fri, 15 Oct 2004) | 3 lines
+r505 | jesse | 2004-03-08 18:53:36 -0500 (Mon, 08 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/releng.cnf
+   M /rt/branches/rt-3.1/lib/RT/Handle.pm
 
- r6014@tinbook:  jesse | 2004-10-15T18:26:19.439204Z
- Bumping to 3.3.8
+Updated handling of CLOBs in oracle.
 
 ------------------------------------------------------------------------
-r1656 | jesse | 2004-10-15 13:56:50 -0400 (Fri, 15 Oct 2004) | 4 lines
+r504 | leira | 2004-03-08 16:49:39 -0500 (Mon, 08 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   A /rt/branches/3.3-TESTING/html/Admin/Elements/GlobalCustomFieldTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/GroupTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ObjectCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/QueueTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SystemTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/UserTabs
-   A /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields
-   A /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields/Groups.html
-   A /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields/Queue-Tickets.html
-   A /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields/Queue-Transactions.html
-   A /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields/Users.html
-   A /rt/branches/3.3-TESTING/html/Admin/Global/CustomFields/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/index.html
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r6009@tinbook:  jesse | 2004-10-15T17:57:36.162346Z
- Administrative menu overhaul to sanitize custom field configuration.
- 
+Actually return the status of creating tickets.
 
 ------------------------------------------------------------------------
-r1650 | jesse | 2004-10-12 17:01:07 -0400 (Tue, 12 Oct 2004) | 5 lines
+r503 | leira | 2004-03-08 16:43:53 -0500 (Mon, 08 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
 
- r1992@tinbook:  jesse | 2004-10-12T21:00:33.006657Z
- RT-Ticket: 6182
- RT-Status: resolved
- 
+Support for offline Watcher update.
 
 ------------------------------------------------------------------------
-r1649 | jesse | 2004-10-11 17:10:40 -0400 (Mon, 11 Oct 2004) | 3 lines
+r501 | leira | 2004-03-08 15:49:18 -0500 (Mon, 08 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1/html/Tools/Offline.html
 
- r1985@tinbook:  jesse | 2004-10-11T20:26:31.046336Z
- Fixed a bug in the merge from 3.2 that broke ticket transaction searching; added support for Ticket "Updated" as a synonym for TransactionDate as a search criterion
+Additional offline upload support.
 
 ------------------------------------------------------------------------
-r1648 | jesse | 2004-10-10 00:30:21 -0400 (Sun, 10 Oct 2004) | 7 lines
+r500 | leira | 2004-03-08 15:48:52 -0500 (Mon, 08 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/configure.ac
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
-   M /rt/branches/3.3-TESTING/html/Search/Results.tsv
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyAll.html
-   M /rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
-   M /rt/branches/3.3-TESTING/sbin/rt-setup-database.in
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Record_Overlay.pm
 
- r1651@tinbook:  jesse | 2004-10-10T04:24:17.077128Z
- 
- r1652@tinbook:  jesse | 2004-10-10T04:30:49.336195Z
-  r1650@tinbook:  jesse | 2004-10-10T04:23:58.456281Z
-  
- 
+Additional offline upload support.
 
 ------------------------------------------------------------------------
-r1603 | jesse | 2004-09-30 22:45:46 -0400 (Thu, 30 Sep 2004) | 5 lines
+r498 | leira | 2004-03-08 00:26:38 -0500 (Mon, 08 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/Menu
-   M /rt/branches/3.3-TESTING/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/html/Elements/Tabs
+   A /rt/branches/rt-3.1/html/Tools/Elements
+   A /rt/branches/rt-3.1/html/Tools/Elements/Tabs
+   A /rt/branches/rt-3.1/html/Tools/Offline.html
 
- ----------------------------------------------------------------------
- r10434@tinbook:  jesse | 2004-10-01T02:43:47.012515Z
- Better cssification of the menus
- ----------------------------------------------------------------------
+Offline ticket creation.
 
 ------------------------------------------------------------------------
-r1566 | jesse | 2004-09-27 17:20:14 -0400 (Mon, 27 Sep 2004) | 8 lines
+r497 | leira | 2004-03-07 23:57:12 -0500 (Sun, 07 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/Menu
-   M /rt/branches/3.3-TESTING/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   A /rt/branches/rt-3.1/lib/RT/Record_Overlay.pm
 
- r10391@tinbook:  jesse | 2004-09-27T21:17:31.817589Z
- RT-Ticket: 6139
- RT-Status: resolved
- RT-Update-Type: correspond
- 
- Applied patch from Oliver Thomas to move more menu styling to the external CSS file and out of the html.
- 
+Support for offline ticket creation/update.
 
 ------------------------------------------------------------------------
-r1556 | jesse | 2004-09-23 15:14:29 -0400 (Thu, 23 Sep 2004) | 6 lines
+r494 | jesse | 2004-03-07 22:12:38 -0500 (Sun, 07 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowPeople
+   M /rt/branches/rt-3.1/html/Ticket/Elements/FindAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
- r10336@Jesse-Vincents-Computer:  jesse | 2004-09-23T06:45:36.828724Z
- 
- r10350@Jesse-Vincents-Computer:  jesse | 2004-09-23T19:13:34.578717Z
- Use ShowUserEntry for ShowPeople
- 
+ACL fixes for outgoing Comment email records.
+Forward porting performance fixes from 3.0.10pre2
 
 ------------------------------------------------------------------------
-r1554 | jesse | 2004-09-23 00:30:24 -0400 (Thu, 23 Sep 2004) | 3 lines
+r493 | jesse | 2004-03-07 16:10:15 -0500 (Sun, 07 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/releng.cnf
+   M /rt/branches/rt-3.1/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/ticket/default
+   M /rt/branches/rt-3.1/html/SelfService/Display.html
+   M /rt/branches/rt-3.1/html/Ticket/Display.html
+   A /rt/branches/rt-3.1/html/Ticket/Elements/FindAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowHistory
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowSummary
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/rt-3.1/html/Ticket/History.html
+   M /rt/branches/rt-3.1/html/autohandler
+   M /rt/branches/rt-3.1/html/index.html
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
+
+Merged forward changes from 3.0.10pre2
 
- r1867@bitsy:  jesse | 2004-09-23T02:39:51.040258Z
- Bumping to 3.3.7
 
 ------------------------------------------------------------------------
-r1553 | jesse | 2004-09-23 00:30:04 -0400 (Thu, 23 Sep 2004) | 5 lines
+r484 | jesse | 2004-03-06 17:46:24 -0500 (Sat, 06 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
 
- r1865@bitsy:  jesse | 2004-09-23T02:28:19.315048Z
- 
- r1866@bitsy:  jesse | 2004-09-23T02:38:19.257248Z
- DBIx::SearchBuilder dependency incremented
+Minor html cleanup on txn display
 
 ------------------------------------------------------------------------
-r1552 | tla | 2004-09-22 23:54:00 -0400 (Wed, 22 Sep 2004) | 3 lines
+r481 | jesse | 2004-03-05 16:35:05 -0500 (Fri, 05 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/lib/t/07acl.pl.in
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   A /rt/branches/rt-3.1/html/Search/Results.rdf
 
-This now actually tests the SelectOwner functionality change.
+Added support for RSS syndication
 
 
 ------------------------------------------------------------------------
-r1551 | tla | 2004-09-22 18:44:28 -0400 (Wed, 22 Sep 2004) | 3 lines
+r480 | jesse | 2004-03-05 14:19:16 -0500 (Fri, 05 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/html/Elements/SelectOwner
-   M /rt/branches/3.3-TESTING/lib/t/07acl.pl.in
+   M /rt/branches/rt-3.1/html/Admin/Tools/Configuration.html
 
-SelectOwner can now be passed a list of queues which the user may see.
+Fixing the admin configuration reporter to abort properly if the user isn't an administrator
 
 
 ------------------------------------------------------------------------
-r1550 | tla | 2004-09-22 17:32:53 -0400 (Wed, 22 Sep 2004) | 3 lines
+r479 | jesse | 2004-03-05 14:06:13 -0500 (Fri, 05 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/lib/t/07acl.pl.in
+   A /rt/branches/rt-3.1/html/Developer
+   A /rt/branches/rt-3.1/html/Developer/Perldoc.html
 
-Add sleeps for the right granting; try a pattern-match that works this time.
+Added an online perldoc browser
 
 
 ------------------------------------------------------------------------
-r1546 | autrijus | 2004-09-22 13:16:22 -0400 (Wed, 22 Sep 2004) | 8 lines
+r474 | jesse | 2004-03-05 00:41:56 -0500 (Fri, 05 Mar 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/releng.cnf
 
- r7965@not:  autrijus | 2004-09-21T13:18:07.917938Z
- 
- 
- 
- r8021@not:  autrijus | 2004-09-22T17:15:50.576469Z
- * On mod_perl1 with root directory, ->filename is empty, not '/',
-   hence breaking index.html handling.  Entirely my fault.
+Bumping the version to 3.1.7
 
 ------------------------------------------------------------------------
-r1544 | tla | 2004-09-22 12:21:24 -0400 (Wed, 22 Sep 2004) | 4 lines
+r473 | jesse | 2004-03-05 00:40:58 -0500 (Fri, 05 Mar 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/html/Elements/Header
+   M /rt/branches/rt-3.1/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips
 
-If a user does not have the ModifySelf right, he/she should also not
-be able to see the Prefs link in the header.
+Slight CSS cleanup.
 
-
-------------------------------------------------------------------------
-r1543 | tla | 2004-09-22 04:08:50 -0400 (Wed, 22 Sep 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING/html/Elements/SelectOwner
-
-If we unlimit the queues, then queues will show up, and then users will
-show up, and then customers will be happy.
+Scrip preview updates
 
 
 ------------------------------------------------------------------------
-r1542 | tla | 2004-09-22 03:41:22 -0400 (Wed, 22 Sep 2004) | 4 lines
+r472 | jesse | 2004-03-05 00:05:28 -0500 (Fri, 05 Mar 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/UPGRADING
-   M /rt/branches/3.3-TESTING/configure.ac
-   M /rt/branches/3.3-TESTING/html/Elements/Tabs
-   M /rt/branches/3.3-TESTING/lib/t/02regression.t.in
-   A /rt/branches/3.3-TESTING/lib/t/07acl.pl.in
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/lib/RT/Action/Autoreply.pm
 
-Moved the functionality whereby Config and Prefs tabs disappear to core.
-Wrote tests for the new core behavior.
+moved a <HR> in the ticketlist
+fixed a bug that killed RT's autoreply.
 
 
 ------------------------------------------------------------------------
-r1541 | tla | 2004-09-22 03:14:33 -0400 (Wed, 22 Sep 2004) | 3 lines
+r471 | jesse | 2004-03-04 17:01:01 -0500 (Thu, 04 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/lib/t/05cronsupport.pl.in
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Edit.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
+
+more cleanups to search editing and ticket listing display
 
-The regression test would die if the last test in here failed.
-That wasn't very nice of me.
 
 ------------------------------------------------------------------------
-r1538 | tla | 2004-09-22 01:57:34 -0400 (Wed, 22 Sep 2004) | 3 lines
+r470 | jesse | 2004-03-04 15:32:51 -0500 (Thu, 04 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/configure.ac
+   M /rt/branches/rt-3.1/html/Elements/TicketList
 
-The cronsupport tests somehow fell out of here.  Replacing.
 
+TicketList now handles relationships and custom fields.
 
 ------------------------------------------------------------------------
-r1535 | jesse | 2004-09-21 02:03:26 -0400 (Tue, 21 Sep 2004) | 10 lines
+r468 | jesse | 2004-03-04 00:14:10 -0500 (Thu, 04 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/html/Elements/TicketList
 
- r10334@tinbook:  jesse | 2004-09-21T06:03:40.050504Z
- RT-Ticket: 6105
- RT-Status: resolved
- RT-UpdateType: correspond
- 
- Refactored some TicketSQL stuff to bound the right thing in our ticketsql subclause
- 
- 
- 
+refactoring the TicketList element to use a subroutine lookup instead of a hash lookup. this will enable us to add CustomField support fairly easily
 
-------------------------------------------------------------------------
-r1534 | jesse | 2004-09-21 01:16:18 -0400 (Tue, 21 Sep 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-
- r10332@tinbook:  jesse | 2004-09-21T05:16:35.439550Z
- Next test version of less broken cf search code
 
 ------------------------------------------------------------------------
-r1533 | jesse | 2004-09-21 00:48:54 -0400 (Tue, 21 Sep 2004) | 3 lines
+r467 | jesse | 2004-03-04 00:12:35 -0500 (Thu, 04 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1/html/autohandler
 
- r10326@tinbook:  jesse | 2004-09-21T04:48:46.583575Z
- First test version of less broken cf search code
-
-------------------------------------------------------------------------
-r1528 | jesse | 2004-09-20 23:18:19 -0400 (Mon, 20 Sep 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
 
- r10324@tinbook:  jesse | 2004-09-21T03:18:34.501590Z
- removing some debugging output
+Autohandler was using "root" as the superuser object instead of RT_System
 
 ------------------------------------------------------------------------
-r1527 | jesse | 2004-09-20 23:12:11 -0400 (Mon, 20 Sep 2004) | 142 lines
+r466 | jesse | 2004-03-03 23:04:37 -0500 (Wed, 03 Mar 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields_Overlay.pm
+   M /rt/branches/rt-3.1/etc/schema.Oracle
+   M /rt/branches/rt-3.1/etc/upgrade/3.1.0/schema.Oracle
 
- r10311@tinbook:  jesse | 2004-09-20T21:22:51.344787Z
-  ----------------------------------------------------------------------
-  r10213@tinbook (orig r1454):  autrijus | 2004-09-08T19:54:32.241114Z
-   r5740@xor:  autrijus | 2004-09-08T19:54:01.384500Z
-   * Let "make install" for inplace layout work without hassle.
-   
-  
-  ----------------------------------------------------------------------
-  r10214@tinbook (orig r1455):  autrijus | 2004-09-08T19:54:55.301056Z
-   r5741@xor:  autrijus | 2004-09-08T19:54:33.611316Z
-   * With SQLite, put database in $VarPath if $DatabaseName is relative.
-  
-  ----------------------------------------------------------------------
-  r10215@tinbook (orig r1456):  autrijus | 2004-09-08T19:59:38.530949Z
-   r5749@xor:  autrijus | 2004-09-08T19:59:51.949128Z
-   * Add mason_handler.scgi and standalone_httpd into list of files
-     to be made executable on "make fixperms".
-  
-  ----------------------------------------------------------------------
-  r10216@tinbook (orig r1457):  jesse | 2004-09-08T20:31:26.131286Z
-   
-   ----------------------------------------------------------------------
-   r10212@tinbook:  jesse | 2004-09-08T20:30:48.849107Z
-   merging 3.2's Offline.html page forward to 3.3
-   ----------------------------------------------------------------------
-  
-  ----------------------------------------------------------------------
-  r10222@tinbook (orig r1461):  autrijus | 2004-09-08T21:30:59.960856Z
-   r5770@xor:  autrijus | 2004-09-08T20:42:48.599276Z
-   
-   
-   
-   r5809@xor:  autrijus | 2004-09-08T21:30:29.869203Z
-   * add sbin/rt-dump-database into sbin files.
-  
-  ----------------------------------------------------------------------
-  r10257@tinbook (orig r1480):  jesse | 2004-09-14T03:28:52.701395Z
-  Bumped to 3.3.6
-  ----------------------------------------------------------------------
-  r10275@tinbook (orig r1493):  autrijus | 2004-09-15T15:40:44.820762Z
-   r7404@not:   | 2004-09-15T00:04:07.008049Z
-   
-   
-   
-   r7442@not:   | 2004-09-15T15:39:23.096249Z
-    ----------------------------------------------------------------------
-    r7441@not:  autrijus | 2004-09-15T15:20:23.097011Z
-    * Luis Arnauth pointed out that we did not serve mail-gateway.
-    ----------------------------------------------------------------------
-   
-  
-  ----------------------------------------------------------------------
-  r10298@tinbook (orig r1506):  jesse | 2004-09-19T20:20:43.620895Z
-  Fixing case of mysql tablenames, since all the world is not case insensitive like Mac OS X. This is a good thing
-  ----------------------------------------------------------------------
-  r10299@tinbook (orig r1507):  jesse | 2004-09-20T00:58:19.610978Z
-   r10219@tinbook (orig r1458):  leira | 2004-09-08T21:19:51.021183Z
-   If something is overdue, set DueRelative to class "overdue".
-   
-   Note: core RT doesn't have an "overdue" class at this time.
-   
-  
-  ----------------------------------------------------------------------
-  r10300@tinbook (orig r1508):  jesse | 2004-09-20T00:58:46.601286Z
-   r10221@tinbook (orig r1460):  leira | 2004-09-08T21:29:25.111044Z
-   Use time() instead of making an RT::Date.
-   
-  
-  ----------------------------------------------------------------------
-  r10301@tinbook (orig r1509):  jesse | 2004-09-20T00:59:15.051043Z
-   r10223@tinbook (orig r1462):  leira | 2004-09-08T21:31:51.811014Z
-   Overdue things are now read.
-   
-  
-  ----------------------------------------------------------------------
-  r10302@tinbook (orig r1510):  jesse | 2004-09-20T00:59:45.271374Z
-   r10225@tinbook (orig r1464):  leira | 2004-09-08T21:41:43.110851Z
-   Don't put a span around things if it won't do anything.
-   
-  
-  ----------------------------------------------------------------------
-  r10303@tinbook (orig r1511):  jesse | 2004-09-20T01:00:10.600204Z
-   r10238@tinbook (orig r1474):  jesse | 2004-09-10T19:40:40.885981Z
-   -l
-   
-   
-  
-  ----------------------------------------------------------------------
-  r10304@tinbook (orig r1512):  jesse | 2004-09-20T01:01:13.381046Z
-   r10253@tinbook (orig r1477):  jesse | 2004-09-13T20:01:18.620833Z
-    r10249@tinbook:  jesse | 2004-09-13T19:56:43.541086Z
-     ----------------------------------------------------------------------
-     r10238@tinbook (orig r1474):  jesse | 2004-09-10T19:40:40.885981Z
-     
-     
-     ----------------------------------------------------------------------
-    
-    r10250@tinbook:  jesse | 2004-09-13T19:58:31.660069Z
-    Bumped to 3.2.2rc1
-   
-  
-  ----------------------------------------------------------------------
-  r10305@tinbook (orig r1513):  jesse | 2004-09-20T01:01:37.103494Z
-   r10265@tinbook (orig r1486):  jesse | 2004-09-14T06:12:08.920979Z
-    r10262@tinbook:  jesse | 2004-09-14T06:12:21.353389Z
-    Never try to fetch attributes when we don't have an object to fetch attributes on
-   
-  
-  ----------------------------------------------------------------------
-  r10306@tinbook (orig r1514):  jesse | 2004-09-20T01:02:01.021112Z
-   r10267@tinbook (orig r1487):  jesse | 2004-09-14T16:14:00.320887Z
-    r10266@tinbook:  jesse | 2004-09-14T16:14:14.588686Z
-    RT-Ticket: 5836
-    RT-Status: resolved
-    RT-ACtion: reply
-    
-    
-    Added back a "ticket refresh" dropdown on the search results page.
-    Thanks to Dirk Pape.
-    
-    
-   
-  
-  ----------------------------------------------------------------------
-  r10307@tinbook (orig r1515):  jesse | 2004-09-20T01:02:23.020890Z
-   r10277@tinbook (orig r1495):  leira | 2004-09-15T19:22:35.471086Z
-   Removed <pre> block around the header keys, and removed an extraneous </td>.
-   
-  
-  ----------------------------------------------------------------------
-  r10308@tinbook (orig r1516):  jesse | 2004-09-20T01:02:45.710756Z
-   r10284@tinbook (orig r1498):  leira | 2004-09-16T22:28:20.860968Z
-   Add another callback that passes parsed headers.
-   
-   Useful for MakeClicky, among other things.
-   
-  
-  ----------------------------------------------------------------------
- 
- r10312@tinbook:  jesse | 2004-09-21T03:10:37.466198Z
- Custom field joins were being incorrectly constructed
+Updating the oracle schema to not include unique constraints or a spurious ","
 
 ------------------------------------------------------------------------
-r1526 | tla | 2004-09-20 18:06:08 -0400 (Mon, 20 Sep 2004) | 5 lines
+r463 | jesse | 2004-03-03 13:51:25 -0500 (Wed, 03 Mar 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/html/Elements/SelectOwner
+   M /rt/branches/rt-3.1/releng.cnf
 
-The SelectOwner widget should not reveal the names system superusers
-to users who are not otherwise privileged to see them.  Made this
-variable change in the UsersWhoHaveRight() call.
+Bumped releng version number to 3.1.6
 
 
 ------------------------------------------------------------------------
-r1525 | autrijus | 2004-09-20 14:25:28 -0400 (Mon, 20 Sep 2004) | 3 lines
+r461 | jesse | 2004-03-03 00:31:24 -0500 (Wed, 03 Mar 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/sbin/rt-dump-database.in
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowMessageHeaders
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
+   A /rt/branches/rt-3.1/html/Ticket/ShowEmailRecord.html
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
 
- r7812@not:  autrijus | 2004-09-20T18:00:42.848849Z
- * dump data has to return 'true'. oops.
+Improved handling of 'EmailRecord' messages and message headers in ticket display
 
 ------------------------------------------------------------------------
-r1522 | autrijus | 2004-09-20 13:22:04 -0400 (Mon, 20 Sep 2004) | 3 lines
+r455 | jesse | 2004-02-25 22:40:25 -0500 (Wed, 25 Feb 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
+   M /rt/branches/rt-3.1/releng.cnf
 
- r7810@not:  autrijus | 2004-09-20T17:22:27.534622Z
- * add YAML as a core dep for rt-dump-database.
+Bumping to 3.1.5
 
 ------------------------------------------------------------------------
-r1519 | autrijus | 2004-09-20 13:09:36 -0400 (Mon, 20 Sep 2004) | 2 lines
+r454 | jesse | 2004-02-25 22:18:44 -0500 (Wed, 25 Feb 2004) | 5 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/sbin/rt-dump-database.in
+   M /rt/branches/rt-3.1/html/Elements/Header
+   M /rt/branches/rt-3.1/html/Projects/Overview.html
 
-* rt-dump-database now uses YAML for easy hand modification.
+Bringing autrijus "header open/close" box fix forward from his branch.
 
-------------------------------------------------------------------------
-r1516 | jesse | 2004-09-19 21:02:45 -0400 (Sun, 19 Sep 2004) | 6 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageHeaders
+more work on the project mangmet ui
 
- r10284@tinbook (orig r1498):  leira | 2004-09-16T22:28:20.860968Z
- Add another callback that passes parsed headers.
- 
- Useful for MakeClicky, among other things.
- 
 
 ------------------------------------------------------------------------
-r1515 | jesse | 2004-09-19 21:02:23 -0400 (Sun, 19 Sep 2004) | 4 lines
+r452 | jesse | 2004-02-25 20:14:08 -0500 (Wed, 25 Feb 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageHeaders
+   M /rt/branches/rt-3.1/html/Elements/TicketList
 
- r10277@tinbook (orig r1495):  leira | 2004-09-15T19:22:35.471086Z
- Removed <pre> block around the header keys, and removed an extraneous </td>.
- 
+Fixing search result sorting
 
-------------------------------------------------------------------------
-r1514 | jesse | 2004-09-19 21:02:01 -0400 (Sun, 19 Sep 2004) | 13 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Results.html
-
- r10267@tinbook (orig r1487):  jesse | 2004-09-14T16:14:00.320887Z
-  r10266@tinbook:  jesse | 2004-09-14T16:14:14.588686Z
-  RT-Ticket: 5836
-  RT-Status: resolved
-  RT-ACtion: reply
-  
-  
-  Added back a "ticket refresh" dropdown on the search results page.
-  Thanks to Dirk Pape.
-  
-  
- 
 
 ------------------------------------------------------------------------
-r1513 | jesse | 2004-09-19 21:01:37 -0400 (Sun, 19 Sep 2004) | 5 lines
+r451 | jesse | 2004-02-25 19:40:04 -0500 (Wed, 25 Feb 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Attributes_Overlay.pm
-
- r10265@tinbook (orig r1486):  jesse | 2004-09-14T06:12:08.920979Z
-  r10262@tinbook:  jesse | 2004-09-14T06:12:21.353389Z
-  Never try to fetch attributes when we don't have an object to fetch attributes on
- 
+   M /rt/branches/rt-3.1/html/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Elements/MyTickets
 
-------------------------------------------------------------------------
-r1512 | jesse | 2004-09-19 21:01:13 -0400 (Sun, 19 Sep 2004) | 12 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/releng.cnf
+Homepage cleanup.
 
- r10253@tinbook (orig r1477):  jesse | 2004-09-13T20:01:18.620833Z
-  r10249@tinbook:  jesse | 2004-09-13T19:56:43.541086Z
-   ----------------------------------------------------------------------
-   r10238@tinbook (orig r1474):  jesse | 2004-09-10T19:40:40.885981Z
-   
-   
-   ----------------------------------------------------------------------
-  
-  r10250@tinbook:  jesse | 2004-09-13T19:58:31.660069Z
-  Bumped to 3.2.2rc1
- 
 
 ------------------------------------------------------------------------
-r1511 | jesse | 2004-09-19 21:00:10 -0400 (Sun, 19 Sep 2004) | 5 lines
+r450 | leira | 2004-02-25 19:35:42 -0500 (Wed, 25 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm
+   M /rt/branches/rt-3.1/html/Elements/TicketList
 
- r10238@tinbook (orig r1474):  jesse | 2004-09-10T19:40:40.885981Z
- -l
- 
- 
+Set $Format to the default if it's not set.
 
 ------------------------------------------------------------------------
-r1510 | jesse | 2004-09-19 20:59:45 -0400 (Sun, 19 Sep 2004) | 4 lines
+r449 | leira | 2004-02-25 19:34:04 -0500 (Wed, 25 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r10225@tinbook (orig r1464):  leira | 2004-09-08T21:41:43.110851Z
- Don't put a span around things if it won't do anything.
- 
+Set entry aggregator properly when building array for display in listbox.
 
 ------------------------------------------------------------------------
-r1509 | jesse | 2004-09-19 20:59:15 -0400 (Sun, 19 Sep 2004) | 4 lines
+r448 | jesse | 2004-02-25 18:56:16 -0500 (Wed, 25 Feb 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/NoAuth/webrt.css
-
- r10223@tinbook (orig r1462):  leira | 2004-09-08T21:31:51.811014Z
- Overdue things are now read.
- 
+   M /rt/branches/rt-3.1/html/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Elements/MyTickets
+   M /rt/branches/rt-3.1/html/Elements/TicketList
 
-------------------------------------------------------------------------
-r1508 | jesse | 2004-09-19 20:58:46 -0400 (Sun, 19 Sep 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
+Cleaning up the front page
 
- r10221@tinbook (orig r1460):  leira | 2004-09-08T21:29:25.111044Z
- Use time() instead of making an RT::Date.
- 
 
 ------------------------------------------------------------------------
-r1507 | jesse | 2004-09-19 20:58:19 -0400 (Sun, 19 Sep 2004) | 6 lines
+r447 | jesse | 2004-02-25 18:25:58 -0500 (Wed, 25 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
 
- r10219@tinbook (orig r1458):  leira | 2004-09-08T21:19:51.021183Z
- If something is overdue, set DueRelative to class "overdue".
- 
- Note: core RT doesn't have an "overdue" class at this time.
- 
+Fixing ACL for "public" user attributes.
 
 ------------------------------------------------------------------------
-r1506 | jesse | 2004-09-19 16:20:43 -0400 (Sun, 19 Sep 2004) | 1 line
+r444 | jesse | 2004-02-25 14:18:32 -0500 (Wed, 25 Feb 2004) | 3 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/etc/upgrade/3.3.0/schema.mysql
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/README
+   M /rt/branches/rt-3.1/UPGRADING
+   M /rt/branches/rt-3.1/etc/schema.Informix
+   M /rt/branches/rt-3.1/etc/schema.Oracle
+   M /rt/branches/rt-3.1/etc/schema.Pg
+   M /rt/branches/rt-3.1/etc/schema.SQLite
+   M /rt/branches/rt-3.1/etc/schema.mysql
+   D /rt/branches/rt-3.1/etc/upgrade/2.1.71
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.Informix
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.Oracle
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.Pg
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.SQLite
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/acl.mysql
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/content
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/schema.Informix
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/schema.Oracle
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/schema.Pg
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/schema.SQLite
+   A /rt/branches/rt-3.1/etc/upgrade/3.1.0/schema.mysql
+   M /rt/branches/rt-3.1/releng.cnf
+   M /rt/branches/rt-3.1/sbin/rt-setup-database.in
 
-Fixing case of mysql tablenames, since all the world is not case insensitive like Mac OS X. This is a good thing
-------------------------------------------------------------------------
-r1493 | autrijus | 2004-09-15 11:40:44 -0400 (Wed, 15 Sep 2004) | 11 lines
-Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
+Added instructions for upgrading from 3.0.x to 3.1.x
 
- r7404@not:   | 2004-09-15T00:04:07.008049Z
- 
- 
- 
- r7442@not:   | 2004-09-15T15:39:23.096249Z
-  ----------------------------------------------------------------------
-  r7441@not:  autrijus | 2004-09-15T15:20:23.097011Z
-  * Luis Arnauth pointed out that we did not serve mail-gateway.
-  ----------------------------------------------------------------------
- 
 
 ------------------------------------------------------------------------
-r1480 | jesse | 2004-09-13 23:28:52 -0400 (Mon, 13 Sep 2004) | 1 line
+r440 | leira | 2004-02-23 14:47:25 -0500 (Mon, 23 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING/releng.cnf
+   M /rt/branches/rt-3.1/html/Admin/Queues/Modify.html
 
-Bumped to 3.3.6
-------------------------------------------------------------------------
-r1461 | autrijus | 2004-09-08 17:30:59 -0400 (Wed, 08 Sep 2004) | 7 lines
-Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/Makefile.in
-   M /rt/branches/3.3-TESTING/configure.ac
-
- r5770@xor:  autrijus | 2004-09-08T20:42:48.599276Z
- 
- 
- 
- r5809@xor:  autrijus | 2004-09-08T21:30:29.869203Z
- * add sbin/rt-dump-database into sbin files.
+We already create a title that's appropriate to the current action.  We should use it.
 
 ------------------------------------------------------------------------
-r1457 | jesse | 2004-09-08 16:31:26 -0400 (Wed, 08 Sep 2004) | 6 lines
+r439 | leira | 2004-02-23 13:53:44 -0500 (Mon, 23 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Tools/Offline.html
+   M /rt/branches/rt-3.1/html/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Elements/MyTickets
 
- 
- ----------------------------------------------------------------------
- r10212@tinbook:  jesse | 2004-09-08T20:30:48.849107Z
- merging 3.2's Offline.html page forward to 3.3
- ----------------------------------------------------------------------
+Use $RT::WebPath for links to Display page.
 
 ------------------------------------------------------------------------
-r1456 | autrijus | 2004-09-08 15:59:38 -0400 (Wed, 08 Sep 2004) | 4 lines
+r436 | jesse | 2004-02-22 22:41:01 -0500 (Sun, 22 Feb 2004) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/Makefile.in
-
- r5749@xor:  autrijus | 2004-09-08T19:59:51.949128Z
- * Add mason_handler.scgi and standalone_httpd into list of files
-   to be made executable on "make fixperms".
+   M /rt/branches/rt-3.1/html/Projects/Elements/OverviewEntry
+   M /rt/branches/rt-3.1/html/Projects/Overview.html
 
-------------------------------------------------------------------------
-r1455 | autrijus | 2004-09-08 15:54:55 -0400 (Wed, 08 Sep 2004) | 3 lines
-Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/lib/RT/Handle.pm
+cleaning up project managment ui a bit
 
- r5741@xor:  autrijus | 2004-09-08T19:54:33.611316Z
- * With SQLite, put database in $VarPath if $DatabaseName is relative.
 
 ------------------------------------------------------------------------
-r1454 | autrijus | 2004-09-08 15:54:32 -0400 (Wed, 08 Sep 2004) | 4 lines
+r435 | jesse | 2004-02-22 18:44:03 -0500 (Sun, 22 Feb 2004) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/Makefile.in
-
- r5740@xor:  autrijus | 2004-09-08T19:54:01.384500Z
- * Let "make install" for inplace layout work without hassle.
- 
+   M /rt/branches/rt-3.1/html/Projects/Elements/OverviewEntry
+   M /rt/branches/rt-3.1/html/Projects/Elements/SelectProjectTaskEntry
+   M /rt/branches/rt-3.1/html/Projects/Overview.html
 
-------------------------------------------------------------------------
-r1453 | jesse | 2004-09-08 15:00:44 -0400 (Wed, 08 Sep 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   A /rt/branches/3.3-TESTING/html/Admin/autohandler
+Work on the project view to get rid of extra windows
 
- r10209@tinbook:  jesse | 2004-09-08T17:44:02.958487Z
- New autohandler to keep prying eyes out of the adminui
 
 ------------------------------------------------------------------------
-r1452 | jesse | 2004-09-08 12:49:35 -0400 (Wed, 08 Sep 2004) | 3 lines
+r428 | jesse | 2004-02-19 02:54:55 -0500 (Thu, 19 Feb 2004) | 5 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Admin/Tools/Configuration.html
+   M /rt/branches/rt-3.1/sbin/rt-setup-database.in
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- r10201@tinbook:  jesse | 2004-09-08T16:46:05.221674Z
- Ticket listings modified to show which N results they're showing
+Added acl check to the configuration dumper.
 
-------------------------------------------------------------------------
-r1451 | jesse | 2004-09-08 12:49:19 -0400 (Wed, 08 Sep 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/SelectOwner
+more work on the sqlite port
 
- r10200@tinbook:  jesse | 2004-09-08T16:44:11.407371Z
- Modified search UI to only show potential owners for tickets in queues the user can see.
 
 ------------------------------------------------------------------------
-r1450 | jesse | 2004-09-08 12:49:07 -0400 (Wed, 08 Sep 2004) | 3 lines
+r427 | jesse | 2004-02-18 23:03:16 -0500 (Wed, 18 Feb 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditSearches
+   M /rt/branches/rt-3.1/README
+   M /rt/branches/rt-3.1/etc/schema.Oracle
+   M /rt/branches/rt-3.1/html/Admin/Elements/Tabs
+   A /rt/branches/rt-3.1/html/Admin/Elements/ToolTabs
+   A /rt/branches/rt-3.1/html/Admin/Tools
+   A /rt/branches/rt-3.1/html/Admin/Tools/Configuration.html
+   A /rt/branches/rt-3.1/html/Admin/Tools/index.html
+   M /rt/branches/rt-3.1/html/Elements/Callback
+   M /rt/branches/rt-3.1/html/Elements/SetupSessionCookie
+   M /rt/branches/rt-3.1/html/NoAuth/webrt.css
+   M /rt/branches/rt-3.1/html/Search/Elements/PickRestriction
+   M /rt/branches/rt-3.1/html/Ticket/Attachment/dhandler
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowAttachments
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowMessageStanza
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowTransaction
+   M /rt/branches/rt-3.1/html/autohandler
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Group_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Handle.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/StyleGuide.pod
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Users_Overlay.pm
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- r10199@tinbook:  jesse | 2004-09-08T16:42:14.323284Z
- Edited the Saved Search UI to not display things the user can not do
+Merging RT 3.0.9; adding a "tools" admin menu which prints out your environment, fairly invasively
 
-------------------------------------------------------------------------
-r1449 | jesse | 2004-09-08 12:48:48 -0400 (Wed, 08 Sep 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Group_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Groups_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/System.pm
 
- r10198@tinbook:  jesse | 2004-09-08T16:40:40.817855Z
- Added new rights: ShowConfigTab, LoadSavedSearch, CreateSavedSearch
 
 ------------------------------------------------------------------------
-r1448 | autrijus | 2004-09-08 05:02:12 -0400 (Wed, 08 Sep 2004) | 7 lines
+r412 | jesse | 2004-02-11 17:20:00 -0500 (Wed, 11 Feb 2004) | 4 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/README
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Bulk.html
+   M /rt/branches/rt-3.1/html/Search/Elements/EditSearches
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   M /rt/branches/rt-3.1/html/Search/Results.tsv
 
- r4031@not:  autrijus | 2004-09-07T20:56:58.734255Z
- 
- 
- 
- r4032@not:  autrijus | 2004-09-07T21:02:14.437187Z
- * Unify httpd.conf settings for mod_perl1 and mod_perl2.
+Saved searches quirks fixed. Bulk update and Download .xls cleaned up
 
-------------------------------------------------------------------------
-r1447 | jesse | 2004-09-08 01:24:48 -0400 (Wed, 08 Sep 2004) | 3 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
 
- r10181@tinbook:  jesse | 2004-09-08T05:21:47.107322Z
- ACL checks to make sure a user can modify both tickets when creating a link
 
 ------------------------------------------------------------------------
-r1446 | jesse | 2004-09-08 01:24:34 -0400 (Wed, 08 Sep 2004) | 3 lines
+r409 | jesse | 2004-02-11 00:32:11 -0500 (Wed, 11 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/releng.cnf
 
- r10180@tinbook:  jesse | 2004-09-08T05:18:46.031232Z
- Fixed a debug message
+Bumping to 3.1.3
 
 ------------------------------------------------------------------------
-r1445 | jesse | 2004-09-08 01:24:22 -0400 (Wed, 08 Sep 2004) | 3 lines
+r408 | jesse | 2004-02-11 00:31:36 -0500 (Wed, 11 Feb 2004) | 4 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
+   M /rt/branches/rt-3.1/etc/RT_Config.pm.in
+   M /rt/branches/rt-3.1/html/Elements/Quicksearch
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/BuildFormatString
+   M /rt/branches/rt-3.1/lib/RT/Attribute_Overlay.pm
 
- r10179@tinbook:  jesse | 2004-09-08T05:17:10.044025Z
- Fixed a bug in the web handler that would throw an error when not running in a modperl environemnt
+fixed up the front page click-through listings.
+Saved searches are now acled properly, though the ui and error reporting leaves something to be desired
 
-------------------------------------------------------------------------
-r1444 | jesse | 2004-09-08 01:24:02 -0400 (Wed, 08 Sep 2004) | 4 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/SelectQueue
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickBasics
-
- r10178@tinbook:  jesse | 2004-09-08T05:16:16.426259Z
- When searching for tickets, now the user will only see tickets they have the right to ShowTicket in...
- 
 
 ------------------------------------------------------------------------
-r1443 | jesse | 2004-09-08 01:23:31 -0400 (Wed, 08 Sep 2004) | 6 lines
+r407 | jesse | 2004-02-09 22:03:41 -0500 (Mon, 09 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Elements/Quicksearch
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/EditSearches
 
- r10177@tinbook:  jesse | 2004-09-07T23:05:53.208347Z
- Updated the Quicksearch element to use slightly cleaner code.
- 
- BEHAVIOR CHANGE:  Only queues for which the current user has "ShowTicket" are listed in the queue list.
- 
+Saving and loading formats works now.
 
 ------------------------------------------------------------------------
-r1436 | jesse | 2004-09-07 18:50:53 -0400 (Tue, 07 Sep 2004) | 7 lines
+r406 | jesse | 2004-02-09 17:57:41 -0500 (Mon, 09 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/EditFormat
+   M /rt/branches/rt-3.1/html/Search/Elements/EditSearches
+   M /rt/branches/rt-3.1/html/Search/Results.html
 
- r10175@tinbook:  jesse | 2004-09-07T22:49:31.744508Z
- iRefactoring of the MergeInto method to use less code, be more correct and be clearer. 
- 
- Updated tests to test merge.
- 
- 
+Ticket search paging works now
 
 ------------------------------------------------------------------------
-r1421 | autrijus | 2004-09-06 10:50:19 -0400 (Mon, 06 Sep 2004) | 2 lines
+r405 | leira | 2004-02-09 17:51:26 -0500 (Mon, 09 Feb 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/zh_tw.po
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Edit.html
+   M /rt/branches/rt-3.1/html/Search/Results.html
 
-* Updated Chinese translations.
+Pass Format, Query, and Rows to Tabs element.
 
 ------------------------------------------------------------------------
-r1417 | jesse | 2004-09-03 19:24:32 -0400 (Fri, 03 Sep 2004) | 3 lines
+r404 | leira | 2004-02-09 16:43:28 -0500 (Mon, 09 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
 
- r10151@tinbook:  jesse | 2004-09-03T23:24:09.414496Z
- minor library cleanups
+Don't add extra "" to the format string.
 
 ------------------------------------------------------------------------
-r1416 | jesse | 2004-09-03 19:24:24 -0400 (Fri, 03 Sep 2004) | 3 lines
+r403 | leira | 2004-02-09 16:06:22 -0500 (Mon, 09 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/rt-mailgate.in
-   M /rt/branches/3.3-TESTING/configure.ac
-   M /rt/branches/3.3-TESTING/lib/t/02regression.t.in
-   A /rt/branches/3.3-TESTING/lib/t/06mailgateway.pl.in
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- r10150@tinbook:  jesse | 2004-09-03T23:22:35.061493Z
- Moving mailgateway tests into their own file
+Get rid of evals.
 
 ------------------------------------------------------------------------
-r1415 | jesse | 2004-09-03 16:35:38 -0400 (Fri, 03 Sep 2004) | 9 lines
+r398 | leira | 2004-02-06 01:08:18 -0500 (Fri, 06 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- ----------------------------------------------------------------------
- r10116@tinbook:  jesse | 2004-09-02T21:14:26.642415Z
- 
- ----------------------------------------------------------------------
- r10144@tinbook:  jesse | 2004-09-03T20:32:06.311337Z
- Query builder fixes (merge bug)
- 
- ----------------------------------------------------------------------
+"our" variables are gone gone gone
 
 ------------------------------------------------------------------------
-r1388 | jesse | 2004-09-01 00:43:19 -0400 (Wed, 01 Sep 2004) | 5 lines
+r396 | jesse | 2004-02-05 23:32:47 -0500 (Thu, 05 Feb 2004) | 2 lines
 Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights
-
- ----------------------------------------------------------------------
- r10114@tinbook:  jesse | 2004-09-01T04:43:10.448516Z
- Don't show rights that a principal has in the list of rights that can be granted to them
- ----------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r1387 | jesse | 2004-09-01 00:10:48 -0400 (Wed, 01 Sep 2004) | 11 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway
-   M /rt/branches/3.3-TESTING/html/Search/Build.html
-   M /rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickBasics
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria
-
- ----------------------------------------------------------------------
- r8302@tinbook:  jesse | 2004-07-28T20:59:42.277484Z
- 
- ----------------------------------------------------------------------
- r10109@tinbook:  jesse | 2004-09-01T04:08:25.198125Z
- rewrote mail gateway shim to be a bit more robust
- ----------------------------------------------------------------------
- r10110@tinbook:  jesse | 2004-09-01T04:09:17.429478Z
- Started to refactor the query builder ui code to yank out the bogus logic.
- ----------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r1383 | jesse | 2004-08-31 22:37:44 -0400 (Tue, 31 Aug 2004) | 407 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/Makefile.in
-   M /rt/branches/3.3-TESTING/README
-   M /rt/branches/3.3-TESTING/bin/mason_handler.fcgi.in
-   M /rt/branches/3.3-TESTING/bin/mason_handler.scgi.in
-   M /rt/branches/3.3-TESTING/bin/mason_handler.svc.in
-   M /rt/branches/3.3-TESTING/bin/rt-crontool.in
-   M /rt/branches/3.3-TESTING/bin/rt-mailgate.in
-   M /rt/branches/3.3-TESTING/bin/rt.in
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
-   M /rt/branches/3.3-TESTING/etc/drop.Oracle
-   M /rt/branches/3.3-TESTING/etc/upgrade/3.1.0/schema.Pg
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/AddCustomFieldValue
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/CreateUserCalled
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFieldValues
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditQueueWatchers
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditScrip
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditScrips
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditTemplates
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditUserComments
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/GroupTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/Header
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalScrips
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ModifyTemplate
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/QueueRightsForUser
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/QueueTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectCustomFieldType
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectGroups
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyGroup
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyQueue
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyUser
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectNewGroupMembers
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectScrip
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripAction
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripCondition
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectSingleOrMultiple
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectStage
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectTemplate
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectUsers
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SystemTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ToolTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/UserTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Global/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Scrip.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Scrips.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Template.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Templates.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/Members.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/CustomField.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/CustomFields.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/People.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Scrip.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Scrips.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Template.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Templates.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Tools/Configuration.html
-   M /rt/branches/3.3-TESTING/html/Admin/Tools/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/index.html
-   M /rt/branches/3.3-TESTING/html/Approvals/Display.html
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/Approve
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/PendingMyApproval
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/ShowDependency
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Approvals/index.html
-   M /rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedEnd
-   M /rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedStart
-   M /rt/branches/3.3-TESTING/html/Elements/Callback
-   M /rt/branches/3.3-TESTING/html/Elements/Checkbox
-   A /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable
-   A /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Header
-   A /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/ParseFormat
-   A /rt/branches/3.3-TESTING/html/Elements/CollectionAsTable/Row
-   M /rt/branches/3.3-TESTING/html/Elements/CreateTicket
-   M /rt/branches/3.3-TESTING/html/Elements/EditLinks
-   M /rt/branches/3.3-TESTING/html/Elements/Error
-   M /rt/branches/3.3-TESTING/html/Elements/Footer
-   M /rt/branches/3.3-TESTING/html/Elements/GotoTicket
-   M /rt/branches/3.3-TESTING/html/Elements/Header
-   M /rt/branches/3.3-TESTING/html/Elements/ListActions
-   M /rt/branches/3.3-TESTING/html/Elements/Login
-   M /rt/branches/3.3-TESTING/html/Elements/Menu
-   M /rt/branches/3.3-TESTING/html/Elements/MessageBox
-   M /rt/branches/3.3-TESTING/html/Elements/MyRequests
-   M /rt/branches/3.3-TESTING/html/Elements/MyTickets
-   M /rt/branches/3.3-TESTING/html/Elements/PageLayout
-   M /rt/branches/3.3-TESTING/html/Elements/QueryString
-   M /rt/branches/3.3-TESTING/html/Elements/QuickCreate
-   M /rt/branches/3.3-TESTING/html/Elements/Quicksearch
-   A /rt/branches/3.3-TESTING/html/Elements/RT__Ticket
-   A /rt/branches/3.3-TESTING/html/Elements/RT__Ticket/ColumnMap
-   M /rt/branches/3.3-TESTING/html/Elements/Refresh
-   M /rt/branches/3.3-TESTING/html/Elements/ScrubHTML
-   M /rt/branches/3.3-TESTING/html/Elements/Section
-   M /rt/branches/3.3-TESTING/html/Elements/SelectAttachmentField
-   M /rt/branches/3.3-TESTING/html/Elements/SelectBoolean
-   M /rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldOperator
-   M /rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldValue
-   M /rt/branches/3.3-TESTING/html/Elements/SelectDate
-   M /rt/branches/3.3-TESTING/html/Elements/SelectDateRelation
-   M /rt/branches/3.3-TESTING/html/Elements/SelectDateType
-   M /rt/branches/3.3-TESTING/html/Elements/SelectEqualityOperator
-   M /rt/branches/3.3-TESTING/html/Elements/SelectGroups
-   M /rt/branches/3.3-TESTING/html/Elements/SelectLang
-   M /rt/branches/3.3-TESTING/html/Elements/SelectLinkType
-   M /rt/branches/3.3-TESTING/html/Elements/SelectMatch
-   M /rt/branches/3.3-TESTING/html/Elements/SelectNewTicketQueue
-   M /rt/branches/3.3-TESTING/html/Elements/SelectOwner
-   M /rt/branches/3.3-TESTING/html/Elements/SelectQueue
-   M /rt/branches/3.3-TESTING/html/Elements/SelectResultsPerPage
-   M /rt/branches/3.3-TESTING/html/Elements/SelectSortOrder
-   M /rt/branches/3.3-TESTING/html/Elements/SelectStatus
-   M /rt/branches/3.3-TESTING/html/Elements/SelectTicketSortBy
-   M /rt/branches/3.3-TESTING/html/Elements/SelectTicketTypes
-   M /rt/branches/3.3-TESTING/html/Elements/SelectUsers
-   M /rt/branches/3.3-TESTING/html/Elements/SelectWatcherType
-   M /rt/branches/3.3-TESTING/html/Elements/SetupSessionCookie
-   M /rt/branches/3.3-TESTING/html/Elements/ShowLink
-   M /rt/branches/3.3-TESTING/html/Elements/ShowLinks
-   M /rt/branches/3.3-TESTING/html/Elements/SimpleSearch
-   M /rt/branches/3.3-TESTING/html/Elements/Submit
-   M /rt/branches/3.3-TESTING/html/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Elements/TicketList
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBox
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBoxEnd
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBoxStart
-   M /rt/branches/3.3-TESTING/html/NoAuth/Logout.html
-   M /rt/branches/3.3-TESTING/html/NoAuth/Reminder.html
-   A /rt/branches/3.3-TESTING/html/NoAuth/images/autohandler
-   M /rt/branches/3.3-TESTING/html/NoAuth/webrt.css
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/default
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/ns
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/attachments
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/default
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/history
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/links
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/default
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/ns
-   M /rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway
-   M /rt/branches/3.3-TESTING/html/REST/1.0/autohandler
-   M /rt/branches/3.3-TESTING/html/REST/1.0/dhandler
-   M /rt/branches/3.3-TESTING/html/REST/1.0/logout
-   M /rt/branches/3.3-TESTING/html/REST/1.0/search/dhandler
-   M /rt/branches/3.3-TESTING/html/REST/1.0/search/ticket
-   M /rt/branches/3.3-TESTING/html/REST/1.0/ticket/comment
-   M /rt/branches/3.3-TESTING/html/REST/1.0/ticket/link
-   M /rt/branches/3.3-TESTING/html/REST/1.0/ticket/merge
-   M /rt/branches/3.3-TESTING/html/Search/Build.html
-   M /rt/branches/3.3-TESTING/html/Search/Bulk.html
-   M /rt/branches/3.3-TESTING/html/Search/Edit.html
-   M /rt/branches/3.3-TESTING/html/Search/Elements/BuildFormatString
-   M /rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditFormat
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditSearches
-   M /rt/branches/3.3-TESTING/html/Search/Elements/NewListActions
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickBasics
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SearchPrivacy
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectAndOr
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectLinks
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectPersonType
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchObject
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchesForObjects
-   M /rt/branches/3.3-TESTING/html/Search/Results.html
-   M /rt/branches/3.3-TESTING/html/Search/Results.rdf
-   M /rt/branches/3.3-TESTING/html/Search/Results.tsv
-   M /rt/branches/3.3-TESTING/html/SelfService/Attachment/dhandler
-   M /rt/branches/3.3-TESTING/html/SelfService/Closed.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Create.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Display.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/GotoTicket
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/Header
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/MyRequests
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/SelfService/Error.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Prefs.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Update.html
-   M /rt/branches/3.3-TESTING/html/SelfService/index.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Attachment/dhandler
-   M /rt/branches/3.3-TESTING/html/Ticket/Create.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Display.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/AddWatchers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/BulkLinks
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditBasics
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomFields
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditDates
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditPeople
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditWatchers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/FindAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/LoadTextAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/PreviewScrips
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowBasics
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowCustomFields
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDates
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDependencies
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowGroupMembers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowHistory
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMemberOf
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMembers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageHeaders
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageStanza
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowPeople
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowReferences
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowRequestor
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowSummary
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransaction
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransactionAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowUserEntry
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Ticket/History.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Modify.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyAll.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyDates.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyLinks.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyPeople.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ShowEmailRecord.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Update.html
-   M /rt/branches/3.3-TESTING/html/Tools/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Tools/MyDay.html
-   M /rt/branches/3.3-TESTING/html/Tools/Offline.html
-   M /rt/branches/3.3-TESTING/html/User/Delegation.html
-   M /rt/branches/3.3-TESTING/html/User/Elements/DelegateRights
-   M /rt/branches/3.3-TESTING/html/User/Elements/GroupTabs
-   M /rt/branches/3.3-TESTING/html/User/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/User/Groups/Members.html
-   M /rt/branches/3.3-TESTING/html/User/Groups/Modify.html
-   M /rt/branches/3.3-TESTING/html/User/Groups/index.html
-   M /rt/branches/3.3-TESTING/html/User/Prefs.html
-   M /rt/branches/3.3-TESTING/html/autohandler
-   M /rt/branches/3.3-TESTING/html/index.html
-   M /rt/branches/3.3-TESTING/html/l
-   M /rt/branches/3.3-TESTING/lib/RT/ACE.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACL_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/AutoOpen.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/Autoreply.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/EscalatePriority.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/Notify.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/NotifyAsComment.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/RecordComment.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/RecordCorrespondence.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/ResolveMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/SetPriority.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/UserDefined.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachment.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachments.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachments_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attribute.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attribute_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attributes.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attributes_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Base.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMember.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMember_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/AnyTransaction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/BeforeDue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/Overdue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/OwnerChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/PriorityChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/PriorityExceeds.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/QueueChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/StatusChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/UserDefined.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Date.pm
-   M /rt/branches/3.3-TESTING/lib/RT/EmailParser.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Group.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMember.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMembers_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Group_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Groups.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Groups_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Handle.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/cs.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/cs.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/da.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/de.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/es.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/fi.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/fr.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/he.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/hu.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/i_default.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/it.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/ja.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/nl.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/no.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/pt_br.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/ru.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/zh_tw.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/CLI.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/GnuPG.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/MailFrom.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email/Filter/SpamAssassin.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/REST.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Link.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Link_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Links.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Links_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principal.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principals.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principals_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripAction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripAction_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripActions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripActions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripCondition.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripCondition_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripConditions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripConditions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrips.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrips_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Search/ActiveTicketsInQueue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Search/FromSQL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Search/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/SearchBuilder.pm
-   M /rt/branches/3.3-TESTING/lib/RT/System.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Template.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Template_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Templates.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Templates_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transactions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transactions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/URI/base.pm
-   M /rt/branches/3.3-TESTING/lib/RT/URI/fsck_com_rt.pm
-   M /rt/branches/3.3-TESTING/lib/RT/URI.pm
-   M /rt/branches/3.3-TESTING/lib/RT/User.pm
-   M /rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Users.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Users_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT.pm.in
-   M /rt/branches/3.3-TESTING/sbin/extract-message-catalog
-   M /rt/branches/3.3-TESTING/sbin/extract_pod_tests
-   M /rt/branches/3.3-TESTING/sbin/factory
-   M /rt/branches/3.3-TESTING/sbin/license_tag
-   M /rt/branches/3.3-TESTING/sbin/regression_harness
-   M /rt/branches/3.3-TESTING/sbin/rt-setup-database.in
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
-
- ----------------------------------------------------------------------
- r8270@tinbook (orig r1270):  autrijus | 2004-07-22T00:39:33.156202Z
-  ----------------------------------------------------------------------
-  r6200@not:  autrijus | 2004-07-22T00:37:31.494556Z
-  
-  * $Ticket->AddCustomFieldValue now takes FIELD as Name.
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8271@tinbook (orig r1271):  autrijus | 2004-07-22T00:52:53.468442Z
-  ----------------------------------------------------------------------
-  r6204@not:  autrijus | 2004-07-22T00:52:38.207887Z
-  
-  * Switch $Ticket->AddCustomFieldValue to use $cf->LoadByNameAndQueue for
-    forward compatibility.
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8272@tinbook (orig r1272):  jesse | 2004-07-22T01:04:55.279276Z
-  ----------------------------------------------------------------------
-  r8267@tinbook:  jesse | 2004-07-22T01:01:02.633960Z
-  
-  Making license blocks fold away
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8282@tinbook (orig r1276):  jesse | 2004-07-22T19:08:32.352834Z
-  ----------------------------------------------------------------------
-  r8281@tinbook:  jesse | 2004-07-22T19:08:48.451578Z
-  
-  * The "/l" component now does all its work in the init block
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8286@tinbook (orig r1277):  leira | 2004-07-23T02:30:36.111345Z
- If a template file is uploaded, clear out the old template first (as before).
- 
- ----------------------------------------------------------------------
- r8287@tinbook (orig r1278):  leira | 2004-07-23T02:32:27.864998Z
- Fill in the default queue if one was specified.
- 
- ----------------------------------------------------------------------
- r8288@tinbook (orig r1279):  leira | 2004-07-23T03:02:15.525380Z
- RT-Ticket: 5880
- RT-Status: resolved
- RT-Action: correspond
- NULL values can now be chosen, and the TicketSQL query is constructed properly.
- 
- ----------------------------------------------------------------------
- r8289@tinbook (orig r1280):  leira | 2004-07-23T03:04:27.962400Z
- No value is NULL, not null.
- 
- ----------------------------------------------------------------------
- r8290@tinbook (orig r1281):  autrijus | 2004-07-23T17:15:16.923948Z
- RT-Ticket: 5274 
- RT-Status: resolved
- RT-Update: correspond
-  
- Apply Bart Duchesne's patch for correctly deleting old TCFV '0'
- when editing SingleValue TCFs.
- 
- ----------------------------------------------------------------------
- r8291@tinbook (orig r1282):  jesse | 2004-07-23T17:34:23.556934Z
- 
-  ----------------------------------------------------------------------
-  r8285@tinbook:  jesse | 2004-07-23T17:33:04.648260Z
-  
-  Using single quotes makes the email address in the copyright not get mangled
-  ----------------------------------------------------------------------
- 
- 
- ----------------------------------------------------------------------
- r8293@tinbook (orig r1283):  jesse | 2004-07-23T21:23:10.580796Z
-  ----------------------------------------------------------------------
-  r8292@tinbook:  jesse | 2004-07-23T21:23:16.884303Z
-  
-  RT now goes out of its way to display images, like the logo... even when users fail to configure their webserver correctly
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8294@tinbook (orig r1284):  leira | 2004-07-23T21:43:20.116290Z
- Reset string properly when uploading a template file.
- 
- ----------------------------------------------------------------------
- r8304@tinbook (orig r1285):  robert | 2004-07-26T19:07:58.942428Z
-  ----------------------------------------------------------------------
-  r1287@dog:  rspier | 2004-07-26T18:56:48.690023Z
-  
-  [fsck.com #5879] - DBIx::SearchBuilder should treat 'IS' as case insensitive, since most databases do too.
-  ----------------------------------------------------------------------
-  r1288@dog:  rspier | 2004-07-26T19:00:50.217330Z
-  
-  MicroOptimizations:
-  	- if we're doing an IS NULL search already, there's no reason to do a $null_columns_ok
-  	- use || instead of 'or' so we can short-circuit
-  ----------------------------------------------------------------------
-  r1289@dog:  rspier | 2004-07-26T19:06:54.604573Z
-  
-  MicroOptimization/Cleanup:
-  	- get rid of $null_columns_ok flag
-  	- clean up logic, and use string compare instead of regexp
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8305@tinbook (orig r1286):  robert | 2004-07-26T19:15:12.786172Z
-  ----------------------------------------------------------------------
-  r1291@dog:  rspier | 2004-07-26T19:14:41.133769Z
-  
-  Revert the last microoptimization.  It smells funny and will create problems with merging to 3.3
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8307@tinbook (orig r1288):  leira | 2004-07-28T04:04:12.240846Z
- Handle 0 values properly.
- 
- ----------------------------------------------------------------------
- r8308@tinbook (orig r1289):  huberth | 2004-07-28T18:35:38.638941Z
- RT-Ticket: 5908
- RT-Status: resolved
- 
-  * drop.Oracle now drops the attributes table.
- 
- ----------------------------------------------------------------------
- r8309@tinbook (orig r1290):  huberth | 2004-07-28T18:39:36.764074Z
- RT-Ticket: 5899
- RT-Status: resolved
- 
-  * html/Search/Results.tsv now works with custom fields that have line breaks
-    within them.
- 
- 
- ----------------------------------------------------------------------
- r8311@tinbook (orig r1292):  jesse | 2004-07-29T00:08:11.298269Z
-  ----------------------------------------------------------------------
-  r8303@tinbook:  jesse | 2004-07-28T23:59:45.883318Z
-  
-  Removed the extra newlines we inserted after the copyright block, since it adds extra newlines to the mason pages, which can break some parsing.
-  
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8316@tinbook (orig r1293):  leira | 2004-07-29T05:41:51.040092Z
- Make the TitleBox title a link to the same search, only not limited to 10.
- 
- ----------------------------------------------------------------------
- r8319@tinbook (orig r1296):  alexmv | 2004-07-30T19:59:24.588580Z
-  * Fix "Unrecognised line: foo@bar" caused by 5.8.0 not matching utf8
-    against regexps
- 
- ----------------------------------------------------------------------
- r8320@tinbook (orig r1297):  huberth | 2004-07-30T21:46:43.639926Z
- RT-Ticket: 5699
- RT-Status: resolved
- 
-  * Bulk editing of custom fields (finally!) added.  Not quite as fast as
-    would be preferred, probably, but it (should) work.
- 
- 
- 
- ----------------------------------------------------------------------
- r8329@tinbook (orig r1298):  huberth | 2004-08-03T14:02:14.558593Z
- RT-Ticket: 5927
- RT-Status: resolved
- 
-  * Due dates in the past no longer look like they're in the future,
-    i.e. "6 days ago".
- 
- ----------------------------------------------------------------------
- r8333@tinbook (orig r1302):  huberth | 2004-08-03T22:06:00.556754Z
- RT-Ticket: 4473
- RT-Status: resolved
- 
-  * In Ticket/Elements/ShowAttachments, the font code that is generated
-    no longer tries to escape the quotes (to give something like
-    <font size=&#34;-1&#34;>).  Now the quotes appear.  Also, the default
-    font size for the date and size has been changed to -2, because -1
-    looks huge and out of place.
- 
- ----------------------------------------------------------------------
- r8338@tinbook (orig r1307):  alexmv | 2004-08-04T14:33:55.363891Z
- RT-Ticket: 5916
- RT-Status: resolved
-  * Postgres doesn't use '#' as a comment character
- 
- ----------------------------------------------------------------------
- r8339@tinbook (orig r1308):  alexmv | 2004-08-04T15:54:14.363856Z
- RT-Ticket: 4036
- RT-Status: resolved
-  * 'Create' is uppercase
-  * TemplateObj->QueueObj is null if the template is just being created
- 
- ----------------------------------------------------------------------
- r8340@tinbook (orig r1309):  alexmv | 2004-08-04T17:42:42.591907Z
-  * Warn if running MySQL < 4.0.x
- 
-  * Suggest something slightly more useful if we don't have InnoDB and
-    we're running MySQL 3.23
- 
- ----------------------------------------------------------------------
- r8341@tinbook (orig r1310):  alexmv | 2004-08-04T19:03:51.226982Z
- RT-Ticket: 5942
- RT-Status: resolved
-  * Use a:after {content: "..."} to put dots after titlebox links; this
-    involves one loc string change
- 
-  * Also force titlebox hrefs to be white, not black
- 
- ----------------------------------------------------------------------
- r8342@tinbook (orig r1311):  huberth | 2004-08-05T00:44:40.527084Z
- RT-Ticket: 4234
- RT-Status: resolved
- 
-  * Doubled headers and navbars no longer appear when an unprivileged user
-    creates a Custom Field.  (This happened because Abort was called within
-    a subcomponent.)
- 
- ----------------------------------------------------------------------
- r8343@tinbook (orig r1312):  alexmv | 2004-08-05T00:50:16.625070Z
-  * Removing accidental paste
- 
- ----------------------------------------------------------------------
- r8344@tinbook (orig r1313):  huberth | 2004-08-05T18:47:43.340906Z
-  * Fixed a couple of other stupid errors resulting from r1311 relating to
-    quoting of pathnames.
- 
- ----------------------------------------------------------------------
- r8383@tinbook (orig r1326):  alexmv | 2004-08-10T19:38:59.860454Z
-  * Add callback in header proper, to allow injection of style and script tags
- 
- ----------------------------------------------------------------------
- r8394@tinbook (orig r1335):  leira | 2004-08-17T16:03:08.253892Z
- Added a new callback at the very beginning of the <%INIT> block.
- 
- RTIR uses this callback to look at the queue and hijack the display
- page, however, the callback itself is more generic than that: it
- happens at the very beginning, and receives all arguments.
- 
- 
- ----------------------------------------------------------------------
- r8396@tinbook (orig r1337):  alexmv | 2004-08-17T19:03:04.023840Z
- RT-Ticket: 5820
- RT-Update: correspond
- RT-Status: resolved
- 
-  * Use "local $_" to prevent "modification of read-only value..."
-    caused by aliasing $_ to a constant
- 
- ----------------------------------------------------------------------
- r8397@tinbook (orig r1338):  alexmv | 2004-08-17T21:05:10.004165Z
- RT-Ticket: 5716
- RT-Update: correspond
- RT-Status: resolved
- 
-  * Move code which is not specific to parsing mime messages into
-    RT::Email::Interface; this removes a large base of duplicated code,
-    and some sketchy "methods" that were getting called with "" as self
-    often
- 
- 
- ----------------------------------------------------------------------
- r8398@tinbook (orig r1339):  alexmv | 2004-08-17T22:16:11.573879Z
- RT-Ticket: 5963
- RT-Update: correspond
- RT-Status: resolved
- 
-  * Applied patch provided by bobg at the domain of uic.edu to exit if
-    there is no content on standard input
- 
- 
- ----------------------------------------------------------------------
- r8399@tinbook (orig r1340):  alexmv | 2004-08-17T22:18:15.933790Z
- RT-Ticket: 5939
- RT-Status: resolved
- RT-Update: correspond
- 
-  * Take out un-needed $fontsize variable; removing <font> tags will
-    have to wait
- 
- ----------------------------------------------------------------------
- r8400@tinbook (orig r1341):  alexmv | 2004-08-17T23:57:59.583821Z
- RT-Ticket: 5897
- RT-Update: correspond
- RT-Status: resolved
- 
-  * ModifyTicket includes CommentOnTicket and ReplyToTicket rights;
-    this effects display of "[Reply] [Comment]" links per transaction
- 
- ----------------------------------------------------------------------
- r8401@tinbook (orig r1342):  alexmv | 2004-08-18T00:05:11.483081Z
- RT-Ticket: 5823
- RT-Update: correspond
- RT-Status: resolved
- 
-  * Applied patch from bobg at the domain of uic.edu, prefixing refresh
-    form's url with $RT::WebPath
- 
- ----------------------------------------------------------------------
- r8402@tinbook (orig r1343):  huberth | 2004-08-18T02:23:42.094984Z
-  * Made bulk editing of custom fields slightly more efficient and 
-    simultaneously cleaned up some of its code.
-  * Also added a little bit of docs for RT::Ticket::Create() - Priority
-    is a valid arg also.
- 
- ----------------------------------------------------------------------
- r8403@tinbook (orig r1344):  alexmv | 2004-08-18T02:27:04.024544Z
- RT-Ticket: 5988
- RT-Update: correspond
- RT-Status: resolved
- 
-  * Back out change r1338, as it breaks API compatibility in a stable
-    release
- 
- ----------------------------------------------------------------------
- r8416@tinbook (orig r1347):  alexmv | 2004-08-18T19:31:10.580958Z
- RT-Ticket: 5826
- RT-Update: correspond
- RT-Status: resolved
- 
-  * Fix logic; bounce message as a loop if $IsALoop and not $RT::StoreLoops;
-    was "if $IsALoop and ($RT::LoopsToOwner and not $RT::StoreLoops)"
- 
- ----------------------------------------------------------------------
- r8417@tinbook (orig r1348):  alexmv | 2004-08-18T20:22:42.711734Z
- RT-Ticket: 5215
- RT-Update: correspond
- RT-Status: resolved
- 
-  * When merging tickets, the resulting ticket's
-    Time{Estimated,Worked,Left} should be the sum of the fields from
-    both tickets
- 
- ----------------------------------------------------------------------
- r8418@tinbook (orig r1349):  alexmv | 2004-08-18T20:38:09.170879Z
- RT-Ticket: 5963
- RT-Update: correspond
- RT-Status: resolved
- 
-  * Some mailers care about the return value rt-mailgate; 'return 0'
-    instead of 'die' to ensure that we fake success
- 
- ----------------------------------------------------------------------
- r8420@tinbook (orig r1351):  alexmv | 2004-08-18T21:53:17.081053Z
- RT-Ticket: 5792
- RT-Update: correspond
- RT-Status: resolved
- 
-  * Move the lasttrans anchor into a table cell
- 
- ----------------------------------------------------------------------
- r8421@tinbook (orig r1352):  alexmv | 2004-08-18T22:04:57.879119Z
- RT-Ticket: 5809
- RT-Status: resolved
- 
-  * Derivative of the doc. patch in [fsck.com #5809] applied
- 
- ----------------------------------------------------------------------
- r8456@tinbook (orig r1372):  jesse | 2004-08-28T23:47:32.411217Z
-  ----------------------------------------------------------------------
-  r8454@tinbook:  jesse | 2004-08-28T23:42:12.276700Z
-  
-  ----------------------------------------------------------------------
-  r8455@tinbook:  jesse | 2004-08-28T23:46:06.962020Z
-  Adding a "SearchActions" callback to Search/Results.html
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8473@tinbook (orig r1376):  jesse | 2004-08-31T04:22:49.340942Z
-  ----------------------------------------------------------------------
-  r8457@tinbook:  jesse | 2004-08-29T01:52:08.449173Z
-  Refactored the TicketList compnent to be more reusable
-  ----------------------------------------------------------------------
-  r8458@tinbook:  jesse | 2004-08-29T02:41:50.808026Z
-  Adding a callback for a customer
-  ----------------------------------------------------------------------
-  r8471@tinbook:  jesse | 2004-08-31T04:20:29.035587Z
-  Fixed the callback in Results.html to not flake out when we've got interesting %ARGS coming into it.
-  
-  ----------------------------------------------------------------------
-  r8472@tinbook:  jesse | 2004-08-31T04:21:47.346418Z
-  Added "DependedOnBy" to TicketSQL  to mean what it means elsewhere.
-  
-  Made TicketSQL let you search by ticket type
-  
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8479@tinbook (orig r1379):  jesse | 2004-08-31T08:14:54.830848Z
-  ----------------------------------------------------------------------
-  r8478@tinbook:  jesse | 2004-08-31T08:14:29.467020Z
-  Inlined Tickets_Overlay_SQL's "match"
-  
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8482@tinbook (orig r1380):  jesse | 2004-08-31T18:49:23.384189Z
- 
-  ----------------------------------------------------------------------
-  r8480@tinbook:  jesse | 2004-08-31T18:48:19.505579Z
-  Added callbacks to let users add entries to show and edit basics boxes
-  
-  Made "type" an editable field on tickets (at the web api level, not in the UI)
-  
-  ----------------------------------------------------------------------
- 
- 
- ----------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r1345 | alexmv | 2004-08-17 22:42:49 -0400 (Tue, 17 Aug 2004) | 6 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.3-TESTING/lib/RT/EmailParser.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm
+   A /rt/branches/rt-3.1/releng.cnf
 
-RT-Ticket: 5716
-RT-Status: resolved
-RT-Update: correspond
-
- * Duplicate code change backed out of 3.2 and checked into 3.3
-
-------------------------------------------------------------------------
-r1275 | jesse | 2004-07-22 14:36:03 -0400 (Thu, 22 Jul 2004) | 8 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/PickCustomFields
-
-
- ----------------------------------------------------------------------
- r8279@tinbook:  jesse | 2004-07-22T18:33:54.229892Z
- 
- * Allow the move up/move down links to work for custom field ordering
- ----------------------------------------------------------------------
-
-
-------------------------------------------------------------------------
-r1268 | jesse | 2004-07-21 15:36:07 -0400 (Wed, 21 Jul 2004) | 1 line
-Changed paths:
-   M /rt/branches/3.3-TESTING/releng.cnf
-
-Bumped to 3.3.5
-------------------------------------------------------------------------
-r1267 | jesse | 2004-07-21 15:12:31 -0400 (Wed, 21 Jul 2004) | 67 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/Makefile.in
-   M /rt/branches/3.3-TESTING/README
-   M /rt/branches/3.3-TESTING/bin/mason_handler.fcgi.in
-   M /rt/branches/3.3-TESTING/bin/mason_handler.scgi.in
-   M /rt/branches/3.3-TESTING/bin/mason_handler.svc.in
-   M /rt/branches/3.3-TESTING/bin/rt-crontool.in
-   M /rt/branches/3.3-TESTING/bin/rt-mailgate.in
-   M /rt/branches/3.3-TESTING/bin/rt.in
-   M /rt/branches/3.3-TESTING/bin/standalone_httpd.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/configure.ac
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/Objects.html
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/CustomFields/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/AddCustomFieldValue
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/CreateUserCalled
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/CustomFieldTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFieldValues
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditQueueWatchers
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditScrip
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditScrips
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditTemplates
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditUserComments
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/GroupTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/Header
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ListGlobalScrips
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ModifyTemplate
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ObjectCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/PickCustomFields
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/PickObjects
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/QueueRightsForUser
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/QueueTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectCustomFieldLookupType
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectCustomFieldType
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectGroups
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyGroup
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyQueue
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectModifyUser
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectNewGroupMembers
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectScrip
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripAction
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectScripCondition
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectSingleOrMultiple
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectStage
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectTemplate
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SelectUsers
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/SystemTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/ToolTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/UserTabs
-   M /rt/branches/3.3-TESTING/html/Admin/Global/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Scrip.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Scrips.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Template.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/Templates.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Global/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/CustomFields.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/History.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/Members.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Groups/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/CustomField.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/CustomFields.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/GroupRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/People.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Scrip.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Scrips.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Template.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/Templates.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/UserRights.html
-   M /rt/branches/3.3-TESTING/html/Admin/Queues/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Tools/Configuration.html
-   M /rt/branches/3.3-TESTING/html/Admin/Tools/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/CustomFields.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/History.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/Memberships.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/Modify.html
-   M /rt/branches/3.3-TESTING/html/Admin/Users/index.html
-   M /rt/branches/3.3-TESTING/html/Admin/index.html
-   M /rt/branches/3.3-TESTING/html/Approvals/Display.html
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/Approve
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/PendingMyApproval
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/ShowDependency
-   M /rt/branches/3.3-TESTING/html/Approvals/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Approvals/index.html
-   M /rt/branches/3.3-TESTING/html/Download/CustomFieldValue/dhandler
-   M /rt/branches/3.3-TESTING/html/Download/Tabular/dhandler
-   M /rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedEnd
-   M /rt/branches/3.3-TESTING/html/Elements/BevelBoxRaisedStart
-   M /rt/branches/3.3-TESTING/html/Elements/Callback
-   M /rt/branches/3.3-TESTING/html/Elements/Checkbox
-   M /rt/branches/3.3-TESTING/html/Elements/CreateTicket
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldBinary
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldFreeform
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldImage
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldSelect
-   M /rt/branches/3.3-TESTING/html/Elements/EditCustomFieldText
-   M /rt/branches/3.3-TESTING/html/Elements/EditLinks
-   M /rt/branches/3.3-TESTING/html/Elements/Error
-   M /rt/branches/3.3-TESTING/html/Elements/Footer
-   M /rt/branches/3.3-TESTING/html/Elements/GotoTicket
-   M /rt/branches/3.3-TESTING/html/Elements/Header
-   M /rt/branches/3.3-TESTING/html/Elements/ListActions
-   M /rt/branches/3.3-TESTING/html/Elements/Login
-   M /rt/branches/3.3-TESTING/html/Elements/Menu
-   M /rt/branches/3.3-TESTING/html/Elements/MessageBox
-   M /rt/branches/3.3-TESTING/html/Elements/MyRequests
-   M /rt/branches/3.3-TESTING/html/Elements/MyTickets
-   M /rt/branches/3.3-TESTING/html/Elements/PageLayout
-   M /rt/branches/3.3-TESTING/html/Elements/QueryString
-   M /rt/branches/3.3-TESTING/html/Elements/QuickCreate
-   M /rt/branches/3.3-TESTING/html/Elements/Quicksearch
-   M /rt/branches/3.3-TESTING/html/Elements/Refresh
-   M /rt/branches/3.3-TESTING/html/Elements/ScrubHTML
-   M /rt/branches/3.3-TESTING/html/Elements/Section
-   M /rt/branches/3.3-TESTING/html/Elements/SelectAttachmentField
-   M /rt/branches/3.3-TESTING/html/Elements/SelectBoolean
-   M /rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldOperator
-   M /rt/branches/3.3-TESTING/html/Elements/SelectCustomFieldValue
-   M /rt/branches/3.3-TESTING/html/Elements/SelectDate
-   M /rt/branches/3.3-TESTING/html/Elements/SelectDateRelation
-   M /rt/branches/3.3-TESTING/html/Elements/SelectDateType
-   M /rt/branches/3.3-TESTING/html/Elements/SelectEqualityOperator
-   M /rt/branches/3.3-TESTING/html/Elements/SelectGroups
-   M /rt/branches/3.3-TESTING/html/Elements/SelectLang
-   M /rt/branches/3.3-TESTING/html/Elements/SelectLinkType
-   M /rt/branches/3.3-TESTING/html/Elements/SelectMatch
-   M /rt/branches/3.3-TESTING/html/Elements/SelectNewTicketQueue
-   M /rt/branches/3.3-TESTING/html/Elements/SelectOwner
-   M /rt/branches/3.3-TESTING/html/Elements/SelectQueue
-   M /rt/branches/3.3-TESTING/html/Elements/SelectResultsPerPage
-   M /rt/branches/3.3-TESTING/html/Elements/SelectSortOrder
-   M /rt/branches/3.3-TESTING/html/Elements/SelectStatus
-   M /rt/branches/3.3-TESTING/html/Elements/SelectTicketSortBy
-   M /rt/branches/3.3-TESTING/html/Elements/SelectTicketTypes
-   M /rt/branches/3.3-TESTING/html/Elements/SelectUsers
-   M /rt/branches/3.3-TESTING/html/Elements/SelectWatcherType
-   M /rt/branches/3.3-TESTING/html/Elements/SetupSessionCookie
-   M /rt/branches/3.3-TESTING/html/Elements/ShowCustomFieldImage
-   M /rt/branches/3.3-TESTING/html/Elements/ShowCustomFields
-   M /rt/branches/3.3-TESTING/html/Elements/ShowLink
-   M /rt/branches/3.3-TESTING/html/Elements/ShowLinks
-   M /rt/branches/3.3-TESTING/html/Elements/ShowMemberships
-   M /rt/branches/3.3-TESTING/html/Elements/SimpleSearch
-   M /rt/branches/3.3-TESTING/html/Elements/Submit
-   M /rt/branches/3.3-TESTING/html/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Elements/TicketList
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBox
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBoxEnd
-   M /rt/branches/3.3-TESTING/html/Elements/TitleBoxStart
-   M /rt/branches/3.3-TESTING/html/NoAuth/Logout.html
-   M /rt/branches/3.3-TESTING/html/NoAuth/Reminder.html
-   M /rt/branches/3.3-TESTING/html/NoAuth/webrt.css
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/default
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/queue/ns
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/attachments
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/default
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/history
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/ticket/links
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/default
-   M /rt/branches/3.3-TESTING/html/REST/1.0/Forms/user/ns
-   M /rt/branches/3.3-TESTING/html/REST/1.0/NoAuth/mail-gateway
-   M /rt/branches/3.3-TESTING/html/REST/1.0/autohandler
-   M /rt/branches/3.3-TESTING/html/REST/1.0/dhandler
-   M /rt/branches/3.3-TESTING/html/REST/1.0/logout
-   M /rt/branches/3.3-TESTING/html/REST/1.0/search/dhandler
-   M /rt/branches/3.3-TESTING/html/REST/1.0/search/ticket
-   M /rt/branches/3.3-TESTING/html/REST/1.0/ticket/comment
-   M /rt/branches/3.3-TESTING/html/REST/1.0/ticket/link
-   M /rt/branches/3.3-TESTING/html/REST/1.0/ticket/merge
-   M /rt/branches/3.3-TESTING/html/Search/Build.html
-   M /rt/branches/3.3-TESTING/html/Search/Bulk.html
-   M /rt/branches/3.3-TESTING/html/Search/Edit.html
-   M /rt/branches/3.3-TESTING/html/Search/Elements/BuildFormatString
-   M /rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditFormat
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditSearches
-   M /rt/branches/3.3-TESTING/html/Search/Elements/NewListActions
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickBasics
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCriteria
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SearchPrivacy
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectAndOr
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectGroup
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectLinks
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectPersonType
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchObject
-   M /rt/branches/3.3-TESTING/html/Search/Elements/SelectSearchesForObjects
-   D /rt/branches/3.3-TESTING/html/Search/Elements/TicketRow
-   M /rt/branches/3.3-TESTING/html/Search/Results.html
-   M /rt/branches/3.3-TESTING/html/Search/Results.rdf
-   M /rt/branches/3.3-TESTING/html/Search/Results.tsv
-   M /rt/branches/3.3-TESTING/html/SelfService/Attachment/dhandler
-   M /rt/branches/3.3-TESTING/html/SelfService/Closed.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Create.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Display.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/GotoTicket
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/Header
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/MyRequests
-   M /rt/branches/3.3-TESTING/html/SelfService/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/SelfService/Error.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Prefs.html
-   M /rt/branches/3.3-TESTING/html/SelfService/Update.html
-   M /rt/branches/3.3-TESTING/html/SelfService/index.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Attachment/dhandler
-   M /rt/branches/3.3-TESTING/html/Ticket/Create.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Display.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/AddWatchers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/BulkLinks
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditBasics
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomField
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditCustomFields
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditDates
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditPeople
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/EditWatchers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/FindAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/LoadTextAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/PreviewScrips
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowBasics
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowCustomFields
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDates
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowDependencies
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowGroupMembers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowHistory
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMemberOf
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMembers
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageHeaders
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowMessageStanza
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowPeople
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowReferences
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowRequestor
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowSummary
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransaction
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowTransactionAttachments
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/ShowUserEntry
-   M /rt/branches/3.3-TESTING/html/Ticket/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Ticket/History.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Modify.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyAll.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyDates.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyLinks.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ModifyPeople.html
-   M /rt/branches/3.3-TESTING/html/Ticket/ShowEmailRecord.html
-   M /rt/branches/3.3-TESTING/html/Ticket/Update.html
-   M /rt/branches/3.3-TESTING/html/Tools/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/Tools/MyDay.html
-   M /rt/branches/3.3-TESTING/html/Tools/Offline.html
-   M /rt/branches/3.3-TESTING/html/User/Delegation.html
-   M /rt/branches/3.3-TESTING/html/User/Elements/DelegateRights
-   M /rt/branches/3.3-TESTING/html/User/Elements/GroupTabs
-   M /rt/branches/3.3-TESTING/html/User/Elements/Tabs
-   M /rt/branches/3.3-TESTING/html/User/Groups/Members.html
-   M /rt/branches/3.3-TESTING/html/User/Groups/Modify.html
-   M /rt/branches/3.3-TESTING/html/User/Groups/index.html
-   M /rt/branches/3.3-TESTING/html/User/Prefs.html
-   M /rt/branches/3.3-TESTING/html/autohandler
-   M /rt/branches/3.3-TESTING/html/index.html
-   M /rt/branches/3.3-TESTING/html/l
-   M /rt/branches/3.3-TESTING/lib/RT/ACE.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACE_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ACL_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/AutoOpen.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/Autoreply.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/EscalatePriority.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/Notify.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/NotifyAsComment.pm
-   A /rt/branches/3.3-TESTING/lib/RT/Action/RecordComment.pm
-   A /rt/branches/3.3-TESTING/lib/RT/Action/RecordCorrespondence.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/ResolveMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/SetPriority.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/UserDefined.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachment.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachments.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attachments_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attribute.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attribute_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attributes.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attributes_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Base.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMember.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMember_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CachedGroupMembers_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/AnyTransaction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/BeforeDue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/Overdue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/OwnerChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/PriorityChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/PriorityExceeds.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/QueueChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/StatusChange.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/UserDefined.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CurrentUser.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields.pm
-   M /rt/branches/3.3-TESTING/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Date.pm
-   M /rt/branches/3.3-TESTING/lib/RT/EmailParser.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Group.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMember.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMember_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMembers.pm
-   M /rt/branches/3.3-TESTING/lib/RT/GroupMembers_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Group_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Groups.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Groups_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Handle.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/cs.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/de.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/i_default.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/CLI.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/GnuPG.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email/Auth/MailFrom.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email/Filter/SpamAssassin.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Email.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/REST.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Link.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Link_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Links.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Links_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomField.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomField_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFields.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ObjectCustomFields_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principal.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principal_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principals.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Principals_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Queues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Record.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripAction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripAction_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripActions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripActions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripCondition.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripCondition_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripConditions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripConditions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrip_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrips.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Scrips_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Search/ActiveTicketsInQueue.pm
-   A /rt/branches/3.3-TESTING/lib/RT/Search/FromSQL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Search/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/SearchBuilder.pm
-   M /rt/branches/3.3-TESTING/lib/RT/System.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Template.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Template_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Templates.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Templates_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValue_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues.pm
-   M /rt/branches/3.3-TESTING/lib/RT/TicketCustomFieldValues_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transaction_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transactions.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Transactions_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/URI/base.pm
-   M /rt/branches/3.3-TESTING/lib/RT/URI/fsck_com_rt.pm
-   M /rt/branches/3.3-TESTING/lib/RT/URI.pm
-   M /rt/branches/3.3-TESTING/lib/RT/User.pm
-   M /rt/branches/3.3-TESTING/lib/RT/User_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Users.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Users_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT.pm.in
-   M /rt/branches/3.3-TESTING/lib/t/02regression.t.in
-   A /rt/branches/3.3-TESTING/lib/t/05cronsupport.pl.in
-   M /rt/branches/3.3-TESTING/sbin/extract-message-catalog
-   M /rt/branches/3.3-TESTING/sbin/extract_pod_tests
-   M /rt/branches/3.3-TESTING/sbin/factory
-   M /rt/branches/3.3-TESTING/sbin/license_tag
-   M /rt/branches/3.3-TESTING/sbin/regression_harness
-   M /rt/branches/3.3-TESTING/sbin/rt-dump-database.in
-   M /rt/branches/3.3-TESTING/sbin/rt-setup-database.in
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
-
- ----------------------------------------------------------------------
- r8262@tinbook:  jesse | 2004-07-21T18:06:24.396460Z
- 
-   Merged forward from 3.2 
-  
-  ----------------------------------------------------------------------
-  r3390@tinbook:  jesse | 2004-07-14T19:30:37.426202Z
-  
-  RT-Ticket: 5886
-  RT-Action: correspond
-  RT-Status: resolved
-  
-  Updated rt-crontool to pass in CurrentUser when creating new actions and searches..
-  
-  ----------------------------------------------------------------------
-  r3397@tinbook:  jesse | 2004-07-14T19:44:51.378312Z
-  
-  
-  ----------------------------------------------------------------------
-  r3398@tinbook:  jesse | 2004-07-14T19:59:24.627023Z
-  
-  
-  ----------------------------------------------------------------------
-  r3399@tinbook:  jesse | 2004-07-14T20:23:59.757938Z
-  
-  Bumping to 3.2.1rc4
-  ----------------------------------------------------------------------
-  r8220@tinbook:  jesse | 2004-07-15T19:02:55.020727Z
-  
-  RT-Ticket: 5891
-  RT-Status: open
-  RT-Action: correspond
-  
-  Interim measure to only list sortable fields in the "Sort display by" 
-  options.
-  
-  
-  ----------------------------------------------------------------------
-  r8222@tinbook:  jesse | 2004-07-16T17:09:30.264982Z
-  
-  Web UI: Fixed bug which prevented unlimited searches
-  ----------------------------------------------------------------------
-  r8239@tinbook:  jesse | 2004-07-19T16:54:11.660605Z
-  
-  
-  ----------------------------------------------------------------------
-  r8240@tinbook:  jesse | 2004-07-19T17:01:43.322617Z
-  
-  Retagging the source code with the updated submission policy
-  ----------------------------------------------------------------------
-  r8258@tinbook:  jesse | 2004-07-20T21:24:03.019565Z
-  
-  Crontool additions to support scripted notifications
-  ----------------------------------------------------------------------
-  r8261@tinbook:  jesse | 2004-07-21T18:05:55.579150Z
-  
-  
-  
-  
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r8264@tinbook:  jesse | 2004-07-21T19:10:28.393515Z
- 
- Bumpped the copyright/license/notice
- ----------------------------------------------------------------------
+Adding releng machinery for rt. 3.1
 
 ------------------------------------------------------------------------
-r1264 | autrijus | 2004-07-19 22:56:01 -0400 (Mon, 19 Jul 2004) | 8 lines
+r395 | jesse | 2004-02-05 19:15:59 -0500 (Thu, 05 Feb 2004) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/3.2-RELEASE/html/Elements/Header
-   M /rt/branches/3.2-RELEASE/html/Elements/SetupSessionCookie
-   M /rt/branches/3.2-RELEASE/html/NoAuth/webrt.css
-   M /rt/branches/3.3-TESTING/html/Download/Tabular/dhandler
-   M /rt/branches/PLATANO-EXPERIMENTAL/docs/design_docs/ruleset-workflow.txt
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   A /rt/branches/rt-3.1/html/Search/Elements/BuildFormatString
+   M /rt/branches/rt-3.1/html/Search/Elements/EditFormat
 
- 
- r6188@not:  autrijus | 2004-07-20T02:52:39.146361Z
- 
- 
- 
- 
- 
+Refactored out the format string building stuff into its own mason component.
+Next up, the query string builder
 
 ------------------------------------------------------------------------
-r1247 | autrijus | 2004-07-14 15:24:23 -0400 (Wed, 14 Jul 2004) | 6 lines
-Changed paths:
-   M /rt
-   M /rt/branches/3.3-TESTING/lib/RT/StyleGuide.pod
-
- ----------------------------------------------------------------------
- r6050@not:  autrijus | 2004-07-14T19:21:34.616159Z
- 
- * Add style guide information about parameter passing style.
- ----------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r1233 | jesse | 2004-07-14 00:37:55 -0400 (Wed, 14 Jul 2004) | 10 lines
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/bin/mason_handler.fcgi.in
-   M /rt/branches/3.3-TESTING/bin/mason_handler.scgi.in
-   M /rt/branches/3.3-TESTING/bin/mason_handler.svc.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/etc/schema.Sybase
-   M /rt/branches/3.3-TESTING/html/Admin/Elements/EditScrip
-   M /rt/branches/3.3-TESTING/html/Elements/Header
-   M /rt/branches/3.3-TESTING/html/Elements/TicketList
-   M /rt/branches/3.3-TESTING/html/Search/Build.html
-   M /rt/branches/3.3-TESTING/html/Search/Bulk.html
-   M /rt/branches/3.3-TESTING/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Condition/Generic.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/it.po
-   A /rt/branches/3.3-TESTING/lib/RT/Interface/Web
-   A /rt/branches/3.3-TESTING/lib/RT/Interface/Web/Handler.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Interface/Web.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripAction_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/ScripCondition_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-
- ----------------------------------------------------------------------
- r3374@tinbook:  jesse | 2004-07-13T23:31:39.996661Z
- 
- Merge forward from RT 3.2
- ----------------------------------------------------------------------
- r3375@tinbook:  jesse | 2004-07-14T04:33:29.296451Z
- 
- Minor fixes for a merge problem from 3.2
- ----------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r1232 | jesse | 2004-07-13 19:15:10 -0400 (Tue, 13 Jul 2004) | 1 line
-Changed paths:
-   M /rt/branches/3.3-TESTING
-   M /rt/branches/3.3-TESTING/Makefile.in
-   M /rt/branches/3.3-TESTING/README
-   M /rt/branches/3.3-TESTING/UPGRADING
-   M /rt/branches/3.3-TESTING/bin/rt-crontool.in
-   M /rt/branches/3.3-TESTING/bin/webmux.pl.in
-   M /rt/branches/3.3-TESTING/etc/RT_Config.pm.in
-   M /rt/branches/3.3-TESTING/html/Elements/QuickCreate
-   M /rt/branches/3.3-TESTING/html/Elements/Quicksearch
-   D /rt/branches/3.3-TESTING/html/Elements/ViewUser
-   M /rt/branches/3.3-TESTING/html/Search/Build.html
-   M /rt/branches/3.3-TESTING/html/Search/Elements/DisplayOptions
-   M /rt/branches/3.3-TESTING/html/Search/Elements/EditSearches
-   M /rt/branches/3.3-TESTING/html/Search/Elements/PickCFs
-   M /rt/branches/3.3-TESTING/html/Search/Results.html
-   M /rt/branches/3.3-TESTING/html/Search/Results.rdf
-   M /rt/branches/3.3-TESTING/html/Ticket/Update.html
-   M /rt/branches/3.3-TESTING/html/Tools/Offline.html
-   M /rt/branches/3.3-TESTING/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Action/SendEmail.pm
-   M /rt/branches/3.3-TESTING/lib/RT/Attribute_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/cs.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/da.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/de.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/en_malkovich.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/es.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/fi.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/fr.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/he.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/hu.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/it.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/ja.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/nl.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/no.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/pt_br.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/ru.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/zh_cn.po
-   M /rt/branches/3.3-TESTING/lib/RT/I18N/zh_tw.po
-   M /rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/3.3-TESTING/lib/t/03web.pl.in
-   M /rt/branches/3.3-TESTING/sbin/rt-setup-database.in
-   M /rt/branches/3.3-TESTING/sbin/rt-test-dependencies.in
-
-
-------------------------------------------------------------------------
-r1224 | jesse | 2004-07-13 14:41:42 -0400 (Tue, 13 Jul 2004) | 1 line
-Changed paths:
-   A /rt/branches/3.3-TESTING (from /rt/branches/rt-3.3:1223)
-   D /rt/branches/rt-3.3
-
-Moving RT 3.0 from "head" to a 3.0-MAINT branch
-------------------------------------------------------------------------
-r1209 | autrijus | 2004-07-12 16:22:48 -0400 (Mon, 12 Jul 2004) | 7 lines
+r394 | leira | 2004-02-05 16:05:32 -0500 (Thu, 05 Feb 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.SQLite
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Results.html
 
- ----------------------------------------------------------------------
- r5990@not:  autrijus | 2004-07-12T20:22:03.588615Z
- 
- * Let the cf param in Ticket->CustomFieldValues be optional,
-   so we can get Atom tests to work.
- ----------------------------------------------------------------------
+Fix a bug.
 
 ------------------------------------------------------------------------
-r1205 | autrijus | 2004-07-12 13:30:03 -0400 (Mon, 12 Jul 2004) | 7 lines
+r393 | leira | 2004-02-05 14:28:54 -0500 (Thu, 05 Feb 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/sbin/rt-setup-database.in
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/DisplayOptions
+   A /rt/branches/rt-3.1/html/Search/Elements/EditFormat
+   M /rt/branches/rt-3.1/html/Search/Elements/EditSearches
+   M /rt/branches/rt-3.1/html/Search/Elements/PickBasics
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCFs
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCriteria
+   D /rt/branches/rt-3.1/html/Search/Elements/PickPeople
+   M /rt/branches/rt-3.1/html/Search/Results.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
 
- ----------------------------------------------------------------------
- r5976@not:  autrijus | 2004-07-12T17:29:13.392510Z
- 
- * The warning on missing ACL files used $RT::EtcPath even if it's
-   reading it fro other paths.  Fixed.
- ----------------------------------------------------------------------
+Add a format editor.  Slim-down PickCriteria a bit.
 
 ------------------------------------------------------------------------
-r1180 | autrijus | 2004-07-05 15:43:17 -0400 (Mon, 05 Jul 2004) | 6 lines
+r391 | leira | 2004-02-03 22:50:54 -0500 (Tue, 03 Feb 2004) | 2 lines
 Changed paths:
-   M /rt
-   A /rt/branches/rt-3.3/sbin/rt-dump-database.in
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   D /rt/branches/rt-3.1/html/Search/Elements/NewPickRestriction
+   M /rt/branches/rt-3.1/html/Search/Elements/PickBasics
+   A /rt/branches/rt-3.1/html/Search/Elements/PickCriteria (from /rt/branches/rt-3.1/html/Search/Elements/NewPickRestriction:390)
+   A /rt/branches/rt-3.1/html/Search/Results.html (from /rt/branches/rt-3.1/html/Search/Show.html:390)
+   D /rt/branches/rt-3.1/html/Search/Show.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
 
- ----------------------------------------------------------------------
- r5913@not:  autrijus | 2004-07-05T19:41:37.720057Z
- 
- * add rt-dump-database, a tool to dump config data to initialdata format.
- ----------------------------------------------------------------------
+Change Show.html to Results.html and NewPickRestrictions to PickCriteria
 
 ------------------------------------------------------------------------
-r1179 | autrijus | 2004-07-05 12:56:22 -0400 (Mon, 05 Jul 2004) | 8 lines
+r390 | leira | 2004-02-03 22:39:03 -0500 (Tue, 03 Feb 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
-
- ----------------------------------------------------------------------
- r5899@not:  autrijus | 2004-07-05T15:13:55.850880Z
- 
- * correct the documentation for CreateTickets; it was still referring
-   to the archaic "Approvals" queue and "Approval" type, whereas now we're
-   using "___Approvals" and "approval" now.
- ----------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r1160 | jesse | 2004-06-27 23:10:54 -0400 (Sun, 27 Jun 2004) | 6 lines
-Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/releng.cnf
-
- ----------------------------------------------------------------------
- r1997@tinbook:  jesse | 2004-06-28T03:10:36.434329Z
- 
- Bumping to 3.3.4
- ----------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r1159 | jesse | 2004-06-27 23:08:01 -0400 (Sun, 27 Jun 2004) | 24 lines
-Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/Makefile.in
-   M /rt/branches/rt-3.3/UPGRADING
-   M /rt/branches/rt-3.3/bin/mason_handler.fcgi.in
-   M /rt/branches/rt-3.3/bin/mason_handler.scgi.in
-   M /rt/branches/rt-3.3/bin/rt.in
-   M /rt/branches/rt-3.3/bin/webmux.pl.in
-   M /rt/branches/rt-3.3/configure.ac
-   M /rt/branches/rt-3.3/etc/RT_Config.pm.in
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditCustomField
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditScrip
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditTemplates
-   M /rt/branches/rt-3.3/html/Admin/Elements/UserTabs
-   M /rt/branches/rt-3.3/html/Admin/Global/GroupRights.html
-   M /rt/branches/rt-3.3/html/Admin/Global/Template.html
-   M /rt/branches/rt-3.3/html/Admin/Global/UserRights.html
-   M /rt/branches/rt-3.3/html/Admin/Groups/GroupRights.html
-   M /rt/branches/rt-3.3/html/Admin/Groups/Members.html
-   M /rt/branches/rt-3.3/html/Admin/Groups/Modify.html
-   M /rt/branches/rt-3.3/html/Admin/Groups/UserRights.html
-   M /rt/branches/rt-3.3/html/Admin/Queues/GroupRights.html
-   M /rt/branches/rt-3.3/html/Admin/Queues/Modify.html
-   M /rt/branches/rt-3.3/html/Admin/Queues/Template.html
-   M /rt/branches/rt-3.3/html/Admin/Queues/UserRights.html
-   M /rt/branches/rt-3.3/html/Admin/Users/Modify.html
-   M /rt/branches/rt-3.3/html/Approvals/index.html
-   M /rt/branches/rt-3.3/html/Search/Bulk.html
-   M /rt/branches/rt-3.3/html/Search/Elements/PickCFs
-   M /rt/branches/rt-3.3/html/SelfService/Prefs.html
-   M /rt/branches/rt-3.3/html/Ticket/Display.html
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowAttachments
-   M /rt/branches/rt-3.3/html/Ticket/ModifyAll.html
-   M /rt/branches/rt-3.3/html/Ticket/ModifyDates.html
-   M /rt/branches/rt-3.3/html/Ticket/ModifyLinks.html
-   M /rt/branches/rt-3.3/html/Ticket/Update.html
-   M /rt/branches/rt-3.3/html/User/Delegation.html
-   M /rt/branches/rt-3.3/html/User/Groups/Members.html
-   M /rt/branches/rt-3.3/html/User/Groups/Modify.html
-   M /rt/branches/rt-3.3/html/User/Prefs.html
-   M /rt/branches/rt-3.3/html/autohandler
-   M /rt/branches/rt-3.3/lib/RT/I18N/da.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/de.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/en_malkovich.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/es.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/fi.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/fr.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/he.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/it.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/ja.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/nl.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/no.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/pt_br.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/ru.po
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-   M /rt/branches/rt-3.3/lib/RT/SearchBuilder.pm
-   M /rt/branches/rt-3.3/lib/RT/Templates_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/html/Elements/Menu
+   M /rt/branches/rt-3.1/html/Elements/SelectAttachmentField
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/NewPickRestriction
+   M /rt/branches/rt-3.1/html/Search/Elements/PickBasics
+   M /rt/branches/rt-3.1/html/Search/Elements/PickPeople
+   A /rt/branches/rt-3.1/html/Search/Elements/SelectPersonType
+   M /rt/branches/rt-3.1/html/Search/Show.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
 
- ----------------------------------------------------------------------
- r1769@tinbook:  jesse | 2004-06-01T20:22:38.640731Z
- 
- 
- ----------------------------------------------------------------------
- r1902@tinbook:  jesse | 2004-06-17T01:08:53.996154Z
- 
- 
- ----------------------------------------------------------------------
- r1991@tinbook:  jesse | 2004-06-28T02:03:57.669851Z
- 
- 
- ----------------------------------------------------------------------
- r1992@tinbook:  jesse | 2004-06-28T02:19:36.386707Z
- 
- Pulling forward from RT 3.1
- 
- 
- ----------------------------------------------------------------------
- r1993@tinbook:  jesse | 2004-06-28T03:06:56.930396Z
- 
- Merging forward from 3.1
- ----------------------------------------------------------------------
+Search improvements.
 
 ------------------------------------------------------------------------
-r1153 | autrijus | 2004-06-27 00:02:47 -0400 (Sun, 27 Jun 2004) | 6 lines
+r389 | jesse | 2004-02-03 19:05:18 -0500 (Tue, 03 Feb 2004) | 5 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/Tools/Offline.html
-   M /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
+   A /rt/branches/rt-3.1/html/Elements/TitleBox
 
- ----------------------------------------------------------------------
- r5788@not:  autrijus | 2004-06-27T04:02:12.644291Z
- 
- * import 3.1 again due to glitches in Offline.html
- ----------------------------------------------------------------------
 
-------------------------------------------------------------------------
-r1150 | autrijus | 2004-06-26 16:31:56 -0400 (Sat, 26 Jun 2004) | 14 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/Makefile.in
-   M /rt/branches/rt-3.3/README
-   M /rt/branches/rt-3.3/UPGRADING
-   M /rt/branches/rt-3.3/bin/mason_handler.fcgi.in
-   D /rt/branches/rt-3.3/bin/rt-commit-handler.in
-   M /rt/branches/rt-3.3/bin/rt-crontool.in
-   M /rt/branches/rt-3.3/bin/rt.in
-   M /rt/branches/rt-3.3/bin/webmux.pl.in
-   M /rt/branches/rt-3.3/configure.ac
-   M /rt/branches/rt-3.3/etc/RT_Config.pm.in
-   M /rt/branches/rt-3.3/etc/acl.mysql
-   M /rt/branches/rt-3.3/etc/initialdata
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.17
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.17/content
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditQueueWatchers
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditScrip
-   D /rt/branches/rt-3.3/html/Admin/Elements/ModifyQueue
-   D /rt/branches/rt-3.3/html/Admin/Elements/ModifyUser
-   M /rt/branches/rt-3.3/html/Admin/Queues/People.html
-   M /rt/branches/rt-3.3/html/Admin/Users/Modify.html
-   D /rt/branches/rt-3.3/html/Admin/Users/Prefs.html
-   D /rt/branches/rt-3.3/html/Developer
-   M /rt/branches/rt-3.3/html/Elements/EditLinks
-   M /rt/branches/rt-3.3/html/Elements/Header
-   M /rt/branches/rt-3.3/html/Elements/ScrubHTML
-   M /rt/branches/rt-3.3/html/Elements/SelectOwner
-   M /rt/branches/rt-3.3/html/Elements/SelectStatus
-   M /rt/branches/rt-3.3/html/Elements/TicketList
-   M /rt/branches/rt-3.3/html/Elements/TitleBoxStart
-   M /rt/branches/rt-3.3/html/NoAuth/webrt.css
-   M /rt/branches/rt-3.3/html/REST/1.0/NoAuth/mail-gateway
-   M /rt/branches/rt-3.3/html/REST/1.0/ticket/link
-   M /rt/branches/rt-3.3/html/Search/Build.html
-   M /rt/branches/rt-3.3/html/Search/Bulk.html
-   M /rt/branches/rt-3.3/html/Search/Edit.html
-   M /rt/branches/rt-3.3/html/Search/Elements/BuildFormatString
-   M /rt/branches/rt-3.3/html/Search/Elements/EditFormat
-   M /rt/branches/rt-3.3/html/Search/Elements/EditSearches
-   M /rt/branches/rt-3.3/html/Search/Elements/PickCFs
-   M /rt/branches/rt-3.3/html/Search/Results.html
-   M /rt/branches/rt-3.3/html/SelfService/Display.html
-   M /rt/branches/rt-3.3/html/SelfService/Update.html
-   M /rt/branches/rt-3.3/html/Ticket/Create.html
-   M /rt/branches/rt-3.3/html/Ticket/Elements/EditBasics
-   M /rt/branches/rt-3.3/html/Ticket/Elements/EditPeople
-   M /rt/branches/rt-3.3/html/Ticket/Elements/EditWatchers
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowDates
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowGroupMembers
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowHistory
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowPeople
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowSummary
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowUserEntry
-   M /rt/branches/rt-3.3/html/Ticket/Elements/Tabs
-   M /rt/branches/rt-3.3/html/Ticket/ModifyAll.html
-   M /rt/branches/rt-3.3/html/Ticket/ModifyLinks.html
-   M /rt/branches/rt-3.3/html/Ticket/Update.html
-   M /rt/branches/rt-3.3/html/Tools/MyDay.html
-   M /rt/branches/rt-3.3/html/Tools/Offline.html
-   M /rt/branches/rt-3.3/html/User/Prefs.html
-   M /rt/branches/rt-3.3/html/index.html
-   M /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/rt-3.3/lib/RT/Action/EscalatePriority.pm
-   A /rt/branches/rt-3.3/lib/RT/Condition/PriorityChange.pm
-   M /rt/branches/rt-3.3/lib/RT/CurrentUser.pm
-   M /rt/branches/rt-3.3/lib/RT/EmailParser.pm
-   M /rt/branches/rt-3.3/lib/RT/I18N/cs.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/da.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/de.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/en_malkovich.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/es.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/fi.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/fr.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/he.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/it.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/ja.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/nl.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/no.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/pt_br.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/ru.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po
-   M /rt/branches/rt-3.3/lib/RT/Interface/Email.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-   M /rt/branches/rt-3.3/lib/RT/Queue_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Record.pm
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Transactions_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT.pm.in
-   M /rt/branches/rt-3.3/lib/t/00smoke.t.in
-   M /rt/branches/rt-3.3/lib/t/02regression.t.in
-   M /rt/branches/rt-3.3/lib/t/03web.pl.in
-   M /rt/branches/rt-3.3/sbin/rt-test-dependencies.in
+Forgot the new titlebox Component with content. 
 
- ----------------------------------------------------------------------
- r5774@not:  autrijus | 2004-06-26T10:40:48.767820Z
- 
- * incremental merge from 3.1 to 3.3
- ----------------------------------------------------------------------
- r5778@not:  autrijus | 2004-06-26T11:28:26.143291Z
- 
- * solve utf8 quoting problem on "Take".
- ----------------------------------------------------------------------
- r5781@not:  autrijus | 2004-06-26T20:27:29.184033Z
- 
- * restore hu.po
- ----------------------------------------------------------------------
 
-------------------------------------------------------------------------
-r1121 | autrijus | 2004-06-20 13:59:07 -0400 (Sun, 20 Jun 2004) | 10 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/bin/webmux.pl.in
-   M /rt/branches/rt-3.3/html/Elements/Header
-   M /rt/branches/rt-3.3/html/Elements/SetupSessionCookie
-   M /rt/branches/rt-3.3/html/NoAuth/webrt.css
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-
- ----------------------------------------------------------------------
- r5682@not:  autrijus | 2004-06-20T17:57:48.360088Z
- 
- * Supports native MasonX::Apache2Handler.
- * Changed header_out to use headers_out instead (which should be
-   used in 1.0 as well). Cf.:
-   http://perl.apache.planetmirror.com/docs/2.0/user/porting/compat.html
- 
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1082 | alexmv | 2004-06-16 10:53:17 -0400 (Wed, 16 Jun 2004) | 11 lines
+r388 | jesse | 2004-02-03 18:27:18 -0500 (Tue, 03 Feb 2004) | 3 lines
 Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/Record.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-
-RT-Ticket: 5732
-RT-Status: stalled
-RT-Update: correspond
+   M /rt/branches/rt-3.1/html/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Elements/MyTickets
+   M /rt/branches/rt-3.1/html/Elements/TicketList
 
- * POD spacing mistake in Ticket_Overlay
+Cleaned up front page display some more. Made tickets without a subject list "(no subject)"
 
- * Ticket_Overlay now overrides RT::Record's CustomFieldValues method,
-   to intercept calls where the field is passed by name.  I don't have
-   a way of testing this patch, so this bug is getting marked stalled
-   until this patch is verified.
 
 ------------------------------------------------------------------------
-r1033 | leira | 2004-06-08 14:26:18 -0400 (Tue, 08 Jun 2004) | 2 lines
+r387 | jesse | 2004-02-02 18:42:04 -0500 (Mon, 02 Feb 2004) | 3 lines
 Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-
-Pass along 'Type' argument in CreateTickets (replicates a patch that was applied to 3.1, but needed for a customer in this branch now).
+   M /rt/branches/rt-3.1/html/Ticket/Display.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/EditBasics
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowBasics
 
-------------------------------------------------------------------------
-r1031 | jesse | 2004-06-08 01:05:46 -0400 (Tue, 08 Jun 2004) | 6 lines
-Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/bin/standalone_httpd.in
+cleaned up the ticket basics display/edit. added TimeEstimated
 
- ----------------------------------------------------------------------
- r1752@debian:  jesse | 2004-06-08T13:50:52.709840Z
- 
-  standalone httpd is now forking rather than singleprocess
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r1023 | alexmv | 2004-06-07 16:03:46 -0400 (Mon, 07 Jun 2004) | 6 lines
+r386 | jesse | 2004-02-02 16:03:13 -0500 (Mon, 02 Feb 2004) | 3 lines
 Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/I18N/he.po
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Edit.html
+   M /rt/branches/rt-3.1/html/Search/Elements/EditSearches
+   A /rt/branches/rt-3.1/html/Search/Elements/SearchPrivacy
 
-RT-Ticket: 5674
-RT-Action: comment
-RT-Status: resolved
+Fixed a bunch of search saving bugs. cleaned up search code a little bit. improved privacy labels
 
- * Apply Ilan Rabinovitch's changes
 
 ------------------------------------------------------------------------
-r1022 | alexmv | 2004-06-07 14:47:18 -0400 (Mon, 07 Jun 2004) | 7 lines
+r385 | jesse | 2004-01-31 17:14:18 -0500 (Sat, 31 Jan 2004) | 3 lines
 Changed paths:
-   M /rt/branches/rt-3.3/etc/schema.mysql
+   A /rt/branches/rt-3.1/html/Elements/QuickCreate
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/index.html
 
-RT-Ticket: 5648
-RT-Action: comment
-RT-Status: resolved
+swapped left and right sides of search ui. fixed a bug that stopped new search criteria being added when the user didn't explicitly click the "add criteria" button
 
- * The last hunk of the ticket no longer applies, as those indexes
-   were reshuffled because they were too long.
-
-------------------------------------------------------------------------
-r986 | jesse | 2004-05-31 21:54:38 -0400 (Mon, 31 May 2004) | 1 line
-Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/bin/rt.in
-   M /rt/branches/rt-3.3/bin/webmux.pl.in
-   M /rt/branches/rt-3.3/configure.ac
-   A /rt/branches/rt-3.3/etc/acl.Sybase
-   A /rt/branches/rt-3.3/etc/schema.Sybase
-   M /rt/branches/rt-3.3/html/Search/Build.html
-   M /rt/branches/rt-3.3/html/Search/Bulk.html
-   M /rt/branches/rt-3.3/lib/RT/EmailParser.pm
-   M /rt/branches/rt-3.3/lib/RT/Handle.pm
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay_SQL.pm
-   M /rt/branches/rt-3.3/lib/RT.pm.in
-   M /rt/branches/rt-3.3/sbin/rt-setup-database.in
-   M /rt/branches/rt-3.3/sbin/rt-test-dependencies.in
-
-Merging forward from RT 3.1
-------------------------------------------------------------------------
-r981 | jesse | 2004-05-30 03:01:04 -0400 (Sun, 30 May 2004) | 7 lines
-Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/etc/schema.mysql
-   M /rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.mysql
-
- 
- ----------------------------------------------------------------------
- r1721@debian:  jesse | 2004-05-30T16:04:25.431679Z
- 
- Mysql on some platforms (built with unicode?) has a shorter max index length. adjusted indexes
- ----------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r966 | jesse | 2004-05-27 23:30:59 -0400 (Thu, 27 May 2004) | 35 lines
-Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/bin/rt.in
-   M /rt/branches/rt-3.3/configure.ac
-   M /rt/branches/rt-3.3/etc/acl.Pg
-   D /rt/branches/rt-3.3/etc/upgrade/2.1.71
-   M /rt/branches/rt-3.3/html/Admin/Elements/ToolTabs
-   D /rt/branches/rt-3.3/html/Developer/Perldoc.html
-   M /rt/branches/rt-3.3/html/Elements/EditLinks
-   M /rt/branches/rt-3.3/html/Elements/Footer
-   D /rt/branches/rt-3.3/html/Elements/ShadedBox
-   D /rt/branches/rt-3.3/html/Elements/ShadedInputRow
-   D /rt/branches/rt-3.3/html/Elements/ShadedRow
-   M /rt/branches/rt-3.3/html/Elements/ShowLinks
-   M /rt/branches/rt-3.3/html/Elements/TicketList
-   D /rt/branches/rt-3.3/html/Projects
-   D /rt/branches/rt-3.3/html/Scope
-   M /rt/branches/rt-3.3/html/Search/Build.html
-   M /rt/branches/rt-3.3/html/Search/Elements/PickCFs
-   D /rt/branches/rt-3.3/html/Search/Elements/PickRestriction
-   D /rt/branches/rt-3.3/html/Search/Elements/TicketHeader
-   D /rt/branches/rt-3.3/html/Search/Elements/TicketHeaderCell
-   D /rt/branches/rt-3.3/html/Search/Listing.html
-   D /rt/branches/rt-3.3/html/Ticket/Elements/EditLinks
-   D /rt/branches/rt-3.3/html/Ticket/Elements/ShowLink
-   D /rt/branches/rt-3.3/html/Ticket/Elements/ShowLinks
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowTransactionAttachments
-   M /rt/branches/rt-3.3/html/Ticket/Elements/Tabs
-   M /rt/branches/rt-3.3/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/CurrentUser.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-
- ----------------------------------------------------------------------
- r1710@tinbook:  jesse | 2004-05-28T02:46:23.907073Z
- 
- 
- ----------------------------------------------------------------------
- r1712@tinbook:  jesse | 2004-05-28T03:15:12.330227Z
- 
-  ----------------------------------------------------------------------
-  r1669@tinbook:  jesse | 2004-05-24T02:17:41.959105Z
-  
-  
-  ----------------------------------------------------------------------
-  r1672@tinbook:  jesse | 2004-05-24T03:09:05.156817Z
-  
-  
-  ----------------------------------------------------------------------
-  r1673@tinbook:  jesse | 2004-05-24T03:59:43.181766Z
-  
-  Bumping to 3.1.16
-  ----------------------------------------------------------------------
-  r1706@tinbook:  jesse | 2004-05-28T02:10:56.309297Z
-  
-  
-  ----------------------------------------------------------------------
-  r1711@tinbook:  jesse | 2004-05-28T02:47:49.277131Z
-  
-  
-  ----------------------------------------------------------------------
- 
- ----------------------------------------------------------------------
- r1713@tinbook:  jesse | 2004-05-28T03:27:19.127190Z
- 
- Cleaning out things split out into other products
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r965 | jesse | 2004-05-27 22:44:48 -0400 (Thu, 27 May 2004) | 1 line
+r384 | jesse | 2004-01-30 23:18:05 -0500 (Fri, 30 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/bin/standalone_httpd.in
-   M /rt/branches/rt-3.3/html/Search/Edit.html
-   M /rt/branches/rt-3.3/html/Search/Results.html
-   M /rt/branches/rt-3.3/html/Ticket/Elements/PreviewScrips
-   M /rt/branches/rt-3.3/lib/RT/Interface/Email/Auth/GnuPG.pm
+   M /rt/branches/rt-3.1/html/Elements/Header
+   M /rt/branches/rt-3.1/html/Elements/TitleBoxStart
+   M /rt/branches/rt-3.1/html/NoAuth/webrt.css
 
+now every titlebox has dhtml-based close boxes.
 
 ------------------------------------------------------------------------
-r954 | autrijus | 2004-05-26 06:12:38 -0400 (Wed, 26 May 2004) | 20 lines
+r383 | leira | 2004-01-30 18:59:22 -0500 (Fri, 30 Jan 2004) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.1/lib/RT/I18N/zh_cn.po
-   M /rt/branches/rt-3.1/lib/RT/I18N/zh_tw.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Elements/DisplayOptions
+   M /rt/branches/rt-3.1/html/Search/Elements/NewPickRestriction
+   M /rt/branches/rt-3.1/html/Search/Elements/PickBasics
+   M /rt/branches/rt-3.1/html/Search/Elements/PickCFs
+   M /rt/branches/rt-3.1/html/Search/Elements/PickPeople
 
- ----------------------------------------------------------------------
- r4757@not:  autrijus | 2004-05-11T06:13:28.139589Z
- 
- * Chinese translation for 3.2 final.
- ----------------------------------------------------------------------
- r5211@not:  autrijus | 2004-05-26T10:07:40.959072Z
- 
- * FreezeThaw fails badly when encoding structures with mixed unicode
-   and byte string contents.  Switch to Storable+Base64 which deals
-   with this gracefully.
- 
- ----------------------------------------------------------------------
- r5212@not:  autrijus | 2004-05-26T10:09:36.398305Z
- 
- * EscapeUTF8 should preserve the byte/unicode flag of the original
-   string.  Otherwise, silent promotion on AutoFlush=>0 can corrupt
-   pages with both byte and unicode string contents.
-   (Reported by: LCamel and jihuang from foundry)
- ----------------------------------------------------------------------
+Reorganize the UI.
 
 ------------------------------------------------------------------------
-r941 | jesse | 2004-05-23 22:29:51 -0400 (Sun, 23 May 2004) | 2 lines
+r382 | leira | 2004-01-30 18:35:01 -0500 (Fri, 30 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/bin/rt.in
-   M /rt/branches/rt-3.3/html/Search/Build.html
-   M /rt/branches/rt-3.3/html/Search/Elements/PickCFs
-   M /rt/branches/rt-3.3/html/Ticket/Create.html
-   M /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/rt-3.3/lib/RT/Groups_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Queue_Overlay.pm
-   A /rt/branches/rt-3.3/lib/t/data/rt-send-cc
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
-Merge forward from 3.1
+Don't copy so many hashes.
 
 ------------------------------------------------------------------------
-r934 | leira | 2004-05-19 12:23:49 -0400 (Wed, 19 May 2004) | 2 lines
+r379 | leira | 2004-01-30 16:48:07 -0500 (Fri, 30 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3/html/Search/Elements/PickCFs
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
-Move file from 3.1 so that CF searching will work.
+Moving fix.
 
 ------------------------------------------------------------------------
-r933 | leira | 2004-05-19 02:34:22 -0400 (Wed, 19 May 2004) | 2 lines
+r378 | leira | 2004-01-30 16:25:37 -0500 (Fri, 30 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/Link_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Record.pm
+   A /rt/branches/rt-3.1/html/Search/Elements/DisplayOptions
 
-Actually pass along link error messages.  Resolves bps #2210.
+Checking in forgotten file.
 
 ------------------------------------------------------------------------
-r930 | leira | 2004-05-19 00:48:20 -0400 (Wed, 19 May 2004) | 2 lines
+r377 | leira | 2004-01-30 13:50:10 -0500 (Fri, 30 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3/html/Ticket/Create.html
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Show.html
 
-Remove Debug field.
+Add UI to specify OrderBy and RowsPerPage.
 
 ------------------------------------------------------------------------
-r920 | jesse | 2004-05-17 22:18:53 -0400 (Mon, 17 May 2004) | 1 line
+r376 | leira | 2004-01-30 13:49:07 -0500 (Fri, 30 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3
+   M /rt/branches/rt-3.1/html/Search/Elements/PickBasics
 
+Re-order the fields (not done yet).
 
 ------------------------------------------------------------------------
-r918 | jesse | 2004-05-17 22:02:24 -0400 (Mon, 17 May 2004) | 10 lines
+r375 | leira | 2004-01-30 05:38:52 -0500 (Fri, 30 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/bin/rt.in
-   M /rt/branches/rt-3.3/html/Admin/Groups/index.html
-   M /rt/branches/rt-3.3/html/Elements/MyTickets
-   M /rt/branches/rt-3.3/html/Search/Elements/PickCFs
-   M /rt/branches/rt-3.3/html/Tools/Offline.html
-   M /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/rt-3.3/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay_SQL.pm
-   M /rt/branches/rt-3.3/lib/t/04_send_email.pl.in
+   M /rt/branches/rt-3.1/html/Search/Build.html
 
- ----------------------------------------------------------------------
- r1191@Jesse-Vincents-Computer:  jesse | 2004-05-18T00:35:23.362237Z
- 
- 
- ----------------------------------------------------------------------
- r1192@Jesse-Vincents-Computer:  jesse | 2004-05-18T02:01:52.198022Z
- 
- Merged forward from rt 3.1
- ----------------------------------------------------------------------
+More moving improvements.
 
 ------------------------------------------------------------------------
-r901 | leira | 2004-05-14 17:35:35 -0400 (Fri, 14 May 2004) | 2 lines
+r374 | leira | 2004-01-30 05:03:01 -0500 (Fri, 30 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3/html/Elements/MyTickets
+   M /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Edit.html
 
-MyTickets doesn't require a Priority to be set.
+Moving fixes.
 
 ------------------------------------------------------------------------
-r890 | leira | 2004-05-14 00:28:27 -0400 (Fri, 14 May 2004) | 4 lines
+r373 | leira | 2004-01-30 00:27:23 -0500 (Fri, 30 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3/html/Admin/Groups/index.html
-   M /rt/branches/rt-3.3/html/Search/Elements/PickCFs
-
-If there isn't a QueueObj to begin with, it can't have a Name.
+   M /rt/branches/rt-3.1/html/Elements/Tabs
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   A /rt/branches/rt-3.1/html/Search/Build.html
+   M /rt/branches/rt-3.1/html/Search/Edit.html
+   A /rt/branches/rt-3.1/html/Search/Elements/NewListActions
+   A /rt/branches/rt-3.1/html/Search/Elements/NewPickRestriction
+   A /rt/branches/rt-3.1/html/Search/Elements/PickBasics
+   A /rt/branches/rt-3.1/html/Search/Elements/PickCFs
+   A /rt/branches/rt-3.1/html/Search/Elements/PickPeople
+   A /rt/branches/rt-3.1/html/Search/Elements/SelectAndOr
+   A /rt/branches/rt-3.1/html/Search/Elements/SelectLinks
+   A /rt/branches/rt-3.1/html/Search/Show.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
 
-Replaced a newline that had gone astray.
+Integration of new search stuff.
 
 ------------------------------------------------------------------------
-r864 | jesse | 2004-05-11 01:25:36 -0400 (Tue, 11 May 2004) | 8 lines
+r372 | jesse | 2004-01-29 23:30:04 -0500 (Thu, 29 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/html/Admin/Elements/CustomFieldTabs
-   M /rt/branches/rt-3.3/html/SelfService/Closed.html
-   M /rt/branches/rt-3.3/html/autohandler
-   M /rt/branches/rt-3.3/lib/RT/I18N/cs.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/da.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/de.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/en.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/en_malkovich.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/es.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/fi.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/fr.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/he.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/hu.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/it.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/ja.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/nl.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/no.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/pt_br.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/ru.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po
-   M /rt/branches/rt-3.3/sbin/extract-message-catalog
+   M /rt/branches/rt-3.1/lib/RT/Attribute_Overlay.pm
 
- 
- 
- ----------------------------------------------------------------------
- r1528@tinbook:  jesse | 2004-05-11T04:57:31.357768Z
- 
- Updated translations, linted them, updated translation extraction software
- ----------------------------------------------------------------------
+Fix for fsck.com #5216
 
 ------------------------------------------------------------------------
-r859 | jesse | 2004-05-09 21:29:48 -0400 (Sun, 09 May 2004) | 6 lines
+r371 | jesse | 2004-01-29 23:27:04 -0500 (Thu, 29 Jan 2004) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/releng.cnf
+   M /rt/branches/rt-3.1/lib/RT/Attribute_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Group_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
 
- ----------------------------------------------------------------------
- r1517@tinbook:  jesse | 2004-05-10T01:29:37.932237Z
- 
- Bumping to 3.3.3
- ----------------------------------------------------------------------
+Added ACL checks to attributes. by default, they're all open, except for saved searches, whcih we want to lock down a bit.
 
 ------------------------------------------------------------------------
-r858 | jesse | 2004-05-09 21:27:33 -0400 (Sun, 09 May 2004) | 6 lines
+r370 | jesse | 2004-01-28 19:38:13 -0500 (Wed, 28 Jan 2004) | 4 lines
 Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/Makefile.in
-   M /rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.Pg
-   M /rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.mysql
-
- ----------------------------------------------------------------------
- r1515@tinbook:  jesse | 2004-05-10T01:26:38.232023Z
- 
- Improved 3.1->3.3 migration support
- ----------------------------------------------------------------------
+   A /rt/branches/rt-3.1/html/Search/Edit.html
+   A /rt/branches/rt-3.1/html/Search/Elements/EditSearches
+   A /rt/branches/rt-3.1/html/Search/Elements/SelectSearchObject
+   A /rt/branches/rt-3.1/html/Search/Elements/SelectSearchesForObjects
+   M /rt/branches/rt-3.1/lib/RT/Attribute_Overlay.pm
 
-------------------------------------------------------------------------
-r851 | jesse | 2004-05-06 21:03:05 -0400 (Thu, 06 May 2004) | 1 line
-Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/bin/rt.in
-   M /rt/branches/rt-3.3/html/Admin/Queues/Scrip.html
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT.pm.in
-
-Merging forward from rt-3.1
-------------------------------------------------------------------------
-r848 | jesse | 2004-05-06 20:33:00 -0400 (Thu, 06 May 2004) | 5 lines
-Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/HOWTO/README
-   M /rt/branches/rt-3.3/HOWTO/change.txt
-   M /rt/branches/rt-3.3/HOWTO/release.txt
-   M /rt/branches/rt-3.3/HOWTO/version-control.txt
-   M /rt/branches/rt-3.3/Makefile.in
-   M /rt/branches/rt-3.3/UPGRADING
-   M /rt/branches/rt-3.3/aclocal.m4
-   M /rt/branches/rt-3.3/bin/mason_handler.fcgi.in
-   M /rt/branches/rt-3.3/bin/mason_handler.scgi.in
-   M /rt/branches/rt-3.3/bin/mason_handler.svc.in
-   M /rt/branches/rt-3.3/bin/rt-commit-handler.in
-   M /rt/branches/rt-3.3/bin/rt.in
-   M /rt/branches/rt-3.3/bin/webmux.pl.in
-   M /rt/branches/rt-3.3/configure.ac
-   M /rt/branches/rt-3.3/docs/Security
-   M /rt/branches/rt-3.3/docs/design_docs/acls
-   M /rt/branches/rt-3.3/docs/design_docs/approval_notices
-   M /rt/branches/rt-3.3/docs/design_docs/approval_template
-   M /rt/branches/rt-3.3/docs/design_docs/cf_search
-   M /rt/branches/rt-3.3/docs/design_docs/cli_spec
-   M /rt/branches/rt-3.3/docs/design_docs/cvs_integration
-   M /rt/branches/rt-3.3/docs/design_docs/delegation
-   M /rt/branches/rt-3.3/docs/design_docs/evil_plans
-   M /rt/branches/rt-3.3/docs/design_docs/groups_notes
-   M /rt/branches/rt-3.3/docs/design_docs/link-definitions.txt
-   M /rt/branches/rt-3.3/docs/design_docs/recursive_group_membership_algorithm
-   M /rt/branches/rt-3.3/docs/design_docs/rql_parser_machine.graphviz
-   M /rt/branches/rt-3.3/docs/design_docs/string-extraction-guide.txt
-   M /rt/branches/rt-3.3/docs/design_docs/ticket_templates
-   M /rt/branches/rt-3.3/docs/design_docs/users
-   M /rt/branches/rt-3.3/docs/rt3-schema-relationships.dot
-   M /rt/branches/rt-3.3/etc/RT_Config.pm.in
-   M /rt/branches/rt-3.3/etc/RT_SiteConfig.pm
-   M /rt/branches/rt-3.3/etc/acl.Informix
-   M /rt/branches/rt-3.3/etc/acl.Oracle
-   M /rt/branches/rt-3.3/etc/constraints.mysql
-   M /rt/branches/rt-3.3/etc/drop.Informix
-   M /rt/branches/rt-3.3/etc/drop.Oracle
-   M /rt/branches/rt-3.3/etc/initialdata
-   M /rt/branches/rt-3.3/etc/rt.spec
-   M /rt/branches/rt-3.3/etc/schema.SQLite
-   M /rt/branches/rt-3.3/html/Admin/Elements/AddCustomFieldValue
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditCustomField
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditCustomFieldValues
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditCustomFields
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditQueueWatchers
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditScrips
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditTemplates
-   M /rt/branches/rt-3.3/html/Admin/Elements/ListGlobalCustomFields
-   M /rt/branches/rt-3.3/html/Admin/Elements/QueueRightsForUser
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectCustomFieldType
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectGroups
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectModifyGroup
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectNewGroupMembers
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectRights
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectScripAction
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectScripCondition
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectSingleOrMultiple
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectUsers
-   M /rt/branches/rt-3.3/html/Admin/Global/Scrip.html
-   M /rt/branches/rt-3.3/html/Admin/Groups/GroupRights.html
-   M /rt/branches/rt-3.3/html/Admin/Groups/Members.html
-   M /rt/branches/rt-3.3/html/Admin/Groups/Modify.html
-   M /rt/branches/rt-3.3/html/Admin/Groups/UserRights.html
-   M /rt/branches/rt-3.3/html/Admin/Groups/index.html
-   M /rt/branches/rt-3.3/html/Admin/Queues/CustomField.html
-   M /rt/branches/rt-3.3/html/Admin/Queues/CustomFields.html
-   M /rt/branches/rt-3.3/html/Admin/Queues/Scrip.html
-   M /rt/branches/rt-3.3/html/Approvals/Display.html
-   M /rt/branches/rt-3.3/html/Approvals/Elements/Approve
-   M /rt/branches/rt-3.3/html/Approvals/Elements/PendingMyApproval
-   M /rt/branches/rt-3.3/html/Approvals/Elements/ShowDependency
-   M /rt/branches/rt-3.3/html/Approvals/Elements/Tabs
-   M /rt/branches/rt-3.3/html/Approvals/index.html
-   M /rt/branches/rt-3.3/html/Elements/BevelBoxRaisedEnd
-   M /rt/branches/rt-3.3/html/Elements/BevelBoxRaisedStart
-   M /rt/branches/rt-3.3/html/Elements/CreateTicket
-   M /rt/branches/rt-3.3/html/Elements/GotoTicket
-   M /rt/branches/rt-3.3/html/Elements/Menu
-   M /rt/branches/rt-3.3/html/Elements/MyRequests
-   M /rt/branches/rt-3.3/html/Elements/MyTickets
-   M /rt/branches/rt-3.3/html/Elements/PageLayout
-   M /rt/branches/rt-3.3/html/Elements/Quicksearch
-   M /rt/branches/rt-3.3/html/Elements/Refresh
-   M /rt/branches/rt-3.3/html/Elements/SelectAttachmentField
-   M /rt/branches/rt-3.3/html/Elements/SelectCustomFieldOperator
-   M /rt/branches/rt-3.3/html/Elements/SelectCustomFieldValue
-   M /rt/branches/rt-3.3/html/Elements/SelectGroups
-   M /rt/branches/rt-3.3/html/Elements/SelectLinkType
-   M /rt/branches/rt-3.3/html/Elements/SelectMatch
-   M /rt/branches/rt-3.3/html/Elements/SelectNewTicketQueue
-   M /rt/branches/rt-3.3/html/Elements/SelectQueue
-   M /rt/branches/rt-3.3/html/Elements/SelectResultsPerPage
-   M /rt/branches/rt-3.3/html/Elements/SelectSortOrder
-   M /rt/branches/rt-3.3/html/Elements/SelectTicketSortBy
-   M /rt/branches/rt-3.3/html/Elements/SelectTicketTypes
-   M /rt/branches/rt-3.3/html/Elements/ViewUser
-   M /rt/branches/rt-3.3/html/NoAuth/images/back_home.gif
-   M /rt/branches/rt-3.3/html/NoAuth/images/bplogo.gif
-   M /rt/branches/rt-3.3/html/NoAuth/images/favicon.png
-   M /rt/branches/rt-3.3/html/NoAuth/images/head_requestracker.gif
-   M /rt/branches/rt-3.3/html/NoAuth/images/rt.jpg
-   M /rt/branches/rt-3.3/html/NoAuth/images/space.gif
-   M /rt/branches/rt-3.3/html/NoAuth/images/spacer.gif
-   M /rt/branches/rt-3.3/html/NoAuth/images/squares_blue.gif
-   M /rt/branches/rt-3.3/html/REST/1.0/Forms/queue/default
-   M /rt/branches/rt-3.3/html/REST/1.0/Forms/queue/ns
-   M /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/attachments
-   M /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/links
-   M /rt/branches/rt-3.3/html/REST/1.0/Forms/user/default
-   M /rt/branches/rt-3.3/html/REST/1.0/Forms/user/ns
-   M /rt/branches/rt-3.3/html/REST/1.0/NoAuth/mail-gateway
-   M /rt/branches/rt-3.3/html/REST/1.0/logout
-   M /rt/branches/rt-3.3/html/REST/1.0/search/dhandler
-   M /rt/branches/rt-3.3/html/REST/1.0/ticket/comment
-   M /rt/branches/rt-3.3/html/REST/1.0/ticket/link
-   M /rt/branches/rt-3.3/html/REST/1.0/ticket/merge
-   M /rt/branches/rt-3.3/html/Search/Elements/PickCFs
-   M /rt/branches/rt-3.3/html/Search/Elements/TicketRow
-   M /rt/branches/rt-3.3/html/SelfService/Attachment/dhandler
-   M /rt/branches/rt-3.3/html/SelfService/Closed.html
-   M /rt/branches/rt-3.3/html/SelfService/Elements/Tabs
-   M /rt/branches/rt-3.3/html/SelfService/index.html
-   M /rt/branches/rt-3.3/html/Ticket/Create.html
-   M /rt/branches/rt-3.3/html/Ticket/Display.html
-   M /rt/branches/rt-3.3/html/Ticket/Elements/BulkLinks
-   M /rt/branches/rt-3.3/html/Ticket/Elements/EditCustomField
-   M /rt/branches/rt-3.3/html/Ticket/Elements/EditCustomFields
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowCustomFields
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowHistory
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowMessageHeaders
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowRequestor
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowTransaction
-   M /rt/branches/rt-3.3/html/Ticket/ShowEmailRecord.html
-   M /rt/branches/rt-3.3/html/Tools/Offline.html
-   M /rt/branches/rt-3.3/html/User/Delegation.html
-   M /rt/branches/rt-3.3/html/User/Elements/DelegateRights
-   M /rt/branches/rt-3.3/html/User/Elements/GroupTabs
-   M /rt/branches/rt-3.3/html/User/Elements/Tabs
-   M /rt/branches/rt-3.3/html/User/Groups/Members.html
-   M /rt/branches/rt-3.3/html/User/Groups/Modify.html
-   M /rt/branches/rt-3.3/html/User/Groups/index.html
-   M /rt/branches/rt-3.3/html/index.html
-   M /rt/branches/rt-3.3/html/l
-   M /rt/branches/rt-3.3/install-sh
-   M /rt/branches/rt-3.3/lib/RT/ACE_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/ACL_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/rt-3.3/lib/RT/Action/EscalatePriority.pm
-   M /rt/branches/rt-3.3/lib/RT/Action/ResolveMembers.pm
-   M /rt/branches/rt-3.3/lib/RT/Action/SendEmail.pm
-   M /rt/branches/rt-3.3/lib/RT/Action/SetPriority.pm
-   M /rt/branches/rt-3.3/lib/RT/Action/UserDefined.pm
-   M /rt/branches/rt-3.3/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Attachments_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/CachedGroupMember.pm
-   M /rt/branches/rt-3.3/lib/RT/CachedGroupMember_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/CachedGroupMembers.pm
-   M /rt/branches/rt-3.3/lib/RT/CachedGroupMembers_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Condition/AnyTransaction.pm
-   M /rt/branches/rt-3.3/lib/RT/Condition/BeforeDue.pm
-   M /rt/branches/rt-3.3/lib/RT/Condition/Overdue.pm
-   M /rt/branches/rt-3.3/lib/RT/Condition/OwnerChange.pm
-   M /rt/branches/rt-3.3/lib/RT/Condition/PriorityExceeds.pm
-   M /rt/branches/rt-3.3/lib/RT/Condition/QueueChange.pm
-   M /rt/branches/rt-3.3/lib/RT/Condition/StatusChange.pm
-   M /rt/branches/rt-3.3/lib/RT/Condition/UserDefined.pm
-   M /rt/branches/rt-3.3/lib/RT/CurrentUser.pm
-   M /rt/branches/rt-3.3/lib/RT/CustomField.pm
-   M /rt/branches/rt-3.3/lib/RT/CustomFieldValue.pm
-   M /rt/branches/rt-3.3/lib/RT/CustomFieldValues.pm
-   M /rt/branches/rt-3.3/lib/RT/CustomFieldValues_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/CustomFields.pm
-   M /rt/branches/rt-3.3/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Date.pm
-   M /rt/branches/rt-3.3/lib/RT/EmailParser.pm
-   M /rt/branches/rt-3.3/lib/RT/GroupMember_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/GroupMembers_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Group_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Groups_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Handle.pm
-   M /rt/branches/rt-3.3/lib/RT/I18N/cs.pm
-   M /rt/branches/rt-3.3/lib/RT/I18N/cs.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/de.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/en.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/es.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/fr.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/he.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/i_default.pm
-   M /rt/branches/rt-3.3/lib/RT/I18N/it.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/ja.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/nl.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/no.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/pt_br.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/ru.po
-   M /rt/branches/rt-3.3/lib/RT/Interface/CLI.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Email/Filter/SpamAssassin.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Email.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/REST.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-   M /rt/branches/rt-3.3/lib/RT/Link.pm
-   M /rt/branches/rt-3.3/lib/RT/Link_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Links.pm
-   M /rt/branches/rt-3.3/lib/RT/Links_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Principal.pm
-   M /rt/branches/rt-3.3/lib/RT/Principal_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Principals.pm
-   M /rt/branches/rt-3.3/lib/RT/Principals_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Queue_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Queues_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/ScripAction_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/ScripActions_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/ScripCondition_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/ScripConditions_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Scrip_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Search/ActiveTicketsInQueue.pm
-   M /rt/branches/rt-3.3/lib/RT/Search/Generic.pm
-   M /rt/branches/rt-3.3/lib/RT/System.pm
-   M /rt/branches/rt-3.3/lib/RT/Template_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Templates_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/TicketCustomFieldValue.pm
-   M /rt/branches/rt-3.3/lib/RT/TicketCustomFieldValue_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/TicketCustomFieldValues.pm
-   M /rt/branches/rt-3.3/lib/RT/TicketCustomFieldValues_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay_SQL.pm
-   M /rt/branches/rt-3.3/lib/RT/Transactions_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/URI/base.pm
-   M /rt/branches/rt-3.3/lib/RT/URI/fsck_com_rt.pm
-   M /rt/branches/rt-3.3/lib/RT/User_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT.pm.in
-   M /rt/branches/rt-3.3/lib/t/00smoke.t.in
-   M /rt/branches/rt-3.3/lib/t/01harness.t.in
-   M /rt/branches/rt-3.3/lib/t/02regression.t.in
-   M /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/dir
-   M /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg1
-   M /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg2
-   M /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg3
-   M /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg4
-   M /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg5
-   M /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg6
-   M /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg7
-   M /rt/branches/rt-3.3/lib/t/data/multipart-alternative-with-umlaut
-   M /rt/branches/rt-3.3/lib/t/data/multipart-report
-   M /rt/branches/rt-3.3/lib/t/data/nested-mime-sample
-   M /rt/branches/rt-3.3/lib/t/data/nested-rfc-822
-   M /rt/branches/rt-3.3/lib/t/data/new-ticket-from-iso-8859-1
-   M /rt/branches/rt-3.3/lib/t/data/new-ticket-from-iso-8859-1-full
-   M /rt/branches/rt-3.3/lib/t/data/russian-subject-no-content-type
-   M /rt/branches/rt-3.3/lib/t/data/text-html-in-russian
-   M /rt/branches/rt-3.3/lib/t/data/text-html-with-umlaut
-   M /rt/branches/rt-3.3/lib/t/regression/00placeholder
-   M /rt/branches/rt-3.3/lib/t/regression/mime_tests
-   M /rt/branches/rt-3.3/m4/rt_enable_layout.m4
-   M /rt/branches/rt-3.3/m4/rt_expand_var.m4
-   M /rt/branches/rt-3.3/m4/rt_layout.m4
-   M /rt/branches/rt-3.3/m4/rt_subst_expanded_arg.m4
-   M /rt/branches/rt-3.3/sbin/extract-message-catalog
-   M /rt/branches/rt-3.3/sbin/extract_pod_tests
-   M /rt/branches/rt-3.3/sbin/factory
-   M /rt/branches/rt-3.3/sbin/regression_harness
-   M /rt/branches/rt-3.3/sbin/rt-setup-database.in
-   M /rt/branches/rt-3.3/sbin/rt-test-dependencies.in
-
- r1484@tinbook:  jesse | 2004-05-07T00:31:24.624807Z
- 
- Merging forward from 3.1
- ----------------------------------------------------------------------
-
-------------------------------------------------------------------------
-r843 | autrijus | 2004-05-06 04:13:18 -0400 (Thu, 06 May 2004) | 10 lines
-Changed paths:
-   M /rt
-   D /rt/branches/rt-3.3/docs/design_docs/atom-api.txt
-   M /rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm
+A first cut at saved searches.  Create, Edit, Delete, Revert work. currently only "personal" searches work.
+And there's no access control.
 
- ----------------------------------------------------------------------
- r4415@not:  autrijus | 2004-05-03T06:42:06.584504Z
- 
- * move atom-api.txt to RTx::Atom space.
- ----------------------------------------------------------------------
- r4510@not:  autrijus | 2004-05-06T07:44:35.710915Z
- 
- * stub undef CustomField->QueueObj to make BuildFormatString happy.
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r833 | jesse | 2004-05-05 14:18:03 -0400 (Wed, 05 May 2004) | 2 lines
+r369 | jesse | 2004-01-28 18:29:46 -0500 (Wed, 28 Jan 2004) | 3 lines
 Changed paths:
-   M /rt/branches/rt-3.3
-
-A new merge ticket
+   M /rt/branches/rt-3.1/etc/schema.Informix
+   M /rt/branches/rt-3.1/etc/schema.Oracle
+   M /rt/branches/rt-3.1/etc/schema.Pg
+   M /rt/branches/rt-3.1/etc/schema.SQLite
+   M /rt/branches/rt-3.1/etc/schema.mysql
+   M /rt/branches/rt-3.1/lib/RT/Attribute.pm
+   M /rt/branches/rt-3.1/lib/RT/Attribute_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/rt-3.1/sbin/factory
 
-------------------------------------------------------------------------
-r810 | autrijus | 2004-05-02 21:00:48 -0400 (Sun, 02 May 2004) | 8 lines
-Changed paths:
-   M /rt
-   D /rt/branches/rt-3.3/html/REST/2.0
+Attributes work to allow multivalue attributes to work better
 
- ----------------------------------------------------------------------
- r4394@not:  autrijus | 2004-05-03T01:00:51.890023Z
- 
- * 301 Moved Permanently
- * Location: /RTx-Atom/html/Atom/0.3
- 
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r808 | autrijus | 2004-05-02 20:21:29 -0400 (Sun, 02 May 2004) | 15 lines
+r365 | jesse | 2004-01-18 16:52:42 -0500 (Sun, 18 Jan 2004) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/docs/design_docs/atom-api.txt
-   A /rt/branches/rt-3.3/html/REST/2.0/Add
-   A /rt/branches/rt-3.3/html/REST/2.0/Add/index
-   D /rt/branches/rt-3.3/html/REST/2.0/Create
-   D /rt/branches/rt-3.3/html/REST/2.0/Delete
-   A /rt/branches/rt-3.3/html/REST/2.0/Remove
-   A /rt/branches/rt-3.3/html/REST/2.0/Remove/index
-   M /rt/branches/rt-3.3/html/REST/2.0/dhandler
-   M /rt/branches/rt-3.3/lib/RT/CurrentUser.pm
-   M /rt/branches/rt-3.3/lib/RT/Date.pm
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Listing.html
+   M /rt/branches/rt-3.1/lib/RT/Attribute_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/branches/rt-3.1/lib/t/03web.pl.in
+   M /rt/branches/rt-3.1/sbin/rt-setup-database.in
 
- ----------------------------------------------------------------------
- r4385@not:  autrijus | 2004-05-02T21:16:04.349680Z
- 
- * Correct POD for W3CDTF
- ----------------------------------------------------------------------
- r4388@not:  autrijus | 2004-05-03T00:17:22.934822Z
- 
- * massive redesign based on discussion with obra.
- ----------------------------------------------------------------------
- r4389@not:  autrijus | 2004-05-03T00:21:25.960300Z
- 
- * Rename "Create" to "Add"; "Delete" to "Remove".
- 
- ----------------------------------------------------------------------
+Web search ui work. refactored out display framework
+allowed attributes to serialize hashrefs.
 
 ------------------------------------------------------------------------
-r805 | autrijus | 2004-05-02 14:03:32 -0400 (Sun, 02 May 2004) | 10 lines
+r364 | jesse | 2004-01-16 13:30:57 -0500 (Fri, 16 Jan 2004) | 4 lines
 Changed paths:
-   M /rt
-   A /rt/branches/rt-3.3/docs/design_docs/atom-api.txt
-   A /rt/branches/rt-3.3/html/REST/2.0/Create/index
-   A /rt/branches/rt-3.3/html/REST/2.0/Delete/index
-   A /rt/branches/rt-3.3/html/REST/2.0/Describe
-   A /rt/branches/rt-3.3/html/REST/2.0/Describe/index
-   M /rt/branches/rt-3.3/html/REST/2.0/Elements/Link
-   A /rt/branches/rt-3.3/html/REST/2.0/Get/index
-   M /rt/branches/rt-3.3/html/REST/2.0/NoAuth/feed.css
-   A /rt/branches/rt-3.3/html/REST/2.0/Put
-   A /rt/branches/rt-3.3/html/REST/2.0/Put/index
-   M /rt/branches/rt-3.3/html/REST/2.0/Search/index
-   A /rt/branches/rt-3.3/html/REST/2.0/Update/index
-   M /rt/branches/rt-3.3/html/REST/2.0/dhandler
-   M /rt/branches/rt-3.3/html/REST/2.0/index
+   M /rt/branches/rt-3.1/UPGRADING
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email/Auth/MailFrom.pm
 
- ----------------------------------------------------------------------
- r4382@not:  autrijus | 2004-05-02T18:02:39.870947Z
- 
- * Describes RT/REST 2.0, Atom-compatible API.
- ----------------------------------------------------------------------
- r4383@not:  autrijus | 2004-05-02T18:03:08.473736Z
- 
- * Put stubs to all the unimplemented verbs.
- ----------------------------------------------------------------------
 
-------------------------------------------------------------------------
-r804 | autrijus | 2004-05-02 11:58:17 -0400 (Sun, 02 May 2004) | 14 lines
-Changed paths:
-   M /rt
-   A /rt/branches/rt-3.3/html/REST/2.0/Elements/Error
-   A /rt/branches/rt-3.3/html/REST/2.0/Elements/Introspect
-   D /rt/branches/rt-3.3/html/REST/2.0/Error
-   M /rt/branches/rt-3.3/html/REST/2.0/Search/index
-   M /rt/branches/rt-3.3/html/REST/2.0/dhandler
-   M /rt/branches/rt-3.3/html/REST/2.0/index
+Updating mailfrom acls
 
- ----------------------------------------------------------------------
- r4379@not:  autrijus | 2004-05-02T15:26:00.873038Z
- 
- * Do content negotiation with the browser and fallback on text/xml.
- * Clean up namespaces a little.
- ----------------------------------------------------------------------
- r4380@not:  autrijus | 2004-05-02T15:58:03.262688Z
- 
- * Move Error/index to Elements/Error since Error is not a verb.
- * Refactor the Introspect part away to Elements/.
- * Correctly redirects /Templates/ and /template/ to /templates/.
- 
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r802 | autrijus | 2004-05-02 09:14:02 -0400 (Sun, 02 May 2004) | 7 lines
+r353 | jesse | 2004-01-04 17:08:35 -0500 (Sun, 04 Jan 2004) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/Elements/Link
-   M /rt/branches/rt-3.3/html/REST/2.0/NoAuth/feed.css
-   M /rt/branches/rt-3.3/html/REST/2.0/NoAuth/index.css
-   M /rt/branches/rt-3.3/html/REST/2.0/Search/index
-
- ----------------------------------------------------------------------
- r4375@not:  autrijus | 2004-05-02T13:13:38.884936Z
- 
- * use ->URI correctly.
- * use <a xmlns="...html..."> so things can correct render in nongecko browsers.
- ----------------------------------------------------------------------
+   M /rt/branches/rt-3.1/UPGRADING
+   M /rt/branches/rt-3.1/bin/rt-crontool.in
+   M /rt/branches/rt-3.1/bin/rt-mailgate.in
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/etc/schema.Informix
+   M /rt/branches/rt-3.1/etc/schema.Oracle
+   M /rt/branches/rt-3.1/etc/schema.Pg
+   M /rt/branches/rt-3.1/etc/schema.SQLite
+   M /rt/branches/rt-3.1/etc/schema.mysql
+   M /rt/branches/rt-3.1/html/Admin/Elements/SelectStage
+   M /rt/branches/rt-3.1/html/Elements/Callback
+   M /rt/branches/rt-3.1/html/Elements/SelectWatcherType
+   M /rt/branches/rt-3.1/html/Elements/SetupSessionCookie
+   M /rt/branches/rt-3.1/html/Elements/SimpleSearch
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/ticket/default
+   M /rt/branches/rt-3.1/html/REST/1.0/Forms/ticket/history
+   M /rt/branches/rt-3.1/html/REST/1.0/autohandler
+   M /rt/branches/rt-3.1/html/REST/1.0/dhandler
+   M /rt/branches/rt-3.1/html/REST/1.0/search/ticket
+   M /rt/branches/rt-3.1/html/Search/Elements/PickRestriction
+   M /rt/branches/rt-3.1/html/SelfService/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowDates
+   M /rt/branches/rt-3.1/html/Ticket/Elements/Tabs
+   M /rt/branches/rt-3.1/html/index.html
+   M /rt/branches/rt-3.1/lib/RT/Action/AutoOpen.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Base.pm
+   M /rt/branches/rt-3.1/lib/RT/CurrentUser.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
+   M /rt/branches/rt-3.1/lib/RT/I18N/zh_cn.po
+   M /rt/branches/rt-3.1/lib/RT/I18N/zh_tw.po
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Principal_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/Template_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/URI.pm
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/lib/t/04_send_email.pl.in
+   A /rt/branches/rt-3.1/lib/t/data/crashes-file-based-parser
+   A /rt/branches/rt-3.1/lib/t/data/notes-uuencoded
+   M /rt/branches/rt-3.1/sbin/license_tag
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
-------------------------------------------------------------------------
-r801 | autrijus | 2004-05-01 19:14:04 -0400 (Sat, 01 May 2004) | 6 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/index
+Merging RT 3.0.7->3.0.8 into 3.1.x
 
- ----------------------------------------------------------------------
- r4365@not:  autrijus | 2004-05-01T23:14:05.342098Z
- 
- * Cross-introspection logic to eliminate subordinate classes from main index.
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r800 | autrijus | 2004-05-01 17:39:50 -0400 (Sat, 01 May 2004) | 8 lines
+r352 | jesse | 2004-01-04 12:21:04 -0500 (Sun, 04 Jan 2004) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/Elements/Link
-   M /rt/branches/rt-3.3/html/REST/2.0/NoAuth/feed.css
-   A /rt/branches/rt-3.3/html/REST/2.0/NoAuth/index.css
-   M /rt/branches/rt-3.3/html/REST/2.0/Search/index
-   M /rt/branches/rt-3.3/html/REST/2.0/autohandler
-   M /rt/branches/rt-3.3/html/REST/2.0/dhandler
-   M /rt/branches/rt-3.3/html/REST/2.0/index
+   D /rt/branches/rt-3.1/Changelog
 
- ----------------------------------------------------------------------
- r4363@not:  autrijus | 2004-05-01T21:39:51.608519Z
- 
- * Index page implemented using multiple "Feed" services.
- * Lots of cute, little icons placed with CSS.
- * Much better preparation for autodiscovery; PostURI is now handled with "/type.new".
- ----------------------------------------------------------------------
+Removed RT 3.0 aegis changelog
 
-------------------------------------------------------------------------
-r799 | autrijus | 2004-05-01 14:54:56 -0400 (Sat, 01 May 2004) | 6 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/NoAuth/feed.css
-
- ----------------------------------------------------------------------
- r4361@not:  autrijus | 2004-05-01T18:55:05.234036Z
- 
- * Even more CSS tricks.
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r798 | autrijus | 2004-05-01 14:49:18 -0400 (Sat, 01 May 2004) | 14 lines
+r351 | jesse | 2004-01-04 12:10:53 -0500 (Sun, 04 Jan 2004) | 5 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/Admin/Elements/Header
-   M /rt/branches/rt-3.3/html/Admin/Global/Templates.html
-   M /rt/branches/rt-3.3/html/Elements/Header
-   M /rt/branches/rt-3.3/html/Elements/TicketList
-   A /rt/branches/rt-3.3/html/REST/2.0/Elements
-   A /rt/branches/rt-3.3/html/REST/2.0/Elements/Link
-   M /rt/branches/rt-3.3/html/REST/2.0/NoAuth/feed.css
-   M /rt/branches/rt-3.3/html/REST/2.0/Search/index
-   M /rt/branches/rt-3.3/html/REST/2.0/autohandler
+   D /rt/branches/rt-3.1/Makefile
+   D /rt/branches/rt-3.1/bin/mason_handler.fcgi
+   D /rt/branches/rt-3.1/bin/mason_handler.scgi
+   D /rt/branches/rt-3.1/bin/mason_handler.svc
+   D /rt/branches/rt-3.1/bin/rt
+   D /rt/branches/rt-3.1/bin/rt-commit-handler
+   D /rt/branches/rt-3.1/bin/rt-crontool
+   D /rt/branches/rt-3.1/bin/rt-mailgate
+   D /rt/branches/rt-3.1/bin/webmux.pl
+   D /rt/branches/rt-3.1/config
+   D /rt/branches/rt-3.1/config.pld
+   D /rt/branches/rt-3.1/config.status
+   D /rt/branches/rt-3.1/configure
+   D /rt/branches/rt-3.1/etc/RT_Config.pm
+   D /rt/branches/rt-3.1/lib/RT.pm
+   D /rt/branches/rt-3.1/lib/t/00smoke.t
+   D /rt/branches/rt-3.1/lib/t/01harness.t
+   D /rt/branches/rt-3.1/lib/t/02regression.t
+   D /rt/branches/rt-3.1/lib/t/03web.pl
+   D /rt/branches/rt-3.1/lib/t/04_send_email.pl
+   D /rt/branches/rt-3.1/sbin/rt-setup-database
+   D /rt/branches/rt-3.1/sbin/rt-test-dependencies
 
- ----------------------------------------------------------------------
- r4357@not:  autrijus | 2004-05-01T18:47:10.055533Z
- 
- * Various CSS tricks.
- ----------------------------------------------------------------------
- r4358@not:  autrijus | 2004-05-01T18:47:49.553353Z
- 
- * Fixed an off-by-one error in ticket listing.
- ----------------------------------------------------------------------
- r4359@not:  autrijus | 2004-05-01T18:48:06.789268Z
- 
- * support for Atom autodiscovery.
- ----------------------------------------------------------------------
+Removed autogenerated files. They'll be generated by configure
 
-------------------------------------------------------------------------
-r797 | autrijus | 2004-05-01 12:11:01 -0400 (Sat, 01 May 2004) | 6 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/Error/index
 
- ----------------------------------------------------------------------
- r4353@not:  autrijus | 2004-05-01T16:11:10.795277Z
- 
- * finally Error works for all three supported carriers.
- ----------------------------------------------------------------------
 
-------------------------------------------------------------------------
-r796 | autrijus | 2004-05-01 12:07:33 -0400 (Sat, 01 May 2004) | 17 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/bin/standalone_httpd.in
-   M /rt/branches/rt-3.3/html/REST/2.0/Error/index
-   M /rt/branches/rt-3.3/html/REST/2.0/Search/index
-   M /rt/branches/rt-3.3/html/REST/2.0/dhandler
-
- ----------------------------------------------------------------------
- r4349@not:  autrijus | 2004-05-01T15:36:00.221832Z
- 
- * Properly clean up leftover HTTP_* environment variables.
- * Pass authorization header to Mason.
- * Send out correct HTTP status code instead of blindly assuming 200.
- ----------------------------------------------------------------------
- r4350@not:  autrijus | 2004-05-01T15:59:39.046584Z
- 
- * RT::Date->new also takes currentuser.
- ----------------------------------------------------------------------
- r4351@not:  autrijus | 2004-05-01T16:00:38.530367Z
- 
- * Correctly handle nonce disposal.
- * $m->abort is needed for mod_perl2.
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r795 | autrijus | 2004-05-01 09:58:07 -0400 (Sat, 01 May 2004) | 6 lines
+r350 | jesse | 2004-01-04 12:05:52 -0500 (Sun, 04 Jan 2004) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/Search/index
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
- ----------------------------------------------------------------------
- r4347@not:  autrijus | 2004-05-01T13:58:14.427055Z
- 
- * it's Queues, not Queue
- ----------------------------------------------------------------------
+Adding in code to support older RTFM
 
-------------------------------------------------------------------------
-r794 | autrijus | 2004-05-01 09:55:57 -0400 (Sat, 01 May 2004) | 6 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/Search/index
-
- ----------------------------------------------------------------------
- r4345@not:  autrijus | 2004-05-01T13:56:03.778530Z
- 
- * use absolute URIs, not relative ones, per the Atom spec
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r793 | autrijus | 2004-05-01 09:51:25 -0400 (Sat, 01 May 2004) | 6 lines
+r316 | jesse | 2003-12-22 16:20:48 -0500 (Mon, 22 Dec 2003) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/Search/index
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies.in
 
- ----------------------------------------------------------------------
- r4343@not:  autrijus | 2004-05-01T13:51:31.406464Z
- 
- * link semantics now agrees with AtomAPI.
- ----------------------------------------------------------------------
+dependency test tool updated to support downloading pristine distributions of modules
 
 ------------------------------------------------------------------------
-r792 | autrijus | 2004-05-01 09:35:28 -0400 (Sat, 01 May 2004) | 6 lines
+r315 | jesse | 2003-12-21 21:51:45 -0500 (Sun, 21 Dec 2003) | 8 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/Search/index
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/EmailParser.pm
+   A /rt/branches/rt-3.1/lib/RT/Interface/Email/Auth/GnuPG.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email/Auth/MailFrom.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Email.pm
 
- ----------------------------------------------------------------------
- r4341@not:  autrijus | 2004-05-01T13:35:35.544895Z
- 
- * Make <id> slightly more unique
- ----------------------------------------------------------------------
+Attributes fix
+CreateTickets fix
 
-------------------------------------------------------------------------
-r791 | autrijus | 2004-05-01 09:33:03 -0400 (Sat, 01 May 2004) | 6 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/Error/index
-   M /rt/branches/rt-3.3/html/REST/2.0/autohandler
+Initial commit of GnuPG authentication.
 
- ----------------------------------------------------------------------
- r4339@not:  autrijus | 2004-05-01T13:32:59.502832Z
- 
- * adapt for FastCGI's needs
- ----------------------------------------------------------------------
 
-------------------------------------------------------------------------
-r790 | autrijus | 2004-05-01 09:22:21 -0400 (Sat, 01 May 2004) | 9 lines
-Changed paths:
-   M /rt
-   A /rt/branches/rt-3.3/html/REST/2.0/Auth
-   A /rt/branches/rt-3.3/html/REST/2.0/Create
-   A /rt/branches/rt-3.3/html/REST/2.0/Delete
-   A /rt/branches/rt-3.3/html/REST/2.0/Error
-   A /rt/branches/rt-3.3/html/REST/2.0/Error/index
-   A /rt/branches/rt-3.3/html/REST/2.0/Get
-   A /rt/branches/rt-3.3/html/REST/2.0/Search
-   A /rt/branches/rt-3.3/html/REST/2.0/Search/index
-   A /rt/branches/rt-3.3/html/REST/2.0/Update
-   M /rt/branches/rt-3.3/html/REST/2.0/dhandler
-   A /rt/branches/rt-3.3/html/REST/2.0/index
 
- ----------------------------------------------------------------------
- r4335@not:  autrijus | 2004-05-01T13:20:56.570615Z
- 
- * Establish directory layout.
- * Error handling.
- * Refactor out the 'Search' verb.
- 
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r788 | autrijus | 2004-05-01 07:44:58 -0400 (Sat, 01 May 2004) | 7 lines
+r314 | root | 2003-12-20 18:21:38 -0500 (Sat, 20 Dec 2003) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/dhandler
-
- ----------------------------------------------------------------------
- r4331@not:  autrijus | 2004-05-01T11:44:31.355329Z
- 
- * do not offer WSSE auth to non-atom clients, and vice versa,
-   to avoid spurious auth warnings.
- ----------------------------------------------------------------------
+   M /rt/branches/rt-3.1/html/Elements/SelectLang
 
-------------------------------------------------------------------------
-r785 | autrijus | 2004-05-01 07:16:25 -0400 (Sat, 01 May 2004) | 10 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/dhandler
-   M /rt/branches/rt-3.3/lib/RT/Date.pm
+Better copes with nonexistent languages.
 
- ----------------------------------------------------------------------
- r4323@not:  autrijus | 2004-05-01T11:14:28.377660Z
- 
- * implement ->W3CDTF.
- ----------------------------------------------------------------------
- r4324@not:  autrijus | 2004-05-01T11:16:31.456041Z
- 
- * we are now a valid Atom feed.
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r784 | autrijus | 2004-05-01 06:52:15 -0400 (Sat, 01 May 2004) | 7 lines
+r313 | jesse | 2003-12-19 03:39:58 -0500 (Fri, 19 Dec 2003) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/REST/2.0/dhandler
+   A /rt/branches/rt-3.1/lib/RT/I18N/en_malkovich.po
 
- ----------------------------------------------------------------------
- r4321@not:  autrijus | 2004-05-01T10:52:23.225100Z
- 
- * add fastcgi support.
- * make proper use of X-WSSE header instead of demanding Authorization
- ----------------------------------------------------------------------
+Malkoviched up a Malkovich Malkovich.
 
 ------------------------------------------------------------------------
-r783 | autrijus | 2004-05-01 06:50:30 -0400 (Sat, 01 May 2004) | 6 lines
+r312 | jesse | 2003-12-18 16:59:08 -0500 (Thu, 18 Dec 2003) | 4 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/lib/RT/I18N.pm
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Listing.html
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
- ----------------------------------------------------------------------
- r4319@not:  autrijus | 2004-05-01T10:50:15.580296Z
- 
- * glob local/*.po too for consistency and intuitiveness.
- ----------------------------------------------------------------------
+Generalized TicketList a fair bit. 
+Added sorting and ordering
 
-------------------------------------------------------------------------
-r782 | autrijus | 2004-05-01 06:35:23 -0400 (Sat, 01 May 2004) | 8 lines
-Changed paths:
-   M /rt
-   A /rt/branches/rt-3.3/html/REST/2.0/NoAuth
-   A /rt/branches/rt-3.3/html/REST/2.0/NoAuth/feed.css
-   M /rt/branches/rt-3.3/html/REST/2.0/autohandler
-   M /rt/branches/rt-3.3/html/REST/2.0/dhandler
-
- ----------------------------------------------------------------------
- r4317@not:  autrijus | 2004-05-01T10:35:00.584748Z
- 
- * now does Basic and Digest authentication, too.
- * CSSify the example feed
- 
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r781 | autrijus | 2004-04-30 23:24:12 -0400 (Fri, 30 Apr 2004) | 7 lines
+r311 | jesse | 2003-12-18 13:59:00 -0500 (Thu, 18 Dec 2003) | 2 lines
 Changed paths:
-   M /rt
-   A /rt/branches/rt-3.3/html/REST/2.0
-   A /rt/branches/rt-3.3/html/REST/2.0/autohandler
-   A /rt/branches/rt-3.3/html/REST/2.0/dhandler
-   M /rt/branches/rt-3.3/lib/RT/CurrentUser.pm
+   M /rt/branches/rt-3.1/Makefile
+   M /rt/branches/rt-3.1/config.status
+   M /rt/branches/rt-3.1/html/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Elements/MyTickets
+   M /rt/branches/rt-3.1/html/Elements/TicketList
+   M /rt/branches/rt-3.1/html/Search/Elements/TicketRow
+   M /rt/branches/rt-3.1/html/Search/Listing.html
+   M /rt/branches/rt-3.1/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
- ----------------------------------------------------------------------
- r4309@not:  autrijus | 2004-05-01T03:22:53.730384Z
- 
- * initial commit of RT/REST 2.0 API and WSSE authentication.
- 
- ----------------------------------------------------------------------
+work in progress update of the ticket listing stuff
 
 ------------------------------------------------------------------------
-r766 | jesse | 2004-04-28 14:26:02 -0400 (Wed, 28 Apr 2004) | 6 lines
+r307 | jesse | 2003-12-16 00:19:38 -0500 (Tue, 16 Dec 2003) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3/etc/upgrade
-   A /rt/branches/rt-3.3/etc/upgrade/3.3.0
-   A /rt/branches/rt-3.3/etc/upgrade/3.3.0/acl.Informix
-   A /rt/branches/rt-3.3/etc/upgrade/3.3.0/acl.Oracle
-   A /rt/branches/rt-3.3/etc/upgrade/3.3.0/acl.Pg
-   A /rt/branches/rt-3.3/etc/upgrade/3.3.0/acl.SQLite
-   A /rt/branches/rt-3.3/etc/upgrade/3.3.0/acl.mysql
-   A /rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.Pg
-   A /rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.mysql
+   M /rt/branches/rt-3.1/html/Elements/MyRequests
+   M /rt/branches/rt-3.1/html/Elements/MyTickets
+   A /rt/branches/rt-3.1/html/Elements/TicketList
 
- ----------------------------------------------------------------------
- r2206@tinbook:  jesse | 2004-04-28T18:24:56.988760Z
- 
- Added the beginnings of upgrade 3.1->3.3 functionality. has not yet been tested
- ----------------------------------------------------------------------
- 
-------------------------------------------------------------------------
-r763 | autrijus | 2004-04-28 02:05:14 -0400 (Wed, 28 Apr 2004) | 8 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/lib/RT/Base.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-
- ----------------------------------------------------------------------
- r4223@not:  autrijus | 2004-04-28T06:00:27.794797Z
- 
- * correctly put loc_fuzzy in Base.
- * do not double-encode EscapeUTF8 for Mason.  this resolves the weird
-   standalong-httpd bug.
- ----------------------------------------------------------------------
+Factoring out MyTickets and MyRequests to TicketList
 
 ------------------------------------------------------------------------
-r761 | jesse | 2004-04-27 23:16:35 -0400 (Tue, 27 Apr 2004) | 2 lines
+r306 | jesse | 2003-12-14 23:24:16 -0500 (Sun, 14 Dec 2003) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3/etc/schema.Pg
+   M /rt/branches/rt-3.1/html/Elements/MyRequests
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
-Updating schema for 3.3 to use 'integer' on postgres rather than int2 on Andrew Sullivan's recommendation
+better docs and a first example of the use in MyRequests. wants more generalization.
 
 ------------------------------------------------------------------------
-r758 | autrijus | 2004-04-27 16:12:38 -0400 (Tue, 27 Apr 2004) | 6 lines
+r305 | root | 2003-12-14 13:23:46 -0500 (Sun, 14 Dec 2003) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/Elements/Footer
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
- ----------------------------------------------------------------------
- r4214@not:  autrijus | 2004-04-27T20:12:39.658238Z
- 
- * rework Footer l10n into one line so not to confuse the old string extractor
- ----------------------------------------------------------------------
+started test suite for tickets_Overlay_SQL
 
 ------------------------------------------------------------------------
-r757 | autrijus | 2004-04-27 16:09:45 -0400 (Tue, 27 Apr 2004) | 6 lines
+r304 | jesse | 2003-12-13 23:18:58 -0500 (Sat, 13 Dec 2003) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po
+   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay_SQL.pm
 
- ----------------------------------------------------------------------
- r4211@not:  autrijus | 2004-04-27T19:55:32.087502Z
- 
- * Chinese translations.
- ----------------------------------------------------------------------
+TicketSQL parser additions. first cut of "SELECT" functionality
 
 ------------------------------------------------------------------------
-r756 | autrijus | 2004-04-27 04:46:57 -0400 (Tue, 27 Apr 2004) | 7 lines
+r303 | root | 2003-12-12 19:30:00 -0500 (Fri, 12 Dec 2003) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/README
+   M /rt/branches/rt-3.1/bin/standalone_httpd.in
 
- ----------------------------------------------------------------------
- r4195@not:  autrijus | 2004-04-27T08:46:36.958817Z
- 
- * now mod_perl2 only needs one line of extra setup.
-  
- ----------------------------------------------------------------------
+a bit of refactoring for the standalone httpd
 
-------------------------------------------------------------------------
-r746 | autrijus | 2004-04-26 15:11:33 -0400 (Mon, 26 Apr 2004) | 7 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.1/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/User_Overlay.pm
-
- ----------------------------------------------------------------------
- r4176@not:  autrijus | 2004-04-26T19:09:53.594445Z
- 
- * switch password format from base64 to hex; maintaining legacy
-   compatibility by upgrading passwords in-place upon successful auth
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r745 | autrijus | 2004-04-26 15:02:48 -0400 (Mon, 26 Apr 2004) | 6 lines
+r302 | jesse | 2003-12-12 03:45:44 -0500 (Fri, 12 Dec 2003) | 3 lines
 Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/SearchBuilder.pm
+   M /rt/branches/rt-3.1/Makefile
+   M /rt/branches/rt-3.1/Makefile.in
+   A /rt/branches/rt-3.1/bin/standalone_httpd.in
+   M /rt/branches/rt-3.1/config.status
+   M /rt/branches/rt-3.1/configure
+   M /rt/branches/rt-3.1/configure.ac
 
- ----------------------------------------------------------------------
- r4171@not:  autrijus | 2004-04-26T18:59:54.608186Z
- 
- * correct EMPTY and NULL support for $Tickets->LimitAttribute().
- ----------------------------------------------------------------------
+Added a standalone "personal" httpd for RT
 
-------------------------------------------------------------------------
-r744 | autrijus | 2004-04-26 15:01:49 -0400 (Mon, 26 Apr 2004) | 8 lines
-Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/Template_Overlay.pm
-
- ----------------------------------------------------------------------
- r4170@not:  autrijus | 2004-04-26T18:56:10.826541Z
- 
- * Do not crash the application when Template parsing failed; instead
-   capture the error and handle it with $RT::Logger->error().
- 
- ----------------------------------------------------------------------
 
 ------------------------------------------------------------------------
-r743 | autrijus | 2004-04-26 15:01:05 -0400 (Mon, 26 Apr 2004) | 8 lines
+r301 | root | 2003-12-09 23:23:27 -0500 (Tue, 09 Dec 2003) | 4 lines
 Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
+   M /rt/branches/rt-3.1/Makefile
+   M /rt/branches/rt-3.1/bin/mason_handler.fcgi
+   M /rt/branches/rt-3.1/bin/mason_handler.svc
+   M /rt/branches/rt-3.1/bin/rt
+   M /rt/branches/rt-3.1/bin/rt-commit-handler
+   M /rt/branches/rt-3.1/bin/rt-crontool
+   M /rt/branches/rt-3.1/bin/rt-mailgate
+   M /rt/branches/rt-3.1/bin/webmux.pl
+   M /rt/branches/rt-3.1/config.status
+   M /rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
+   M /rt/branches/rt-3.1/lib/RT/Action/Notify.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/t/00smoke.t
+   M /rt/branches/rt-3.1/lib/t/01harness.t
+   M /rt/branches/rt-3.1/lib/t/02regression.t
+   M /rt/branches/rt-3.1/lib/t/03web.pl
+   M /rt/branches/rt-3.1/lib/t/04_send_email.pl
+   M /rt/branches/rt-3.1/sbin/rt-setup-database
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies
 
- ----------------------------------------------------------------------
- r4169@not:  autrijus | 2004-04-26T18:52:39.442581Z
- 
- * allow subkeys limit like $Tickets->Limit( FIELD => 'Requestor.Id' );
-   previously it was only available from "CF.*" keys.
- 
- ----------------------------------------------------------------------
+Squelching messages to individual recipients now works
 
-------------------------------------------------------------------------
-r741 | autrijus | 2004-04-26 14:48:52 -0400 (Mon, 26 Apr 2004) | 3 lines
-Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
 
-* freeze() forgot to take account of the look_at_* indices, resulting
-  in incorrect object after thaw()ing
 
 ------------------------------------------------------------------------
-r733 | autrijus | 2004-04-23 15:09:40 -0400 (Fri, 23 Apr 2004) | 5 lines
+r297 | jesse | 2003-12-04 20:10:48 -0500 (Thu, 04 Dec 2003) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/lib/RT/Groups_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
- r4083@not:  autrijus | 2004-04-23T19:08:59.061919Z
- 
- * ENTRY_AGGREGATOR is a misspelling (for ENTRYAGGREGATOR), and it
-   defaults to OR anyway, so simply eliminate this bogus parameter.
+The per-ticket recipient blacklist appears to actually work.
 
-------------------------------------------------------------------------
-r722 | autrijus | 2004-04-21 18:32:19 -0400 (Wed, 21 Apr 2004) | 10 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.1/lib/RT/SearchBuilder.pm
-   M /rt/branches/rt-3.3/lib/RT/SearchBuilder.pm
-
- r4037@not:  autrijus | 2004-04-21T22:30:37.269510Z
- 
- * It turns out that for EMPTY => 1 to work, IS NULL needs to be OR'ed
-   to the other columns as well...
- 
- ----------------------------------------------------------------------
- r4038@not:  autrijus | 2004-04-21T22:31:56.271421Z
- 
- * merge previous commit from 3.3 to 3.1.
 
 ------------------------------------------------------------------------
-r719 | autrijus | 2004-04-21 14:59:55 -0400 (Wed, 21 Apr 2004) | 4 lines
+r296 | jesse | 2003-12-03 23:58:30 -0500 (Wed, 03 Dec 2003) | 2 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/lib/RT/SearchBuilder.pm
+   M /rt/branches/rt-3.1/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripAction_Overlay.pm
 
- r4027@not:  autrijus | 2004-04-21T18:59:19.548165Z
-
- * LimitAttribute( EMPTY => 1 ) is much more correctly handled with a IS NULL.
-
-------------------------------------------------------------------------
-r717 | jesse | 2004-04-21 01:25:01 -0400 (Wed, 21 Apr 2004) | 6 lines
-Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/Makefile.in
-   M /rt/branches/rt-3.3/bin/webmux.pl.in
-   M /rt/branches/rt-3.3/configure.ac
-   M /rt/branches/rt-3.3/etc/RT_Config.pm.in
-   M /rt/branches/rt-3.3/etc/schema.mysql
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/acl.Informix
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/acl.Oracle
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/acl.Pg
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/acl.SQLite
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/acl.mysql
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/content
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.Informix
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.Oracle
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.Pg
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.SQLite
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.0/schema.mysql
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectNewGroupMembers
-   A /rt/branches/rt-3.3/html/Admin/Elements/ToolTabs
-   A /rt/branches/rt-3.3/html/Admin/Tools
-   A /rt/branches/rt-3.3/html/Admin/Tools/Configuration.html
-   A /rt/branches/rt-3.3/html/Admin/Tools/index.html
-   A /rt/branches/rt-3.3/html/Elements/QueryString
-   A /rt/branches/rt-3.3/html/Elements/ScrubHTML
-   M /rt/branches/rt-3.3/html/Elements/Tabs
-   M /rt/branches/rt-3.3/html/Elements/TicketList
-   M /rt/branches/rt-3.3/html/NoAuth/webrt.css
-   M /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/default
-   M /rt/branches/rt-3.3/html/Scope/Search.html
-   M /rt/branches/rt-3.3/html/Search/Build.html
-   M /rt/branches/rt-3.3/html/Search/Edit.html
-   M /rt/branches/rt-3.3/html/Search/Elements/BuildFormatString
-   M /rt/branches/rt-3.3/html/Search/Elements/DisplayOptions
-   M /rt/branches/rt-3.3/html/Search/Elements/EditFormat
-   M /rt/branches/rt-3.3/html/Search/Elements/EditSearches
-   M /rt/branches/rt-3.3/html/Search/Results.html
-   M /rt/branches/rt-3.3/html/Search/Results.rdf
-   M /rt/branches/rt-3.3/html/Search/Results.tsv
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowRequestor
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowTransaction
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowTransactionAttachments
-   M /rt/branches/rt-3.3/html/Ticket/Elements/Tabs
-   A /rt/branches/rt-3.3/html/Ticket/ShowEmailRecord.html
-   M /rt/branches/rt-3.3/html/Ticket/Update.html
-   A /rt/branches/rt-3.3/html/Tools/Elements
-   A /rt/branches/rt-3.3/html/Tools/Elements/Tabs
-   A /rt/branches/rt-3.3/html/Tools/Offline.html
-   M /rt/branches/rt-3.3/html/autohandler
-   M /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/rt-3.3/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Group_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/I18N.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-   M /rt/branches/rt-3.3/lib/RT/Queue_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Transaction_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Users_Overlay.pm
-   M /rt/branches/rt-3.3/sbin/rt-test-dependencies.in
+A bunch of work on attributes
 
-  ----------------------------------------------------------------------
-  r2113@tinbook:  jesse | 2004-04-21T05:24:17.573962Z
-  
-  Remerging from RT 3.1.x
-  ----------------------------------------------------------------------
-  
 ------------------------------------------------------------------------
-r714 | autrijus | 2004-04-20 23:49:45 -0400 (Tue, 20 Apr 2004) | 7 lines
+r294 | jesse | 2003-12-03 16:04:55 -0500 (Wed, 03 Dec 2003) | 4 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/Elements/EditCustomFieldImage
-   A /rt/branches/rt-3.3/html/Elements/ShowCustomFieldImage
-   M /rt/branches/rt-3.3/html/Elements/ShowCustomFields
+   M /rt/branches/rt-3.1/etc/schema.Informix
+   M /rt/branches/rt-3.1/etc/schema.Oracle
+   M /rt/branches/rt-3.1/etc/schema.Pg
+   M /rt/branches/rt-3.1/etc/schema.SQLite
+   M /rt/branches/rt-3.1/etc/schema.mysql
+   M /rt/branches/rt-3.1/lib/RT/ACE.pm
+   M /rt/branches/rt-3.1/lib/RT/ACL.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachment.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachments.pm
+   M /rt/branches/rt-3.1/lib/RT/Attribute.pm
+   M /rt/branches/rt-3.1/lib/RT/Attributes.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMember.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMembers.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomField.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFieldValue.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFieldValues.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFields.pm
+   M /rt/branches/rt-3.1/lib/RT/Group.pm
+   M /rt/branches/rt-3.1/lib/RT/GroupMember.pm
+   M /rt/branches/rt-3.1/lib/RT/GroupMembers.pm
+   M /rt/branches/rt-3.1/lib/RT/Groups.pm
+   M /rt/branches/rt-3.1/lib/RT/Link.pm
+   M /rt/branches/rt-3.1/lib/RT/Links.pm
+   M /rt/branches/rt-3.1/lib/RT/Principal.pm
+   M /rt/branches/rt-3.1/lib/RT/Principals.pm
+   M /rt/branches/rt-3.1/lib/RT/Queue.pm
+   M /rt/branches/rt-3.1/lib/RT/Queues.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrip.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripAction.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripActions.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripCondition.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripConditions.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrips.pm
+   M /rt/branches/rt-3.1/lib/RT/Template.pm
+   M /rt/branches/rt-3.1/lib/RT/Templates.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValue.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValues.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions.pm
+   M /rt/branches/rt-3.1/lib/RT/User.pm
+   M /rt/branches/rt-3.1/lib/RT/Users.pm
 
-r4005@not:  autrijus | 2004-04-21T03:49:17.533641Z
+Added a "Description" column to the attributes table. Regenerated the basefiles for all the db-classes
 
-RT-Ticket: 5365
-RT-Status: resolved
 
-Make image display inline on ticket info screen.
 
 ------------------------------------------------------------------------
-r712 | leira | 2004-04-20 22:49:09 -0400 (Tue, 20 Apr 2004) | 2 lines
+r293 | jesse | 2003-11-30 22:30:22 -0500 (Sun, 30 Nov 2003) | 3 lines
 Changed paths:
-   M /rt/branches/rt-3.3/html/Admin/Groups/index.html
-   M /rt/branches/rt-3.3/html/Admin/Users/index.html
-   M /rt/branches/rt-3.3/html/Elements/EditCustomFieldImage
+   A /rt/branches/rt-3.1/html/Ticket/Elements/PreviewScrips
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
+   M /rt/branches/rt-3.1/lib/RT/Action/Notify.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripAction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
 
-fix WebPath urls
+Added support for previewing what email a scrip update will send.
 
-------------------------------------------------------------------------
-r711 | leira | 2004-04-20 22:43:57 -0400 (Tue, 20 Apr 2004) | 2 lines
-Changed paths:
-   M /rt/branches/rt-3.3/html/Admin/Groups/index.html
-   M /rt/branches/rt-3.3/html/Admin/Users/index.html
-   M /rt/branches/rt-3.3/html/Elements/EditCustomFieldBinary
-   M /rt/branches/rt-3.3/html/Elements/EditCustomFieldImage
-
-Dowload links need the WebPath.
 
 ------------------------------------------------------------------------
-r710 | leira | 2004-04-20 22:37:34 -0400 (Tue, 20 Apr 2004) | 2 lines
+r292 | jesse | 2003-11-30 14:57:38 -0500 (Sun, 30 Nov 2003) | 7 lines
 Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/ObjectCustomFieldValue_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrips_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
 
-decode_utf8, not decode_utf_8
+Added methods to get address lists out of active scrips.
 
-------------------------------------------------------------------------
-r709 | leira | 2004-04-20 22:16:04 -0400 (Tue, 20 Apr 2004) | 2 lines
-Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/ObjectCustomFieldValue_Overlay.pm
+cleaned up handling of prepared, but not activated scrips.
 
-"decode_utf_8", not "decode_utf 8"
 
-------------------------------------------------------------------------
-r708 | leira | 2004-04-20 22:15:39 -0400 (Tue, 20 Apr 2004) | 2 lines
-Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm
 
-CFs are no longer attached to queues.
 
 ------------------------------------------------------------------------
-r707 | jesse | 2004-04-20 21:21:11 -0400 (Tue, 20 Apr 2004) | 1 line
+r291 | jesse | 2003-11-29 15:56:19 -0500 (Sat, 29 Nov 2003) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/ObjectCustomFieldValue_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/Generic.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrip_Overlay.pm
 
-Adding support for encoding LOBs for the new custom field behaviour
-------------------------------------------------------------------------
-r703 | jesse | 2004-04-19 22:26:50 -0400 (Mon, 19 Apr 2004) | 1 line
-Changed paths:
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/etc/schema.Pg
-   M /rt/branches/rt-3.3/html/Ticket/Elements/FindAttachments
-   M /rt/branches/rt-3.3/html/Ticket/Elements/LoadTextAttachments
-   M /rt/branches/rt-3.3/lib/RT/Transaction_Overlay.pm
+Smarter leak prevention that doesn't prematurely destroy objects we need.
 
-"Another pass at trying to fix the schema"
 ------------------------------------------------------------------------
-r702 | jesse | 2004-04-19 22:12:32 -0400 (Mon, 19 Apr 2004) | 2 lines
+r290 | jesse | 2003-11-29 15:54:51 -0500 (Sat, 29 Nov 2003) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3/etc/acl.Pg
-   M /rt/branches/rt-3.3/etc/schema.Pg
-
-Fixing conflicts from fixing the same bugs as linda.
-
-------------------------------------------------------------------------
-r701 | leira | 2004-04-19 14:35:01 -0400 (Mon, 19 Apr 2004) | 2 lines
-Changed paths:
-   M /rt/branches/rt-3.3/etc/acl.Pg
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
 
-One more acl fix.
+New functionality to support "try ouyt this comment without committing"
 
 ------------------------------------------------------------------------
-r700 | leira | 2004-04-19 14:16:08 -0400 (Mon, 19 Apr 2004) | 2 lines
+r289 | jesse | 2003-11-29 02:50:35 -0500 (Sat, 29 Nov 2003) | 7 lines
 Changed paths:
-   M /rt/branches/rt-3.3/etc/acl.Pg
-   M /rt/branches/rt-3.3/etc/schema.Pg
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrip_Overlay.pm
 
-Schema & acl fixes for Postgres.
 
-------------------------------------------------------------------------
-r695 | autrijus | 2004-04-16 15:33:06 -0400 (Fri, 16 Apr 2004) | 4 lines
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/Elements/EditCustomFieldSelect
+SendEmail cleanup.
 
-r3928@not:  autrijus | 2004-04-16T19:32:35.970968Z
+no longer Destroy action and condition objects immediately upon commit. 
+now we can get at the data we want
 
-Fix select CF display bug as reported by leira
 
 ------------------------------------------------------------------------
-r685 | autrijus | 2004-04-14 05:29:23 -0400 (Wed, 14 Apr 2004) | 5 lines
+r288 | jesse | 2003-11-28 17:52:56 -0500 (Fri, 28 Nov 2003) | 14 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/Elements/EditCustomFieldBinary
+   M /rt/branches/rt-3.1/lib/RT/Scrips_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
 
-r3851@not:  autrijus | 2004-04-14T09:27:57.550568Z
+Refactoring how ticket comments and correspondence are submitted. 
 
-* make EditCustomFieldBinary's condition style agree with other
-  elements -- also avoids comparing an uninitialized value.
+Comment and Correspond now share a subroutine, rather than a bunch of identical code.
 
-------------------------------------------------------------------------
-r682 | leira | 2004-04-12 02:07:01 -0400 (Mon, 12 Apr 2004) | 2 lines
-Changed paths:
-   M /rt/branches/rt-3.3/html/Admin/Groups/Modify.html
-   M /rt/branches/rt-3.3/html/Admin/Users/Modify.html
-   M /rt/branches/rt-3.3/html/Elements/EditCustomFieldBinary
-   M /rt/branches/rt-3.3/html/Elements/EditCustomFieldImage
-   M /rt/branches/rt-3.3/html/Elements/EditCustomFieldSelect
-   M /rt/branches/rt-3.3/html/Elements/EditCustomFieldText
-   M /rt/branches/rt-3.3/html/Search/Elements/SelectPersonType
-   M /rt/branches/rt-3.3/html/Ticket/Elements/EditCustomFields
-   M /rt/branches/rt-3.3/html/Ticket/Modify.html
-   M /rt/branches/rt-3.3/html/Ticket/ModifyAll.html
-   M /rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/CustomFields_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-   M /rt/branches/rt-3.3/lib/RT/ObjectCustomFieldValues_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Record.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Transaction_Overlay.pm
-
-Fixes from autrijus.
-
-------------------------------------------------------------------------
-r665 | jesse | 2004-04-02 16:54:23 -0500 (Fri, 02 Apr 2004) | 1 line
-Changed paths:
-   M /rt/branches/rt-3.3/html/Admin/Elements/PickObjects
-
-Allowing the custom field admin screens to add custom fields to all users
-------------------------------------------------------------------------
-r664 | jesse | 2004-04-02 16:39:27 -0500 (Fri, 02 Apr 2004) | 1 line
-Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/Record.pm
-   M /rt/branches/rt-3.3/lib/RT/Transaction_Overlay.pm
-
-Pulling forward relationships fixes from 3.1; updating a transaction-related assertion for 3.3
-------------------------------------------------------------------------
-r662 | jesse | 2004-04-02 10:54:22 -0500 (Fri, 02 Apr 2004) | 1 line
-Changed paths:
-   M /rt/branches/rt-3.3/etc/acl.Pg
-   M /rt/branches/rt-3.3/html/Admin/Elements/ModifyQueue
-   M /rt/branches/rt-3.3/html/Admin/Queues/Modify.html
-   A /rt/branches/rt-3.3/html/Elements/EditLinks
-   M /rt/branches/rt-3.3/html/Elements/MessageBox
-   M /rt/branches/rt-3.3/html/Elements/SelectMatch
-   A /rt/branches/rt-3.3/html/Elements/ShowLink
-   A /rt/branches/rt-3.3/html/Elements/ShowLinks
-   M /rt/branches/rt-3.3/html/Scope/Elements/ShowSummary
-   M /rt/branches/rt-3.3/html/Search/Build.html
-   M /rt/branches/rt-3.3/html/Search/Bulk.html
-   M /rt/branches/rt-3.3/html/Search/Elements/SelectPersonType
-   M /rt/branches/rt-3.3/html/SelfService/Display.html
-   M /rt/branches/rt-3.3/html/Ticket/Create.html
-   M /rt/branches/rt-3.3/html/Ticket/Display.html
-   A /rt/branches/rt-3.3/html/Ticket/Elements/LoadTextAttachments
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowHistory
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowSummary
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowTransaction
-   M /rt/branches/rt-3.3/html/Ticket/History.html
-   M /rt/branches/rt-3.3/html/Ticket/ModifyAll.html
-   M /rt/branches/rt-3.3/html/Ticket/ModifyLinks.html
-   M /rt/branches/rt-3.3/html/Ticket/Update.html
-   M /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/rt-3.3/lib/RT/Action/SendEmail.pm
-   M /rt/branches/rt-3.3/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Attribute_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/CurrentUser.pm
-   M /rt/branches/rt-3.3/lib/RT/EmailParser.pm
-   A /rt/branches/rt-3.3/lib/RT/I18N/da.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/fr.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/hu.po
-   M /rt/branches/rt-3.3/lib/RT/Interface/Email/Auth/MailFrom.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-   M /rt/branches/rt-3.3/lib/RT/Record.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Transaction_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/URI/fsck_com_rt.pm
-   M /rt/branches/rt-3.3/lib/RT/User_Overlay.pm
+RT::Transaction::Create now holds onto a bunch more Scrip data and metadata
 
-Took a hand-merging pass at 3.1->3.3 after autrijus manual baseless merge.
-------------------------------------------------------------------------
-r661 | autrijus | 2004-04-02 08:57:08 -0500 (Fri, 02 Apr 2004) | 3 lines
-Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
+Scrips being applied now expose the set of scrips that actually get prepared.
 
-* put Ticket_Overlay back to where it was.
+It's possible to create a transaction that prepares, but does not fire scrips. 
 
+The API for accessing this has not yet been stabilized
 
-------------------------------------------------------------------------
-r660 | autrijus | 2004-04-02 08:43:44 -0500 (Fri, 02 Apr 2004) | 1 line
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3
-   M /rt/branches/rt-3.3/Makefile.in
-   A /rt/branches/rt-3.3/README.Oracle
-   M /rt/branches/rt-3.3/UPGRADING
-   M /rt/branches/rt-3.3/bin/mason_handler.fcgi.in
-   M /rt/branches/rt-3.3/bin/mason_handler.scgi.in
-   M /rt/branches/rt-3.3/bin/rt-crontool.in
-   M /rt/branches/rt-3.3/bin/rt-mailgate.in
-   M /rt/branches/rt-3.3/bin/rt.in
-   M /rt/branches/rt-3.3/bin/webmux.pl.in
-   M /rt/branches/rt-3.3/config.layout
-   M /rt/branches/rt-3.3/configure.ac
-   M /rt/branches/rt-3.3/etc/initialdata
-   M /rt/branches/rt-3.3/etc/schema.Informix
-   M /rt/branches/rt-3.3/etc/schema.Oracle
-   M /rt/branches/rt-3.3/etc/schema.SQLite
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.15
-   A /rt/branches/rt-3.3/etc/upgrade/3.1.15/content
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditScrip
-   M /rt/branches/rt-3.3/html/Admin/Elements/SelectStage
-   M /rt/branches/rt-3.3/html/Elements/Callback
-   M /rt/branches/rt-3.3/html/Elements/MessageBox
-   M /rt/branches/rt-3.3/html/Elements/SelectLang
-   M /rt/branches/rt-3.3/html/Elements/SelectMatch
-   M /rt/branches/rt-3.3/html/Elements/SelectWatcherType
-   M /rt/branches/rt-3.3/html/Elements/SetupSessionCookie
-   M /rt/branches/rt-3.3/html/Elements/SimpleSearch
-   M /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/default
-   M /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/history
-   M /rt/branches/rt-3.3/html/REST/1.0/autohandler
-   M /rt/branches/rt-3.3/html/REST/1.0/dhandler
-   M /rt/branches/rt-3.3/html/REST/1.0/search/ticket
-   M /rt/branches/rt-3.3/html/Scope/Elements/ShowHistory
-   M /rt/branches/rt-3.3/html/Scope/Elements/ShowTransaction
-   M /rt/branches/rt-3.3/html/Search/Elements/PickRestriction
-   M /rt/branches/rt-3.3/html/SelfService/Elements/MyRequests
-   M /rt/branches/rt-3.3/html/Ticket/Attachment/dhandler
-   M /rt/branches/rt-3.3/html/Ticket/Display.html
-   M /rt/branches/rt-3.3/html/Ticket/Elements/FindAttachments
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowAttachments
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowHistory
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowMessageStanza
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowRequestor
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowTransaction
-   M /rt/branches/rt-3.3/html/Ticket/Elements/Tabs
-   M /rt/branches/rt-3.3/html/index.html
-   M /rt/branches/rt-3.3/lib/RT/Action/AutoOpen.pm
-   M /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/rt-3.3/lib/RT/Attachment_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Attachments_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Base.pm
-   M /rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/EmailParser.pm
-   M /rt/branches/rt-3.3/lib/RT/Group_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Handle.pm
-   M /rt/branches/rt-3.3/lib/RT/I18N/fi.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/fr.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po
-   M /rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po
-   M /rt/branches/rt-3.3/lib/RT/I18N.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Email/Auth/MailFrom.pm
-   M /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-   M /rt/branches/rt-3.3/lib/RT/Principal_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Queue_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/StyleGuide.pod
-   M /rt/branches/rt-3.3/lib/RT/Template_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Tickets_Overlay_SQL.pm
-   M /rt/branches/rt-3.3/lib/RT/Transaction_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Transactions_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/URI.pm
-   M /rt/branches/rt-3.3/lib/RT/User_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Users_Overlay.pm
-   M /rt/branches/rt-3.3/lib/t/03web.pl.in
-   M /rt/branches/rt-3.3/lib/t/04_send_email.pl.in
-   M /rt/branches/rt-3.3/sbin/license_tag
-   M /rt/branches/rt-3.3/sbin/rt-test-dependencies.in
 
-MERGE: 3.1 to 3.3
-------------------------------------------------------------------------
-r659 | jesse | 2004-04-01 21:23:57 -0500 (Thu, 01 Apr 2004) | 1 line
-Changed paths:
-   M /rt/branches/rt-3.3/releng.cnf
 
-Updated releng.cnf
 ------------------------------------------------------------------------
-r656 | jesse | 2004-04-01 16:54:22 -0500 (Thu, 01 Apr 2004) | 2 lines
+r287 | jesse | 2003-11-26 23:07:51 -0500 (Wed, 26 Nov 2003) | 2 lines
 Changed paths:
-   M /rt/branches/rt-3.3/html/Admin/CustomFields/Objects.html
-   M /rt/branches/rt-3.3/html/Admin/CustomFields/index.html
-   M /rt/branches/rt-3.3/html/Admin/Elements/EditCustomFields
-   M /rt/branches/rt-3.3/html/Admin/Elements/PickCustomFields
-   M /rt/branches/rt-3.3/html/Admin/Elements/PickObjects
-   M /rt/branches/rt-3.3/html/Admin/Elements/QueueTabs
+   A /rt/branches/rt-3.1/html/Admin/Elements/SelectStage
 
-UI updates to remove unneeded options and clarify some language
+added back missing file from merge
 
 ------------------------------------------------------------------------
-r655 | jesse | 2004-04-01 16:53:29 -0500 (Thu, 01 Apr 2004) | 3 lines
+r286 | jesse | 2003-11-26 15:48:52 -0500 (Wed, 26 Nov 2003) | 4 lines
 Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrips_Overlay.pm
 
-Updated how RT generates friendly name for which object a Custom Field applies to
+Refactoring how scrips figure out what to do in anticipation of "prepare but don't apply"
 
 
-------------------------------------------------------------------------
-r654 | jesse | 2004-04-01 16:52:31 -0500 (Thu, 01 Apr 2004) | 1 line
-Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/Transactions_Overlay.pm
 
-Added support for RT 3.0 compatible Transactions->Limit
 ------------------------------------------------------------------------
-r653 | autrijus | 2004-04-01 11:37:33 -0500 (Thu, 01 Apr 2004) | 4 lines
+r285 | jesse | 2003-11-26 03:31:26 -0500 (Wed, 26 Nov 2003) | 4 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/html/Admin/Elements/QueueTabs
+   D /rt/branches/rt-3.1/config.log
+   M /rt/branches/rt-3.1/lib/RT/Scrip_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrips_Overlay.pm
+
+major scrips refactoring in preparation for more atomic calls
 
-r3597@not:  autrijus | 2004-04-01T16:36:37.019460Z
 
-* put global Cf editing back.
 
 ------------------------------------------------------------------------
-r648 | autrijus | 2004-03-31 11:12:04 -0500 (Wed, 31 Mar 2004) | 4 lines
+r284 | jesse | 2003-11-25 23:04:52 -0500 (Tue, 25 Nov 2003) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/lib/RT/I18N.pm
+   M /rt/branches/rt-3.1/Makefile
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/README
+   M /rt/branches/rt-3.1/UPGRADING
+   M /rt/branches/rt-3.1/bin/mason_handler.fcgi
+   M /rt/branches/rt-3.1/bin/mason_handler.fcgi.in
+   M /rt/branches/rt-3.1/bin/mason_handler.scgi
+   M /rt/branches/rt-3.1/bin/mason_handler.scgi.in
+   M /rt/branches/rt-3.1/bin/mason_handler.svc
+   M /rt/branches/rt-3.1/bin/rt
+   M /rt/branches/rt-3.1/bin/rt-commit-handler
+   M /rt/branches/rt-3.1/bin/rt-crontool
+   M /rt/branches/rt-3.1/bin/rt-mailgate
+   M /rt/branches/rt-3.1/bin/rt.in
+   M /rt/branches/rt-3.1/bin/webmux.pl
+   M /rt/branches/rt-3.1/config.log
+   M /rt/branches/rt-3.1/config.status
+   M /rt/branches/rt-3.1/html/Admin/Elements/EditScrip
+   M /rt/branches/rt-3.1/html/Ticket/Display.html
+   M /rt/branches/rt-3.1/html/Ticket/Elements/ShowDates
+   M /rt/branches/rt-3.1/html/Ticket/Modify.html
+   M /rt/branches/rt-3.1/html/Ticket/ModifyAll.html
+   M /rt/branches/rt-3.1/html/Ticket/Update.html
+   M /rt/branches/rt-3.1/lib/RT/Interface/Web.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrips_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
+   M /rt/branches/rt-3.1/lib/t/00smoke.t
+   M /rt/branches/rt-3.1/lib/t/01harness.t
+   M /rt/branches/rt-3.1/lib/t/02regression.t
+   M /rt/branches/rt-3.1/lib/t/03web.pl
+   M /rt/branches/rt-3.1/lib/t/03web.pl.in
+   M /rt/branches/rt-3.1/lib/t/04_send_email.pl
+   M /rt/branches/rt-3.1/sbin/rt-setup-database
+   M /rt/branches/rt-3.1/sbin/rt-setup-database.in
+   M /rt/branches/rt-3.1/sbin/rt-test-dependencies
 
-r3556@not:  autrijus | 2004-03-31T16:11:11.225511Z
+Merging forward the changes from 3.0.7_01 to 3.0.8
 
-* lexicon path may contain spaces, esp. on win32.
 
 ------------------------------------------------------------------------
-r645 | autrijus | 2004-03-31 01:20:10 -0500 (Wed, 31 Mar 2004) | 5 lines
+r281 | jesse | 2003-11-24 20:09:00 -0500 (Mon, 24 Nov 2003) | 3 lines
 Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/etc/schema.Informix
-   M /rt/branches/rt-3.3/etc/schema.Oracle
-   M /rt/branches/rt-3.3/etc/schema.Pg
-   M /rt/branches/rt-3.3/etc/schema.SQLite
-   M /rt/branches/rt-3.3/etc/schema.mysql
-
-r3541@not:  autrijus | 2004-03-31T06:19:36.740253Z
+   D /rt/branches/rt-3.1/autom4te.cache
 
-* port mysql schema to Pg.
-* other database are partially ported -- OCF and OCFV currently not there
+Removed the autoconf m4 cache
 
-------------------------------------------------------------------------
-r643 | autrijus | 2004-03-31 00:16:07 -0500 (Wed, 31 Mar 2004) | 1 line
-Changed paths:
-   M /rt
-   M /rt/branches/rt-3.3/lib/RT/CustomFields_Overlay.pm
 
-hint to self: don't refactor when you're tired.
 ------------------------------------------------------------------------
-r612 | autrijus | 2004-03-22 13:46:04 -0500 (Mon, 22 Mar 2004) | 2 lines
+r280 | jesse | 2003-11-24 01:31:00 -0500 (Mon, 24 Nov 2003) | 2 lines
 Changed paths:
-   D /rt/branches/rt-3.3/html/Admin/Global/CustomField.html
-   D /rt/branches/rt-3.3/html/Admin/Global/CustomFields.html
+   M /rt/branches/rt-3.1/Makefile
+   M /rt/branches/rt-3.1/config.log
+   M /rt/branches/rt-3.1/config.status
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+   M /rt/branches/rt-3.1/lib/RT/User_Overlay.pm
 
-* remove unused "Global" CF admin pages.
+A bunch of cleanup to the SendEmail action in preparation for "show me what this scrip will do"
 
 ------------------------------------------------------------------------
-r611 | autrijus | 2004-03-20 10:40:58 -0500 (Sat, 20 Mar 2004) | 7 lines
+r279 | jesse | 2003-11-22 18:13:58 -0500 (Sat, 22 Nov 2003) | 4 lines
 Changed paths:
-   M /rt/branches/rt-3.3/lib/RT/CurrentUser.pm
-   M /rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/User_Overlay.pm
+   M /rt/branches/rt-3.1/html/Search/Results.tsv
 
-* merge Jesse's $RT::SystemUser->LanguageHandle fix; corrected a
-  bug caused by it in setup database stage where there's no SystemUser.
-* fixed two tests in RT::CustomField that incorrectly expected old-style
-  ->Type return values; they now test ->Type and ->MaxValues separately.
-* change some ok() tests into is() and like() tests.
-
-
-------------------------------------------------------------------------
-r597 | autrijus | 2004-03-17 13:12:25 -0500 (Wed, 17 Mar 2004) | 2 lines
-Changed paths:
-   M /rt/branches
-   A /rt/branches/rt-3.3/html/Developer
-   A /rt/branches/rt-3.3/html/Developer/Log.html
-   A /rt/branches/rt-3.3/html/Developer/Perldoc.html
-   A /rt/branches/rt-3.3/html/Developer/autohandler
-
-* Developer tools.
-
-------------------------------------------------------------------------
-r585 | autrijus | 2004-03-16 14:22:32 -0500 (Tue, 16 Mar 2004) | 3 lines
-Changed paths:
-   M /rt/branches
-   M /rt/branches/rt-3.3/bin/webmux.pl.in
-   M /rt/branches/rt-3.3/etc/acl.mysql
-   M /rt/branches/rt-3.3/lib/RT.pm.in
-
-* move class loading to RT::InitClasses.
-* do not do acl if mysql is in skip-grant-tables mode.
-
-------------------------------------------------------------------------
-r584 | autrijus | 2004-03-16 14:07:50 -0500 (Tue, 16 Mar 2004) | 3 lines
-Changed paths:
-   M /rt/branches
-   M /rt/branches/rt-3.3/Makefile.in
-   M /rt/branches/rt-3.3/etc/RT_Config.pm.in
-
-* it is possible that the DESTDIR is the current directory.
-* also, hint on how to use MasonX::Profiler more concisely.
-
-------------------------------------------------------------------------
-r571 | autrijus | 2004-03-15 10:22:17 -0500 (Mon, 15 Mar 2004) | 2 lines
-Changed paths:
-   M /rt/branches
-   M /rt/branches/rt-3.3/html/User/Prefs.html
-
-* backport lang handle setting from -elixus
-
-------------------------------------------------------------------------
-r560 | autrijus | 2004-03-12 21:44:05 -0500 (Fri, 12 Mar 2004) | 2 lines
-Changed paths:
-   M /rt/branches
-   M /rt/branches/rt-3.3/README
-   M /rt/branches/rt-3.3/bin/rt-mailgate.in
-   M /rt/branches/rt-3.3/bin/rt.in
-   M /rt/branches/rt-3.3/etc/RT_Config.pm.in
-   M /rt/branches/rt-3.3/etc/schema.Oracle
-   M /rt/branches/rt-3.3/html/Admin/Users/Modify.html
-   M /rt/branches/rt-3.3/html/Elements/Footer
-   M /rt/branches/rt-3.3/html/Elements/Header
-   M /rt/branches/rt-3.3/html/Elements/Login
-   M /rt/branches/rt-3.3/html/Elements/SelectQueue
-   M /rt/branches/rt-3.3/html/Elements/TicketList
-   M /rt/branches/rt-3.3/html/NoAuth/webrt.css
-   M /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/attachments
-   M /rt/branches/rt-3.3/html/REST/1.0/ticket/comment
-   M /rt/branches/rt-3.3/html/Search/Build.html
-   M /rt/branches/rt-3.3/html/Search/Elements/BuildFormatString
-   M /rt/branches/rt-3.3/html/Search/Elements/PickBasics
-   M /rt/branches/rt-3.3/html/Search/Elements/PickRestriction
-   M /rt/branches/rt-3.3/html/Search/Results.html
-   M /rt/branches/rt-3.3/html/Search/Results.rdf
-   M /rt/branches/rt-3.3/html/Ticket/Display.html
-   A /rt/branches/rt-3.3/html/Ticket/Elements/FindAttachments
-   M /rt/branches/rt-3.3/html/Ticket/Elements/PreviewScrips
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowAttachments
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowHistory
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowSummary
-   M /rt/branches/rt-3.3/html/Ticket/Elements/ShowTransaction
-   M /rt/branches/rt-3.3/html/Ticket/Elements/Tabs
-   M /rt/branches/rt-3.3/html/Ticket/History.html
-   M /rt/branches/rt-3.3/html/autohandler
-   M /rt/branches/rt-3.3/lib/RT/Action/Autoreply.pm
-   M /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
-   M /rt/branches/rt-3.3/lib/RT/Condition/OwnerChange.pm
-   M /rt/branches/rt-3.3/lib/RT/Handle.pm
-   M /rt/branches/rt-3.3/lib/RT/Link_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/Record.pm
-   M /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-   M /rt/branches/rt-3.3/lib/RT/URI/fsck_com_rt.pm
-   M /rt/branches/rt-3.3/lib/RT/User_Overlay.pm
-   M /rt/branches/rt-3.3/releng.cnf
-
-* smerge rt-3.1 to rt-3.3.
-
-------------------------------------------------------------------------
-r559 | autrijus | 2004-03-12 21:22:26 -0500 (Fri, 12 Mar 2004) | 2 lines
-Changed paths:
-   M /rt/branches
-   D /rt/branches/autrijus-3.1
-   A /rt/branches/rt-3.3
-   A /rt/branches/rt-3.3/COPYING
-   A /rt/branches/rt-3.3/HOWTO
-   A /rt/branches/rt-3.3/HOWTO/README
-   A /rt/branches/rt-3.3/HOWTO/change.txt
-   A /rt/branches/rt-3.3/HOWTO/release.txt
-   A /rt/branches/rt-3.3/HOWTO/version-control.txt
-   A /rt/branches/rt-3.3/Makefile.in
-   A /rt/branches/rt-3.3/README
-   A /rt/branches/rt-3.3/UPGRADING
-   A /rt/branches/rt-3.3/aclocal.m4
-   A /rt/branches/rt-3.3/bin
-   A /rt/branches/rt-3.3/bin/mason_handler.fcgi.in
-   A /rt/branches/rt-3.3/bin/mason_handler.scgi.in
-   A /rt/branches/rt-3.3/bin/mason_handler.svc.in
-   A /rt/branches/rt-3.3/bin/rt-commit-handler.in
-   A /rt/branches/rt-3.3/bin/rt-crontool.in
-   A /rt/branches/rt-3.3/bin/rt-mailgate.in
-   A /rt/branches/rt-3.3/bin/rt.in
-   A /rt/branches/rt-3.3/bin/standalone_httpd.in
-   A /rt/branches/rt-3.3/bin/webmux.pl.in
-   A /rt/branches/rt-3.3/config.layout
-   A /rt/branches/rt-3.3/configure.ac
-   A /rt/branches/rt-3.3/docs
-   A /rt/branches/rt-3.3/docs/README.docs
-   A /rt/branches/rt-3.3/docs/Security
-   A /rt/branches/rt-3.3/docs/design_docs
-   A /rt/branches/rt-3.3/docs/design_docs/CARS
-   A /rt/branches/rt-3.3/docs/design_docs/TransactionTypes.txt
-   A /rt/branches/rt-3.3/docs/design_docs/acls
-   A /rt/branches/rt-3.3/docs/design_docs/approval_notices
-   A /rt/branches/rt-3.3/docs/design_docs/approval_template
-   A /rt/branches/rt-3.3/docs/design_docs/cf_search
-   A /rt/branches/rt-3.3/docs/design_docs/cli_spec
-   A /rt/branches/rt-3.3/docs/design_docs/cvs_integration
-   A /rt/branches/rt-3.3/docs/design_docs/delegation
-   A /rt/branches/rt-3.3/docs/design_docs/evil_plans
-   A /rt/branches/rt-3.3/docs/design_docs/groups_notes
-   A /rt/branches/rt-3.3/docs/design_docs/link-definitions.txt
-   A /rt/branches/rt-3.3/docs/design_docs/recursive_group_membership_algorithm
-   A /rt/branches/rt-3.3/docs/design_docs/rql_parser_machine.graphviz
-   A /rt/branches/rt-3.3/docs/design_docs/string-extraction-guide.txt
-   A /rt/branches/rt-3.3/docs/design_docs/subscription-definitions.txt
-   A /rt/branches/rt-3.3/docs/design_docs/ticket_templates
-   A /rt/branches/rt-3.3/docs/design_docs/users
-   A /rt/branches/rt-3.3/docs/rt3-schema-relationships.dot
-   A /rt/branches/rt-3.3/etc
-   A /rt/branches/rt-3.3/etc/RT_Config.pm.in
-   A /rt/branches/rt-3.3/etc/RT_SiteConfig.pm
-   A /rt/branches/rt-3.3/etc/acl.Informix
-   A /rt/branches/rt-3.3/etc/acl.Oracle
-   A /rt/branches/rt-3.3/etc/acl.Pg
-   A /rt/branches/rt-3.3/etc/acl.mysql
-   A /rt/branches/rt-3.3/etc/constraints.mysql
-   A /rt/branches/rt-3.3/etc/drop.Informix
-   A /rt/branches/rt-3.3/etc/drop.Oracle
-   A /rt/branches/rt-3.3/etc/initialdata
-   A /rt/branches/rt-3.3/etc/rt.spec
-   A /rt/branches/rt-3.3/etc/schema.Informix
-   A /rt/branches/rt-3.3/etc/schema.Oracle
-   A /rt/branches/rt-3.3/etc/schema.Pg
-   A /rt/branches/rt-3.3/etc/schema.SQLite
-   A /rt/branches/rt-3.3/etc/schema.mysql
-   A /rt/branches/rt-3.3/etc/upgrade
-   A /rt/branches/rt-3.3/etc/upgrade/2.1.71
-   A /rt/branches/rt-3.3/html
-   A /rt/branches/rt-3.3/html/Admin
-   A /rt/branches/rt-3.3/html/Admin/CustomFields
-   A /rt/branches/rt-3.3/html/Admin/CustomFields/GroupRights.html
-   A /rt/branches/rt-3.3/html/Admin/CustomFields/Modify.html
-   A /rt/branches/rt-3.3/html/Admin/CustomFields/Objects.html
-   A /rt/branches/rt-3.3/html/Admin/CustomFields/UserRights.html
-   A /rt/branches/rt-3.3/html/Admin/CustomFields/index.html
-   A /rt/branches/rt-3.3/html/Admin/Elements
-   A /rt/branches/rt-3.3/html/Admin/Elements/AddCustomFieldValue
-   A /rt/branches/rt-3.3/html/Admin/Elements/CreateUserCalled
-   A /rt/branches/rt-3.3/html/Admin/Elements/CustomFieldTabs
-   A /rt/branches/rt-3.3/html/Admin/Elements/EditCustomField
-   A /rt/branches/rt-3.3/html/Admin/Elements/EditCustomFieldValues
-   A /rt/branches/rt-3.3/html/Admin/Elements/EditCustomFields
-   A /rt/branches/rt-3.3/html/Admin/Elements/EditQueueWatchers
-   A /rt/branches/rt-3.3/html/Admin/Elements/EditScrip
-   A /rt/branches/rt-3.3/html/Admin/Elements/EditScrips
-   A /rt/branches/rt-3.3/html/Admin/Elements/EditTemplates
-   A /rt/branches/rt-3.3/html/Admin/Elements/EditUserComments
-   A /rt/branches/rt-3.3/html/Admin/Elements/GroupTabs
-   A /rt/branches/rt-3.3/html/Admin/Elements/Header
-   A /rt/branches/rt-3.3/html/Admin/Elements/ListGlobalCustomFields
-   A /rt/branches/rt-3.3/html/Admin/Elements/ListGlobalScrips
-   A /rt/branches/rt-3.3/html/Admin/Elements/ModifyQueue
-   A /rt/branches/rt-3.3/html/Admin/Elements/ModifyTemplate
-   A /rt/branches/rt-3.3/html/Admin/Elements/ModifyUser
-   A /rt/branches/rt-3.3/html/Admin/Elements/ObjectCustomFields
-   A /rt/branches/rt-3.3/html/Admin/Elements/PickCustomFields
-   A /rt/branches/rt-3.3/html/Admin/Elements/PickObjects
-   A /rt/branches/rt-3.3/html/Admin/Elements/QueueRightsForUser
-   A /rt/branches/rt-3.3/html/Admin/Elements/QueueTabs
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectCustomFieldLookupType
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectCustomFieldType
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectGroups
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectModifyGroup
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectModifyQueue
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectModifyUser
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectNewGroupMembers
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectRights
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectScrip
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectScripAction
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectScripCondition
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectSingleOrMultiple
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectStage
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectTemplate
-   A /rt/branches/rt-3.3/html/Admin/Elements/SelectUsers
-   A /rt/branches/rt-3.3/html/Admin/Elements/SystemTabs
-   A /rt/branches/rt-3.3/html/Admin/Elements/Tabs
-   A /rt/branches/rt-3.3/html/Admin/Elements/UserTabs
-   A /rt/branches/rt-3.3/html/Admin/Global
-   A /rt/branches/rt-3.3/html/Admin/Global/CustomField.html
-   A /rt/branches/rt-3.3/html/Admin/Global/CustomFields.html
-   A /rt/branches/rt-3.3/html/Admin/Global/GroupRights.html
-   A /rt/branches/rt-3.3/html/Admin/Global/Scrip.html
-   A /rt/branches/rt-3.3/html/Admin/Global/Scrips.html
-   A /rt/branches/rt-3.3/html/Admin/Global/Template.html
-   A /rt/branches/rt-3.3/html/Admin/Global/Templates.html
-   A /rt/branches/rt-3.3/html/Admin/Global/UserRights.html
-   A /rt/branches/rt-3.3/html/Admin/Global/index.html
-   A /rt/branches/rt-3.3/html/Admin/Groups
-   A /rt/branches/rt-3.3/html/Admin/Groups/CustomFields.html
-   A /rt/branches/rt-3.3/html/Admin/Groups/GroupRights.html
-   A /rt/branches/rt-3.3/html/Admin/Groups/History.html
-   A /rt/branches/rt-3.3/html/Admin/Groups/Members.html
-   A /rt/branches/rt-3.3/html/Admin/Groups/Modify.html
-   A /rt/branches/rt-3.3/html/Admin/Groups/UserRights.html
-   A /rt/branches/rt-3.3/html/Admin/Groups/index.html
-   A /rt/branches/rt-3.3/html/Admin/Queues
-   A /rt/branches/rt-3.3/html/Admin/Queues/CustomField.html
-   A /rt/branches/rt-3.3/html/Admin/Queues/CustomFields.html
-   A /rt/branches/rt-3.3/html/Admin/Queues/GroupRights.html
-   A /rt/branches/rt-3.3/html/Admin/Queues/Modify.html
-   A /rt/branches/rt-3.3/html/Admin/Queues/People.html
-   A /rt/branches/rt-3.3/html/Admin/Queues/Scrip.html
-   A /rt/branches/rt-3.3/html/Admin/Queues/Scrips.html
-   A /rt/branches/rt-3.3/html/Admin/Queues/Template.html
-   A /rt/branches/rt-3.3/html/Admin/Queues/Templates.html
-   A /rt/branches/rt-3.3/html/Admin/Queues/UserRights.html
-   A /rt/branches/rt-3.3/html/Admin/Queues/index.html
-   A /rt/branches/rt-3.3/html/Admin/Users
-   A /rt/branches/rt-3.3/html/Admin/Users/CustomFields.html
-   A /rt/branches/rt-3.3/html/Admin/Users/History.html
-   A /rt/branches/rt-3.3/html/Admin/Users/Memberships.html
-   A /rt/branches/rt-3.3/html/Admin/Users/Modify.html
-   A /rt/branches/rt-3.3/html/Admin/Users/Prefs.html
-   A /rt/branches/rt-3.3/html/Admin/Users/index.html
-   A /rt/branches/rt-3.3/html/Admin/index.html
-   A /rt/branches/rt-3.3/html/Approvals
-   A /rt/branches/rt-3.3/html/Approvals/Display.html
-   A /rt/branches/rt-3.3/html/Approvals/Elements
-   A /rt/branches/rt-3.3/html/Approvals/Elements/Approve
-   A /rt/branches/rt-3.3/html/Approvals/Elements/PendingMyApproval
-   A /rt/branches/rt-3.3/html/Approvals/Elements/ShowDependency
-   A /rt/branches/rt-3.3/html/Approvals/Elements/Tabs
-   A /rt/branches/rt-3.3/html/Approvals/index.html
-   A /rt/branches/rt-3.3/html/Download
-   A /rt/branches/rt-3.3/html/Download/CustomFieldValue
-   A /rt/branches/rt-3.3/html/Download/CustomFieldValue/dhandler
-   A /rt/branches/rt-3.3/html/Download/Tabular
-   A /rt/branches/rt-3.3/html/Download/Tabular/dhandler
-   A /rt/branches/rt-3.3/html/Elements
-   A /rt/branches/rt-3.3/html/Elements/BevelBoxRaisedEnd
-   A /rt/branches/rt-3.3/html/Elements/BevelBoxRaisedStart
-   A /rt/branches/rt-3.3/html/Elements/Callback
-   A /rt/branches/rt-3.3/html/Elements/Checkbox
-   A /rt/branches/rt-3.3/html/Elements/CreateTicket
-   A /rt/branches/rt-3.3/html/Elements/EditCustomField
-   A /rt/branches/rt-3.3/html/Elements/EditCustomFieldBinary
-   A /rt/branches/rt-3.3/html/Elements/EditCustomFieldFreeform
-   A /rt/branches/rt-3.3/html/Elements/EditCustomFieldImage
-   A /rt/branches/rt-3.3/html/Elements/EditCustomFieldSelect
-   A /rt/branches/rt-3.3/html/Elements/EditCustomFieldText
-   A /rt/branches/rt-3.3/html/Elements/Error
-   A /rt/branches/rt-3.3/html/Elements/Footer
-   A /rt/branches/rt-3.3/html/Elements/GotoTicket
-   A /rt/branches/rt-3.3/html/Elements/Header
-   A /rt/branches/rt-3.3/html/Elements/ListActions
-   A /rt/branches/rt-3.3/html/Elements/Login
-   A /rt/branches/rt-3.3/html/Elements/Menu
-   A /rt/branches/rt-3.3/html/Elements/MessageBox
-   A /rt/branches/rt-3.3/html/Elements/MyRequests
-   A /rt/branches/rt-3.3/html/Elements/MyTickets
-   A /rt/branches/rt-3.3/html/Elements/PageLayout
-   A /rt/branches/rt-3.3/html/Elements/QuickCreate
-   A /rt/branches/rt-3.3/html/Elements/Quicksearch
-   A /rt/branches/rt-3.3/html/Elements/Refresh
-   A /rt/branches/rt-3.3/html/Elements/Section
-   A /rt/branches/rt-3.3/html/Elements/SelectAttachmentField
-   A /rt/branches/rt-3.3/html/Elements/SelectBoolean
-   A /rt/branches/rt-3.3/html/Elements/SelectCustomFieldOperator
-   A /rt/branches/rt-3.3/html/Elements/SelectCustomFieldValue
-   A /rt/branches/rt-3.3/html/Elements/SelectDate
-   A /rt/branches/rt-3.3/html/Elements/SelectDateRelation
-   A /rt/branches/rt-3.3/html/Elements/SelectDateType
-   A /rt/branches/rt-3.3/html/Elements/SelectEqualityOperator
-   A /rt/branches/rt-3.3/html/Elements/SelectGroups
-   A /rt/branches/rt-3.3/html/Elements/SelectLang
-   A /rt/branches/rt-3.3/html/Elements/SelectLinkType
-   A /rt/branches/rt-3.3/html/Elements/SelectMatch
-   A /rt/branches/rt-3.3/html/Elements/SelectNewTicketQueue
-   A /rt/branches/rt-3.3/html/Elements/SelectOwner
-   A /rt/branches/rt-3.3/html/Elements/SelectQueue
-   A /rt/branches/rt-3.3/html/Elements/SelectResultsPerPage
-   A /rt/branches/rt-3.3/html/Elements/SelectSortOrder
-   A /rt/branches/rt-3.3/html/Elements/SelectStatus
-   A /rt/branches/rt-3.3/html/Elements/SelectTicketSortBy
-   A /rt/branches/rt-3.3/html/Elements/SelectTicketTypes
-   A /rt/branches/rt-3.3/html/Elements/SelectUsers
-   A /rt/branches/rt-3.3/html/Elements/SelectWatcherType
-   A /rt/branches/rt-3.3/html/Elements/SetupSessionCookie
-   A /rt/branches/rt-3.3/html/Elements/ShadedBox
-   A /rt/branches/rt-3.3/html/Elements/ShadedInputRow
-   A /rt/branches/rt-3.3/html/Elements/ShadedRow
-   A /rt/branches/rt-3.3/html/Elements/ShowCustomFields
-   A /rt/branches/rt-3.3/html/Elements/ShowMemberships
-   A /rt/branches/rt-3.3/html/Elements/SimpleSearch
-   A /rt/branches/rt-3.3/html/Elements/Submit
-   A /rt/branches/rt-3.3/html/Elements/Tabs
-   A /rt/branches/rt-3.3/html/Elements/TicketList
-   A /rt/branches/rt-3.3/html/Elements/TitleBox
-   A /rt/branches/rt-3.3/html/Elements/TitleBoxEnd
-   A /rt/branches/rt-3.3/html/Elements/TitleBoxStart
-   A /rt/branches/rt-3.3/html/Elements/ViewUser
-   A /rt/branches/rt-3.3/html/NoAuth
-   A /rt/branches/rt-3.3/html/NoAuth/Logout.html
-   A /rt/branches/rt-3.3/html/NoAuth/Reminder.html
-   A /rt/branches/rt-3.3/html/NoAuth/images
-   A /rt/branches/rt-3.3/html/NoAuth/images/back_home.gif
-   A /rt/branches/rt-3.3/html/NoAuth/images/bplogo.gif
-   A /rt/branches/rt-3.3/html/NoAuth/images/favicon.png
-   A /rt/branches/rt-3.3/html/NoAuth/images/head_requestracker.gif
-   A /rt/branches/rt-3.3/html/NoAuth/images/rt.jpg
-   A /rt/branches/rt-3.3/html/NoAuth/images/space.gif
-   A /rt/branches/rt-3.3/html/NoAuth/images/spacer.gif
-   A /rt/branches/rt-3.3/html/NoAuth/images/squares_blue.gif
-   A /rt/branches/rt-3.3/html/NoAuth/webrt.css
-   A /rt/branches/rt-3.3/html/Projects
-   A /rt/branches/rt-3.3/html/Projects/Create.html
-   A /rt/branches/rt-3.3/html/Projects/Edit.html
-   A /rt/branches/rt-3.3/html/Projects/Elements
-   A /rt/branches/rt-3.3/html/Projects/Elements/CreateTask
-   A /rt/branches/rt-3.3/html/Projects/Elements/EditTask
-   A /rt/branches/rt-3.3/html/Projects/Elements/OverviewEntry
-   A /rt/branches/rt-3.3/html/Projects/Elements/SelectProjectTask
-   A /rt/branches/rt-3.3/html/Projects/Elements/SelectProjectTaskEntry
-   A /rt/branches/rt-3.3/html/Projects/Elements/Tabs
-   A /rt/branches/rt-3.3/html/Projects/Elements/TicketTabs
-   A /rt/branches/rt-3.3/html/Projects/Gantt.html
-   A /rt/branches/rt-3.3/html/Projects/History.html
-   A /rt/branches/rt-3.3/html/Projects/Overview.html
-   A /rt/branches/rt-3.3/html/Projects/Schedule.html
-   A /rt/branches/rt-3.3/html/Projects/ScheduleByActor.html
-   A /rt/branches/rt-3.3/html/Projects/index.html
-   A /rt/branches/rt-3.3/html/REST
-   A /rt/branches/rt-3.3/html/REST/1.0
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/queue
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/queue/default
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/queue/ns
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/attachments
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/default
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/history
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/links
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/user
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/user/default
-   A /rt/branches/rt-3.3/html/REST/1.0/Forms/user/ns
-   A /rt/branches/rt-3.3/html/REST/1.0/NoAuth
-   A /rt/branches/rt-3.3/html/REST/1.0/NoAuth/mail-gateway
-   A /rt/branches/rt-3.3/html/REST/1.0/autohandler
-   A /rt/branches/rt-3.3/html/REST/1.0/dhandler
-   A /rt/branches/rt-3.3/html/REST/1.0/logout
-   A /rt/branches/rt-3.3/html/REST/1.0/search
-   A /rt/branches/rt-3.3/html/REST/1.0/search/dhandler
-   A /rt/branches/rt-3.3/html/REST/1.0/search/ticket
-   A /rt/branches/rt-3.3/html/REST/1.0/ticket
-   A /rt/branches/rt-3.3/html/REST/1.0/ticket/comment
-   A /rt/branches/rt-3.3/html/REST/1.0/ticket/link
-   A /rt/branches/rt-3.3/html/REST/1.0/ticket/merge
-   A /rt/branches/rt-3.3/html/Scope
-   A /rt/branches/rt-3.3/html/Scope/Action.html
-   A /rt/branches/rt-3.3/html/Scope/Elements
-   A /rt/branches/rt-3.3/html/Scope/Elements/Header
-   A /rt/branches/rt-3.3/html/Scope/Elements/MessageBox
-   A /rt/branches/rt-3.3/html/Scope/Elements/ShowHistory
-   A /rt/branches/rt-3.3/html/Scope/Elements/ShowHistoryView
-   A /rt/branches/rt-3.3/html/Scope/Elements/ShowMessageHeaders
-   A /rt/branches/rt-3.3/html/Scope/Elements/ShowMessageStanza
-   A /rt/branches/rt-3.3/html/Scope/Elements/ShowSummary
-   A /rt/branches/rt-3.3/html/Scope/Elements/ShowTransaction
-   A /rt/branches/rt-3.3/html/Scope/History.html
-   A /rt/branches/rt-3.3/html/Scope/Search.html
-   A /rt/branches/rt-3.3/html/Scope/Update.html
-   A /rt/branches/rt-3.3/html/Scope/View.html
-   A /rt/branches/rt-3.3/html/Scope/Work.html
-   A /rt/branches/rt-3.3/html/Scope/index.html
-   A /rt/branches/rt-3.3/html/Search
-   A /rt/branches/rt-3.3/html/Search/Build.html
-   A /rt/branches/rt-3.3/html/Search/Bulk.html
-   A /rt/branches/rt-3.3/html/Search/Edit.html
-   A /rt/branches/rt-3.3/html/Search/Elements
-   A /rt/branches/rt-3.3/html/Search/Elements/BuildFormatString
-   A /rt/branches/rt-3.3/html/Search/Elements/DisplayOptions
-   A /rt/branches/rt-3.3/html/Search/Elements/EditFormat
-   A /rt/branches/rt-3.3/html/Search/Elements/EditSearches
-   A /rt/branches/rt-3.3/html/Search/Elements/NewListActions
-   A /rt/branches/rt-3.3/html/Search/Elements/PickBasics
-   A /rt/branches/rt-3.3/html/Search/Elements/PickCFs
-   A /rt/branches/rt-3.3/html/Search/Elements/PickCriteria
-   A /rt/branches/rt-3.3/html/Search/Elements/PickRestriction
-   A /rt/branches/rt-3.3/html/Search/Elements/SearchPrivacy
-   A /rt/branches/rt-3.3/html/Search/Elements/SelectAndOr
-   A /rt/branches/rt-3.3/html/Search/Elements/SelectGroup
-   A /rt/branches/rt-3.3/html/Search/Elements/SelectLinks
-   A /rt/branches/rt-3.3/html/Search/Elements/SelectPersonType
-   A /rt/branches/rt-3.3/html/Search/Elements/SelectSearchObject
-   A /rt/branches/rt-3.3/html/Search/Elements/SelectSearchesForObjects
-   A /rt/branches/rt-3.3/html/Search/Elements/TicketHeader
-   A /rt/branches/rt-3.3/html/Search/Elements/TicketHeaderCell
-   A /rt/branches/rt-3.3/html/Search/Elements/TicketRow
-   A /rt/branches/rt-3.3/html/Search/Listing.html
-   A /rt/branches/rt-3.3/html/Search/Results.html
-   A /rt/branches/rt-3.3/html/Search/Results.rdf
-   A /rt/branches/rt-3.3/html/Search/Results.tsv
-   A /rt/branches/rt-3.3/html/SelfService
-   A /rt/branches/rt-3.3/html/SelfService/Attachment
-   A /rt/branches/rt-3.3/html/SelfService/Attachment/dhandler
-   A /rt/branches/rt-3.3/html/SelfService/Closed.html
-   A /rt/branches/rt-3.3/html/SelfService/Create.html
-   A /rt/branches/rt-3.3/html/SelfService/Display.html
-   A /rt/branches/rt-3.3/html/SelfService/Elements
-   A /rt/branches/rt-3.3/html/SelfService/Elements/GotoTicket
-   A /rt/branches/rt-3.3/html/SelfService/Elements/Header
-   A /rt/branches/rt-3.3/html/SelfService/Elements/MyRequests
-   A /rt/branches/rt-3.3/html/SelfService/Elements/Tabs
-   A /rt/branches/rt-3.3/html/SelfService/Error.html
-   A /rt/branches/rt-3.3/html/SelfService/Prefs.html
-   A /rt/branches/rt-3.3/html/SelfService/Update.html
-   A /rt/branches/rt-3.3/html/SelfService/index.html
-   A /rt/branches/rt-3.3/html/Ticket
-   A /rt/branches/rt-3.3/html/Ticket/Attachment
-   A /rt/branches/rt-3.3/html/Ticket/Attachment/dhandler
-   A /rt/branches/rt-3.3/html/Ticket/Create.html
-   A /rt/branches/rt-3.3/html/Ticket/Display.html
-   A /rt/branches/rt-3.3/html/Ticket/Elements
-   A /rt/branches/rt-3.3/html/Ticket/Elements/AddWatchers
-   A /rt/branches/rt-3.3/html/Ticket/Elements/BulkLinks
-   A /rt/branches/rt-3.3/html/Ticket/Elements/EditBasics
-   A /rt/branches/rt-3.3/html/Ticket/Elements/EditCustomField
-   A /rt/branches/rt-3.3/html/Ticket/Elements/EditCustomFields
-   A /rt/branches/rt-3.3/html/Ticket/Elements/EditDates
-   A /rt/branches/rt-3.3/html/Ticket/Elements/EditLinks
-   A /rt/branches/rt-3.3/html/Ticket/Elements/EditPeople
-   A /rt/branches/rt-3.3/html/Ticket/Elements/EditWatchers
-   A /rt/branches/rt-3.3/html/Ticket/Elements/PreviewScrips
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowAttachments
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowBasics
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowCustomFields
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowDates
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowDependencies
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowHistory
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowLink
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowLinks
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowMemberOf
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowMembers
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowMessageHeaders
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowMessageStanza
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowPeople
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowReferences
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowRequestor
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowSummary
-   A /rt/branches/rt-3.3/html/Ticket/Elements/ShowTransaction
-   A /rt/branches/rt-3.3/html/Ticket/Elements/Tabs
-   A /rt/branches/rt-3.3/html/Ticket/History.html
-   A /rt/branches/rt-3.3/html/Ticket/Modify.html
-   A /rt/branches/rt-3.3/html/Ticket/ModifyAll.html
-   A /rt/branches/rt-3.3/html/Ticket/ModifyDates.html
-   A /rt/branches/rt-3.3/html/Ticket/ModifyLinks.html
-   A /rt/branches/rt-3.3/html/Ticket/ModifyPeople.html
-   A /rt/branches/rt-3.3/html/Ticket/Update.html
-   A /rt/branches/rt-3.3/html/Tools
-   A /rt/branches/rt-3.3/html/Tools/MyDay.html
-   A /rt/branches/rt-3.3/html/User
-   A /rt/branches/rt-3.3/html/User/Delegation.html
-   A /rt/branches/rt-3.3/html/User/Elements
-   A /rt/branches/rt-3.3/html/User/Elements/DelegateRights
-   A /rt/branches/rt-3.3/html/User/Elements/GroupTabs
-   A /rt/branches/rt-3.3/html/User/Elements/Tabs
-   A /rt/branches/rt-3.3/html/User/Groups
-   A /rt/branches/rt-3.3/html/User/Groups/Members.html
-   A /rt/branches/rt-3.3/html/User/Groups/Modify.html
-   A /rt/branches/rt-3.3/html/User/Groups/index.html
-   A /rt/branches/rt-3.3/html/User/Prefs.html
-   A /rt/branches/rt-3.3/html/autohandler
-   A /rt/branches/rt-3.3/html/index.html
-   A /rt/branches/rt-3.3/html/l
-   A /rt/branches/rt-3.3/install-sh
-   A /rt/branches/rt-3.3/lib
-   A /rt/branches/rt-3.3/lib/RT
-   A /rt/branches/rt-3.3/lib/RT/ACE.pm
-   A /rt/branches/rt-3.3/lib/RT/ACE_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/ACL.pm
-   A /rt/branches/rt-3.3/lib/RT/ACL_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Action
-   A /rt/branches/rt-3.3/lib/RT/Action/AutoOpen.pm
-   A /rt/branches/rt-3.3/lib/RT/Action/Autoreply.pm
-   A /rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
-   A /rt/branches/rt-3.3/lib/RT/Action/EscalatePriority.pm
-   A /rt/branches/rt-3.3/lib/RT/Action/Generic.pm
-   A /rt/branches/rt-3.3/lib/RT/Action/Notify.pm
-   A /rt/branches/rt-3.3/lib/RT/Action/NotifyAsComment.pm
-   A /rt/branches/rt-3.3/lib/RT/Action/ResolveMembers.pm
-   A /rt/branches/rt-3.3/lib/RT/Action/SendEmail.pm
-   A /rt/branches/rt-3.3/lib/RT/Action/SetPriority.pm
-   A /rt/branches/rt-3.3/lib/RT/Action/UserDefined.pm
-   A /rt/branches/rt-3.3/lib/RT/Attachment.pm
-   A /rt/branches/rt-3.3/lib/RT/Attachment_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Attachments.pm
-   A /rt/branches/rt-3.3/lib/RT/Attachments_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Attribute.pm
-   A /rt/branches/rt-3.3/lib/RT/Attribute_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Attributes.pm
-   A /rt/branches/rt-3.3/lib/RT/Attributes_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Base.pm
-   A /rt/branches/rt-3.3/lib/RT/CachedGroupMember.pm
-   A /rt/branches/rt-3.3/lib/RT/CachedGroupMember_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/CachedGroupMembers.pm
-   A /rt/branches/rt-3.3/lib/RT/CachedGroupMembers_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Condition
-   A /rt/branches/rt-3.3/lib/RT/Condition/AnyTransaction.pm
-   A /rt/branches/rt-3.3/lib/RT/Condition/BeforeDue.pm
-   A /rt/branches/rt-3.3/lib/RT/Condition/Generic.pm
-   A /rt/branches/rt-3.3/lib/RT/Condition/Overdue.pm
-   A /rt/branches/rt-3.3/lib/RT/Condition/OwnerChange.pm
-   A /rt/branches/rt-3.3/lib/RT/Condition/PriorityExceeds.pm
-   A /rt/branches/rt-3.3/lib/RT/Condition/QueueChange.pm
-   A /rt/branches/rt-3.3/lib/RT/Condition/StatusChange.pm
-   A /rt/branches/rt-3.3/lib/RT/Condition/UserDefined.pm
-   A /rt/branches/rt-3.3/lib/RT/CurrentUser.pm
-   A /rt/branches/rt-3.3/lib/RT/CustomField.pm
-   A /rt/branches/rt-3.3/lib/RT/CustomFieldValue.pm
-   A /rt/branches/rt-3.3/lib/RT/CustomFieldValues.pm
-   A /rt/branches/rt-3.3/lib/RT/CustomFieldValues_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/CustomFields.pm
-   A /rt/branches/rt-3.3/lib/RT/CustomFields_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Date.pm
-   A /rt/branches/rt-3.3/lib/RT/EmailParser.pm
-   A /rt/branches/rt-3.3/lib/RT/Group.pm
-   A /rt/branches/rt-3.3/lib/RT/GroupMember.pm
-   A /rt/branches/rt-3.3/lib/RT/GroupMember_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/GroupMembers.pm
-   A /rt/branches/rt-3.3/lib/RT/GroupMembers_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Group_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Groups.pm
-   A /rt/branches/rt-3.3/lib/RT/Groups_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Handle.pm
-   A /rt/branches/rt-3.3/lib/RT/I18N
-   A /rt/branches/rt-3.3/lib/RT/I18N/cs.pm
-   A /rt/branches/rt-3.3/lib/RT/I18N/cs.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/de.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/en.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/en_malkovich.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/es.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/fi.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/fr.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/he.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/i_default.pm
-   A /rt/branches/rt-3.3/lib/RT/I18N/it.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/ja.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/nl.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/no.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/pt_br.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/ru.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po
-   A /rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po
-   A /rt/branches/rt-3.3/lib/RT/I18N.pm
-   A /rt/branches/rt-3.3/lib/RT/Interface
-   A /rt/branches/rt-3.3/lib/RT/Interface/CLI.pm
-   A /rt/branches/rt-3.3/lib/RT/Interface/Email
-   A /rt/branches/rt-3.3/lib/RT/Interface/Email/Auth
-   A /rt/branches/rt-3.3/lib/RT/Interface/Email/Auth/GnuPG.pm
-   A /rt/branches/rt-3.3/lib/RT/Interface/Email/Auth/MailFrom.pm
-   A /rt/branches/rt-3.3/lib/RT/Interface/Email/Filter
-   A /rt/branches/rt-3.3/lib/RT/Interface/Email/Filter/SpamAssassin.pm
-   A /rt/branches/rt-3.3/lib/RT/Interface/Email.pm
-   A /rt/branches/rt-3.3/lib/RT/Interface/REST.pm
-   A /rt/branches/rt-3.3/lib/RT/Interface/Web.pm
-   A /rt/branches/rt-3.3/lib/RT/Link.pm
-   A /rt/branches/rt-3.3/lib/RT/Link_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Links.pm
-   A /rt/branches/rt-3.3/lib/RT/Links_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/ObjectCustomField.pm
-   A /rt/branches/rt-3.3/lib/RT/ObjectCustomFieldValue.pm
-   A /rt/branches/rt-3.3/lib/RT/ObjectCustomFieldValue_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/ObjectCustomFieldValues.pm
-   A /rt/branches/rt-3.3/lib/RT/ObjectCustomFieldValues_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/ObjectCustomField_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/ObjectCustomFields.pm
-   A /rt/branches/rt-3.3/lib/RT/ObjectCustomFields_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Principal.pm
-   A /rt/branches/rt-3.3/lib/RT/Principal_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Principals.pm
-   A /rt/branches/rt-3.3/lib/RT/Principals_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Queue.pm
-   A /rt/branches/rt-3.3/lib/RT/Queue_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Queues.pm
-   A /rt/branches/rt-3.3/lib/RT/Queues_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Record.pm
-   A /rt/branches/rt-3.3/lib/RT/Scrip.pm
-   A /rt/branches/rt-3.3/lib/RT/ScripAction.pm
-   A /rt/branches/rt-3.3/lib/RT/ScripAction_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/ScripActions.pm
-   A /rt/branches/rt-3.3/lib/RT/ScripActions_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/ScripCondition.pm
-   A /rt/branches/rt-3.3/lib/RT/ScripCondition_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/ScripConditions.pm
-   A /rt/branches/rt-3.3/lib/RT/ScripConditions_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Scrip_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Scrips.pm
-   A /rt/branches/rt-3.3/lib/RT/Scrips_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Search
-   A /rt/branches/rt-3.3/lib/RT/Search/ActiveTicketsInQueue.pm
-   A /rt/branches/rt-3.3/lib/RT/Search/Generic.pm
-   A /rt/branches/rt-3.3/lib/RT/SearchBuilder.pm
-   A /rt/branches/rt-3.3/lib/RT/StyleGuide.pod
-   A /rt/branches/rt-3.3/lib/RT/System.pm
-   A /rt/branches/rt-3.3/lib/RT/Template.pm
-   A /rt/branches/rt-3.3/lib/RT/Template_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Templates.pm
-   A /rt/branches/rt-3.3/lib/RT/Templates_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Ticket.pm
-   A /rt/branches/rt-3.3/lib/RT/TicketCustomFieldValue.pm
-   A /rt/branches/rt-3.3/lib/RT/TicketCustomFieldValue_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/TicketCustomFieldValues.pm
-   A /rt/branches/rt-3.3/lib/RT/TicketCustomFieldValues_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Tickets.pm
-   A /rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Tickets_Overlay_SQL.pm
-   A /rt/branches/rt-3.3/lib/RT/Transaction.pm
-   A /rt/branches/rt-3.3/lib/RT/Transaction_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Transactions.pm
-   A /rt/branches/rt-3.3/lib/RT/Transactions_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/URI
-   A /rt/branches/rt-3.3/lib/RT/URI/base.pm
-   A /rt/branches/rt-3.3/lib/RT/URI/fsck_com_rt.pm
-   A /rt/branches/rt-3.3/lib/RT/URI.pm
-   A /rt/branches/rt-3.3/lib/RT/User.pm
-   A /rt/branches/rt-3.3/lib/RT/User_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT/Users.pm
-   A /rt/branches/rt-3.3/lib/RT/Users_Overlay.pm
-   A /rt/branches/rt-3.3/lib/RT.pm.in
-   A /rt/branches/rt-3.3/lib/t
-   A /rt/branches/rt-3.3/lib/t/00smoke.t.in
-   A /rt/branches/rt-3.3/lib/t/01harness.t.in
-   A /rt/branches/rt-3.3/lib/t/02regression.t.in
-   A /rt/branches/rt-3.3/lib/t/03web.pl.in
-   A /rt/branches/rt-3.3/lib/t/04_send_email.pl.in
-   A /rt/branches/rt-3.3/lib/t/data
-   A /rt/branches/rt-3.3/lib/t/data/8859-15-message-series
-   A /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/dir
-   A /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg1
-   A /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg2
-   A /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg3
-   A /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg4
-   A /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg5
-   A /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg6
-   A /rt/branches/rt-3.3/lib/t/data/8859-15-message-series/msg7
-   A /rt/branches/rt-3.3/lib/t/data/crashes-file-based-parser
-   A /rt/branches/rt-3.3/lib/t/data/multipart-alternative-with-umlaut
-   A /rt/branches/rt-3.3/lib/t/data/multipart-report
-   A /rt/branches/rt-3.3/lib/t/data/nested-mime-sample
-   A /rt/branches/rt-3.3/lib/t/data/nested-rfc-822
-   A /rt/branches/rt-3.3/lib/t/data/new-ticket-from-iso-8859-1
-   A /rt/branches/rt-3.3/lib/t/data/new-ticket-from-iso-8859-1-full
-   A /rt/branches/rt-3.3/lib/t/data/notes-uuencoded
-   A /rt/branches/rt-3.3/lib/t/data/russian-subject-no-content-type
-   A /rt/branches/rt-3.3/lib/t/data/text-html-in-russian
-   A /rt/branches/rt-3.3/lib/t/data/text-html-with-umlaut
-   A /rt/branches/rt-3.3/lib/t/regression
-   A /rt/branches/rt-3.3/lib/t/regression/00placeholder
-   A /rt/branches/rt-3.3/lib/t/regression/mime_tests
-   A /rt/branches/rt-3.3/m4
-   A /rt/branches/rt-3.3/m4/rt_enable_layout.m4
-   A /rt/branches/rt-3.3/m4/rt_expand_var.m4
-   A /rt/branches/rt-3.3/m4/rt_layout.m4
-   A /rt/branches/rt-3.3/m4/rt_subst_expanded_arg.m4
-   A /rt/branches/rt-3.3/releng.cnf
-   A /rt/branches/rt-3.3/sbin
-   A /rt/branches/rt-3.3/sbin/extract-message-catalog
-   A /rt/branches/rt-3.3/sbin/extract_pod_tests
-   A /rt/branches/rt-3.3/sbin/factory
-   A /rt/branches/rt-3.3/sbin/license_tag
-   A /rt/branches/rt-3.3/sbin/regression_harness
-   A /rt/branches/rt-3.3/sbin/rt-setup-database.in
-   A /rt/branches/rt-3.3/sbin/rt-test-dependencies.in
-   A /rt/branches/rt-3.3/spec
-   A /rt/branches/rt-3.3/spec/schema.txt
-
-* mv autrijus-3.1 to rt-3.3
+
+Work on Results.tsv to add custom fields support, clean up output, clean up internals.
+Probably hurt performance. 
+
+------------------------------------------------------------------------
+r278 | jesse | 2003-11-19 22:53:07 -0500 (Wed, 19 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/branches/rt-3.1/lib/RT/Action/SendEmail.pm
+
+first cut of "record all outgoing mail"
+
+------------------------------------------------------------------------
+r277 | jesse | 2003-11-19 20:17:13 -0500 (Wed, 19 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/branches/rt-3.1/html/Search/Listing.html
+   A /rt/branches/rt-3.1/html/Search/Results.tsv
+
+Now support downloading of tab seperated values of ticket search results
+
+------------------------------------------------------------------------
+r276 | jesse | 2003-11-19 02:59:16 -0500 (Wed, 19 Nov 2003) | 6 lines
+Changed paths:
+   M /rt/branches/rt-3.1/Makefile
+   M /rt/branches/rt-3.1/Makefile.in
+   M /rt/branches/rt-3.1/aclocal.m4
+   M /rt/branches/rt-3.1/autom4te.cache/output.0
+   M /rt/branches/rt-3.1/autom4te.cache/requests
+   M /rt/branches/rt-3.1/autom4te.cache/traces.0
+   M /rt/branches/rt-3.1/bin/rt-mailgate
+   M /rt/branches/rt-3.1/config.layout
+   M /rt/branches/rt-3.1/config.log
+   M /rt/branches/rt-3.1/config.status
+   M /rt/branches/rt-3.1/configure
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/lib/RT/CurrentUser.pm
+   M /rt/branches/rt-3.1/lib/RT.pm
+
+Buildsystem fixes from jesse's experimental 3.1 branch
+
+CurrentUser fixes from jesse's experimental 3.1 branch
+
+
+
+------------------------------------------------------------------------
+r275 | jesse | 2003-11-19 02:21:29 -0500 (Wed, 19 Nov 2003) | 4 lines
+Changed paths:
+   M /rt/branches/rt-3.1/bin/rt-mailgate.in
+   M /rt/branches/rt-3.1/configure.ac
+   M /rt/branches/rt-3.1/etc/schema.mysql
+   A /rt/branches/rt-3.1/html/Projects
+   A /rt/branches/rt-3.1/html/Projects/Create.html
+   A /rt/branches/rt-3.1/html/Projects/Edit.html
+   A /rt/branches/rt-3.1/html/Projects/Elements
+   A /rt/branches/rt-3.1/html/Projects/Elements/CreateTask
+   A /rt/branches/rt-3.1/html/Projects/Elements/EditTask
+   A /rt/branches/rt-3.1/html/Projects/Elements/OverviewEntry
+   A /rt/branches/rt-3.1/html/Projects/Elements/SelectProjectTask
+   A /rt/branches/rt-3.1/html/Projects/Elements/SelectProjectTaskEntry
+   A /rt/branches/rt-3.1/html/Projects/Elements/Tabs
+   A /rt/branches/rt-3.1/html/Projects/Elements/TicketTabs
+   A /rt/branches/rt-3.1/html/Projects/Gantt.html
+   A /rt/branches/rt-3.1/html/Projects/History.html
+   A /rt/branches/rt-3.1/html/Projects/Overview.html
+   A /rt/branches/rt-3.1/html/Projects/Schedule.html
+   A /rt/branches/rt-3.1/html/Projects/ScheduleByActor.html
+   A /rt/branches/rt-3.1/html/Projects/index.html
+   A /rt/branches/rt-3.1/html/Scope
+   A /rt/branches/rt-3.1/html/Scope/Action.html
+   A /rt/branches/rt-3.1/html/Scope/Elements
+   A /rt/branches/rt-3.1/html/Scope/Elements/Header
+   A /rt/branches/rt-3.1/html/Scope/Elements/MessageBox
+   A /rt/branches/rt-3.1/html/Scope/Elements/ShowHistory
+   A /rt/branches/rt-3.1/html/Scope/Elements/ShowHistoryView
+   A /rt/branches/rt-3.1/html/Scope/Elements/ShowMessageHeaders
+   A /rt/branches/rt-3.1/html/Scope/Elements/ShowMessageStanza
+   A /rt/branches/rt-3.1/html/Scope/Elements/ShowSummary
+   A /rt/branches/rt-3.1/html/Scope/Elements/ShowTransaction
+   A /rt/branches/rt-3.1/html/Scope/History.html
+   A /rt/branches/rt-3.1/html/Scope/Search.html
+   A /rt/branches/rt-3.1/html/Scope/Update.html
+   A /rt/branches/rt-3.1/html/Scope/View.html
+   A /rt/branches/rt-3.1/html/Scope/Work.html
+   A /rt/branches/rt-3.1/html/Scope/index.html
+   A /rt/branches/rt-3.1/html/Tools
+   A /rt/branches/rt-3.1/html/Tools/MyDay.html
+   M /rt/branches/rt-3.1/lib/RT/ACE.pm
+   M /rt/branches/rt-3.1/lib/RT/ACL.pm
+   M /rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachment.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachment_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/Attachments.pm
+   A /rt/branches/rt-3.1/lib/RT/Attribute.pm
+   A /rt/branches/rt-3.1/lib/RT/Attribute_Overlay.pm
+   A /rt/branches/rt-3.1/lib/RT/Attributes.pm
+   A /rt/branches/rt-3.1/lib/RT/Attributes_Overlay.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMember.pm
+   M /rt/branches/rt-3.1/lib/RT/CachedGroupMembers.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomField.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFieldValue.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFieldValues.pm
+   M /rt/branches/rt-3.1/lib/RT/CustomFields.pm
+   M /rt/branches/rt-3.1/lib/RT/Group.pm
+   M /rt/branches/rt-3.1/lib/RT/GroupMember.pm
+   M /rt/branches/rt-3.1/lib/RT/GroupMembers.pm
+   M /rt/branches/rt-3.1/lib/RT/Groups.pm
+   M /rt/branches/rt-3.1/lib/RT/Link.pm
+   M /rt/branches/rt-3.1/lib/RT/Links.pm
+   M /rt/branches/rt-3.1/lib/RT/Principal.pm
+   M /rt/branches/rt-3.1/lib/RT/Principals.pm
+   M /rt/branches/rt-3.1/lib/RT/Queue.pm
+   M /rt/branches/rt-3.1/lib/RT/Queues.pm
+   M /rt/branches/rt-3.1/lib/RT/Record.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrip.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripAction.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripActions.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripCondition.pm
+   M /rt/branches/rt-3.1/lib/RT/ScripConditions.pm
+   M /rt/branches/rt-3.1/lib/RT/Scrips.pm
+   M /rt/branches/rt-3.1/lib/RT/SearchBuilder.pm
+   M /rt/branches/rt-3.1/lib/RT/Template.pm
+   M /rt/branches/rt-3.1/lib/RT/Templates.pm
+   M /rt/branches/rt-3.1/lib/RT/Ticket.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValue.pm
+   M /rt/branches/rt-3.1/lib/RT/TicketCustomFieldValues.pm
+   M /rt/branches/rt-3.1/lib/RT/Tickets.pm
+   M /rt/branches/rt-3.1/lib/RT/Transaction.pm
+   M /rt/branches/rt-3.1/lib/RT/Transactions.pm
+   M /rt/branches/rt-3.1/lib/RT/User.pm
+   M /rt/branches/rt-3.1/lib/RT/Users.pm
+   M /rt/branches/rt-3.1/lib/RT.pm
+   M /rt/branches/rt-3.1/sbin/factory
+
+moving in the non-experimental changes from my experimental branch
+
+
+
+------------------------------------------------------------------------
+r274 | jesse | 2003-11-19 00:45:03 -0500 (Wed, 19 Nov 2003) | 2 lines
+Changed paths:
+   A /rt/branches/rt-3.1 (from /rt/trunk:273)
+
+Branching RT 3.1 from RT 3.0.7_01
+
+------------------------------------------------------------------------
+r267 | root | 2003-11-17 23:03:48 -0500 (Mon, 17 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Changelog
+   M /rt/trunk/Makefile
+   M /rt/trunk/UPGRADING
+   M /rt/trunk/autom4te.cache/output.0
+   M /rt/trunk/autom4te.cache/traces.0
+   M /rt/trunk/config.log
+   M /rt/trunk/config.status
+   M /rt/trunk/configure
+   M /rt/trunk/configure.ac
+   M /rt/trunk/lib/RT.pm
+
+Load rt-3-0-7_01 into rt/trunk.
+
+------------------------------------------------------------------------
+r265 | root | 2003-11-17 23:03:20 -0500 (Mon, 17 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Changelog
+   M /rt/trunk/Makefile
+   M /rt/trunk/Makefile.in
+   M /rt/trunk/README
+   A /rt/trunk/UPGRADING
+   M /rt/trunk/autom4te.cache/output.0
+   M /rt/trunk/autom4te.cache/traces.0
+   M /rt/trunk/bin/mason_handler.fcgi
+   M /rt/trunk/bin/mason_handler.fcgi.in
+   M /rt/trunk/bin/mason_handler.scgi
+   M /rt/trunk/bin/mason_handler.scgi.in
+   M /rt/trunk/bin/mason_handler.svc
+   M /rt/trunk/bin/mason_handler.svc.in
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt.in
+   M /rt/trunk/bin/webmux.pl
+   M /rt/trunk/bin/webmux.pl.in
+   M /rt/trunk/config.log
+   M /rt/trunk/config.status
+   M /rt/trunk/configure
+   M /rt/trunk/configure.ac
+   A /rt/trunk/docs/rt3-schema-relationships.dot
+   M /rt/trunk/etc/RT_Config.pm
+   M /rt/trunk/etc/RT_Config.pm.in
+   A /rt/trunk/etc/acl.Informix
+   M /rt/trunk/etc/constraints.mysql
+   A /rt/trunk/etc/drop.Informix
+   A /rt/trunk/etc/schema.Informix
+   M /rt/trunk/etc/schema.Oracle
+   M /rt/trunk/etc/schema.Pg
+   M /rt/trunk/etc/schema.SQLite
+   M /rt/trunk/etc/schema.mysql
+   M /rt/trunk/html/Admin/Elements/SelectRights
+   M /rt/trunk/html/Admin/Queues/CustomFields.html
+   A /rt/trunk/html/Elements/SelectLang
+   M /rt/trunk/html/Elements/SetupSessionCookie
+   M /rt/trunk/html/REST/1.0/Forms/queue/default
+   M /rt/trunk/html/REST/1.0/Forms/ticket/attachments
+   M /rt/trunk/html/REST/1.0/Forms/ticket/default
+   A /rt/trunk/html/REST/1.0/Forms/ticket/history
+   M /rt/trunk/html/REST/1.0/Forms/user/default
+   M /rt/trunk/html/REST/1.0/search/ticket
+   M /rt/trunk/html/SelfService/Display.html
+   M /rt/trunk/html/SelfService/Update.html
+   M /rt/trunk/html/Ticket/Create.html
+   M /rt/trunk/html/Ticket/Elements/AddWatchers
+   M /rt/trunk/html/Ticket/Elements/EditCustomField
+   M /rt/trunk/html/Ticket/Elements/EditPeople
+   M /rt/trunk/html/Ticket/Elements/ShowDates
+   M /rt/trunk/html/Ticket/Elements/ShowHistory
+   M /rt/trunk/html/Ticket/Elements/ShowMessageStanza
+   M /rt/trunk/html/Ticket/Elements/ShowTransaction
+   M /rt/trunk/html/Ticket/ModifyPeople.html
+   M /rt/trunk/html/User/Prefs.html
+   M /rt/trunk/html/autohandler
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/Attachment_Overlay.pm
+   M /rt/trunk/lib/RT/Base.pm
+   M /rt/trunk/lib/RT/CachedGroupMember_Overlay.pm
+   M /rt/trunk/lib/RT/CachedGroupMembers_Overlay.pm
+   M /rt/trunk/lib/RT/CurrentUser.pm
+   M /rt/trunk/lib/RT/EmailParser.pm
+   M /rt/trunk/lib/RT/GroupMember_Overlay.pm
+   M /rt/trunk/lib/RT/Group_Overlay.pm
+   M /rt/trunk/lib/RT/Groups_Overlay.pm
+   M /rt/trunk/lib/RT/I18N/zh_cn.po
+   M /rt/trunk/lib/RT/I18N/zh_tw.po
+   M /rt/trunk/lib/RT/I18N.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Principal_Overlay.pm
+   M /rt/trunk/lib/RT/Queue_Overlay.pm
+   M /rt/trunk/lib/RT/Record.pm
+   M /rt/trunk/lib/RT/Scrip_Overlay.pm
+   M /rt/trunk/lib/RT/Tickets_Overlay.pm
+   M /rt/trunk/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/trunk/lib/RT/Transaction_Overlay.pm
+   M /rt/trunk/lib/RT/Users_Overlay.pm
+   M /rt/trunk/lib/RT.pm
+   M /rt/trunk/sbin/extract-message-catalog
+   M /rt/trunk/sbin/rt-setup-database
+   M /rt/trunk/sbin/rt-setup-database.in
+   M /rt/trunk/sbin/rt-test-dependencies
+   M /rt/trunk/sbin/rt-test-dependencies.in
+
+Load rt-3-0-7 into rt/trunk.
+
+------------------------------------------------------------------------
+r76 | root | 2003-11-16 02:27:07 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Changelog
+   M /rt/trunk/Makefile
+   M /rt/trunk/autom4te.cache/output.0
+   M /rt/trunk/autom4te.cache/traces.0
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt.in
+   M /rt/trunk/config.log
+   M /rt/trunk/config.status
+   M /rt/trunk/configure
+   M /rt/trunk/configure.ac
+   M /rt/trunk/html/Elements/MessageBox
+   M /rt/trunk/html/Ticket/Elements/EditLinks
+   M /rt/trunk/html/Ticket/Update.html
+   M /rt/trunk/lib/RT/URI/fsck_com_rt.pm
+   M /rt/trunk/lib/RT.pm
+
+Load rt-3-0-6 into rt/trunk.
+
+------------------------------------------------------------------------
+r74 | root | 2003-11-16 02:26:32 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Changelog
+   M /rt/trunk/Makefile
+   M /rt/trunk/Makefile.in
+   M /rt/trunk/README
+   M /rt/trunk/autom4te.cache/output.0
+   M /rt/trunk/autom4te.cache/traces.0
+   M /rt/trunk/bin/mason_handler.fcgi
+   M /rt/trunk/bin/mason_handler.fcgi.in
+   A /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/rt-mailgate.in
+   A /rt/trunk/bin/rt.in
+   M /rt/trunk/bin/webmux.pl
+   M /rt/trunk/bin/webmux.pl.in
+   M /rt/trunk/config.log
+   M /rt/trunk/config.status
+   M /rt/trunk/configure
+   M /rt/trunk/configure.ac
+   M /rt/trunk/etc/RT_Config.pm
+   M /rt/trunk/etc/RT_Config.pm.in
+   M /rt/trunk/etc/acl.Oracle
+   A /rt/trunk/etc/drop.Oracle
+   M /rt/trunk/etc/initialdata
+   A /rt/trunk/etc/schema.Oracle
+   M /rt/trunk/etc/schema.Pg
+   M /rt/trunk/etc/schema.SQLite
+   M /rt/trunk/etc/schema.mysql
+   M /rt/trunk/html/Admin/Elements/EditCustomField
+   M /rt/trunk/html/Admin/Elements/EditCustomFieldValues
+   M /rt/trunk/html/Admin/Elements/EditCustomFields
+   M /rt/trunk/html/Admin/Elements/EditScrips
+   M /rt/trunk/html/Admin/Elements/SelectGroups
+   M /rt/trunk/html/Admin/Queues/index.html
+   M /rt/trunk/html/Admin/Users/Modify.html
+   M /rt/trunk/html/Admin/Users/index.html
+   M /rt/trunk/html/Approvals/Display.html
+   M /rt/trunk/html/Elements/MessageBox
+   M /rt/trunk/html/Elements/MyTickets
+   M /rt/trunk/html/Elements/SelectStatus
+   M /rt/trunk/html/Elements/SetupSessionCookie
+   A /rt/trunk/html/REST/1.0/Forms
+   A /rt/trunk/html/REST/1.0/Forms/queue
+   A /rt/trunk/html/REST/1.0/Forms/queue/default
+   A /rt/trunk/html/REST/1.0/Forms/queue/ns
+   A /rt/trunk/html/REST/1.0/Forms/ticket
+   A /rt/trunk/html/REST/1.0/Forms/ticket/attachments
+   A /rt/trunk/html/REST/1.0/Forms/ticket/default
+   A /rt/trunk/html/REST/1.0/Forms/ticket/links
+   A /rt/trunk/html/REST/1.0/Forms/user
+   A /rt/trunk/html/REST/1.0/Forms/user/default
+   A /rt/trunk/html/REST/1.0/Forms/user/ns
+   M /rt/trunk/html/REST/1.0/NoAuth/mail-gateway
+   A /rt/trunk/html/REST/1.0/autohandler
+   A /rt/trunk/html/REST/1.0/dhandler
+   A /rt/trunk/html/REST/1.0/logout
+   A /rt/trunk/html/REST/1.0/search
+   A /rt/trunk/html/REST/1.0/search/dhandler
+   A /rt/trunk/html/REST/1.0/search/ticket
+   A /rt/trunk/html/REST/1.0/ticket
+   A /rt/trunk/html/REST/1.0/ticket/comment
+   A /rt/trunk/html/REST/1.0/ticket/link
+   A /rt/trunk/html/REST/1.0/ticket/merge
+   M /rt/trunk/html/Search/Bulk.html
+   M /rt/trunk/html/Search/Elements/PickRestriction
+   M /rt/trunk/html/Ticket/Create.html
+   M /rt/trunk/html/Ticket/Display.html
+   M /rt/trunk/html/Ticket/Elements/ShowAttachments
+   M /rt/trunk/html/Ticket/Elements/ShowPeople
+   M /rt/trunk/html/Ticket/Elements/ShowTransaction
+   M /rt/trunk/html/User/Prefs.html
+   M /rt/trunk/html/autohandler
+   M /rt/trunk/lib/RT/Action/Autoreply.pm
+   M /rt/trunk/lib/RT/Action/CreateTickets.pm
+   M /rt/trunk/lib/RT/Attachment_Overlay.pm
+   M /rt/trunk/lib/RT/EmailParser.pm
+   M /rt/trunk/lib/RT/Groups_Overlay.pm
+   M /rt/trunk/lib/RT/I18N/cs.pm
+   M /rt/trunk/lib/RT/I18N/de.po
+   A /rt/trunk/lib/RT/I18N/it.po
+   M /rt/trunk/lib/RT/I18N/ru.po
+   M /rt/trunk/lib/RT/I18N/zh_cn.po
+   M /rt/trunk/lib/RT/I18N/zh_tw.po
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   A /rt/trunk/lib/RT/Interface/REST.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Principal_Overlay.pm
+   M /rt/trunk/lib/RT/Queue_Overlay.pm
+   M /rt/trunk/lib/RT/ScripAction_Overlay.pm
+   A /rt/trunk/lib/RT/StyleGuide.pod
+   M /rt/trunk/lib/RT/Template_Overlay.pm
+   M /rt/trunk/lib/RT/Ticket_Overlay.pm
+   M /rt/trunk/lib/RT/Tickets_Overlay.pm
+   M /rt/trunk/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/trunk/lib/RT/Transaction_Overlay.pm
+   M /rt/trunk/lib/RT/URI/fsck_com_rt.pm
+   M /rt/trunk/lib/RT/User_Overlay.pm
+   M /rt/trunk/lib/RT/Users_Overlay.pm
+   M /rt/trunk/lib/RT.pm
+   M /rt/trunk/lib/RT.pm.in
+   M /rt/trunk/lib/t/02regression.t
+   M /rt/trunk/lib/t/02regression.t.in
+   M /rt/trunk/lib/t/03web.pl
+   M /rt/trunk/lib/t/03web.pl.in
+   M /rt/trunk/lib/t/04_send_email.pl
+   M /rt/trunk/lib/t/04_send_email.pl.in
+   A /rt/trunk/lib/t/data/multipart-report
+   M /rt/trunk/sbin/factory
+   M /rt/trunk/sbin/license_tag
+   M /rt/trunk/sbin/rt-setup-database
+   M /rt/trunk/sbin/rt-setup-database.in
+   M /rt/trunk/sbin/rt-test-dependencies
+   M /rt/trunk/sbin/rt-test-dependencies.in
+
+Load rt-3-0-5 into rt/trunk.
+
+------------------------------------------------------------------------
+r72 | root | 2003-11-16 02:25:12 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Changelog
+   M /rt/trunk/Makefile
+   M /rt/trunk/README
+   M /rt/trunk/autom4te.cache/output.0
+   M /rt/trunk/autom4te.cache/traces.0
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/rt-mailgate.in
+   M /rt/trunk/config.log
+   M /rt/trunk/config.status
+   M /rt/trunk/configure
+   M /rt/trunk/configure.ac
+   M /rt/trunk/html/Admin/Elements/UserTabs
+   M /rt/trunk/html/Elements/Footer
+   M /rt/trunk/html/Elements/ListActions
+   M /rt/trunk/html/Ticket/Elements/EditLinks
+   M /rt/trunk/html/Ticket/Elements/ShowAttachments
+   M /rt/trunk/html/Ticket/Elements/ShowHistory
+   M /rt/trunk/html/Ticket/Elements/ShowLink
+   A /rt/trunk/html/Ticket/Elements/ShowMessageHeaders
+   M /rt/trunk/html/Ticket/Elements/ShowTransaction
+   M /rt/trunk/html/Ticket/Update.html
+   M /rt/trunk/lib/RT/Action/EscalatePriority.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/Attachment_Overlay.pm
+   M /rt/trunk/lib/RT/CustomField_Overlay.pm
+   M /rt/trunk/lib/RT/EmailParser.pm
+   M /rt/trunk/lib/RT/Groups_Overlay.pm
+   M /rt/trunk/lib/RT/I18N/fr.po
+   M /rt/trunk/lib/RT/I18N/zh_tw.po
+   M /rt/trunk/lib/RT/I18N.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Principal_Overlay.pm
+   M /rt/trunk/lib/RT/Queue_Overlay.pm
+   M /rt/trunk/lib/RT/SearchBuilder.pm
+   M /rt/trunk/lib/RT/Ticket_Overlay.pm
+   M /rt/trunk/lib/RT/Tickets_Overlay.pm
+   M /rt/trunk/lib/RT/Transaction_Overlay.pm
+   M /rt/trunk/lib/RT/URI/base.pm
+   M /rt/trunk/lib/RT/URI/fsck_com_rt.pm
+   M /rt/trunk/lib/RT/Users_Overlay.pm
+   M /rt/trunk/lib/RT.pm
+   M /rt/trunk/lib/RT.pm.in
+   M /rt/trunk/lib/t/00smoke.t
+   M /rt/trunk/lib/t/00smoke.t.in
+   M /rt/trunk/lib/t/04_send_email.pl
+   M /rt/trunk/lib/t/04_send_email.pl.in
+   A /rt/trunk/lib/t/data/nested-rfc-822
+   M /rt/trunk/sbin/factory
+   M /rt/trunk/sbin/rt-setup-database
+   M /rt/trunk/sbin/rt-setup-database.in
+
+Load rt-3-0-4 into rt/trunk.
+
+------------------------------------------------------------------------
+r70 | root | 2003-11-16 02:24:18 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Changelog
+   M /rt/trunk/Makefile
+   M /rt/trunk/Makefile.in
+   M /rt/trunk/autom4te.cache/output.0
+   M /rt/trunk/autom4te.cache/traces.0
+   M /rt/trunk/bin/mason_handler.fcgi
+   M /rt/trunk/bin/mason_handler.fcgi.in
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/rt-mailgate.in
+   M /rt/trunk/bin/webmux.pl
+   M /rt/trunk/bin/webmux.pl.in
+   M /rt/trunk/config.log
+   M /rt/trunk/config.status
+   M /rt/trunk/configure
+   M /rt/trunk/configure.ac
+   M /rt/trunk/etc/RT_Config.pm
+   M /rt/trunk/etc/RT_Config.pm.in
+   M /rt/trunk/etc/schema.SQLite
+   M /rt/trunk/html/Admin/Elements/EditQueueWatchers
+   M /rt/trunk/html/Admin/Queues/Scrip.html
+   M /rt/trunk/html/Elements/Header
+   M /rt/trunk/html/Elements/Login
+   M /rt/trunk/html/Elements/PageLayout
+   M /rt/trunk/html/Elements/SetupSessionCookie
+   M /rt/trunk/html/NoAuth/Logout.html
+   M /rt/trunk/html/NoAuth/webrt.css
+   M /rt/trunk/html/Search/Bulk.html
+   M /rt/trunk/html/Search/Elements/TicketHeaderCell
+   M /rt/trunk/html/Ticket/Attachment/dhandler
+   M /rt/trunk/html/Ticket/Create.html
+   M /rt/trunk/html/Ticket/Elements/EditCustomField
+   M /rt/trunk/html/Ticket/Elements/ShowLink
+   M /rt/trunk/html/Ticket/Elements/ShowLinks
+   M /rt/trunk/html/Ticket/Elements/ShowRequestor
+   M /rt/trunk/html/Ticket/Elements/ShowTransaction
+   M /rt/trunk/html/Ticket/Elements/Tabs
+   M /rt/trunk/html/Ticket/Update.html
+   M /rt/trunk/html/autohandler
+   M /rt/trunk/html/l
+   M /rt/trunk/lib/RT/ACL_Overlay.pm
+   M /rt/trunk/lib/RT/Action/CreateTickets.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/Attachment_Overlay.pm
+   M /rt/trunk/lib/RT/CachedGroupMember_Overlay.pm
+   M /rt/trunk/lib/RT/CachedGroupMembers_Overlay.pm
+   M /rt/trunk/lib/RT/Condition/OwnerChange.pm
+   M /rt/trunk/lib/RT/CurrentUser.pm
+   M /rt/trunk/lib/RT/EmailParser.pm
+   M /rt/trunk/lib/RT/GroupMembers_Overlay.pm
+   M /rt/trunk/lib/RT/Group_Overlay.pm
+   M /rt/trunk/lib/RT/Groups_Overlay.pm
+   M /rt/trunk/lib/RT/Handle.pm
+   M /rt/trunk/lib/RT/I18N/de.po
+   M /rt/trunk/lib/RT/I18N/fr.po
+   M /rt/trunk/lib/RT/I18N/he.po
+   M /rt/trunk/lib/RT/I18N/nl.po
+   A /rt/trunk/lib/RT/I18N/no.po
+   M /rt/trunk/lib/RT/I18N/zh_cn.po
+   M /rt/trunk/lib/RT/I18N/zh_tw.po
+   M /rt/trunk/lib/RT/I18N.pm
+   M /rt/trunk/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Queue_Overlay.pm
+   M /rt/trunk/lib/RT/Record.pm
+   M /rt/trunk/lib/RT/Scrip_Overlay.pm
+   M /rt/trunk/lib/RT/SearchBuilder.pm
+   M /rt/trunk/lib/RT/Template_Overlay.pm
+   M /rt/trunk/lib/RT/Ticket_Overlay.pm
+   M /rt/trunk/lib/RT/Tickets_Overlay.pm
+   M /rt/trunk/lib/RT/Transaction_Overlay.pm
+   M /rt/trunk/lib/RT/User_Overlay.pm
+   M /rt/trunk/lib/RT/Users_Overlay.pm
+   M /rt/trunk/lib/RT.pm
+   M /rt/trunk/lib/RT.pm.in
+   M /rt/trunk/lib/t/00smoke.t
+   M /rt/trunk/lib/t/00smoke.t.in
+   M /rt/trunk/lib/t/02regression.t
+   M /rt/trunk/lib/t/02regression.t.in
+   A /rt/trunk/lib/t/04_send_email.pl
+   A /rt/trunk/lib/t/04_send_email.pl.in
+   A /rt/trunk/lib/t/data/8859-15-message-series
+   A /rt/trunk/lib/t/data/8859-15-message-series/dir
+   A /rt/trunk/lib/t/data/8859-15-message-series/msg1
+   A /rt/trunk/lib/t/data/8859-15-message-series/msg2
+   A /rt/trunk/lib/t/data/8859-15-message-series/msg3
+   A /rt/trunk/lib/t/data/8859-15-message-series/msg4
+   A /rt/trunk/lib/t/data/8859-15-message-series/msg5
+   A /rt/trunk/lib/t/data/8859-15-message-series/msg6
+   A /rt/trunk/lib/t/data/8859-15-message-series/msg7
+   A /rt/trunk/lib/t/data/multipart-alternative-with-umlaut
+   A /rt/trunk/lib/t/data/new-ticket-from-iso-8859-1
+   A /rt/trunk/lib/t/data/new-ticket-from-iso-8859-1-full
+   A /rt/trunk/lib/t/data/russian-subject-no-content-type
+   A /rt/trunk/lib/t/data/text-html-in-russian
+   A /rt/trunk/lib/t/data/text-html-with-umlaut
+   M /rt/trunk/sbin/extract-message-catalog
+   M /rt/trunk/sbin/rt-setup-database
+   M /rt/trunk/sbin/rt-setup-database.in
+   M /rt/trunk/sbin/rt-test-dependencies
+   M /rt/trunk/sbin/rt-test-dependencies.in
+
+Load rt-3-0-3 into rt/trunk.
+
+------------------------------------------------------------------------
+r68 | root | 2003-11-16 02:23:17 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Changelog
+   M /rt/trunk/Makefile
+   M /rt/trunk/Makefile.in
+   M /rt/trunk/README
+   M /rt/trunk/aclocal.m4
+   M /rt/trunk/autom4te.cache/output.0
+   M /rt/trunk/autom4te.cache/traces.0
+   M /rt/trunk/bin/webmux.pl
+   M /rt/trunk/bin/webmux.pl.in
+   M /rt/trunk/config.layout
+   M /rt/trunk/config.log
+   M /rt/trunk/config.pld
+   M /rt/trunk/config.status
+   M /rt/trunk/configure
+   M /rt/trunk/configure.ac
+   M /rt/trunk/etc/RT_Config.pm
+   M /rt/trunk/etc/RT_Config.pm.in
+   M /rt/trunk/etc/initialdata
+   M /rt/trunk/html/Admin/Elements/SelectRights
+   M /rt/trunk/html/Admin/Queues/GroupRights.html
+   M /rt/trunk/html/Admin/Queues/Modify.html
+   M /rt/trunk/html/Admin/Queues/Scrips.html
+   M /rt/trunk/html/Admin/Queues/UserRights.html
+   M /rt/trunk/html/Approvals/Elements/ShowDependency
+   M /rt/trunk/html/Elements/Error
+   M /rt/trunk/html/Elements/Footer
+   M /rt/trunk/html/Elements/Quicksearch
+   M /rt/trunk/html/REST/1.0/NoAuth/mail-gateway
+   M /rt/trunk/html/Search/Bulk.html
+   A /rt/trunk/html/Ticket/Elements/BulkLinks
+   M /rt/trunk/html/Ticket/Elements/ShowAttachments
+   M /rt/trunk/html/Ticket/Elements/ShowMessageStanza
+   M /rt/trunk/html/Ticket/Elements/ShowRequestor
+   M /rt/trunk/html/Ticket/Elements/ShowTransaction
+   M /rt/trunk/html/autohandler
+   M /rt/trunk/lib/RT/ACE.pm
+   M /rt/trunk/lib/RT/ACL.pm
+   M /rt/trunk/lib/RT/Action/AutoOpen.pm
+   M /rt/trunk/lib/RT/Action/Autoreply.pm
+   M /rt/trunk/lib/RT/Action/CreateTickets.pm
+   M /rt/trunk/lib/RT/Action/EscalatePriority.pm
+   M /rt/trunk/lib/RT/Action/Generic.pm
+   M /rt/trunk/lib/RT/Action/Notify.pm
+   M /rt/trunk/lib/RT/Action/NotifyAsComment.pm
+   M /rt/trunk/lib/RT/Action/ResolveMembers.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/Action/SetPriority.pm
+   M /rt/trunk/lib/RT/Action/UserDefined.pm
+   M /rt/trunk/lib/RT/Attachment.pm
+   M /rt/trunk/lib/RT/Attachment_Overlay.pm
+   M /rt/trunk/lib/RT/Attachments.pm
+   M /rt/trunk/lib/RT/Base.pm
+   M /rt/trunk/lib/RT/CachedGroupMember.pm
+   M /rt/trunk/lib/RT/CachedGroupMembers.pm
+   M /rt/trunk/lib/RT/Condition/AnyTransaction.pm
+   M /rt/trunk/lib/RT/Condition/BeforeDue.pm
+   M /rt/trunk/lib/RT/Condition/Generic.pm
+   M /rt/trunk/lib/RT/Condition/Overdue.pm
+   M /rt/trunk/lib/RT/Condition/OwnerChange.pm
+   M /rt/trunk/lib/RT/Condition/PriorityExceeds.pm
+   M /rt/trunk/lib/RT/Condition/QueueChange.pm
+   M /rt/trunk/lib/RT/Condition/StatusChange.pm
+   M /rt/trunk/lib/RT/Condition/UserDefined.pm
+   M /rt/trunk/lib/RT/CurrentUser.pm
+   M /rt/trunk/lib/RT/CustomField.pm
+   M /rt/trunk/lib/RT/CustomFieldValue.pm
+   M /rt/trunk/lib/RT/CustomFieldValues.pm
+   M /rt/trunk/lib/RT/CustomFields.pm
+   M /rt/trunk/lib/RT/Date.pm
+   M /rt/trunk/lib/RT/EmailParser.pm
+   M /rt/trunk/lib/RT/Group.pm
+   M /rt/trunk/lib/RT/GroupMember.pm
+   M /rt/trunk/lib/RT/GroupMembers.pm
+   M /rt/trunk/lib/RT/Groups.pm
+   M /rt/trunk/lib/RT/Handle.pm
+   M /rt/trunk/lib/RT/I18N/i_default.pm
+   M /rt/trunk/lib/RT/I18N/zh_cn.po
+   M /rt/trunk/lib/RT/I18N/zh_tw.po
+   M /rt/trunk/lib/RT/I18N.pm
+   M /rt/trunk/lib/RT/Interface/CLI.pm
+   M /rt/trunk/lib/RT/Interface/Email/Auth/MailFrom.pm
+   M /rt/trunk/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Link.pm
+   M /rt/trunk/lib/RT/Links.pm
+   M /rt/trunk/lib/RT/Principal.pm
+   M /rt/trunk/lib/RT/Principal_Overlay.pm
+   M /rt/trunk/lib/RT/Principals.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   M /rt/trunk/lib/RT/Queue_Overlay.pm
+   M /rt/trunk/lib/RT/Queues.pm
+   M /rt/trunk/lib/RT/Record.pm
+   M /rt/trunk/lib/RT/Scrip.pm
+   M /rt/trunk/lib/RT/ScripAction.pm
+   M /rt/trunk/lib/RT/ScripActions.pm
+   M /rt/trunk/lib/RT/ScripCondition.pm
+   M /rt/trunk/lib/RT/ScripConditions.pm
+   M /rt/trunk/lib/RT/Scrips.pm
+   M /rt/trunk/lib/RT/Search/ActiveTicketsInQueue.pm
+   M /rt/trunk/lib/RT/Search/Generic.pm
+   M /rt/trunk/lib/RT/SearchBuilder.pm
+   M /rt/trunk/lib/RT/System.pm
+   M /rt/trunk/lib/RT/Template.pm
+   M /rt/trunk/lib/RT/Template_Overlay.pm
+   M /rt/trunk/lib/RT/Templates.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/TicketCustomFieldValue.pm
+   M /rt/trunk/lib/RT/TicketCustomFieldValues.pm
+   M /rt/trunk/lib/RT/Ticket_Overlay.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   M /rt/trunk/lib/RT/Transaction_Overlay.pm
+   M /rt/trunk/lib/RT/Transactions.pm
+   M /rt/trunk/lib/RT/URI/base.pm
+   M /rt/trunk/lib/RT/URI/fsck_com_rt.pm
+   M /rt/trunk/lib/RT/URI.pm
+   M /rt/trunk/lib/RT/User.pm
+   M /rt/trunk/lib/RT/User_Overlay.pm
+   M /rt/trunk/lib/RT/Users.pm
+   M /rt/trunk/lib/RT/Users_Overlay.pm
+   M /rt/trunk/lib/RT.pm
+   M /rt/trunk/lib/RT.pm.in
+   M /rt/trunk/m4/rt_layout.m4
+   M /rt/trunk/sbin/factory
+   M /rt/trunk/sbin/rt-setup-database
+   M /rt/trunk/sbin/rt-setup-database.in
+   M /rt/trunk/sbin/rt-test-dependencies
+   M /rt/trunk/sbin/rt-test-dependencies.in
+
+Load rt-3-0-2 into rt/trunk.
+
+------------------------------------------------------------------------
+r66 | root | 2003-11-16 02:22:32 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Changelog
+   M /rt/trunk/Makefile
+   M /rt/trunk/Makefile.in
+   M /rt/trunk/autom4te.cache/output.0
+   M /rt/trunk/autom4te.cache/traces.0
+   A /rt/trunk/bin/mason_handler.scgi
+   A /rt/trunk/bin/mason_handler.scgi.in
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/rt-mailgate.in
+   M /rt/trunk/bin/webmux.pl
+   M /rt/trunk/bin/webmux.pl.in
+   M /rt/trunk/config.log
+   M /rt/trunk/config.status
+   M /rt/trunk/configure
+   M /rt/trunk/configure.ac
+   M /rt/trunk/html/Elements/Login
+   M /rt/trunk/html/Elements/SetupSessionCookie
+   M /rt/trunk/html/Ticket/Elements/ShowMessageStanza
+   M /rt/trunk/html/Ticket/Elements/ShowTransaction
+   M /rt/trunk/html/autohandler
+   M /rt/trunk/html/l
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   A /rt/trunk/lib/RT/I18N/cs.pm
+   M /rt/trunk/lib/RT/I18N/cs.po
+   M /rt/trunk/lib/RT/I18N/es.po
+   A /rt/trunk/lib/RT/I18N/he.po
+   M /rt/trunk/lib/RT/I18N/zh_cn.po
+   M /rt/trunk/lib/RT/I18N/zh_tw.po
+   M /rt/trunk/lib/RT/I18N.pm
+   M /rt/trunk/lib/RT/Interface/Email/Auth/MailFrom.pm
+   M /rt/trunk/lib/RT/Ticket_Overlay.pm
+   M /rt/trunk/lib/RT/User_Overlay.pm
+   M /rt/trunk/lib/RT.pm
+   M /rt/trunk/sbin/rt-test-dependencies
+   M /rt/trunk/sbin/rt-test-dependencies.in
+
+Load rt-3-0-1 into rt/trunk.
+
+------------------------------------------------------------------------
+r64 | root | 2003-11-16 02:21:25 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Changelog
+   A /rt/trunk/HOWTO
+   A /rt/trunk/HOWTO/README
+   A /rt/trunk/HOWTO/change.txt
+   A /rt/trunk/HOWTO/release.txt
+   A /rt/trunk/HOWTO/version-control.txt
+   M /rt/trunk/Makefile
+   A /rt/trunk/Makefile.in
+   M /rt/trunk/README
+   D /rt/trunk/TODO
+   A /rt/trunk/aclocal.m4
+   A /rt/trunk/autom4te.cache
+   A /rt/trunk/autom4te.cache/output.0
+   A /rt/trunk/autom4te.cache/requests
+   A /rt/trunk/autom4te.cache/traces.0
+   D /rt/trunk/bin/initacls.Oracle
+   D /rt/trunk/bin/initacls.Pg
+   D /rt/trunk/bin/initacls.mysql
+   M /rt/trunk/bin/mason_handler.fcgi
+   A /rt/trunk/bin/mason_handler.fcgi.in
+   D /rt/trunk/bin/mason_handler.scgi
+   A /rt/trunk/bin/mason_handler.svc
+   A /rt/trunk/bin/mason_handler.svc.in
+   D /rt/trunk/bin/rt
+   A /rt/trunk/bin/rt-commit-handler
+   A /rt/trunk/bin/rt-commit-handler.in
+   A /rt/trunk/bin/rt-crontool
+   A /rt/trunk/bin/rt-crontool.in
+   M /rt/trunk/bin/rt-mailgate
+   A /rt/trunk/bin/rt-mailgate.in
+   D /rt/trunk/bin/rtadmin
+   M /rt/trunk/bin/webmux.pl
+   A /rt/trunk/bin/webmux.pl.in
+   A /rt/trunk/config
+   A /rt/trunk/config.layout
+   A /rt/trunk/config.log
+   A /rt/trunk/config.pld
+   A /rt/trunk/config.status
+   A /rt/trunk/configure
+   A /rt/trunk/configure.ac
+   D /rt/trunk/debian
+   M /rt/trunk/docs/design_docs/acls
+   A /rt/trunk/docs/design_docs/approval_notices
+   A /rt/trunk/docs/design_docs/approval_template
+   D /rt/trunk/docs/design_docs/basic-definitions.txt
+   A /rt/trunk/docs/design_docs/cf_search
+   M /rt/trunk/docs/design_docs/cli_spec
+   A /rt/trunk/docs/design_docs/delegation
+   M /rt/trunk/docs/design_docs/evil_plans
+   A /rt/trunk/docs/design_docs/groups_notes
+   D /rt/trunk/docs/design_docs/local_hacking
+   A /rt/trunk/docs/design_docs/recursive_group_membership_algorithm
+   A /rt/trunk/docs/design_docs/rql_parser_machine.graphviz
+   A /rt/trunk/docs/design_docs/string-extraction-guide.txt
+   A /rt/trunk/docs/design_docs/ticket_templates
+   D /rt/trunk/docs/rt.gif
+   M /rt/trunk/etc/RT_Config.pm
+   A /rt/trunk/etc/RT_Config.pm.in
+   A /rt/trunk/etc/RT_SiteConfig.pm
+   M /rt/trunk/etc/acl.Oracle
+   M /rt/trunk/etc/acl.Pg
+   M /rt/trunk/etc/acl.mysql
+   A /rt/trunk/etc/constraints.mysql
+   A /rt/trunk/etc/initialdata
+   D /rt/trunk/etc/schema.Oracle
+   M /rt/trunk/etc/schema.Pg
+   A /rt/trunk/etc/schema.SQLite
+   M /rt/trunk/etc/schema.mysql
+   D /rt/trunk/etc/schema.pm
+   A /rt/trunk/etc/upgrade
+   A /rt/trunk/etc/upgrade/2.1.71
+   A /rt/trunk/html/Admin/Elements/AddCustomFieldValue
+   D /rt/trunk/html/Admin/Elements/CreateQueueCalled
+   M /rt/trunk/html/Admin/Elements/CreateUserCalled
+   A /rt/trunk/html/Admin/Elements/EditCustomField
+   A /rt/trunk/html/Admin/Elements/EditCustomFieldValues
+   A /rt/trunk/html/Admin/Elements/EditCustomFields
+   A /rt/trunk/html/Admin/Elements/EditQueueWatchers
+   A /rt/trunk/html/Admin/Elements/EditScrip
+   A /rt/trunk/html/Admin/Elements/EditScrips
+   A /rt/trunk/html/Admin/Elements/EditTemplates
+   M /rt/trunk/html/Admin/Elements/EditUserComments
+   D /rt/trunk/html/Admin/Elements/GrantQueueRightsTo
+   M /rt/trunk/html/Admin/Elements/GroupTabs
+   M /rt/trunk/html/Admin/Elements/Header
+   A /rt/trunk/html/Admin/Elements/ListGlobalCustomFields
+   D /rt/trunk/html/Admin/Elements/ListGlobalKeywordSelects
+   M /rt/trunk/html/Admin/Elements/ListGlobalScrips
+   D /rt/trunk/html/Admin/Elements/ModifyKeyword
+   D /rt/trunk/html/Admin/Elements/ModifyKeywordSelect
+   M /rt/trunk/html/Admin/Elements/ModifyQueue
+   M /rt/trunk/html/Admin/Elements/ModifyTemplate
+   M /rt/trunk/html/Admin/Elements/ModifyUser
+   M /rt/trunk/html/Admin/Elements/QueueRightsForUser
+   M /rt/trunk/html/Admin/Elements/QueueTabs
+   A /rt/trunk/html/Admin/Elements/SelectCustomFieldType
+   A /rt/trunk/html/Admin/Elements/SelectGroups
+   D /rt/trunk/html/Admin/Elements/SelectKeywordSelect
+   M /rt/trunk/html/Admin/Elements/SelectModifyGroup
+   D /rt/trunk/html/Admin/Elements/SelectModifyKeyword
+   D /rt/trunk/html/Admin/Elements/SelectModifyKeywordSelect
+   M /rt/trunk/html/Admin/Elements/SelectModifyQueue
+   M /rt/trunk/html/Admin/Elements/SelectModifyUser
+   A /rt/trunk/html/Admin/Elements/SelectNewGroupMembers
+   D /rt/trunk/html/Admin/Elements/SelectQueueRights
+   M /rt/trunk/html/Admin/Elements/SelectRights
+   M /rt/trunk/html/Admin/Elements/SelectScrip
+   M /rt/trunk/html/Admin/Elements/SelectScripAction
+   M /rt/trunk/html/Admin/Elements/SelectScripCondition
+   M /rt/trunk/html/Admin/Elements/SelectSingleOrMultiple
+   M /rt/trunk/html/Admin/Elements/SelectTemplate
+   M /rt/trunk/html/Admin/Elements/SelectUsers
+   M /rt/trunk/html/Admin/Elements/SystemTabs
+   M /rt/trunk/html/Admin/Elements/Tabs
+   M /rt/trunk/html/Admin/Elements/UserTabs
+   A /rt/trunk/html/Admin/Global/CustomField.html
+   A /rt/trunk/html/Admin/Global/CustomFields.html
+   M /rt/trunk/html/Admin/Global/GroupRights.html
+   D /rt/trunk/html/Admin/Global/Keywords.html
+   A /rt/trunk/html/Admin/Global/Scrip.html
+   M /rt/trunk/html/Admin/Global/Scrips.html
+   M /rt/trunk/html/Admin/Global/Template.html
+   M /rt/trunk/html/Admin/Global/Templates.html
+   M /rt/trunk/html/Admin/Global/UserRights.html
+   M /rt/trunk/html/Admin/Global/index.html
+   A /rt/trunk/html/Admin/Groups/GroupRights.html
+   M /rt/trunk/html/Admin/Groups/Members.html
+   M /rt/trunk/html/Admin/Groups/Modify.html
+   M /rt/trunk/html/Admin/Groups/UserRights.html
+   M /rt/trunk/html/Admin/Groups/index.html
+   D /rt/trunk/html/Admin/KeywordSelects
+   D /rt/trunk/html/Admin/Keywords
+   D /rt/trunk/html/Admin/Queues/Create.html
+   A /rt/trunk/html/Admin/Queues/CustomField.html
+   A /rt/trunk/html/Admin/Queues/CustomFields.html
+   M /rt/trunk/html/Admin/Queues/GroupRights.html
+   D /rt/trunk/html/Admin/Queues/Keywords.html
+   M /rt/trunk/html/Admin/Queues/Modify.html
+   M /rt/trunk/html/Admin/Queues/People.html
+   A /rt/trunk/html/Admin/Queues/Scrip.html
+   M /rt/trunk/html/Admin/Queues/Scrips.html
+   M /rt/trunk/html/Admin/Queues/Template.html
+   M /rt/trunk/html/Admin/Queues/Templates.html
+   M /rt/trunk/html/Admin/Queues/UserRights.html
+   M /rt/trunk/html/Admin/Queues/index.html
+   M /rt/trunk/html/Admin/Users/Modify.html
+   M /rt/trunk/html/Admin/Users/Prefs.html
+   D /rt/trunk/html/Admin/Users/Rights.html
+   M /rt/trunk/html/Admin/Users/index.html
+   M /rt/trunk/html/Admin/index.html
+   A /rt/trunk/html/Approvals
+   A /rt/trunk/html/Approvals/Display.html
+   A /rt/trunk/html/Approvals/Elements
+   A /rt/trunk/html/Approvals/Elements/Approve
+   A /rt/trunk/html/Approvals/Elements/PendingMyApproval
+   A /rt/trunk/html/Approvals/Elements/ShowDependency
+   A /rt/trunk/html/Approvals/Elements/Tabs
+   A /rt/trunk/html/Approvals/index.html
+   A /rt/trunk/html/Elements/BevelBoxRaisedEnd
+   A /rt/trunk/html/Elements/BevelBoxRaisedStart
+   A /rt/trunk/html/Elements/Callback
+   M /rt/trunk/html/Elements/Checkbox
+   M /rt/trunk/html/Elements/CreateTicket
+   D /rt/trunk/html/Elements/CustomHomepageHeader
+   M /rt/trunk/html/Elements/Error
+   M /rt/trunk/html/Elements/Footer
+   M /rt/trunk/html/Elements/GotoTicket
+   M /rt/trunk/html/Elements/Header
+   M /rt/trunk/html/Elements/ListActions
+   M /rt/trunk/html/Elements/Login
+   A /rt/trunk/html/Elements/Menu
+   M /rt/trunk/html/Elements/MessageBox
+   M /rt/trunk/html/Elements/MyRequests
+   M /rt/trunk/html/Elements/MyTickets
+   A /rt/trunk/html/Elements/PageLayout
+   M /rt/trunk/html/Elements/Quicksearch
+   M /rt/trunk/html/Elements/Refresh
+   M /rt/trunk/html/Elements/Section
+   A /rt/trunk/html/Elements/SelectAttachmentField
+   M /rt/trunk/html/Elements/SelectBoolean
+   A /rt/trunk/html/Elements/SelectCustomFieldOperator
+   A /rt/trunk/html/Elements/SelectCustomFieldValue
+   M /rt/trunk/html/Elements/SelectDate
+   M /rt/trunk/html/Elements/SelectDateRelation
+   M /rt/trunk/html/Elements/SelectDateType
+   M /rt/trunk/html/Elements/SelectEqualityOperator
+   A /rt/trunk/html/Elements/SelectGroups
+   D /rt/trunk/html/Elements/SelectKeyword
+   D /rt/trunk/html/Elements/SelectKeywordOptions
+   M /rt/trunk/html/Elements/SelectLinkType
+   M /rt/trunk/html/Elements/SelectMatch
+   M /rt/trunk/html/Elements/SelectNewTicketQueue
+   M /rt/trunk/html/Elements/SelectOwner
+   M /rt/trunk/html/Elements/SelectQueue
+   M /rt/trunk/html/Elements/SelectResultsPerPage
+   M /rt/trunk/html/Elements/SelectSortOrder
+   M /rt/trunk/html/Elements/SelectStatus
+   M /rt/trunk/html/Elements/SelectTicketSortBy
+   A /rt/trunk/html/Elements/SelectTicketTypes
+   M /rt/trunk/html/Elements/SelectUsers
+   M /rt/trunk/html/Elements/SelectWatcherType
+   A /rt/trunk/html/Elements/SetupSessionCookie
+   M /rt/trunk/html/Elements/ShadedBox
+   A /rt/trunk/html/Elements/ShadedInputRow
+   A /rt/trunk/html/Elements/ShadedRow
+   A /rt/trunk/html/Elements/SimpleSearch
+   M /rt/trunk/html/Elements/Submit
+   M /rt/trunk/html/Elements/Tabs
+   M /rt/trunk/html/Elements/TitleBoxEnd
+   M /rt/trunk/html/Elements/TitleBoxStart
+   M /rt/trunk/html/Elements/ViewUser
+   D /rt/trunk/html/Elements/dayMenu
+   D /rt/trunk/html/Elements/monthMenu
+   D /rt/trunk/html/Elements/yearMenu
+   M /rt/trunk/html/NoAuth/Logout.html
+   M /rt/trunk/html/NoAuth/Reminder.html
+   A /rt/trunk/html/NoAuth/images/back_home.gif
+   A /rt/trunk/html/NoAuth/images/bplogo.gif
+   A /rt/trunk/html/NoAuth/images/favicon.png
+   A /rt/trunk/html/NoAuth/images/head_requestracker.gif
+   A /rt/trunk/html/NoAuth/images/space.gif
+   A /rt/trunk/html/NoAuth/images/squares_blue.gif
+   M /rt/trunk/html/NoAuth/webrt.css
+   A /rt/trunk/html/REST
+   A /rt/trunk/html/REST/1.0
+   A /rt/trunk/html/REST/1.0/NoAuth
+   A /rt/trunk/html/REST/1.0/NoAuth/mail-gateway
+   M /rt/trunk/html/Search/Bulk.html
+   A /rt/trunk/html/Search/Elements
+   A /rt/trunk/html/Search/Elements/PickRestriction
+   A /rt/trunk/html/Search/Elements/TicketHeader
+   A /rt/trunk/html/Search/Elements/TicketHeaderCell
+   A /rt/trunk/html/Search/Elements/TicketRow
+   M /rt/trunk/html/Search/Listing.html
+   D /rt/trunk/html/Search/PickRestriction
+   D /rt/trunk/html/Search/RestrictSearch.html
+   D /rt/trunk/html/Search/TicketCell
+   M /rt/trunk/html/SelfService/Attachment/dhandler
+   M /rt/trunk/html/SelfService/Closed.html
+   M /rt/trunk/html/SelfService/Create.html
+   M /rt/trunk/html/SelfService/Display.html
+   M /rt/trunk/html/SelfService/Elements/GotoTicket
+   M /rt/trunk/html/SelfService/Elements/Header
+   M /rt/trunk/html/SelfService/Elements/MyRequests
+   M /rt/trunk/html/SelfService/Elements/Tabs
+   M /rt/trunk/html/SelfService/Error.html
+   M /rt/trunk/html/SelfService/Prefs.html
+   M /rt/trunk/html/SelfService/Update.html
+   M /rt/trunk/html/SelfService/index.html
+   M /rt/trunk/html/Ticket/Attachment/dhandler
+   M /rt/trunk/html/Ticket/Create.html
+   M /rt/trunk/html/Ticket/Display.html
+   M /rt/trunk/html/Ticket/Elements/AddWatchers
+   M /rt/trunk/html/Ticket/Elements/EditBasics
+   A /rt/trunk/html/Ticket/Elements/EditCustomField
+   A /rt/trunk/html/Ticket/Elements/EditCustomFields
+   M /rt/trunk/html/Ticket/Elements/EditDates
+   D /rt/trunk/html/Ticket/Elements/EditKeywordSelects
+   M /rt/trunk/html/Ticket/Elements/EditLinks
+   M /rt/trunk/html/Ticket/Elements/EditPeople
+   M /rt/trunk/html/Ticket/Elements/EditWatchers
+   A /rt/trunk/html/Ticket/Elements/ShowAttachments
+   M /rt/trunk/html/Ticket/Elements/ShowBasics
+   A /rt/trunk/html/Ticket/Elements/ShowCustomFields
+   M /rt/trunk/html/Ticket/Elements/ShowDates
+   M /rt/trunk/html/Ticket/Elements/ShowDependencies
+   M /rt/trunk/html/Ticket/Elements/ShowHistory
+   D /rt/trunk/html/Ticket/Elements/ShowKeywordSelects
+   A /rt/trunk/html/Ticket/Elements/ShowLink
+   M /rt/trunk/html/Ticket/Elements/ShowLinks
+   M /rt/trunk/html/Ticket/Elements/ShowMemberOf
+   M /rt/trunk/html/Ticket/Elements/ShowMembers
+   A /rt/trunk/html/Ticket/Elements/ShowMessageStanza
+   M /rt/trunk/html/Ticket/Elements/ShowPeople
+   M /rt/trunk/html/Ticket/Elements/ShowReferences
+   M /rt/trunk/html/Ticket/Elements/ShowRequestor
+   M /rt/trunk/html/Ticket/Elements/ShowSummary
+   M /rt/trunk/html/Ticket/Elements/ShowTransaction
+   M /rt/trunk/html/Ticket/Elements/Tabs
+   D /rt/trunk/html/Ticket/Elements/ToolBar
+   M /rt/trunk/html/Ticket/History.html
+   M /rt/trunk/html/Ticket/Modify.html
+   M /rt/trunk/html/Ticket/ModifyAll.html
+   M /rt/trunk/html/Ticket/ModifyDates.html
+   M /rt/trunk/html/Ticket/ModifyLinks.html
+   M /rt/trunk/html/Ticket/ModifyPeople.html
+   M /rt/trunk/html/Ticket/Update.html
+   A /rt/trunk/html/User/Delegation.html
+   A /rt/trunk/html/User/Elements
+   A /rt/trunk/html/User/Elements/DelegateRights
+   A /rt/trunk/html/User/Elements/GroupTabs
+   A /rt/trunk/html/User/Elements/Tabs
+   A /rt/trunk/html/User/Groups
+   A /rt/trunk/html/User/Groups/Members.html
+   A /rt/trunk/html/User/Groups/Modify.html
+   A /rt/trunk/html/User/Groups/index.html
+   M /rt/trunk/html/User/Prefs.html
+   M /rt/trunk/html/autohandler
+   M /rt/trunk/html/index.html
+   A /rt/trunk/html/l
+   A /rt/trunk/install-sh
+   D /rt/trunk/lib/MANIFEST
+   D /rt/trunk/lib/MANIFEST.SKIP
+   D /rt/trunk/lib/Makefile.PL
+   M /rt/trunk/lib/RT/ACE.pm
+   A /rt/trunk/lib/RT/ACE_Overlay.pm
+   M /rt/trunk/lib/RT/ACL.pm
+   A /rt/trunk/lib/RT/ACL_Overlay.pm
+   A /rt/trunk/lib/RT/Action/AutoOpen.pm
+   M /rt/trunk/lib/RT/Action/Autoreply.pm
+   A /rt/trunk/lib/RT/Action/CreateTickets.pm
+   A /rt/trunk/lib/RT/Action/EscalatePriority.pm
+   M /rt/trunk/lib/RT/Action/Generic.pm
+   M /rt/trunk/lib/RT/Action/Notify.pm
+   M /rt/trunk/lib/RT/Action/NotifyAsComment.pm
+   D /rt/trunk/lib/RT/Action/OpenDependent.pm
+   D /rt/trunk/lib/RT/Action/README.hackers
+   M /rt/trunk/lib/RT/Action/ResolveMembers.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   D /rt/trunk/lib/RT/Action/SendPasswordEmail.pm
+   A /rt/trunk/lib/RT/Action/SetPriority.pm
+   D /rt/trunk/lib/RT/Action/StallDependent.pm
+   A /rt/trunk/lib/RT/Action/UserDefined.pm
+   M /rt/trunk/lib/RT/Attachment.pm
+   A /rt/trunk/lib/RT/Attachment_Overlay.pm
+   M /rt/trunk/lib/RT/Attachments.pm
+   A /rt/trunk/lib/RT/Attachments_Overlay.pm
+   A /rt/trunk/lib/RT/Base.pm
+   A /rt/trunk/lib/RT/CachedGroupMember.pm
+   A /rt/trunk/lib/RT/CachedGroupMember_Overlay.pm
+   A /rt/trunk/lib/RT/CachedGroupMembers.pm
+   A /rt/trunk/lib/RT/CachedGroupMembers_Overlay.pm
+   M /rt/trunk/lib/RT/Condition/AnyTransaction.pm
+   A /rt/trunk/lib/RT/Condition/BeforeDue.pm
+   M /rt/trunk/lib/RT/Condition/Generic.pm
+   D /rt/trunk/lib/RT/Condition/NewDependency.pm
+   A /rt/trunk/lib/RT/Condition/Overdue.pm
+   A /rt/trunk/lib/RT/Condition/OwnerChange.pm
+   A /rt/trunk/lib/RT/Condition/PriorityExceeds.pm
+   A /rt/trunk/lib/RT/Condition/QueueChange.pm
+   M /rt/trunk/lib/RT/Condition/StatusChange.pm
+   A /rt/trunk/lib/RT/Condition/UserDefined.pm
+   M /rt/trunk/lib/RT/CurrentUser.pm
+   A /rt/trunk/lib/RT/CustomField.pm
+   A /rt/trunk/lib/RT/CustomFieldValue.pm
+   A /rt/trunk/lib/RT/CustomFieldValues.pm
+   A /rt/trunk/lib/RT/CustomFieldValues_Overlay.pm
+   A /rt/trunk/lib/RT/CustomField_Overlay.pm
+   A /rt/trunk/lib/RT/CustomFields.pm
+   A /rt/trunk/lib/RT/CustomFields_Overlay.pm
+   M /rt/trunk/lib/RT/Date.pm
+   A /rt/trunk/lib/RT/EmailParser.pm
+   M /rt/trunk/lib/RT/Group.pm
+   M /rt/trunk/lib/RT/GroupMember.pm
+   A /rt/trunk/lib/RT/GroupMember_Overlay.pm
+   M /rt/trunk/lib/RT/GroupMembers.pm
+   A /rt/trunk/lib/RT/GroupMembers_Overlay.pm
+   A /rt/trunk/lib/RT/Group_Overlay.pm
+   M /rt/trunk/lib/RT/Groups.pm
+   A /rt/trunk/lib/RT/Groups_Overlay.pm
+   M /rt/trunk/lib/RT/Handle.pm
+   A /rt/trunk/lib/RT/I18N
+   A /rt/trunk/lib/RT/I18N/cs.po
+   A /rt/trunk/lib/RT/I18N/de.po
+   A /rt/trunk/lib/RT/I18N/en.po
+   A /rt/trunk/lib/RT/I18N/es.po
+   A /rt/trunk/lib/RT/I18N/fi.po
+   A /rt/trunk/lib/RT/I18N/fr.po
+   A /rt/trunk/lib/RT/I18N/i_default.pm
+   A /rt/trunk/lib/RT/I18N/ja.po
+   A /rt/trunk/lib/RT/I18N/nl.po
+   A /rt/trunk/lib/RT/I18N/pt_br.po
+   A /rt/trunk/lib/RT/I18N/ru.po
+   A /rt/trunk/lib/RT/I18N/zh_cn.po
+   A /rt/trunk/lib/RT/I18N/zh_tw.po
+   A /rt/trunk/lib/RT/I18N.pm
+   M /rt/trunk/lib/RT/Interface/CLI.pm
+   A /rt/trunk/lib/RT/Interface/Email
+   A /rt/trunk/lib/RT/Interface/Email/Auth
+   A /rt/trunk/lib/RT/Interface/Email/Auth/MailFrom.pm
+   A /rt/trunk/lib/RT/Interface/Email/Filter
+   A /rt/trunk/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   D /rt/trunk/lib/RT/Keyword.pm
+   D /rt/trunk/lib/RT/KeywordSelect.pm
+   D /rt/trunk/lib/RT/KeywordSelects.pm
+   D /rt/trunk/lib/RT/Keywords.pm
+   M /rt/trunk/lib/RT/Link.pm
+   A /rt/trunk/lib/RT/Link_Overlay.pm
+   M /rt/trunk/lib/RT/Links.pm
+   A /rt/trunk/lib/RT/Links_Overlay.pm
+   D /rt/trunk/lib/RT/ObjectKeyword.pm
+   D /rt/trunk/lib/RT/ObjectKeywords.pm
+   A /rt/trunk/lib/RT/Principal.pm
+   A /rt/trunk/lib/RT/Principal_Overlay.pm
+   A /rt/trunk/lib/RT/Principals.pm
+   A /rt/trunk/lib/RT/Principals_Overlay.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   A /rt/trunk/lib/RT/Queue_Overlay.pm
+   M /rt/trunk/lib/RT/Queues.pm
+   A /rt/trunk/lib/RT/Queues_Overlay.pm
+   M /rt/trunk/lib/RT/Record.pm
+   M /rt/trunk/lib/RT/Scrip.pm
+   M /rt/trunk/lib/RT/ScripAction.pm
+   A /rt/trunk/lib/RT/ScripAction_Overlay.pm
+   M /rt/trunk/lib/RT/ScripActions.pm
+   A /rt/trunk/lib/RT/ScripActions_Overlay.pm
+   M /rt/trunk/lib/RT/ScripCondition.pm
+   A /rt/trunk/lib/RT/ScripCondition_Overlay.pm
+   M /rt/trunk/lib/RT/ScripConditions.pm
+   A /rt/trunk/lib/RT/ScripConditions_Overlay.pm
+   A /rt/trunk/lib/RT/Scrip_Overlay.pm
+   M /rt/trunk/lib/RT/Scrips.pm
+   A /rt/trunk/lib/RT/Scrips_Overlay.pm
+   A /rt/trunk/lib/RT/Search
+   A /rt/trunk/lib/RT/Search/ActiveTicketsInQueue.pm
+   A /rt/trunk/lib/RT/Search/Generic.pm
+   M /rt/trunk/lib/RT/SearchBuilder.pm
+   A /rt/trunk/lib/RT/System.pm
+   M /rt/trunk/lib/RT/Template.pm
+   A /rt/trunk/lib/RT/Template_Overlay.pm
+   M /rt/trunk/lib/RT/Templates.pm
+   A /rt/trunk/lib/RT/Templates_Overlay.pm
+   D /rt/trunk/lib/RT/TestHarness.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   A /rt/trunk/lib/RT/TicketCustomFieldValue.pm
+   A /rt/trunk/lib/RT/TicketCustomFieldValue_Overlay.pm
+   A /rt/trunk/lib/RT/TicketCustomFieldValues.pm
+   A /rt/trunk/lib/RT/TicketCustomFieldValues_Overlay.pm
+   A /rt/trunk/lib/RT/Ticket_Overlay.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   A /rt/trunk/lib/RT/Tickets_Overlay.pm
+   A /rt/trunk/lib/RT/Tickets_Overlay_SQL.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   A /rt/trunk/lib/RT/Transaction_Overlay.pm
+   M /rt/trunk/lib/RT/Transactions.pm
+   A /rt/trunk/lib/RT/Transactions_Overlay.pm
+   A /rt/trunk/lib/RT/URI
+   A /rt/trunk/lib/RT/URI/base.pm
+   A /rt/trunk/lib/RT/URI/fsck_com_rt.pm
+   A /rt/trunk/lib/RT/URI.pm
+   M /rt/trunk/lib/RT/User.pm
+   A /rt/trunk/lib/RT/User_Overlay.pm
+   M /rt/trunk/lib/RT/Users.pm
+   A /rt/trunk/lib/RT/Users_Overlay.pm
+   D /rt/trunk/lib/RT/Watcher.pm
+   D /rt/trunk/lib/RT/Watchers.pm
+   M /rt/trunk/lib/RT.pm
+   A /rt/trunk/lib/RT.pm.in
+   A /rt/trunk/lib/t
+   A /rt/trunk/lib/t/00smoke.t
+   A /rt/trunk/lib/t/00smoke.t.in
+   A /rt/trunk/lib/t/01harness.t
+   A /rt/trunk/lib/t/01harness.t.in
+   A /rt/trunk/lib/t/02regression.t
+   A /rt/trunk/lib/t/02regression.t.in
+   A /rt/trunk/lib/t/03web.pl
+   A /rt/trunk/lib/t/03web.pl.in
+   A /rt/trunk/lib/t/data
+   A /rt/trunk/lib/t/data/nested-mime-sample
+   A /rt/trunk/lib/t/regression
+   A /rt/trunk/lib/t/regression/00placeholder
+   A /rt/trunk/lib/t/regression/mime_tests
+   D /rt/trunk/lib/test.pl
+   A /rt/trunk/m4
+   A /rt/trunk/m4/rt_enable_layout.m4
+   A /rt/trunk/m4/rt_expand_var.m4
+   A /rt/trunk/m4/rt_layout.m4
+   A /rt/trunk/m4/rt_subst_expanded_arg.m4
+   A /rt/trunk/sbin/extract-message-catalog
+   A /rt/trunk/sbin/extract_pod_tests
+   A /rt/trunk/sbin/factory
+   A /rt/trunk/sbin/license_tag
+   A /rt/trunk/sbin/regression_harness
+   A /rt/trunk/sbin/rt-setup-database
+   M /rt/trunk/sbin/rt-setup-database.in
+   A /rt/trunk/sbin/rt-test-dependencies
+   M /rt/trunk/sbin/rt-test-dependencies.in
+   D /rt/trunk/tools
+
+Load rt-3-0-0 into rt/trunk.
+
+------------------------------------------------------------------------
+r63 | root | 2003-11-16 02:20:51 -0500 (Sun, 16 Nov 2003) | 11 lines
+Changed paths:
+   D /rt/trunk/html/Admin/Groups/Rights.html
+   A /rt/trunk/html/Admin/Groups/UserRights.html (from /rt/trunk/html/Admin/Groups/Rights.html:62)
+   D /rt/trunk/lib/RT/EasySearch.pm
+   A /rt/trunk/lib/RT/SearchBuilder.pm (from /rt/trunk/lib/RT/EasySearch.pm:62)
+   A /rt/trunk/sbin
+   A /rt/trunk/sbin/rt-setup-database.in (from /rt/trunk/tools/insertdata:62)
+   A /rt/trunk/sbin/rt-test-dependencies.in (from /rt/trunk/tools/testdeps:62)
+   D /rt/trunk/tools/insertdata
+   D /rt/trunk/tools/testdeps
+
+To prepare to load rt-3-0-0 into rt/trunk, perform 4 renames.
+
+* rt/trunk/html/Admin/Groups/UserRights.html: Renamed from
+  rt/trunk/html/Admin/Groups/Rights.html.
+* rt/trunk/sbin/rt-setup-database.in: Renamed from
+  rt/trunk/tools/insertdata.
+* rt/trunk/sbin/rt-test-dependencies.in: Renamed from
+  rt/trunk/tools/testdeps.
+* rt/trunk/lib/RT/SearchBuilder.pm: Renamed from
+  rt/trunk/lib/RT/EasySearch.pm.
+
+------------------------------------------------------------------------
+r62 | root | 2003-11-16 02:18:34 -0500 (Sun, 16 Nov 2003) | 6 lines
+Changed paths:
+   D /rt/trunk/ChangeLog
+   A /rt/trunk/Changelog (from /rt/trunk/ChangeLog:61)
+   A /rt/trunk/etc/RT_Config.pm (from /rt/trunk/etc/config.pm:61)
+   D /rt/trunk/etc/config.pm
+   A /rt/trunk/html (from /rt/trunk/webrt:61)
+   D /rt/trunk/webrt
+
+To prepare to load rt-3-0-0 into rt/trunk, perform 3 renames.
+
+* rt/trunk/html: Renamed from rt/trunk/webrt.
+* rt/trunk/Changelog: Renamed from rt/trunk/ChangeLog.
+* rt/trunk/etc/RT_Config.pm: Renamed from rt/trunk/etc/config.pm.
+
+------------------------------------------------------------------------
+r60 | root | 2003-11-16 02:06:06 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   A /rt/trunk/debian
+   A /rt/trunk/debian/README.Debian
+   A /rt/trunk/debian/apache.conf
+   A /rt/trunk/debian/changelog
+   A /rt/trunk/debian/control
+   A /rt/trunk/debian/copyright
+   A /rt/trunk/debian/cron.d
+   A /rt/trunk/debian/dirs
+   A /rt/trunk/debian/etc.aliases
+   A /rt/trunk/debian/files
+   A /rt/trunk/debian/postinst
+   A /rt/trunk/debian/postrm
+   A /rt/trunk/debian/preinst
+   A /rt/trunk/debian/prerm
+   A /rt/trunk/debian/request-tracker-docs
+   A /rt/trunk/debian/rules
+   A /rt/trunk/debian/templates
+   A /rt/trunk/debian/watch
+   M /rt/trunk/lib/RT/Action/Autoreply.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+
+Load rt-2-0-15 into rt/trunk.
+
+------------------------------------------------------------------------
+r58 | root | 2003-11-16 02:05:41 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/README
+   M /rt/trunk/bin/mason_handler.fcgi
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/webmux.pl
+   M /rt/trunk/etc/config.pm
+   M /rt/trunk/lib/RT/Action/Notify.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/GroupMember.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   M /rt/trunk/lib/RT/User.pm
+   M /rt/trunk/lib/RT.pm
+   M /rt/trunk/webrt/Admin/Queues/GroupRights.html
+   M /rt/trunk/webrt/Admin/Queues/UserRights.html
+   M /rt/trunk/webrt/Elements/ListActions
+   M /rt/trunk/webrt/Search/Bulk.html
+   M /rt/trunk/webrt/Ticket/Display.html
+   M /rt/trunk/webrt/Ticket/Elements/ShowBasics
+   M /rt/trunk/webrt/Ticket/Elements/ToolBar
+   M /rt/trunk/webrt/Ticket/ModifyAll.html
+   M /rt/trunk/webrt/Ticket/Update.html
+   M /rt/trunk/webrt/autohandler
+
+Load rt-2-0-14 into rt/trunk.
+
+------------------------------------------------------------------------
+r56 | root | 2003-11-16 02:05:14 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/lib/RT/User.pm
+
+Load rt-2-0-13 into rt/trunk.
+
+------------------------------------------------------------------------
+r54 | root | 2003-11-16 02:04:45 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/README
+   M /rt/trunk/bin/mason_handler.fcgi
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/etc/config.pm
+   M /rt/trunk/etc/schema.Pg
+   M /rt/trunk/etc/schema.mysql
+   M /rt/trunk/lib/RT/Action/Autoreply.pm
+   M /rt/trunk/lib/RT/Action/Notify.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/Attachment.pm
+   M /rt/trunk/lib/RT/Condition/Generic.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   M /rt/trunk/lib/RT/Record.pm
+   M /rt/trunk/lib/RT/Scrip.pm
+   M /rt/trunk/lib/RT/Scrips.pm
+   M /rt/trunk/lib/RT/Template.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   M /rt/trunk/tools/insertdata
+   M /rt/trunk/tools/testdeps
+   M /rt/trunk/webrt/Admin/Groups/Members.html
+   M /rt/trunk/webrt/Admin/Groups/index.html
+   M /rt/trunk/webrt/Admin/Keywords/index.html
+   M /rt/trunk/webrt/Admin/Queues/Modify.html
+   M /rt/trunk/webrt/Admin/Queues/index.html
+   M /rt/trunk/webrt/Admin/Users/index.html
+   M /rt/trunk/webrt/Elements/Header
+   M /rt/trunk/webrt/Elements/Login
+   M /rt/trunk/webrt/NoAuth/webrt.css
+   M /rt/trunk/webrt/Search/Listing.html
+   M /rt/trunk/webrt/SelfService/Display.html
+   M /rt/trunk/webrt/SelfService/Elements/Header
+   M /rt/trunk/webrt/Ticket/Elements/ShowHistory
+   M /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+   M /rt/trunk/webrt/Ticket/Modify.html
+   M /rt/trunk/webrt/Ticket/ModifyAll.html
+   M /rt/trunk/webrt/Ticket/Update.html
+
+Load rt-2-0-12 into rt/trunk.
+
+------------------------------------------------------------------------
+r52 | root | 2003-11-16 02:04:20 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/README
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/webrt/Elements/Login
+
+Load rt-2-0-11 into rt/trunk.
+
+------------------------------------------------------------------------
+r50 | root | 2003-11-16 02:03:55 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   A /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/rtadmin
+   M /rt/trunk/lib/Makefile.PL
+   M /rt/trunk/lib/RT/ACE.pm
+   M /rt/trunk/lib/RT/EasySearch.pm
+   M /rt/trunk/lib/RT/Group.pm
+   M /rt/trunk/lib/RT/GroupMember.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Keyword.pm
+   M /rt/trunk/lib/RT/KeywordSelect.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   M /rt/trunk/lib/RT/Record.pm
+   M /rt/trunk/lib/RT/Scrip.pm
+   M /rt/trunk/lib/RT/Template.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/lib/RT/User.pm
+   M /rt/trunk/tools/insertdata
+   M /rt/trunk/tools/testdeps
+   M /rt/trunk/webrt/Admin/Queues/Modify.html
+   M /rt/trunk/webrt/Admin/Queues/People.html
+   M /rt/trunk/webrt/Admin/Users/Modify.html
+   M /rt/trunk/webrt/Elements/GotoTicket
+   M /rt/trunk/webrt/Elements/Login
+   A /rt/trunk/webrt/Elements/SelectEqualityOperator
+   M /rt/trunk/webrt/Elements/SelectOwner
+   M /rt/trunk/webrt/Search/PickRestriction
+   M /rt/trunk/webrt/SelfService/Elements/Header
+   M /rt/trunk/webrt/Ticket/Elements/EditPeople
+   M /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+   M /rt/trunk/webrt/Ticket/Update.html
+
+Load rt-2-0-10 into rt/trunk.
+
+------------------------------------------------------------------------
+r48 | root | 2003-11-16 02:02:39 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   D /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/README
+   M /rt/trunk/bin/initacls.Pg
+   M /rt/trunk/bin/mason_handler.fcgi
+   M /rt/trunk/bin/mason_handler.scgi
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/rtadmin
+   M /rt/trunk/bin/webmux.pl
+   M /rt/trunk/docs/design_docs/acls
+   A /rt/trunk/docs/design_docs/cvs_integration
+   M /rt/trunk/docs/design_docs/evil_plans
+   M /rt/trunk/etc/config.pm
+   M /rt/trunk/etc/rt.spec
+   M /rt/trunk/etc/schema.Pg
+   M /rt/trunk/etc/schema.mysql
+   M /rt/trunk/etc/schema.pm
+   M /rt/trunk/lib/Makefile.PL
+   M /rt/trunk/lib/RT/ACE.pm
+   M /rt/trunk/lib/RT/ACL.pm
+   M /rt/trunk/lib/RT/Action/Autoreply.pm
+   M /rt/trunk/lib/RT/Action/Generic.pm
+   M /rt/trunk/lib/RT/Action/Notify.pm
+   M /rt/trunk/lib/RT/Action/NotifyAsComment.pm
+   M /rt/trunk/lib/RT/Action/OpenDependent.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   A /rt/trunk/lib/RT/Action/SendPasswordEmail.pm
+   M /rt/trunk/lib/RT/Attachment.pm
+   M /rt/trunk/lib/RT/Attachments.pm
+   M /rt/trunk/lib/RT/Condition/AnyTransaction.pm
+   M /rt/trunk/lib/RT/Condition/Generic.pm
+   M /rt/trunk/lib/RT/Condition/StatusChange.pm
+   M /rt/trunk/lib/RT/CurrentUser.pm
+   M /rt/trunk/lib/RT/Date.pm
+   M /rt/trunk/lib/RT/EasySearch.pm
+   M /rt/trunk/lib/RT/Group.pm
+   M /rt/trunk/lib/RT/GroupMember.pm
+   M /rt/trunk/lib/RT/GroupMembers.pm
+   M /rt/trunk/lib/RT/Groups.pm
+   M /rt/trunk/lib/RT/Handle.pm
+   M /rt/trunk/lib/RT/Interface/CLI.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Keyword.pm
+   M /rt/trunk/lib/RT/KeywordSelect.pm
+   M /rt/trunk/lib/RT/KeywordSelects.pm
+   M /rt/trunk/lib/RT/Keywords.pm
+   M /rt/trunk/lib/RT/Link.pm
+   M /rt/trunk/lib/RT/Links.pm
+   M /rt/trunk/lib/RT/ObjectKeyword.pm
+   M /rt/trunk/lib/RT/ObjectKeywords.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   M /rt/trunk/lib/RT/Queues.pm
+   M /rt/trunk/lib/RT/Record.pm
+   M /rt/trunk/lib/RT/Scrip.pm
+   M /rt/trunk/lib/RT/ScripAction.pm
+   M /rt/trunk/lib/RT/ScripActions.pm
+   M /rt/trunk/lib/RT/ScripCondition.pm
+   M /rt/trunk/lib/RT/ScripConditions.pm
+   M /rt/trunk/lib/RT/Scrips.pm
+   M /rt/trunk/lib/RT/Template.pm
+   M /rt/trunk/lib/RT/Templates.pm
+   A /rt/trunk/lib/RT/TestHarness.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   M /rt/trunk/lib/RT/Transactions.pm
+   M /rt/trunk/lib/RT/User.pm
+   M /rt/trunk/lib/RT/Users.pm
+   M /rt/trunk/lib/RT/Watcher.pm
+   M /rt/trunk/lib/RT/Watchers.pm
+   M /rt/trunk/lib/RT.pm
+   D /rt/trunk/t
+   A /rt/trunk/tools/cpan2rpm
+   M /rt/trunk/tools/initdb
+   M /rt/trunk/tools/insertdata
+   M /rt/trunk/tools/testdeps
+   M /rt/trunk/webrt/Admin/Elements/SelectQueueRights
+   M /rt/trunk/webrt/Admin/Elements/SelectRights
+   M /rt/trunk/webrt/Admin/Keywords/index.html
+   M /rt/trunk/webrt/Admin/Queues/index.html
+   M /rt/trunk/webrt/Admin/Users/Modify.html
+   M /rt/trunk/webrt/Elements/Checkbox
+   A /rt/trunk/webrt/Elements/CustomHomepageHeader
+   M /rt/trunk/webrt/Elements/Footer
+   M /rt/trunk/webrt/Elements/Header
+   M /rt/trunk/webrt/Elements/MyRequests
+   M /rt/trunk/webrt/Elements/MyTickets
+   M /rt/trunk/webrt/Elements/SelectBoolean
+   M /rt/trunk/webrt/Elements/SelectDateRelation
+   M /rt/trunk/webrt/Elements/SelectLinkType
+   M /rt/trunk/webrt/Elements/SelectMatch
+   M /rt/trunk/webrt/Elements/SelectNewTicketQueue
+   M /rt/trunk/webrt/Elements/SelectQueue
+   M /rt/trunk/webrt/Elements/SelectResultsPerPage
+   M /rt/trunk/webrt/Elements/SelectStatus
+   M /rt/trunk/webrt/Elements/SelectTicketSortBy
+   M /rt/trunk/webrt/Elements/SelectWatcherType
+   M /rt/trunk/webrt/Elements/TitleBoxEnd
+   M /rt/trunk/webrt/Elements/TitleBoxStart
+   M /rt/trunk/webrt/Search/Bulk.html
+   M /rt/trunk/webrt/Search/Listing.html
+   M /rt/trunk/webrt/Search/PickRestriction
+   M /rt/trunk/webrt/Search/TicketCell
+   M /rt/trunk/webrt/SelfService/Create.html
+   M /rt/trunk/webrt/SelfService/Display.html
+   M /rt/trunk/webrt/SelfService/Elements/Header
+   M /rt/trunk/webrt/Ticket/Create.html
+   M /rt/trunk/webrt/Ticket/Display.html
+   M /rt/trunk/webrt/Ticket/Elements/EditLinks
+   M /rt/trunk/webrt/Ticket/Elements/EditWatchers
+   M /rt/trunk/webrt/Ticket/Elements/ShowHistory
+   M /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+   M /rt/trunk/webrt/Ticket/History.html
+   M /rt/trunk/webrt/Ticket/ModifyAll.html
+   M /rt/trunk/webrt/Ticket/ModifyLinks.html
+   M /rt/trunk/webrt/Ticket/Update.html
+   M /rt/trunk/webrt/autohandler
+   M /rt/trunk/webrt/index.html
+
+Load rt-2-0-9 into rt/trunk.
+
+------------------------------------------------------------------------
+r47 | root | 2003-11-16 02:02:17 -0500 (Sun, 16 Nov 2003) | 6 lines
+Changed paths:
+   A /rt/trunk/etc/rt.spec (from /rt/trunk/rt.spec:45)
+   D /rt/trunk/rt.spec
+   A /rt/trunk/webrt/NoAuth/images/rt.jpg (from /rt/trunk/webrt/rt.jpg:45)
+   D /rt/trunk/webrt/rt.jpg
+
+To prepare to load rt-2-0-9 into rt/trunk, perform 2 renames.
+
+* rt/trunk/etc/rt.spec: Renamed from rt/trunk/rt.spec.
+* rt/trunk/webrt/NoAuth/images/rt.jpg: Renamed from
+  rt/trunk/webrt/rt.jpg.
+
+------------------------------------------------------------------------
+r45 | root | 2003-11-16 02:01:34 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/bin/initacls.Pg
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/rtadmin
+   D /rt/trunk/docs/design_docs/cvs_integration
+   M /rt/trunk/docs/design_docs/evil_plans
+   M /rt/trunk/etc/config.pm
+   D /rt/trunk/etc/rt.spec
+   M /rt/trunk/etc/schema.Pg
+   M /rt/trunk/etc/schema.mysql
+   M /rt/trunk/etc/schema.pm
+   M /rt/trunk/lib/Makefile.PL
+   M /rt/trunk/lib/RT/ACE.pm
+   M /rt/trunk/lib/RT/ACL.pm
+   M /rt/trunk/lib/RT/Action/Generic.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/Attachment.pm
+   M /rt/trunk/lib/RT/Attachments.pm
+   M /rt/trunk/lib/RT/Condition/Generic.pm
+   M /rt/trunk/lib/RT/CurrentUser.pm
+   M /rt/trunk/lib/RT/Date.pm
+   M /rt/trunk/lib/RT/EasySearch.pm
+   M /rt/trunk/lib/RT/Group.pm
+   M /rt/trunk/lib/RT/GroupMember.pm
+   M /rt/trunk/lib/RT/GroupMembers.pm
+   M /rt/trunk/lib/RT/Groups.pm
+   M /rt/trunk/lib/RT/Handle.pm
+   M /rt/trunk/lib/RT/Interface/CLI.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Keyword.pm
+   M /rt/trunk/lib/RT/KeywordSelect.pm
+   M /rt/trunk/lib/RT/KeywordSelects.pm
+   M /rt/trunk/lib/RT/Keywords.pm
+   M /rt/trunk/lib/RT/Link.pm
+   M /rt/trunk/lib/RT/Links.pm
+   M /rt/trunk/lib/RT/ObjectKeyword.pm
+   M /rt/trunk/lib/RT/ObjectKeywords.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   M /rt/trunk/lib/RT/Queues.pm
+   M /rt/trunk/lib/RT/Record.pm
+   M /rt/trunk/lib/RT/Scrip.pm
+   M /rt/trunk/lib/RT/ScripAction.pm
+   M /rt/trunk/lib/RT/ScripActions.pm
+   M /rt/trunk/lib/RT/ScripCondition.pm
+   M /rt/trunk/lib/RT/ScripConditions.pm
+   M /rt/trunk/lib/RT/Scrips.pm
+   M /rt/trunk/lib/RT/Template.pm
+   M /rt/trunk/lib/RT/Templates.pm
+   D /rt/trunk/lib/RT/TestHarness.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   M /rt/trunk/lib/RT/Transactions.pm
+   M /rt/trunk/lib/RT/User.pm
+   M /rt/trunk/lib/RT/Users.pm
+   M /rt/trunk/lib/RT/Watcher.pm
+   M /rt/trunk/lib/RT/Watchers.pm
+   M /rt/trunk/lib/RT.pm
+   M /rt/trunk/rt.spec
+   A /rt/trunk/t
+   A /rt/trunk/t/create.t
+   A /rt/trunk/t/stress.t
+   A /rt/trunk/t/testsuite_notes
+   D /rt/trunk/tools/cpan2rpm
+   M /rt/trunk/tools/initdb
+   M /rt/trunk/tools/insertdata
+   M /rt/trunk/tools/testdeps
+   M /rt/trunk/webrt/Admin/Keywords/index.html
+   M /rt/trunk/webrt/Admin/Queues/index.html
+   D /rt/trunk/webrt/Elements/CustomHomepageHeader
+   M /rt/trunk/webrt/Elements/Footer
+   M /rt/trunk/webrt/Elements/Header
+   M /rt/trunk/webrt/Elements/SelectNewTicketQueue
+   M /rt/trunk/webrt/Elements/SelectQueue
+   M /rt/trunk/webrt/Elements/SelectStatus
+   M /rt/trunk/webrt/Elements/SelectTicketSortBy
+   M /rt/trunk/webrt/Elements/TitleBoxEnd
+   M /rt/trunk/webrt/Elements/TitleBoxStart
+   M /rt/trunk/webrt/Search/Listing.html
+   M /rt/trunk/webrt/SelfService/Elements/Header
+   M /rt/trunk/webrt/Ticket/Create.html
+   M /rt/trunk/webrt/Ticket/Display.html
+   M /rt/trunk/webrt/Ticket/Elements/EditLinks
+   M /rt/trunk/webrt/Ticket/Elements/ShowHistory
+   M /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+   M /rt/trunk/webrt/autohandler
+   M /rt/trunk/webrt/index.html
+
+Load rt-2-0-8_02 into rt/trunk.
+
+------------------------------------------------------------------------
+r44 | root | 2003-11-16 02:01:11 -0500 (Sun, 16 Nov 2003) | 5 lines
+Changed paths:
+   D /rt/trunk/webrt/NoAuth/images/rt.jpg
+   A /rt/trunk/webrt/rt.jpg (from /rt/trunk/webrt/NoAuth/images/rt.jpg:42)
+
+To prepare to load rt-2-0-8_02 into rt/trunk, perform 1 rename.
+
+* rt/trunk/webrt/rt.jpg: Renamed from
+  rt/trunk/webrt/NoAuth/images/rt.jpg.
+
+------------------------------------------------------------------------
+r42 | root | 2003-11-16 02:00:12 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/bin/initacls.Pg
+   M /rt/trunk/bin/rt
+   A /rt/trunk/docs/design_docs/cvs_integration
+   M /rt/trunk/docs/design_docs/evil_plans
+   M /rt/trunk/etc/config.pm
+   A /rt/trunk/etc/rt.spec
+   M /rt/trunk/etc/schema.Pg
+   M /rt/trunk/etc/schema.mysql
+   M /rt/trunk/etc/schema.pm
+   M /rt/trunk/lib/Makefile.PL
+   M /rt/trunk/lib/RT/ACE.pm
+   M /rt/trunk/lib/RT/ACL.pm
+   M /rt/trunk/lib/RT/Action/Generic.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/Attachment.pm
+   M /rt/trunk/lib/RT/Attachments.pm
+   M /rt/trunk/lib/RT/Condition/Generic.pm
+   M /rt/trunk/lib/RT/CurrentUser.pm
+   M /rt/trunk/lib/RT/Date.pm
+   M /rt/trunk/lib/RT/EasySearch.pm
+   M /rt/trunk/lib/RT/Group.pm
+   M /rt/trunk/lib/RT/GroupMember.pm
+   M /rt/trunk/lib/RT/GroupMembers.pm
+   M /rt/trunk/lib/RT/Groups.pm
+   M /rt/trunk/lib/RT/Handle.pm
+   M /rt/trunk/lib/RT/Interface/CLI.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Keyword.pm
+   M /rt/trunk/lib/RT/KeywordSelect.pm
+   M /rt/trunk/lib/RT/KeywordSelects.pm
+   M /rt/trunk/lib/RT/Keywords.pm
+   M /rt/trunk/lib/RT/Link.pm
+   M /rt/trunk/lib/RT/Links.pm
+   M /rt/trunk/lib/RT/ObjectKeyword.pm
+   M /rt/trunk/lib/RT/ObjectKeywords.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   M /rt/trunk/lib/RT/Queues.pm
+   M /rt/trunk/lib/RT/Record.pm
+   M /rt/trunk/lib/RT/Scrip.pm
+   M /rt/trunk/lib/RT/ScripAction.pm
+   M /rt/trunk/lib/RT/ScripActions.pm
+   M /rt/trunk/lib/RT/ScripCondition.pm
+   M /rt/trunk/lib/RT/ScripConditions.pm
+   M /rt/trunk/lib/RT/Scrips.pm
+   M /rt/trunk/lib/RT/Template.pm
+   M /rt/trunk/lib/RT/Templates.pm
+   A /rt/trunk/lib/RT/TestHarness.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   M /rt/trunk/lib/RT/Transactions.pm
+   M /rt/trunk/lib/RT/User.pm
+   M /rt/trunk/lib/RT/Users.pm
+   M /rt/trunk/lib/RT/Watcher.pm
+   M /rt/trunk/lib/RT/Watchers.pm
+   M /rt/trunk/lib/RT.pm
+   M /rt/trunk/rt.spec
+   D /rt/trunk/t
+   A /rt/trunk/tools/cpan2rpm
+   M /rt/trunk/tools/initdb
+   M /rt/trunk/tools/insertdata
+   M /rt/trunk/tools/testdeps
+   M /rt/trunk/webrt/Admin/Keywords/index.html
+   M /rt/trunk/webrt/Admin/Queues/index.html
+   A /rt/trunk/webrt/Elements/CustomHomepageHeader
+   M /rt/trunk/webrt/Elements/Footer
+   M /rt/trunk/webrt/Elements/Header
+   M /rt/trunk/webrt/Elements/SelectNewTicketQueue
+   M /rt/trunk/webrt/Elements/SelectQueue
+   M /rt/trunk/webrt/Elements/SelectStatus
+   M /rt/trunk/webrt/Elements/SelectTicketSortBy
+   M /rt/trunk/webrt/Elements/TitleBoxEnd
+   M /rt/trunk/webrt/Elements/TitleBoxStart
+   M /rt/trunk/webrt/Search/Listing.html
+   M /rt/trunk/webrt/SelfService/Elements/Header
+   M /rt/trunk/webrt/Ticket/Create.html
+   M /rt/trunk/webrt/Ticket/Display.html
+   M /rt/trunk/webrt/Ticket/Elements/EditLinks
+   M /rt/trunk/webrt/Ticket/Elements/ShowHistory
+   M /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+   M /rt/trunk/webrt/autohandler
+   M /rt/trunk/webrt/index.html
+
+Load rt-2-0-8_01 into rt/trunk.
+
+------------------------------------------------------------------------
+r41 | root | 2003-11-16 01:59:49 -0500 (Sun, 16 Nov 2003) | 5 lines
+Changed paths:
+   A /rt/trunk/webrt/NoAuth/images/rt.jpg (from /rt/trunk/webrt/rt.jpg:39)
+   D /rt/trunk/webrt/rt.jpg
+
+To prepare to load rt-2-0-8_01 into rt/trunk, perform 1 rename.
+
+* rt/trunk/webrt/NoAuth/images/rt.jpg: Renamed from
+  rt/trunk/webrt/rt.jpg.
+
+------------------------------------------------------------------------
+r39 | root | 2003-11-16 01:57:40 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/README
+   M /rt/trunk/bin/initacls.Pg
+   M /rt/trunk/bin/rt
+   M /rt/trunk/etc/config.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   A /rt/trunk/rt.spec
+   M /rt/trunk/tools/testdeps
+   M /rt/trunk/webrt/Admin/Queues/Scrips.html
+   M /rt/trunk/webrt/Elements/Header
+   M /rt/trunk/webrt/Search/Bulk.html
+   M /rt/trunk/webrt/Search/Listing.html
+   M /rt/trunk/webrt/Search/PickRestriction
+   M /rt/trunk/webrt/Ticket/Create.html
+   M /rt/trunk/webrt/Ticket/Display.html
+   M /rt/trunk/webrt/Ticket/Elements/EditBasics
+   M /rt/trunk/webrt/Ticket/Elements/ShowHistory
+   M /rt/trunk/webrt/Ticket/Elements/ShowLinks
+   M /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+   M /rt/trunk/webrt/Ticket/History.html
+   M /rt/trunk/webrt/Ticket/ModifyAll.html
+   M /rt/trunk/webrt/Ticket/Update.html
+
+Load rt-2-0-8 into rt/trunk.
+
+------------------------------------------------------------------------
+r37 | root | 2003-11-16 01:57:14 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/bin/mason_handler.fcgi
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/webmux.pl
+   M /rt/trunk/lib/RT/ObjectKeyword.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/User.pm
+   M /rt/trunk/webrt/Elements/Header
+   M /rt/trunk/webrt/Elements/MessageBox
+   M /rt/trunk/webrt/Elements/Refresh
+   M /rt/trunk/webrt/SelfService/Display.html
+   M /rt/trunk/webrt/Ticket/Display.html
+   M /rt/trunk/webrt/Ticket/Elements/ShowHistory
+   M /rt/trunk/webrt/Ticket/Elements/ShowKeywordSelects
+   M /rt/trunk/webrt/Ticket/Elements/ShowSummary
+   M /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+
+Load rt-2-0-7 into rt/trunk.
+
+------------------------------------------------------------------------
+r35 | root | 2003-11-16 01:56:51 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/README
+   M /rt/trunk/bin/initacls.Oracle
+   M /rt/trunk/bin/initacls.Pg
+   M /rt/trunk/bin/initacls.mysql
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/rtadmin
+   M /rt/trunk/etc/config.pm
+   M /rt/trunk/etc/schema.Pg
+   M /rt/trunk/etc/schema.mysql
+   M /rt/trunk/etc/schema.pm
+   M /rt/trunk/lib/RT/Attachment.pm
+   M /rt/trunk/lib/RT/Groups.pm
+   M /rt/trunk/lib/RT/Handle.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Record.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   M /rt/trunk/tools/initdb
+   M /rt/trunk/tools/testdeps
+   M /rt/trunk/webrt/Admin/Global/Keywords.html
+   M /rt/trunk/webrt/Admin/Users/Modify.html
+   M /rt/trunk/webrt/Elements/Header
+   M /rt/trunk/webrt/Elements/Login
+   M /rt/trunk/webrt/Elements/MessageBox
+   A /rt/trunk/webrt/Elements/Refresh
+   M /rt/trunk/webrt/NoAuth/webrt.css
+   M /rt/trunk/webrt/Search/Listing.html
+   M /rt/trunk/webrt/Search/PickRestriction
+   M /rt/trunk/webrt/SelfService/Prefs.html
+   M /rt/trunk/webrt/Ticket/Elements/ShowHistory
+   M /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+   M /rt/trunk/webrt/Ticket/ModifyDates.html
+   M /rt/trunk/webrt/Ticket/Update.html
+   M /rt/trunk/webrt/User/Prefs.html
+   M /rt/trunk/webrt/autohandler
+   M /rt/trunk/webrt/index.html
+
+Load rt-2-0-6 into rt/trunk.
+
+------------------------------------------------------------------------
+r33 | root | 2003-11-16 01:56:01 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/tools/testdeps
+
+Load rt-2-0-5_03 into rt/trunk.
+
+------------------------------------------------------------------------
+r31 | root | 2003-11-16 01:55:38 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/lib/RT/Attachment.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/tools/testdeps
+
+Load rt-2-0-5_01 into rt/trunk.
+
+------------------------------------------------------------------------
+r29 | root | 2003-11-16 01:54:52 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/README
+   M /rt/trunk/TODO
+   M /rt/trunk/bin/mason_handler.fcgi
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/webmux.pl
+   A /rt/trunk/docs/design_docs/evil_plans
+   D /rt/trunk/docs/manual.pod
+   M /rt/trunk/etc/config.pm
+   M /rt/trunk/lib/RT/Action/Autoreply.pm
+   M /rt/trunk/lib/RT/Action/SendEmail.pm
+   M /rt/trunk/lib/RT/Attachment.pm
+   M /rt/trunk/lib/RT/Attachments.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/Links.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   M /rt/trunk/lib/RT/Users.pm
+   M /rt/trunk/tools/testdeps
+   A /rt/trunk/webrt/Admin/Elements/ListGlobalKeywordSelects
+   A /rt/trunk/webrt/Admin/Elements/ListGlobalScrips
+   M /rt/trunk/webrt/Admin/Global/Scrips.html
+   M /rt/trunk/webrt/Admin/Queues/Keywords.html
+   M /rt/trunk/webrt/Admin/Queues/People.html
+   M /rt/trunk/webrt/Admin/Queues/Scrips.html
+   M /rt/trunk/webrt/Admin/Users/index.html
+   M /rt/trunk/webrt/Elements/MessageBox
+   M /rt/trunk/webrt/Elements/Quicksearch
+   M /rt/trunk/webrt/Elements/SelectResultsPerPage
+   M /rt/trunk/webrt/Elements/SelectStatus
+   M /rt/trunk/webrt/Search/PickRestriction
+   M /rt/trunk/webrt/SelfService/Create.html
+   M /rt/trunk/webrt/SelfService/Display.html
+   M /rt/trunk/webrt/SelfService/Elements/GotoTicket
+   M /rt/trunk/webrt/SelfService/Elements/MyRequests
+   M /rt/trunk/webrt/SelfService/Update.html
+   M /rt/trunk/webrt/Ticket/Create.html
+   M /rt/trunk/webrt/Ticket/Display.html
+   M /rt/trunk/webrt/Ticket/Elements/AddWatchers
+   M /rt/trunk/webrt/Ticket/Elements/EditBasics
+   M /rt/trunk/webrt/Ticket/Elements/EditDates
+   M /rt/trunk/webrt/Ticket/Elements/EditLinks
+   M /rt/trunk/webrt/Ticket/Elements/ShowLinks
+   M /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+   M /rt/trunk/webrt/Ticket/Modify.html
+   M /rt/trunk/webrt/Ticket/ModifyAll.html
+   M /rt/trunk/webrt/Ticket/ModifyDates.html
+   M /rt/trunk/webrt/Ticket/ModifyLinks.html
+   M /rt/trunk/webrt/Ticket/ModifyPeople.html
+   M /rt/trunk/webrt/Ticket/Update.html
+   M /rt/trunk/webrt/User/Prefs.html
+   M /rt/trunk/webrt/index.html
+
+Load rt-2-0-5 into rt/trunk.
+
+------------------------------------------------------------------------
+r28 | root | 2003-11-16 01:54:35 -0500 (Sun, 16 Nov 2003) | 5 lines
+Changed paths:
+   D /rt/trunk/webrt/SelfService/Details.html
+   A /rt/trunk/webrt/SelfService/Display.html (from /rt/trunk/webrt/SelfService/Details.html:26)
+
+To prepare to load rt-2-0-5 into rt/trunk, perform 1 rename.
+
+* rt/trunk/webrt/SelfService/Display.html: Renamed from
+  rt/trunk/webrt/SelfService/Details.html.
+
+------------------------------------------------------------------------
+r26 | root | 2003-11-16 01:53:50 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/lib/RT/Tickets.pm
+
+Load rt-2-0-4 into rt/trunk.
+
+------------------------------------------------------------------------
+r24 | root | 2003-11-16 01:53:28 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/webrt/Search/PickRestriction
+
+Load rt-2-0-3 into rt/trunk.
+
+------------------------------------------------------------------------
+r22 | root | 2003-11-16 01:53:07 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/README
+   M /rt/trunk/bin/mason_handler.fcgi
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/webmux.pl
+   M /rt/trunk/etc/config.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/KeywordSelect.pm
+   M /rt/trunk/lib/RT/Keywords.pm
+   M /rt/trunk/lib/RT/Queue.pm
+   M /rt/trunk/lib/RT/Queues.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/lib/RT/Transaction.pm
+   M /rt/trunk/lib/RT/User.pm
+   M /rt/trunk/lib/RT/Users.pm
+   M /rt/trunk/tools/testdeps
+   M /rt/trunk/webrt/Admin/Queues/People.html
+   M /rt/trunk/webrt/Admin/Users/index.html
+   M /rt/trunk/webrt/Elements/MyRequests
+   M /rt/trunk/webrt/Elements/Submit
+   M /rt/trunk/webrt/Search/Listing.html
+   M /rt/trunk/webrt/Search/PickRestriction
+   M /rt/trunk/webrt/SelfService/Details.html
+   A /rt/trunk/webrt/SelfService/Update.html
+
+Load rt-2-0-2 into rt/trunk.
+
+------------------------------------------------------------------------
+r20 | root | 2003-11-16 01:52:44 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   M /rt/trunk/README
+   M /rt/trunk/bin/mason_handler.fcgi
+   M /rt/trunk/bin/rt
+   M /rt/trunk/bin/rt-mailgate
+   M /rt/trunk/bin/rtadmin
+   M /rt/trunk/bin/webmux.pl
+   M /rt/trunk/etc/config.pm
+   M /rt/trunk/etc/schema.mysql
+   M /rt/trunk/lib/Makefile.PL
+   M /rt/trunk/lib/RT/Attachment.pm
+   M /rt/trunk/lib/RT/Interface/CLI.pm
+   M /rt/trunk/lib/RT/Interface/Email.pm
+   M /rt/trunk/lib/RT/Interface/Web.pm
+   M /rt/trunk/lib/RT/ScripAction.pm
+   M /rt/trunk/lib/RT/ScripCondition.pm
+   M /rt/trunk/lib/RT/Template.pm
+   M /rt/trunk/lib/RT/Ticket.pm
+   M /rt/trunk/lib/RT/Tickets.pm
+   M /rt/trunk/lib/RT.pm
+   M /rt/trunk/tools/testdeps
+   M /rt/trunk/webrt/Admin/Queues/index.html
+   M /rt/trunk/webrt/Elements/SelectMatch
+   M /rt/trunk/webrt/NoAuth/Logout.html
+   M /rt/trunk/webrt/Search/PickRestriction
+   A /rt/trunk/webrt/SelfService/Attachment
+   A /rt/trunk/webrt/SelfService/Attachment/dhandler
+   M /rt/trunk/webrt/SelfService/Details.html
+   D /rt/trunk/webrt/SelfService/Elements/ShowTransaction
+   M /rt/trunk/webrt/Ticket/Attachment/dhandler
+   M /rt/trunk/webrt/Ticket/Elements/ShowLinks
+   M /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+
+Load rt-2-0-1 into rt/trunk.
+
+------------------------------------------------------------------------
+r18 | root | 2003-11-16 01:52:04 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   A /rt/trunk/ChangeLog
+   M /rt/trunk/Makefile
+   D /rt/trunk/NEWS
+   M /rt/trunk/README
+   M /rt/trunk/TODO
+   A /rt/trunk/bin/initacls.Oracle
+   A /rt/trunk/bin/initacls.Pg
+   A /rt/trunk/bin/initacls.mysql
+   A /rt/trunk/bin/mason_handler.fcgi
+   A /rt/trunk/bin/mason_handler.scgi
+   A /rt/trunk/bin/rt
+   A /rt/trunk/bin/rt-mailgate
+   A /rt/trunk/bin/rtadmin
+   D /rt/trunk/bin/rtmux.pl
+   D /rt/trunk/bin/testdeps.pl
+   A /rt/trunk/bin/webmux.pl
+   D /rt/trunk/contrib
+   D /rt/trunk/docs/FAQ
+   D /rt/trunk/docs/FAQ.html
+   M /rt/trunk/docs/README.docs
+   A /rt/trunk/docs/Security
+   A /rt/trunk/docs/design_docs
+   A /rt/trunk/docs/design_docs/CARS
+   A /rt/trunk/docs/design_docs/TransactionTypes.txt
+   A /rt/trunk/docs/design_docs/acls
+   A /rt/trunk/docs/design_docs/basic-definitions.txt
+   A /rt/trunk/docs/design_docs/cli_spec
+   A /rt/trunk/docs/design_docs/link-definitions.txt
+   A /rt/trunk/docs/design_docs/local_hacking
+   A /rt/trunk/docs/design_docs/subscription-definitions.txt
+   A /rt/trunk/docs/design_docs/users
+   A /rt/trunk/docs/manual.pod
+   D /rt/trunk/docs/rt-templates.html
+   D /rt/trunk/docs/rt_users_guide.html
+   A /rt/trunk/etc/acl.Oracle
+   A /rt/trunk/etc/acl.Pg
+   A /rt/trunk/etc/acl.mysql
+   M /rt/trunk/etc/config.pm
+   D /rt/trunk/etc/mysql.acl
+   D /rt/trunk/etc/schema
+   A /rt/trunk/etc/schema.Oracle
+   A /rt/trunk/etc/schema.Pg
+   A /rt/trunk/etc/schema.mysql
+   A /rt/trunk/etc/schema.pm
+   D /rt/trunk/etc/suidrt.c
+   D /rt/trunk/etc/templates
+   A /rt/trunk/lib/MANIFEST
+   A /rt/trunk/lib/MANIFEST.SKIP
+   A /rt/trunk/lib/Makefile.PL
+   A /rt/trunk/lib/RT
+   A /rt/trunk/lib/RT/ACE.pm
+   A /rt/trunk/lib/RT/ACL.pm
+   A /rt/trunk/lib/RT/Action
+   A /rt/trunk/lib/RT/Action/Autoreply.pm
+   A /rt/trunk/lib/RT/Action/Generic.pm
+   A /rt/trunk/lib/RT/Action/Notify.pm
+   A /rt/trunk/lib/RT/Action/NotifyAsComment.pm
+   A /rt/trunk/lib/RT/Action/OpenDependent.pm
+   A /rt/trunk/lib/RT/Action/README.hackers
+   A /rt/trunk/lib/RT/Action/ResolveMembers.pm
+   A /rt/trunk/lib/RT/Action/SendEmail.pm
+   A /rt/trunk/lib/RT/Action/StallDependent.pm
+   A /rt/trunk/lib/RT/Attachment.pm
+   A /rt/trunk/lib/RT/Attachments.pm
+   A /rt/trunk/lib/RT/Condition
+   A /rt/trunk/lib/RT/Condition/AnyTransaction.pm
+   A /rt/trunk/lib/RT/Condition/Generic.pm
+   A /rt/trunk/lib/RT/Condition/NewDependency.pm
+   A /rt/trunk/lib/RT/Condition/StatusChange.pm
+   A /rt/trunk/lib/RT/CurrentUser.pm
+   A /rt/trunk/lib/RT/Date.pm
+   A /rt/trunk/lib/RT/EasySearch.pm
+   A /rt/trunk/lib/RT/Group.pm
+   A /rt/trunk/lib/RT/GroupMember.pm
+   A /rt/trunk/lib/RT/GroupMembers.pm
+   A /rt/trunk/lib/RT/Groups.pm
+   A /rt/trunk/lib/RT/Handle.pm
+   A /rt/trunk/lib/RT/Interface
+   A /rt/trunk/lib/RT/Interface/CLI.pm
+   A /rt/trunk/lib/RT/Interface/Email.pm
+   A /rt/trunk/lib/RT/Interface/Web.pm
+   A /rt/trunk/lib/RT/Keyword.pm
+   A /rt/trunk/lib/RT/KeywordSelect.pm
+   A /rt/trunk/lib/RT/KeywordSelects.pm
+   A /rt/trunk/lib/RT/Keywords.pm
+   A /rt/trunk/lib/RT/Link.pm
+   A /rt/trunk/lib/RT/Links.pm
+   A /rt/trunk/lib/RT/ObjectKeyword.pm
+   A /rt/trunk/lib/RT/ObjectKeywords.pm
+   A /rt/trunk/lib/RT/Queue.pm
+   A /rt/trunk/lib/RT/Queues.pm
+   A /rt/trunk/lib/RT/Record.pm
+   A /rt/trunk/lib/RT/Scrip.pm
+   A /rt/trunk/lib/RT/ScripAction.pm
+   A /rt/trunk/lib/RT/ScripActions.pm
+   A /rt/trunk/lib/RT/ScripCondition.pm
+   A /rt/trunk/lib/RT/ScripConditions.pm
+   A /rt/trunk/lib/RT/Scrips.pm
+   A /rt/trunk/lib/RT/Template.pm
+   A /rt/trunk/lib/RT/Templates.pm
+   A /rt/trunk/lib/RT/Ticket.pm
+   A /rt/trunk/lib/RT/Tickets.pm
+   A /rt/trunk/lib/RT/Transaction.pm
+   A /rt/trunk/lib/RT/Transactions.pm
+   A /rt/trunk/lib/RT/User.pm
+   A /rt/trunk/lib/RT/Users.pm
+   A /rt/trunk/lib/RT/Watcher.pm
+   A /rt/trunk/lib/RT/Watchers.pm
+   A /rt/trunk/lib/RT.pm
+   D /rt/trunk/lib/generic_templates
+   D /rt/trunk/lib/images
+   D /rt/trunk/lib/rt
+   A /rt/trunk/lib/test.pl
+   A /rt/trunk/t
+   A /rt/trunk/t/create.t
+   A /rt/trunk/t/stress.t
+   A /rt/trunk/t/testsuite_notes
+   A /rt/trunk/tools
+   A /rt/trunk/tools/initdb
+   A /rt/trunk/tools/insertdata
+   A /rt/trunk/tools/testdeps
+   A /rt/trunk/webrt
+   A /rt/trunk/webrt/Admin
+   A /rt/trunk/webrt/Admin/Elements
+   A /rt/trunk/webrt/Admin/Elements/CreateQueueCalled
+   A /rt/trunk/webrt/Admin/Elements/CreateUserCalled
+   A /rt/trunk/webrt/Admin/Elements/EditUserComments
+   A /rt/trunk/webrt/Admin/Elements/GrantQueueRightsTo
+   A /rt/trunk/webrt/Admin/Elements/GroupTabs
+   A /rt/trunk/webrt/Admin/Elements/Header
+   A /rt/trunk/webrt/Admin/Elements/ModifyKeyword
+   A /rt/trunk/webrt/Admin/Elements/ModifyKeywordSelect
+   A /rt/trunk/webrt/Admin/Elements/ModifyQueue
+   A /rt/trunk/webrt/Admin/Elements/ModifyTemplate
+   A /rt/trunk/webrt/Admin/Elements/ModifyUser
+   A /rt/trunk/webrt/Admin/Elements/QueueRightsForUser
+   A /rt/trunk/webrt/Admin/Elements/QueueTabs
+   A /rt/trunk/webrt/Admin/Elements/SelectKeywordSelect
+   A /rt/trunk/webrt/Admin/Elements/SelectModifyGroup
+   A /rt/trunk/webrt/Admin/Elements/SelectModifyKeyword
+   A /rt/trunk/webrt/Admin/Elements/SelectModifyKeywordSelect
+   A /rt/trunk/webrt/Admin/Elements/SelectModifyQueue
+   A /rt/trunk/webrt/Admin/Elements/SelectModifyUser
+   A /rt/trunk/webrt/Admin/Elements/SelectQueueRights
+   A /rt/trunk/webrt/Admin/Elements/SelectRights
+   A /rt/trunk/webrt/Admin/Elements/SelectScrip
+   A /rt/trunk/webrt/Admin/Elements/SelectScripAction
+   A /rt/trunk/webrt/Admin/Elements/SelectScripCondition
+   A /rt/trunk/webrt/Admin/Elements/SelectSingleOrMultiple
+   A /rt/trunk/webrt/Admin/Elements/SelectTemplate
+   A /rt/trunk/webrt/Admin/Elements/SelectUsers
+   A /rt/trunk/webrt/Admin/Elements/SystemTabs
+   A /rt/trunk/webrt/Admin/Elements/Tabs
+   A /rt/trunk/webrt/Admin/Elements/UserTabs
+   A /rt/trunk/webrt/Admin/Global
+   A /rt/trunk/webrt/Admin/Global/GroupRights.html
+   A /rt/trunk/webrt/Admin/Global/Keywords.html
+   A /rt/trunk/webrt/Admin/Global/Scrips.html
+   A /rt/trunk/webrt/Admin/Global/Template.html
+   A /rt/trunk/webrt/Admin/Global/Templates.html
+   A /rt/trunk/webrt/Admin/Global/UserRights.html
+   A /rt/trunk/webrt/Admin/Global/index.html
+   A /rt/trunk/webrt/Admin/Groups
+   A /rt/trunk/webrt/Admin/Groups/Members.html
+   A /rt/trunk/webrt/Admin/Groups/Modify.html
+   A /rt/trunk/webrt/Admin/Groups/Rights.html
+   A /rt/trunk/webrt/Admin/Groups/index.html
+   A /rt/trunk/webrt/Admin/KeywordSelects
+   A /rt/trunk/webrt/Admin/KeywordSelects/Modify.html
+   A /rt/trunk/webrt/Admin/KeywordSelects/index.html
+   A /rt/trunk/webrt/Admin/Keywords
+   A /rt/trunk/webrt/Admin/Keywords/Modify.html
+   A /rt/trunk/webrt/Admin/Keywords/index.html
+   A /rt/trunk/webrt/Admin/Queues
+   A /rt/trunk/webrt/Admin/Queues/Create.html
+   A /rt/trunk/webrt/Admin/Queues/GroupRights.html
+   A /rt/trunk/webrt/Admin/Queues/Keywords.html
+   A /rt/trunk/webrt/Admin/Queues/Modify.html
+   A /rt/trunk/webrt/Admin/Queues/People.html
+   A /rt/trunk/webrt/Admin/Queues/Scrips.html
+   A /rt/trunk/webrt/Admin/Queues/Template.html
+   A /rt/trunk/webrt/Admin/Queues/Templates.html
+   A /rt/trunk/webrt/Admin/Queues/UserRights.html
+   A /rt/trunk/webrt/Admin/Queues/index.html
+   A /rt/trunk/webrt/Admin/Users
+   A /rt/trunk/webrt/Admin/Users/Modify.html
+   A /rt/trunk/webrt/Admin/Users/Prefs.html
+   A /rt/trunk/webrt/Admin/Users/Rights.html
+   A /rt/trunk/webrt/Admin/Users/index.html
+   A /rt/trunk/webrt/Admin/index.html
+   A /rt/trunk/webrt/Elements
+   A /rt/trunk/webrt/Elements/Checkbox
+   A /rt/trunk/webrt/Elements/CreateTicket
+   A /rt/trunk/webrt/Elements/Error
+   A /rt/trunk/webrt/Elements/Footer
+   A /rt/trunk/webrt/Elements/GotoTicket
+   A /rt/trunk/webrt/Elements/Header
+   A /rt/trunk/webrt/Elements/ListActions
+   A /rt/trunk/webrt/Elements/Login
+   A /rt/trunk/webrt/Elements/MessageBox
+   A /rt/trunk/webrt/Elements/MyRequests
+   A /rt/trunk/webrt/Elements/MyTickets
+   A /rt/trunk/webrt/Elements/Quicksearch
+   A /rt/trunk/webrt/Elements/Section
+   A /rt/trunk/webrt/Elements/SelectBoolean
+   A /rt/trunk/webrt/Elements/SelectDate
+   A /rt/trunk/webrt/Elements/SelectDateRelation
+   A /rt/trunk/webrt/Elements/SelectDateType
+   A /rt/trunk/webrt/Elements/SelectKeyword
+   A /rt/trunk/webrt/Elements/SelectKeywordOptions
+   A /rt/trunk/webrt/Elements/SelectLinkType
+   A /rt/trunk/webrt/Elements/SelectMatch
+   A /rt/trunk/webrt/Elements/SelectNewTicketQueue
+   A /rt/trunk/webrt/Elements/SelectOwner
+   A /rt/trunk/webrt/Elements/SelectQueue
+   A /rt/trunk/webrt/Elements/SelectResultsPerPage
+   A /rt/trunk/webrt/Elements/SelectSortOrder
+   A /rt/trunk/webrt/Elements/SelectStatus
+   A /rt/trunk/webrt/Elements/SelectTicketSortBy
+   A /rt/trunk/webrt/Elements/SelectUsers
+   A /rt/trunk/webrt/Elements/SelectWatcherType
+   A /rt/trunk/webrt/Elements/ShadedBox
+   A /rt/trunk/webrt/Elements/Submit
+   A /rt/trunk/webrt/Elements/Tabs
+   A /rt/trunk/webrt/Elements/TitleBoxEnd
+   A /rt/trunk/webrt/Elements/TitleBoxStart
+   A /rt/trunk/webrt/Elements/ViewUser
+   A /rt/trunk/webrt/Elements/dayMenu
+   A /rt/trunk/webrt/Elements/monthMenu
+   A /rt/trunk/webrt/Elements/yearMenu
+   A /rt/trunk/webrt/NoAuth
+   A /rt/trunk/webrt/NoAuth/Logout.html
+   A /rt/trunk/webrt/NoAuth/Reminder.html
+   A /rt/trunk/webrt/NoAuth/images
+   A /rt/trunk/webrt/NoAuth/images/spacer.gif
+   A /rt/trunk/webrt/NoAuth/webrt.css
+   A /rt/trunk/webrt/Search
+   A /rt/trunk/webrt/Search/Bulk.html
+   A /rt/trunk/webrt/Search/Listing.html
+   A /rt/trunk/webrt/Search/PickRestriction
+   A /rt/trunk/webrt/Search/RestrictSearch.html
+   A /rt/trunk/webrt/Search/TicketCell
+   A /rt/trunk/webrt/SelfService
+   A /rt/trunk/webrt/SelfService/Closed.html
+   A /rt/trunk/webrt/SelfService/Create.html
+   A /rt/trunk/webrt/SelfService/Details.html
+   A /rt/trunk/webrt/SelfService/Elements
+   A /rt/trunk/webrt/SelfService/Elements/GotoTicket
+   A /rt/trunk/webrt/SelfService/Elements/Header
+   A /rt/trunk/webrt/SelfService/Elements/MyRequests
+   A /rt/trunk/webrt/SelfService/Elements/ShowTransaction
+   A /rt/trunk/webrt/SelfService/Elements/Tabs
+   A /rt/trunk/webrt/SelfService/Error.html
+   A /rt/trunk/webrt/SelfService/Prefs.html
+   A /rt/trunk/webrt/SelfService/index.html
+   A /rt/trunk/webrt/Ticket
+   A /rt/trunk/webrt/Ticket/Attachment
+   A /rt/trunk/webrt/Ticket/Attachment/dhandler
+   A /rt/trunk/webrt/Ticket/Create.html
+   A /rt/trunk/webrt/Ticket/Display.html
+   A /rt/trunk/webrt/Ticket/Elements
+   A /rt/trunk/webrt/Ticket/Elements/AddWatchers
+   A /rt/trunk/webrt/Ticket/Elements/EditBasics
+   A /rt/trunk/webrt/Ticket/Elements/EditDates
+   A /rt/trunk/webrt/Ticket/Elements/EditKeywordSelects
+   A /rt/trunk/webrt/Ticket/Elements/EditLinks
+   A /rt/trunk/webrt/Ticket/Elements/EditPeople
+   A /rt/trunk/webrt/Ticket/Elements/EditWatchers
+   A /rt/trunk/webrt/Ticket/Elements/ShowBasics
+   A /rt/trunk/webrt/Ticket/Elements/ShowDates
+   A /rt/trunk/webrt/Ticket/Elements/ShowDependencies
+   A /rt/trunk/webrt/Ticket/Elements/ShowHistory
+   A /rt/trunk/webrt/Ticket/Elements/ShowKeywordSelects
+   A /rt/trunk/webrt/Ticket/Elements/ShowLinks
+   A /rt/trunk/webrt/Ticket/Elements/ShowMemberOf
+   A /rt/trunk/webrt/Ticket/Elements/ShowMembers
+   A /rt/trunk/webrt/Ticket/Elements/ShowPeople
+   A /rt/trunk/webrt/Ticket/Elements/ShowReferences
+   A /rt/trunk/webrt/Ticket/Elements/ShowRequestor
+   A /rt/trunk/webrt/Ticket/Elements/ShowSummary
+   A /rt/trunk/webrt/Ticket/Elements/ShowTransaction
+   A /rt/trunk/webrt/Ticket/Elements/Tabs
+   A /rt/trunk/webrt/Ticket/Elements/ToolBar
+   A /rt/trunk/webrt/Ticket/History.html
+   A /rt/trunk/webrt/Ticket/Modify.html
+   A /rt/trunk/webrt/Ticket/ModifyAll.html
+   A /rt/trunk/webrt/Ticket/ModifyDates.html
+   A /rt/trunk/webrt/Ticket/ModifyLinks.html
+   A /rt/trunk/webrt/Ticket/ModifyPeople.html
+   A /rt/trunk/webrt/Ticket/Update.html
+   A /rt/trunk/webrt/User
+   A /rt/trunk/webrt/User/Prefs.html
+   A /rt/trunk/webrt/autohandler
+   A /rt/trunk/webrt/index.html
+   A /rt/trunk/webrt/rt.jpg
+
+Load rt-2-0-0 into rt/trunk.
+
+------------------------------------------------------------------------
+r16 | root | 2003-11-16 01:48:24 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Makefile
+   M /rt/trunk/NEWS
+   M /rt/trunk/README
+   M /rt/trunk/lib/rt/ui/mail/manipulate.pm
+   M /rt/trunk/lib/rt/ui/web/manipulate.pm
+
+Load rt-1-0-7 into rt/trunk.
+
+------------------------------------------------------------------------
+r14 | root | 2003-11-16 01:48:14 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Makefile
+   M /rt/trunk/NEWS
+   M /rt/trunk/lib/rt/support/mail.pm
+   M /rt/trunk/lib/rt/support/utils.pm
+   M /rt/trunk/lib/rt/ui/mail/manipulate.pm
+   M /rt/trunk/lib/rt/ui/web/support.pm
+
+Load rt-1-0-6 into rt/trunk.
+
+------------------------------------------------------------------------
+r12 | root | 2003-11-16 01:48:04 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Makefile
+   M /rt/trunk/NEWS
+   M /rt/trunk/README
+   A /rt/trunk/bin/testdeps.pl
+   M /rt/trunk/etc/suidrt.c
+   M /rt/trunk/lib/rt/database/manipulate.pm
+   M /rt/trunk/lib/rt/ui/cli/manipulate.pm
+   M /rt/trunk/lib/rt/ui/mail/manipulate.pm
+   M /rt/trunk/lib/rt/ui/web/manipulate.pm
+
+Load rt-1-0-5 into rt/trunk.
+
+------------------------------------------------------------------------
+r10 | root | 2003-11-16 01:47:53 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Makefile
+   M /rt/trunk/NEWS
+   M /rt/trunk/README
+   M /rt/trunk/etc/schema
+   M /rt/trunk/lib/rt/ui/mail/manipulate.pm
+
+Load rt-1-0-4 into rt/trunk.
+
+------------------------------------------------------------------------
+r8 | root | 2003-11-16 01:47:42 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Makefile
+   M /rt/trunk/NEWS
+   M /rt/trunk/README
+   M /rt/trunk/docs/rt-templates.html
+   M /rt/trunk/lib/rt/ui/cli/admin.pm
+   M /rt/trunk/lib/rt/ui/cli/query.pm
+   M /rt/trunk/lib/rt/ui/mail/manipulate.pm
+   M /rt/trunk/lib/rt/ui/web/admin.pm
+   M /rt/trunk/lib/rt/ui/web/forms.pm
+   M /rt/trunk/lib/rt/ui/web/manipulate.pm
+
+Load rt-1-0-3 into rt/trunk.
+
+------------------------------------------------------------------------
+r6 | root | 2003-11-16 01:47:30 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Makefile
+   M /rt/trunk/NEWS
+   M /rt/trunk/README
+   M /rt/trunk/docs/FAQ
+   M /rt/trunk/docs/FAQ.html
+   A /rt/trunk/docs/rt-templates.html
+   M /rt/trunk/etc/schema
+   M /rt/trunk/etc/suidrt.c
+   M /rt/trunk/lib/generic_templates/autoreply
+   M /rt/trunk/lib/generic_templates/comment
+   M /rt/trunk/lib/generic_templates/give
+   M /rt/trunk/lib/generic_templates/steal
+   M /rt/trunk/lib/rt/database/manipulate.pm
+   M /rt/trunk/lib/rt/support/mail.pm
+   M /rt/trunk/lib/rt/ui/mail/manipulate.pm
+   M /rt/trunk/lib/rt/ui/web/admin.pm
+   M /rt/trunk/lib/rt/ui/web/forms.pm
+   M /rt/trunk/lib/rt/ui/web/manipulate.pm
+
+Load rt-1-0-2 into rt/trunk.
+
+------------------------------------------------------------------------
+r4 | root | 2003-11-16 01:47:20 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   M /rt/trunk/Makefile
+   M /rt/trunk/NEWS
+   M /rt/trunk/docs/rt_users_guide.html
+   M /rt/trunk/lib/rt/database/manipulate.pm
+   M /rt/trunk/lib/rt/support/mail.pm
+   M /rt/trunk/lib/rt/support/utils.pm
+   M /rt/trunk/lib/rt/ui/cli/query.pm
+   M /rt/trunk/lib/rt/ui/mail/manipulate.pm
+
+Load rt-1-0-1 into rt/trunk.
+
+------------------------------------------------------------------------
+r2 | root | 2003-11-16 01:47:10 -0500 (Sun, 16 Nov 2003) | 2 lines
+Changed paths:
+   A /rt/trunk/COPYING
+   A /rt/trunk/Makefile
+   A /rt/trunk/NEWS
+   A /rt/trunk/README
+   A /rt/trunk/TODO
+   A /rt/trunk/bin
+   A /rt/trunk/bin/rtmux.pl
+   A /rt/trunk/contrib
+   A /rt/trunk/contrib/cookie-prefs.tar.gz
+   A /rt/trunk/contrib/cookie-prefs.tar.gz.README
+   A /rt/trunk/contrib/forms.cgi
+   A /rt/trunk/contrib/manipulate.pm.pth
+   A /rt/trunk/contrib/manipulate.pm.pth.README
+   A /rt/trunk/contrib/mod_auth_mysql.README
+   A /rt/trunk/contrib/ns_authentication.patch
+   A /rt/trunk/contrib/ns_authentication.patch.README
+   A /rt/trunk/contrib/rename_queue.README
+   A /rt/trunk/contrib/req2rt.tar.gz
+   A /rt/trunk/contrib/req2rt.tar.gz.README
+   A /rt/trunk/contrib/signatureforcorrespondence
+   A /rt/trunk/contrib/stats.tar.gz
+   A /rt/trunk/docs
+   A /rt/trunk/docs/FAQ
+   A /rt/trunk/docs/FAQ.html
+   A /rt/trunk/docs/README.docs
+   A /rt/trunk/docs/rt.gif
+   A /rt/trunk/docs/rt_users_guide.html
+   A /rt/trunk/etc
+   A /rt/trunk/etc/config.pm
+   A /rt/trunk/etc/mysql.acl
+   A /rt/trunk/etc/schema
+   A /rt/trunk/etc/suidrt.c
+   A /rt/trunk/etc/templates
+   A /rt/trunk/etc/templates/queues
+   A /rt/trunk/etc/templates/queues/.placeholder
+   A /rt/trunk/etc/templates/queues/_rt_system
+   A /rt/trunk/etc/templates/queues/_rt_system/act_response
+   A /rt/trunk/etc/templates/queues/_rt_system/error
+   A /rt/trunk/lib
+   A /rt/trunk/lib/generic_templates
+   A /rt/trunk/lib/generic_templates/autoreply
+   A /rt/trunk/lib/generic_templates/comment
+   A /rt/trunk/lib/generic_templates/correspondence
+   A /rt/trunk/lib/generic_templates/error
+   A /rt/trunk/lib/generic_templates/give
+   A /rt/trunk/lib/generic_templates/respond
+   A /rt/trunk/lib/generic_templates/steal
+   A /rt/trunk/lib/generic_templates/transaction
+   A /rt/trunk/lib/generic_templates/web_create
+   A /rt/trunk/lib/images
+   A /rt/trunk/lib/images/comment.gif
+   A /rt/trunk/lib/images/down.gif
+   A /rt/trunk/lib/images/endcap.gif
+   A /rt/trunk/lib/images/give.gif
+   A /rt/trunk/lib/images/pixel_black.gif
+   A /rt/trunk/lib/images/resolve.gif
+   A /rt/trunk/lib/images/respond.gif
+   A /rt/trunk/lib/images/rt.jpeg
+   A /rt/trunk/lib/images/sbc.gif
+   A /rt/trunk/lib/images/sbs.gif
+   A /rt/trunk/lib/images/slc.gif
+   A /rt/trunk/lib/images/srs.gif
+   A /rt/trunk/lib/images/take.gif
+   A /rt/trunk/lib/images/up.gif
+   A /rt/trunk/lib/rt
+   A /rt/trunk/lib/rt/database
+   A /rt/trunk/lib/rt/database/admin.pm
+   A /rt/trunk/lib/rt/database/config.pm
+   A /rt/trunk/lib/rt/database/content.pm
+   A /rt/trunk/lib/rt/database/manipulate.pm
+   A /rt/trunk/lib/rt/database.pm
+   A /rt/trunk/lib/rt/support
+   A /rt/trunk/lib/rt/support/mail.pm
+   A /rt/trunk/lib/rt/support/utils.pm
+   A /rt/trunk/lib/rt/ui
+   A /rt/trunk/lib/rt/ui/cli
+   A /rt/trunk/lib/rt/ui/cli/admin.pm
+   A /rt/trunk/lib/rt/ui/cli/manipulate.pm
+   A /rt/trunk/lib/rt/ui/cli/query.pm
+   A /rt/trunk/lib/rt/ui/cli/support.pm
+   A /rt/trunk/lib/rt/ui/mail
+   A /rt/trunk/lib/rt/ui/mail/manipulate.pm
+   A /rt/trunk/lib/rt/ui/web
+   A /rt/trunk/lib/rt/ui/web/admin.pm
+   A /rt/trunk/lib/rt/ui/web/auth.pm
+   A /rt/trunk/lib/rt/ui/web/forms.pm
+   A /rt/trunk/lib/rt/ui/web/manipulate.pm
+   A /rt/trunk/lib/rt/ui/web/support.pm
+
+Load rt-1-0-0 into rt/trunk.
+
+------------------------------------------------------------------------
+r1 | jesse | 2003-11-14 16:32:58 -0500 (Fri, 14 Nov 2003) | 2 lines
+Changed paths:
+   A /rt
+   A /rt/branches
+   A /rt/tags
+   A /rt/trunk
+
+added rt project
 
 ------------------------------------------------------------------------
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index a013b83..afdce23 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -4,10 +4,7 @@ config.layout.in
  etc/RT_SiteConfig.pm
 lib/RT/Interface/Web_Vendor.pm
 lib/RT/URI/freeside.pm
-lib/RT/URI/freeside/Internal.pm
-lib/RT/URI/freeside/XMLRPC.pm
  html/Elements/Header
- html/Elements/Menu
  html/Elements/PageLayout
  html/Elements/SimpleSearch
  html/Elements/Tabs
diff --git a/rt/HOWTO/README b/rt/HOWTO/README
new file mode 100644
index 0000000..942096b
--- /dev/null
+++ b/rt/HOWTO/README
@@ -0,0 +1,14 @@
+Here you'll find plain text documentation of how to handle various
+project procedures.  Files contained herein:
+
+change.txt
+        How changes are integrated, including generating and
+        distributing aedist change sets, and updating the CVS repository.
+
+release.txt
+	Steps to go through when releasing a new version of RT.
+
+
+These procedures are based on documentation from the scons project
+as http://www.scons.org/
+
diff --git a/rt/HOWTO/change.txt b/rt/HOWTO/change.txt
new file mode 100644
index 0000000..de31645
--- /dev/null
+++ b/rt/HOWTO/change.txt
@@ -0,0 +1,67 @@
+Handling a change set:
+
+    --	Start the change:
+
+		aedist -r	[if it's a remote submission]
+                
+                -or-
+
+    		aedb {cnum}	[if it's initiated locally]
+
+    --	Normal development cycle:
+
+                aecd -c {cnum}                   
+                aecp .          # Copy the baseline to your working dir
+                # work on your change
+                aenf {new file names}
+
+                aecpu -unch   # Remove unchanged files, for faster diffs
+    		aeb # Currently does nothing
+		aet # Currently does nothing
+		aed # Diff your change
+		aede # End the change
+
+    --	As the reviewer:
+ 
+		aerpass {cnum}
+
+    --	As the integrator:
+
+		aeib {cnum}
+		aeb
+		aet
+		aed
+                cd ~ # Get out of the current working directory
+		aeipass
+
+
+
+
+    --	Update the aedist baseline on the web site:
+
+		aedist -s -bl -p rt.2.1 > rt.2.1.ae
+		scp rt.2.1.ae jesse@fsck.com:/home/ftp/pub/rt/devel/rt.2.1.ae
+		rm rt.2.1.ae
+
+	[This will eventually be automated.]
+
+    --	Distribute the change to CVS:
+
+        WARNING. DOES NOT YET WORK
+
+		export CVS_RSH=ssh
+    		ae2cvs -n -aegis -p rt.2.1 -c {cnum} -u ~/SCons/scons
+    		ae2cvs -X -aegis -p rt.2.1 -c {cnum} -u ~/SCons/scons
+
+        If you need the "ae2cvs" Perl script, you can find a copy
+        checked in to the bin/subdirectory.
+
+	[This may eventually be automated.]
+
+
+
+	-- Grabbing the latest dev sources over ssh 
+
+	ssh fsck.com "aedist -s -p rt.2.1 -naa -bl -entire-source" | aedist -r
+
+
diff --git a/rt/HOWTO/release.txt b/rt/HOWTO/release.txt
new file mode 100644
index 0000000..285041c
--- /dev/null
+++ b/rt/HOWTO/release.txt
@@ -0,0 +1,124 @@
+Things to do to release a new version of rt:
+
+	Build and test candidate packages
+
+	Read through the README and src/README.txt files for any updates
+
+	Prepare ChangeLog
+
+		date -R the latest release
+
+		should be current if this has been updated as each
+		change went in.
+
+                [ Should be automated ]
+
+
+        TODO: nothing below this line is accurate for RT
+
+	END THE BRANCH
+
+		ae_p rt.2
+		aede {5}
+		aerpass {5}
+		aeib {5}
+		aeb
+		aet
+		aet -reg
+		aed
+		aeipass
+
+	START THE NEW BRANCH
+
+		aenbr -p rt.2 {6}
+		aenc -p rt.2.{6}
+
+                        Call it something like, "Initialize the new
+                        branch."  Cause = internal_enhancement.  Exempt
+                        it from all tests (*_exempt = true).
+
+		ae_p rt.2.{6}
+
+		aedb 100
+
+		aecd
+
+		# Change the hard-coded package version numbers
+		# in the following files.
+		aecp rttruct debian/changelog rpm/rt.spec
+
+		vi rttruct debian/changelog rpm/rt.spec
+
+		# Optionally, do the same in the following:
+		[optional] aecp HOWTO/change.txt
+		[optional] aecp HOWTO/release.txt
+		[optional] aecp debian/rt.postinst
+
+		[optional] vi HOWTO/change.txt
+		[optional] vi HOWTO/release.txt
+		[optional] vi debian/rt.postinst
+
+		aeb
+
+		aet -reg
+
+		aed
+
+		aede
+
+		etc.
+
+
+	Read through the FAQ for any updates
+
+	Test downloading from the web site download page
+
+
+	In the Bugs Tracker, add a Group for the new release (0.05)
+
+	Announce to the following mailing lists (template below):
+
+		rt-announce@lists.fsck.com
+
+
+	Notify www.cmtoday.com/contribute.html
+
+                [This guy wants an announcement no more frequently than
+                once a month, so save it for a future release if it's
+                been too soon since the previous one.]
+
+	Notify freshmeat.net
+
+                [Wait until the morning so the announcement hits the
+                main freshmeat.net page while people in the U.S. are
+                awake and working]
+
+
+
+
+=======================
+
+Template release announcement:
+
+
+
+Version 2.1.XXX of rt has been released and is available for download
+from the rt web site:
+
+        http://bestpractical.com/rt/
+
+
+
+WHAT'S NEW IN THIS RELEASE?
+
+Version 2.1.XXX of rt contains the following important changes:
+
+  - XXX
+
+For a complete list of changes in version 2.1.XXX, see the CHANGES.txt
+file in the release itself.
+
+
+WHAT IS RT? 
+
+        FILL THIS IN
diff --git a/rt/HOWTO/version-control.txt b/rt/HOWTO/version-control.txt
new file mode 100644
index 0000000..06babfd
--- /dev/null
+++ b/rt/HOWTO/version-control.txt
@@ -0,0 +1,41 @@
+Using Aegis for RT development
+
+   1. The main line of RT development will be under the control
+      of the Aegis change management system, as administered by
+       Best Practical Solutions, LLC
+
+   2. We will use aedist to generate change sets for each change
+      checked in to the main Aegis repository. These change sets will be
+      either distributed by a mailing list or made available via the web,
+      or both.
+
+   3. Remote developers using Aegis will send aedist output for
+      their changes to rt-patches@bestpractical.com for review and
+      integration.
+
+   4. The aedist output should be sent to rt-patches@bestpractical.com
+      after the change has completed its local aede, but before aerpass.
+
+   5. If the change is rejected, the developer can aedeu to reopen
+      the change and fix whatever problems caused the review to not pass.
+
+   6. A baseline snapshot (aedist -bl) of the main Aegis repository
+      will be generated at least daily and made available via http
+      to provide a central location for synchronizing remote Aegis
+      repositories.
+
+   7. Changes to the main Aegis repository will also be propagated
+      automatically to the tracking CVS repository.
+
+Using CVS for RT development
+
+   1. CVS is accessed via anonymous cvs with the following CVSROOT:
+
+      :pserver:anoncvs@cvs.fsck.com:/raid/cvsroot/rt-2-1
+
+   2. Remote developers using CVS will send patches (cvs -diff
+      output) to rt-patches@bestpractical.com  for integration into the
+      main Aegis repository. This allows anonymous CVS access to be used
+      for RT development by developers who are unable to use Aegis.
+
+
diff --git a/rt/Makefile.in b/rt/Makefile.in
index 43dcee1..4c268ac 100644
--- a/rt/Makefile.in
+++ b/rt/Makefile.in
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 #
 # DO NOT HAND-EDIT the file named 'Makefile'. This file is autogenerated.
 # Have a look at "configure" and "Makefile.in" instead
@@ -120,10 +120,6 @@ RT_READABLE_DIR_MODE	=	0755
 
 # RT_MODPERL_HANDLER is the mason handler script for mod_perl
 RT_MODPERL_HANDLER	=	$(RT_BIN_PATH)/webmux.pl
-# RT_STANDALONE_SERVER is a stand-alone HTTP server
-RT_STANDALONE_SERVER	=	$(RT_BIN_PATH)/standalone_httpd
-# RT_SPEEDYCGI_HANDLER is the mason handler script for SpeedyCGI
-RT_SPEEDYCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.scgi
 # RT_FASTCGI_HANDLER is the mason handler script for FastCGI
 RT_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.fcgi
 # RT_WIN32_FASTCGI_HANDLER is the mason handler script for FastCGI
@@ -142,9 +138,7 @@ BINARIES		=	$(DESTDIR)/$(RT_MODPERL_HANDLER) \
 				$(DESTDIR)/$(RT_MAILGATE_BIN) \
 				$(DESTDIR)/$(RT_CLI_BIN) \
 				$(DESTDIR)/$(RT_CRON_BIN) \
-				$(DESTDIR)/$(RT_STANDALONE_SERVER) \
-				$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-				$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
+ 				$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
 				$(DESTDIR)/$(RT_WIN32_FASTCGI_HANDLER)
 SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
 
@@ -219,11 +213,8 @@ instruct:
 	@echo ""
 	@echo "You must now configure RT by editing $(SITE_CONFIG_FILE)."
 	@echo ""
-	@echo "(You will definitely need to set RT's database password in "
-	@echo "$(SITE_CONFIG_FILE) before continuing. Not doing so could be "
-	@echo "very dangerous.  Note that you do not have to manually add a "
-	@echo "database user or set up a database for RT.  These actions will be "
-	@echo "taken care of in the next step.)"
+	@echo "(You will definitely need to set RT's database password before continuing."
+	@echo " Not doing so could be very dangerous)"
 	@echo ""
 	@echo "After that, you need to initialize RT's database by running" 
 	@echo " 'make initialize-database'"
@@ -256,8 +247,6 @@ upgrade-noclobber: config-install libs-install html-install bin-install local-in
 testdeps:
 	$(PERL) ./sbin/rt-test-dependencies --verbose --with-$(DB_TYPE)
 
-depends: fixdeps
-
 fixdeps:
 	$(PERL) ./sbin/rt-test-dependencies --verbose --install --with-$(DB_TYPE)
 
@@ -279,7 +268,7 @@ fixperms:
 	chmod 0500 $(DESTDIR)/$(RT_ETC_PATH)/*
 
 	#TODO: the config file should probably be able to have its
-	# owner set separately from the binaries.
+	# owner set seperately from the binaries.
 	chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_ETC_PATH)
 	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_ETC_PATH)
 
@@ -330,7 +319,7 @@ files-install: libs-install etc-install bin-install sbin-install html-install lo
 
 config-install:
 	mkdir -p $(DESTDIR)/$(CONFIG_FILE_PATH)	
-	-cp etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
+	cp etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
 	[ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE) 
 
 	chgrp $(RTGROUP) $(DESTDIR)/$(CONFIG_FILE)
@@ -347,14 +336,11 @@ test:
 regression-install: config-install
 	$(PERL) -pi -e 's/Set\(\$$DatabaseName.*\);/Set\(\$$DatabaseName, "rt3regression"\);/' $(DESTDIR)/$(CONFIG_FILE)
 
-regression: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms apachectl run-regression
-
-run-regression:
-	prove -Ilib lib/t/setup_regression.t  lib/t/autogen/ lib/t/regression/
-
-
-regression-noapache: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms start-httpd  run-regression
+regression: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms apachectl
+	$(PERL) lib/t/02regression.t
 
+regression-noapache: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms start-httpd 
+	$(PERL) lib/t/02regression.t
 regression-quiet:
 	$(PERL) sbin/regression_harness
 
@@ -368,8 +354,6 @@ regression-reset-db:
 	$(PERL)	$(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --dba-password '' --force
 	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
 
-initdb :: initialize-database
-
 initialize-database: 
 	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --prompt-for-dba-password
 
@@ -382,13 +366,13 @@ insert-approval-data:
 
 # {{{ libs-install
 libs-install: 
-	[ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir -p $(DESTDIR)/$(RT_LIB_PATH)
+	[ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir $(DESTDIR)/$(RT_LIB_PATH)
 	-cp -rp lib/* $(DESTDIR)/$(RT_LIB_PATH)
 # }}}
 
 # {{{ html-install
 html-install:
-	[ -d $(DESTDIR)/$(MASON_HTML_PATH) ] || mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
+	[ -d $(DESTDIR)/$(MASON_HTML_PATH) ] || mkdir $(DESTDIR)/$(MASON_HTML_PATH)
 	-cp -rp ./html/* $(DESTDIR)/$(MASON_HTML_PATH)
 # }}}
 
@@ -396,7 +380,7 @@ html-install:
 doc-install:
 	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
 	-[ -f $(DESTDIR)/$(RT_DOC_PATH) ] && rm $(DESTDIR)/$(RT_DOC_PATH) 
-	[ -d $(DESTDIR)/$(RT_DOC_PATH) ] || mkdir -p $(DESTDIR)/$(RT_DOC_PATH)
+	[ -d $(DESTDIR)/$(RT_DOC_PATH) ] || mkdir $(DESTDIR)/$(RT_DOC_PATH)
 	-cp -rp ./README $(DESTDIR)/$(RT_DOC_PATH)
 # }}}
 
@@ -415,12 +399,9 @@ etc-install:
 
 sbin-install:
 	mkdir -p $(DESTDIR)/$(RT_SBIN_PATH)
-	chmod +x \
-		sbin/rt-dump-database \
-		sbin/rt-setup-database \
+	chmod +x sbin/rt-setup-database \
 		sbin/rt-test-dependencies
 	-cp -rp \
-		sbin/rt-dump-database \
 		sbin/rt-setup-database \
 		sbin/rt-test-dependencies \
 		$(DESTDIR)/$(RT_SBIN_PATH)
diff --git a/rt/README b/rt/README
index caead27..9373f69 100755
--- a/rt/README
+++ b/rt/README
@@ -1,18 +1,62 @@
-RT is an enterprise-grade issue tracking system. It allows organizations
-to keep track of what needs to get done, who is working on which tasks,
-what's already been done, and when tasks were (or weren't) completed.
-
-RT doesn't cost anything to use, no matter how much you use it; it
-is freely available under the terms of Version 2 of the GNU General
-Public License.
+# {{{ BEGIN BPS TAGGED BLOCK
+# 
+# COPYRIGHT:
+#  
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+#                                          <jesse@bestpractical.com>
+# 
+# (Except where explicitly superseded by other copyright notices)
+# 
+# 
+# LICENSE:
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# 
+# 
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+# 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+# 
+# }}} END BPS TAGGED BLOCK
+RT is an enterprise-grade issue tracking system. It allows
+organizations to keep track of their to-do lists, who is working
+on which tasks, what's already been done, and when tasks were
+completed. It is available under the terms of version 2 of the GNU
+General Public License (GPL), so it doesn't cost anything to set
+up and use.
 
-RT is commercially-supported software. To purchase support, training,
-custom development, or professional services, please get in touch with
-us at sales@bestpractical.com.
+RT is commercially supported software. To purchase support, training,
+custom development or professional services, please write to
+sales@bestpractical.com. 
 
-     Jesse Vincent
-     Best Practical Solutions, LLC
-     March, 2005
+        Jesse Vincent
+        Best Practical Solutions, LLC
+        June 2004
 
 
 REQUIRED PACKAGES:
@@ -20,25 +64,30 @@ REQUIRED PACKAGES:
 
 o   Perl 5.8.3 or later (http://www.perl.com).
 
-       Perl versions prior to 5.8.3 contain bugs that could result
-       in data corruption. We recommend strongly that you use 5.8.3
-       or newer.
-
-o   A supported SQL database
+	    Perl versions prior to 5.8.3 contain bugs that could result
+	    in data corruption. We recommend strongly that you use 5.8.3
+	    or newer. RT may function with perl 5.8.0 and later, but
+	    is unsupported in that configuration.
 
+o   A DB backend; MySQL is recommended ( http://www.mysql.com ) 
         Currently supported:  Mysql 4.0.13 or later with InnoDB support.
                               Postgres 7.2 or later.
-                              Oracle 9iR2 or later.
-                              SQLite 3.0. (Not recommended for production)
+                              Oracle 9iR2.
+        Beta-quality support for Informix and SQLite is also available.
+
 
 o   Apache version 1.3.x or 2.x (http://httpd.apache.org) 
-        with mod_perl -- (http://perl.apache.org ) 
-        or a webserver with FastCGI support (www.fastcgi.com)
+    with mod_perl -- (http://perl.apache.org ) 
+    or a webserver with FastCGI support (www.fastcgi.com)
+
+        mod_perl 2.0 isn't quite ready for prime_time just yet;
+        Best Practical Solutions strongly recommends that sites use 
+        Apache 1.3 or FastCGI.
 
         Compiling mod_perl on Apache 1.3.x as a DSO has been known 
-        to have massive stability problems and is not recommended.
+         to have massive stability problems and is not recommended.
 
-        mod_perl 1.x must be built with EVERYTHING=1
+        mod_perl 1.x must be build with EVERYTHING=1
 
         RT's FastCGI handler needs to access RT's configuration file.
 
@@ -48,7 +97,7 @@ o    Various and sundry perl modules
 
 	The tool supplied with RT uses Perl's CPAN system
 	(http://www.cpan.org) to install modules. Some operating
-	systems package all or some of the modules required, and
+	systems package all or some of the modules required and
 	you may be better off installing the modules that way.
 
 
@@ -60,112 +109,100 @@ want to read a more comprehensive installation guide at:
 
     http://wiki.bestpractical.com/index.cgi?InstallationGuides
 
-1   Unpack this distribution other than where you want to install RT
+1   Unpack this distribution SOMWHERE OTHER THAN where you want to install RT
 
-     To do this cleanly, run the following command:
+        Granted, you've already got it open. To do this cleanly:
 
-       tar xzvf rt.tar.gz -C /tmp
+                tar xzvf rt.tar.gz -C /tmp
 
 2   Run the "configure" script. 
 
-       ./configure --help to see the list of options
-       ./configure (with the flags you want)
-
-    RT defaults to installing in /opt/rt3 with MySQL as its database. It
-    tries to guess which of www-data, www, apache or nobody your webserver
-    will run as, but you can override that behavior.
+        ./configure --help to see the list of options
+        ./configure (with the flags you want)
 
-3   Make sure that RT has everything it needs to run.
+3   Make sure that RT has everything it needs to run:
 
-    Check for missing dependencies by running:
+3.1   Check for missing dependencies:
 
-       make testdeps        
+        make testdeps        
 
-4   If the script reports any missing dependencies, install them by hand
-    or run the following command as a user who has permission to install perl
-    modules on your system:
+3.2   If there are unsatisfied dependencies, install them by hand or run:
 
-     make fixdeps
+        make fixdeps
 
-5   Check to make sure everything was installed properly.
-     
-       make testdeps
+3.3   Check to make sure everything was installed properly:
+        
+        make testdeps
 
-     It might sometimes be necessary to run "make fixdeps" several times
-     to install all necessary perl modules.
+        It might sometimes be necessary to run "make fixdeps" several times
+        to install all necessary perl modules.
 
-6   If this is a new installation:
-     
-     As a user with permission to install RT in your chosen directory, type:
+4   Create a group called 'rt'
 
-       make install   
-                    
-     Set up etc/RT_SiteConfig.pm in your RT installation directory.
-     You'll need to add any values you need to change from the defaults 
-     in etc/RT_Config.pm
+5a  FOR A NEW INSTALLATION: 
+        
+        As root, type:
+                 make install   
+                       
+                 make initialize-database 
 
-     As a user with permission to read RT's configuration file, type:
-     
-       make initialize-database 
+        If the make fails, type:
+                make dropdb 
+        and start over from step 5a
 
-     If the make fails, type:
-     
-       make dropdb 
+5b  FOR UPGRADING: (Within the RT 3.x series)
 
-     and start over from step 6
+        Read through the UPGRADING document included in this distribution.
+        It may contain important instructions which will help you upgrade
+        RT safely.
 
-7   If you're upgrading from RT 3.0 or newer:
+        As root, type: 
+                make upgrade    
 
-     Read through the UPGRADING document included in this distribution.
-     
-     It includes special upgrade instructions that will help you get this
-     new version of RT up and running smoothly.
+        This will build new binaries, config files and libraries without
+        overwriting your RT database. 
 
-     As a user with permission to install RT in your chosen installation
-     directory, type: 
+        You may also need to update RT's database.  To find out, type:
 
-       make upgrade    
+           ls etc/upgrade
 
-     This will install new binaries, config files and libraries without
-     overwriting your RT database. 
+        For each item in that directory whose name is greater than
+        your previously installed RT version, run:
+            /opt/rt3/sbin/rt-setup-database --action schema \
+                --datadir etc/upgrade/<version>
+            /opt/rt3/sbin/rt-setup-database --action acl \
+                --datadir etc/upgrade/<version>
+            /opt/rt3/sbin/rt-setup-database --action insert \
+                 --datadir etc/upgrade/<version>
 
-     Update etc/RT_SiteConfig.pm in your RT installation directory.
-     You'll need to add any new values you need to change from the defaults 
-     in etc/RT_Config.pm
 
-     You may also need to update RT's database.  To find out, type:
+5c  FOR UPGRADING: (From RT 2.0.x)
 
-       ls etc/upgrade
+    Download the RT2 to RT3 migration tools from:
 
-     For each item in that directory whose name is greater than
-     your previously installed RT version, run:
+    http://bestpractical.com/pub/rt/devel/rt2-to-rt3.tar.gz
 
-       /opt/rt3/sbin/rt-setup-database --action schema \
-           --datadir etc/upgrade/<version>
-       /opt/rt3/sbin/rt-setup-database --action acl \
-           --datadir etc/upgrade/<version>
-       /opt/rt3/sbin/rt-setup-database --action insert \
-            --datadir etc/upgrade/<version>
+    Follow the included instructions.
 
-8  If you're upgrading from RT 2.0:
+6   Edit etc/RT_SiteConfig.pm in your RT installation directory, by specifying
+    any values you need to change from the defaults in etc/RT_Config.pm
 
-    Please upgrade from RT 2.0 to RT 3.2 and then follow the instructions
-    for section 7.
+7   Configure the email and web gateways, as described below. 
 
-9   Configure the email and web gateways, as described below. 
+8   Stop and start your webserver, so it picks up your configuration changes.
 
     NOTE: root's password for the web interface is "password" 
-    (without the quotes).  Not changing this is a SECURITY risk!
+    (without the quotes.)  Not changing this is a SECURITY risk
     
-10   Set up users, groups, queues, scrips and access control.
+9   Configure RT per the instructions in RT's manual.
 
     Until you do this, RT will not be able to send or receive email,
     nor will it be more than marginally functional.  This is not an
     optional step.
 
 
-SETTING UP THE WEB INTERFACE
-----------------------------
+THE WEB INTERFACE
+-----------------
 
 RT's web interface is based around HTML::Mason, which works well with
 the mod_perl perl interpreter within Apache httpd and FastCGI
@@ -173,26 +210,27 @@ the mod_perl perl interpreter within Apache httpd and FastCGI
 mod_perl
 --------
 
-To install RT with mod_perl, you'll need to install the
-apache database connection cache.  To make sure it's installed, run
-the following command:
-
-    perl -MCPAN -e'install Apache::DBI'
-
-Next, add a few lines to your Apache configuration file, so that
-it knows where to find RT:
+To install RT with mod_perl, you'll need to add a few lines to your 
+Apache configuration file telling it about RT:
 
 <VirtualHost your.ip.address>
     ServerName your.rt.server.hostname
     DocumentRoot /opt/rt3/share/html
     AddDefaultCharset UTF-8
 
+    # these four lines apply to Apache2+mod_perl2 only: {{{
+    PerlSetVar MasonArgsMethod CGI
+    PerlModule Apache2 Apache::compat
+    RewriteEngine On
+    RewriteRule ^(.*)/$ $1/index.html
+    # }}}
+
     PerlModule Apache::DBI
     PerlRequire /opt/rt3/bin/webmux.pl
 
     <Location />
-     SetHandler perl-script
-     PerlHandler RT::Mason
+        SetHandler perl-script
+        PerlHandler RT::Mason
     </Location>
 </VirtualHost>
 
@@ -231,22 +269,30 @@ Apache configuration file telling it about RT:
 SETTING UP THE MAIL GATEWAY 
 ---------------------------
 
-To let email flow to your RT server, you need to add a few lines of
-configuration to your mail server's "aliases" file. These lines "pipe"
-incoming email messages from your mail server to RT.
-
-Add the following lines to /etc/aliases (or your local equivalent) on your mail server:
+RT can accept incoming email using a simple program run as a "pipe" 
+by your mail server.
 
-rt:         "|/opt/rt3/bin/rt-mailgate --queue general --action correspond --url http://rt.example.com/"
-rt-comment: "|/opt/rt3/bin/rt-mailgate --queue general --action comment --url http://rt.example.com/"
+An alias for the initial queue will need to be made in either your
+global mail aliases file (if you are using NIS) or locally on your
+machine.
+ 
+Add the following lines to /etc/aliases (or your local equivalent) :
 
-You'll need to add similar lines for each queue you want to be able
-to send email to. To find out more about how to configure RT's email
-gateway, type:
+rt:         "|/opt/rt3/bin/rt-mailgate --queue general --action correspond --url http://localhost/"
+rt-comment: "|/opt/rt3/bin/rt-mailgate --queue general --action comment --url http://localhost/"
+                                            |                |             |
+                            <queue-name>----/                |             |
+                                                             |             |
+               <correspond or comment depending on whether   |             |
+               the mail should be resent to the requestor>---/             |
+                                                                           |
+                                            <URL for RT's web interface>---/
 
-       perldoc /opt/rt3/bin/rt-mailgate
 
+BUGS
+----
 
+To report a bug, send email to rt-bugs@fsck.com.
 
 GETTING HELP
 ------------
@@ -254,36 +300,24 @@ GETTING HELP
 If RT is mission-critical for you or if you use it heavily, we recommend that
 you purchase a commercial support contract.  Details on support contracts
 are available at http://www.bestpractical.com or by writing to
-<sales@bestpractical.com>. 
+sales@bestpractical.com.
 
 If you're interested in having RT extended or customized or would like more
 information about commercial support options, please send email to 
 <sales@bestpractical.com> to discuss rates and availability.
 
 
-
-RT WEBSITE
-----------
-
-For current information about RT, check out the RT website at 
-     http://www.bestpractical.com/  
-
-You'll find screenshots, a pointer to the current version of RT, contributed 
-patches, and lots of other great stuff.
-
-
-
-RT-USERS MAILING LIST
+RT-USERS MAILINGLIST
 --------------------
 
 To keep up to date on the latest RT tips, techniques and extensions,
 you probably want to join the rt-users mailing list.  Send a message to:
 
-      rt-users-request@lists.bestpractical.com 
+         rt-users-request@lists.bestpractical.com 
 
-with the body of the message consisting of only the word:
+With the body of the message consisting of only the word:
 
-     subscribe
+        subscribe
 
 If you're interested in hacking on RT, you'll want to subscribe to
 rt-devel@lists.bestpractical.com.  Subscribe to it with instructions
@@ -295,61 +329,12 @@ your questions are best not asked publicly, send them personally to
 <jesse@bestpractical.com>.
 
 
+RT WEBSITE
+----------
 
-BUGS
-----
-
-RT's a pretty complex application, and as you get up to speed, you might
-run into some trouble. Generally, it's best to ask about things you
-run into on the rt-users mailinglist (or pick up a commercial support
-contract from Best Practical). But, sometimes people do run into bugs. In
-the exceedingly unlikely event that you hit a bug in RT, please report
-it! We'd love to hear about problems you have with RT, so we can fix them.
-To report a bug, send email to rt-bugs@fsck.com.
+For current information about RT, check out the RT website at 
+        http://www.bestpractical.com/  
 
 
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
+You'll find screenshots, a pointer to the current version of RT, contributed 
+patches, and lots of other great stuff.
diff --git a/rt/UPGRADING b/rt/UPGRADING
index 11a26e8..7256f97 100644
--- a/rt/UPGRADING
+++ b/rt/UPGRADING
@@ -16,32 +16,6 @@ accidentally damage your database and lose data or worse.
 
 *******
 
-UPGRADING FROM 3.3.14 and earlier - Changes:
-
-The "ModifyObjectCustomFieldValues" right name was too long. It's been changed to
-"ModifyCustomField"
-
-
-UPGRADING FROM 3.3.11 and earlier - Changes:
-
-= Rights Changes =
-
-Custom Fields now have an additional right "ModifyCustomField". 
-This right governs whether a user can modify an object's custom field values
-for a particular custom field. This includes adding, deleting and changing values.
-
-
-UPGRADING FROM 3.2 and earlier - Changes:
-
-= Rights changes =
-
-Now, if you want any user to be able to access the Admin tools (a.k.a. 
-the Configuration tab), you must grant that user the "ShowConfigTab" 
-right.  Making the user a privileged user is no longer sufficient.
-
-"SuperUser" users are no longer automatically added to the list of users who can own tickets in a queue. You now need to explicitly give them the "own tickets" right.
-
-
 
 UPGRADING FROM 3.0.x - Changes:
 
diff --git a/rt/aclocal.m4 b/rt/aclocal.m4
index 67ff30d..6e8659c 100644
--- a/rt/aclocal.m4
+++ b/rt/aclocal.m4
@@ -10,6 +10,825 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
+# lib-prefix.m4 serial 3 (gettext-0.12.2)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/lib"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/lib"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/lib"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+# lib-link.m4 serial 4 (gettext-0.12)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    LIBS="$LIBS $LIB[]NAME"
+    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+dnl hardcode_direct, hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib$1-prefix],
+[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
+  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/lib"
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          if test $use_additional = yes; then
+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+              found_dir="$additional_libdir"
+              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
+              fi
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                    found_dir="$dir"
+                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */lib | */lib/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux*) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/lib"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux*) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+# lib-ld.m4 serial 2 (gettext-0.12)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  acl_cv_prog_gnu_ld=yes
+else
+  acl_cv_prog_gnu_ld=no
+fi])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH(gnu-ld,
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(acl_cv_path_LD,
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+	test "$with_gnu_ld" != no && break
+      else
+	test "$with_gnu_ld" != yes && break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
+
 dnl
 dnl @synopsis RT_ENABLE_LAYOUT()
 dnl
diff --git a/rt/bin/mason_handler.fcgi.in b/rt/bin/mason_handler.fcgi.in
index 193eaae..4a1abd3 100644
--- a/rt/bin/mason_handler.fcgi.in
+++ b/rt/bin/mason_handler.fcgi.in
@@ -1,9 +1,9 @@
 #!@PERL@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Mason;
 
 use strict;
@@ -65,7 +65,6 @@ while ( my $cgi = CGI::Fast->new ) {
     $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
     $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
 
-    Module::Refresh->refresh if $RT::DevelMode;
     RT::ConnectToDatabase();
 
     if ( ( !$Handler->interp->comp_exists( $cgi->path_info ) )
@@ -77,7 +76,13 @@ while ( my $cgi = CGI::Fast->new ) {
     if ($@) {
         $RT::Logger->crit($@);
     }
-    RT::Interface::Web::Handler->CleanupRequest(); 
+
+
+    if ($RT::Handle->TransactionDepth) {
+        $RT::Handle->ForceRollback;
+        $RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") ;
+    }
+
 
 }
 
diff --git a/rt/bin/mason_handler.scgi.in b/rt/bin/mason_handler.scgi.in
index 2b38c93..177ff00 100644
--- a/rt/bin/mason_handler.scgi.in
+++ b/rt/bin/mason_handler.scgi.in
@@ -1,9 +1,9 @@
 #!@SPEEDY_BIN@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Mason;
 
 use strict;
@@ -61,5 +61,5 @@ if ( ( !$Handler->interp->comp_exists( $cgi->path_info ) )
 }
 
 $Handler->handle_cgi_object($cgi);
-RT::Interface::Web::Handler->CleanupRequest();
+
 1;
diff --git a/rt/bin/mason_handler.svc.in b/rt/bin/mason_handler.svc.in
index 7be566d..d82f3c1 100644
--- a/rt/bin/mason_handler.svc.in
+++ b/rt/bin/mason_handler.svc.in
@@ -1,9 +1,9 @@
 #!@PERL@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
 mason_handler.svc - Win32 IIS Service handler for RT
@@ -237,7 +236,6 @@ while( my $cgi = CGI::Fast->new ) {
     warn "Serving $comp\n";
 
     $Handler->handle_cgi($comp);
-    RT::Interface::Web::Handler->CleanupRequest();
     # _should_ always be tied
 }
 
diff --git a/rt/bin/rt-crontool.in b/rt/bin/rt-crontool.in
index 76b08c3..6b95d8d 100644
--- a/rt/bin/rt-crontool.in
+++ b/rt/bin/rt-crontool.in
@@ -1,9 +1,9 @@
 #!@PERL@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,11 +43,11 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 use strict;
 use Carp;
 
-use lib ("@LOCAL_LIB_PATH@", "@RT_LIB_PATH@");
+use lib ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
 
 package RT;
 
diff --git a/rt/bin/rt-mailgate.in b/rt/bin/rt-mailgate.in
index 5ac9469..a37364f 100644
--- a/rt/bin/rt-mailgate.in
+++ b/rt/bin/rt-mailgate.in
@@ -1,9 +1,9 @@
 #!@PERL@ -w
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,12 +43,385 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 
 =head1 NAME
 
 rt-mailgate - Mail interface to RT3.
 
+=begin testing
+
+use RT::I18N;
+
+# Make sure that when we call the mailgate wrong, it tempfails
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://bad.address"), "Opened the mailgate - The error below is expected - $@");
+print MAIL <<EOF;
+From: root\@localhost
+To: rt\@example.com
+Subject: This is a test of new ticket creation
+
+Foob!
+EOF
+close (MAIL);
+
+# Check the return value
+is ( $? >> 8, 75, "The error message above is expected The mail gateway exited with a failure. yay");
+
+
+# {{{ Test new ticket creation by root who is privileged and superuser
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate  --debug --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: root\@localhost
+To: rt\@example.com
+Subject: This is a test of new ticket creation
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
+use RT::Tickets;
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $tick = $tickets->First();
+ok (UNIVERSAL::isa($tick,'RT::Ticket'));
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'This is a test of new ticket creation', "Created the ticket");
+
+# }}}
+
+
+# {{{This is a test of new ticket creation as an unknown user
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist\@example.com
+To: rt\@example.com
+Subject: This is a test of new ticket creation as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
+$tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+$tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject ne 'This is a test of new ticket creation as an unknown user', "failed to create the new ticket from an unprivileged account");
+my $u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by failed ticket submission");
+
+
+# }}}
+
+# {{{ now everybody can create tickets.  can a random unkown user create tickets?
+
+my $g = RT::Group->new($RT::SystemUser);
+$g->LoadSystemInternalGroup('Everyone');
+ok( $g->Id, "Found 'everybody'");
+
+my ($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+ok ($val, "Granted everybody the right to create tickets - $msg");
+
+sleep(60); # gotta sleep so the remote process' ACL cache times out
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist\@example.com
+To: rt\@example.com
+Subject: This is a test of new ticket creation as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
+
+$tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
+$tick = $tickets->First();
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'This is a test of new ticket creation as an unknown user', "failed to create the new ticket from an unprivileged account");
+my $u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist@example.com');
+ok( $u->Id != 0, " user does not exist and was created by ticket submission");
+
+# }}}
+
+
+# {{{  can another random reply to a ticket without being granted privs? answer should be no.
+
+
+#($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+#ok ($val, "Granted everybody the right to create tickets - $msg");
+#sleep(60); # gotta sleep so the remote process' ACL cache times out
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-2\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a reply as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-2@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by ticket correspondence submission");
+# }}}
+
+
+# {{{  can another random reply to a ticket after being granted privs? answer should be yes
+
+
+($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'ReplyToTicket');
+ok ($val, "Granted everybody the right to reply to  tickets - $msg");
+sleep(60); # gotta sleep so the remote process' ACL cache times out
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-2\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a reply as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-2@example.com');
+ok( $u->Id != 0, " user exists and was created by ticket correspondence submission");
+
+# }}}
+
+# {{{  can another random comment on a ticket without being granted privs? answer should be no.
+
+
+#($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
+#ok ($val, "Granted everybody the right to create tickets - $msg");
+#sleep(60); # gotta sleep so the remote process' ACL cache times out
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action comment"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-3\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a comment as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-3@example.com');
+ok( $u->Id == 0, " user does not exist and was not created by ticket comment submission");
+
+# }}}
+# {{{  can another random reply to a ticket after being granted privs? answer should be yes
+
+
+($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CommentOnTicket');
+ok ($val, "Granted everybody the right to reply to  tickets - $msg");
+sleep(60); # gotta sleep so the remote process' ACL cache times out
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action comment"), "Opened the mailgate - $@");
+print MAIL <<EOF;
+From: doesnotexist-3\@example.com
+To: rt\@example.com
+Subject: [example.com #@{[$tick->Id]}] This is a test of a comment as an unknown user
+
+Blah!
+Foob!
+EOF
+close (MAIL);
+
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
+$u = RT::User->new($RT::SystemUser);
+$u->Load('doesnotexist-3@example.com');
+ok( $u->Id != 0, " user exists and was created by ticket comment submission");
+
+# }}}
+
+# {{{ Testing preservation of binary attachments
+
+# Get a binary blob (Best Practical logo) 
+
+# Create a mime entity with an attachment
+
+use MIME::Entity;
+my $entity = MIME::Entity->build( From => 'root@localhost',
+                                 To => 'rt@localhost',
+                                Subject => 'binary attachment test',
+                                Data => ['This is a test of a binary attachment']);
+
+# currently in lib/t/autogen
+$entity->attach(Path => '@MASON_HTML_PATH@/NoAuth/images/spacer.gif', 
+                Type => 'image/gif',
+                Encoding => 'base64');
+
+# Create a ticket with a binary attachment
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
+
+$entity->print(\*MAIL);
+
+close (MAIL);
+
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
+my $tickets = RT::Tickets->new($RT::SystemUser);
+$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+ $tick = $tickets->First();
+ok (UNIVERSAL::isa($tick,'RT::Ticket'));
+ok ($tick->Id, "found ticket ".$tick->Id);
+ok ($tick->Subject eq 'binary attachment test', "Created the ticket - ".$tick->Id);
+
+my $file = `cat ../../../html/NoAuth/images/spacer.gif`;
+ok ($file, "Read in the logo image");
+
+
+        use Digest::MD5;
+warn "for the raw file the content is ".Digest::MD5::md5_base64($file);
+
+
+
+# Verify that the binary attachment is valid in the database
+my $attachments = RT::Attachments->new($RT::SystemUser);
+$attachments->Limit(FIELD => 'ContentType', VALUE => 'image/gif');
+ok ($attachments->Count == 1, 'Found only one gif in the database');
+my $attachment = $attachments->First;
+ok($attachment->Id);
+my $acontent = $attachment->Content;
+
+        warn "coming from the  database, the content is ".Digest::MD5::md5_base64($acontent);
+
+is( $acontent, $file, 'The attachment isn\'t screwed up in the database.');
+# Log in as root
+use Getopt::Long;
+use LWP::UserAgent;
+
+
+# Grab the binary attachment via the web ui
+my $ua      = LWP::UserAgent->new();
+
+my $full_url = "http://localhost".$RT::WebPath."/Ticket/Attachment/".$attachment->TransactionId."/".$attachment->id."/spacer.gif?&user=root&pass=password";
+my $r = $ua->get( $full_url);
+
+
+# Verify that the downloaded attachment is the same as what we uploaded.
+is($file, $r->content, 'The attachment isn\'t screwed up in download');
+
+
+
+# }}}
+
+# {{{ Simple I18N testing
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
+                                                                         
+print MAIL <<EOF;
+From: root\@localhost
+To: rtemail\@example.com
+Subject: This is a test of I18N ticket creation
+Content-Type: text/plain; charset="utf-8"
+
+2 accented lines
+\303\242\303\252\303\256\303\264\303\273
+\303\241\303\251\303\255\303\263\303\272
+bye
+EOF
+close (MAIL);
+
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
+my $unitickets = RT::Tickets->new($RT::SystemUser);
+$unitickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$unitickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $unitick = $unitickets->First();
+ok (UNIVERSAL::isa($unitick,'RT::Ticket'));
+ok ($unitick->Id, "found ticket ".$unitick->Id);
+ok ($unitick->Subject eq 'This is a test of I18N ticket creation', "Created the ticket - ". $unitick->Subject);
+
+
+
+my $unistring = "\303\241\303\251\303\255\303\263\303\272";
+Encode::_utf8_on($unistring);
+is ($unitick->Transactions->First->Content, $unitick->Transactions->First->Attachments->First->Content, "Content is ". $unitick->Transactions->First->Attachments->First->Content);
+ok($unitick->Transactions->First->Attachments->First->Content =~ /$unistring/i, $unitick->Id." appears to be unicode ". $unitick->Transactions->First->Attachments->First->Id);
+# supposedly I18N fails on the second message sent in.
+
+ok(open(MAIL, "|@RT_BIN_PATH@/rt-mailgate --url http://localhost".$RT::WebPath."/ --queue general --action correspond"), "Opened the mailgate - $@");
+                                                                         
+print MAIL <<EOF;
+From: root\@localhost
+To: rtemail\@example.com
+Subject: This is a test of I18N ticket creation
+Content-Type: text/plain; charset="utf-8"
+
+2 accented lines
+\303\242\303\252\303\256\303\264\303\273
+\303\241\303\251\303\255\303\263\303\272
+bye
+EOF
+close (MAIL);
+
+#Check the return value
+is ($? >> 8, 0, "The mail gateway exited normally. yay");
+
+my $tickets2 = RT::Tickets->new($RT::SystemUser);
+$tickets2->OrderBy(FIELD => 'id', ORDER => 'DESC');
+$tickets2->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
+my $tick2 = $tickets2->First();
+ok (UNIVERSAL::isa($tick2,'RT::Ticket'));
+ok ($tick2->Id, "found ticket ".$tick2->Id);
+ok ($tick2->Subject eq 'This is a test of I18N ticket creation', "Created the ticket");
+
+
+
+my $unistring = "\303\241\303\251\303\255\303\263\303\272";
+Encode::_utf8_on($unistring);
+
+ok ($tick2->Transactions->First->Content =~ $unistring, "It appears to be unicode - ".$tick2->Transactions->First->Content);
+
+# }}}
+
+
+($val,$msg) = $g->PrincipalObj->RevokeRight(Right => 'CreateTicket');
+ok ($val, $msg);
+
+
+
+=end testing
+
 =cut
 
 
@@ -72,6 +445,7 @@ for (qw(url)) {
     die "$0 invoked improperly\n\nNo $_ provided to mail gateway!\n" unless $opts{$_};
 }
 
+undef $/;
 my $ua      = LWP::UserAgent->new();
 $ua->cookie_jar( { file => $opts{jar} } );
 
@@ -82,7 +456,7 @@ my %args = (
 );
 
 # Read the message in from STDIN
-$args{'message'} = do { local (@ARGV, $/); <> };
+$args{'message'} = <>;
 
 unless ( $args{message} =~ /\S/ ) {
     print STDERR "$0: no message passed on STDIN!\n";
@@ -155,7 +529,7 @@ sub check_failure {
 
 Usual invocation (from MTA):
 
-    rt-mailgate --action (correspond|comment|...) --queue queuename
+    rt-mailgate --action (correspond|comment) --queue queuename
                 --url http://your.rt.server/
                 [ --debug ]
                 [ --extension (queue|action|ticket) ]
@@ -171,31 +545,15 @@ See C<man rt-mailgate> for more.
 
 =item C<--action>
 
-Specifies what happens to email sent to this alias.  The avaliable
-basic actions are: C<correspond>, C<comment>.
-
-
-If you've set the RT configuration variable B<$RT::UnsafeEmailCommands>,
-C<take> and C<resolve> are also available.  You can execute two or more
-actions on a single message using a C<-> separated list.  RT will execute
-the actions in the listed order.  For example you can use C<take-comment>,
-C<correspond-resolve> or C<take-comment-resolve> as actions.
-
-Note that C<take> and C<resolve> actions ignore message text if used
-alone.  Include a  C<comment> or C<correspond> action if you want RT
-to record the incoming message.
-
-The default action is C<correspond>.
+Specifies whether this is a correspondence or comment address.
 
 =item C<--queue>
 
-This flag determines which queue this alias should create a ticket in if no ticket identifier
-is found.
+Reflects which queue this address handles.
 
 =item C<--url>
 
-This flag tells the mail gateway where it can find your RT server. You should 
-probably use the same URL that users use to log into RT.
+The location of the web server for your RT instance.
 
 
 =item C<--extension> OPTIONAL
@@ -286,7 +644,6 @@ several parameters:
 =item Message
 
 A C<MIME::Entity> object representing the email
-
 =item CurrentUser
 
 An C<RT::CurrentUser> object
diff --git a/rt/bin/rt.in b/rt/bin/rt.in
index d12460b..86c83ca 100644
--- a/rt/bin/rt.in
+++ b/rt/bin/rt.in
@@ -1,9 +1,9 @@
 #!@PERL@ -w
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,11 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
-# Designed and implemented for Best Practical Solutions, LLC by
-# Abhijit Menon-Sen <ams@wiw.org>
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 
 # This program is intentionally written to have as few non-core module
@@ -1259,7 +1255,7 @@ sub vsplit {
     my @values = ref $val eq 'ARRAY' ? @$val : $val;
 
     foreach my $line (map {split /\n/} @values) {
-        # XXX: This should become a real parser, à la Text::ParseWords.
+        # XXX: This should become a real parser, à la Text::ParseWords.
         $line =~ s/^\s+//;
         $line =~ s/\s+$//;
         push @words, split /\s*,\s*/, $line;
@@ -1775,7 +1771,7 @@ Text:
 
     Examples:
 
-        rt comment -m 'Not worth fixing.' -a stddisclaimer.h 23
+        rt comment -t 'Not worth fixing.' -a stddisclaimer.h 23
 
 --
 
diff --git a/rt/bin/standalone_httpd.in b/rt/bin/standalone_httpd.in
index 6ba7998..bf44945 100755
--- a/rt/bin/standalone_httpd.in
+++ b/rt/bin/standalone_httpd.in
@@ -1,9 +1,9 @@
 #!@PERL@ -w
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,24 +43,150 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
+package RT::Mason;
 
-use warnings;
 use strict;
+use vars '$Handler';
 
-BEGIN {
-    use lib( "@LOCAL_LIB_PATH@", "@RT_LIB_PATH@");
-    use RT;
-    RT::LoadConfig();
-    if ($RT::DevelMode) { require Module::Refresh; }
-}
+require ('@RT_BIN_PATH@/webmux.pl');
+
+use lib( "@LOCAL_LIB_PATH@", "@RT_LIB_PATH@");
+
+use Socket;
 
 RT::Init();
 
-use RT::Interface::Web::Standalone;
+my $port = shift || '8080';
+
+main_loop($port);
+
+sub main_loop {
+    my $port = shift;
+    my $tcp  = getprotobyname('tcp');
+
+    socket( HTTPDaemon, PF_INET, SOCK_STREAM, $tcp ) or die "socket: $!";
+    setsockopt( HTTPDaemon, SOL_SOCKET, SO_REUSEADDR, pack( "l", 1 ) )
+      or warn "setsockopt: $!";
+    bind( HTTPDaemon, sockaddr_in( $port, INADDR_ANY ) ) or die "bind: $!";
+    listen( HTTPDaemon, SOMAXCONN ) or die "listen: $!";
+
+    print("You can connect to your RT server at http://localhost:$port/\n");
+
+    while (1) {
+
+        for ( ; accept( Remote, HTTPDaemon ); close Remote ) {
+
+            *STDIN  = *Remote;
+            *STDOUT = *Remote;
+
+            my $remote_sockaddr = getpeername(STDIN);
+            my ( undef, $iaddr ) = sockaddr_in($remote_sockaddr);
+            my $peername = gethostbyaddr( $iaddr, AF_INET ) || "localhost";
+            my $peeraddr = inet_ntoa($iaddr) || "127.0.0.1";
+
+            my $local_sockaddr = getsockname(STDIN);
+            my ( undef, $localiaddr ) = sockaddr_in($local_sockaddr);
+            my $localname = gethostbyaddr( $localiaddr, AF_INET )
+              || "localhost";
+            my $localaddr = inet_ntoa($localiaddr) || "127.0.0.1";
+
+            chomp( $_ = <STDIN> );
+            my ( $method, $request_uri, $proto, undef ) = split;
+
+            #$request_uri =~ s#\\#/#g;
+            $RT::Logger->info("<- $peername: $_");
+            my ( $file, undef, $query_string ) =
+              ( $request_uri =~ /([^?]*)(\?(.*))?/ );    # split at ?
+            #$file =~ s/%([\dA-Fa-f]{2})/chr(hex($1))/eg;  # decode url-escaped entities
+
+            last if ( $method !~ /^(GET|POST|HEAD)$/ );
+
+            build_cgi_env( method       => $method,
+                           query_string => $query_string,
+                           path         => $file,
+                           method       => $method,
+                           port         => $port,
+                           peername     => $peername,
+                           peeraddr     => $peeraddr,
+                           localname    => $localname,
+                           request_uri  => $request_uri );
+
+            RT::ConnectToDatabase();
+            my $cgi = CGI->new();
+
+            print "HTTP/1.0 200 OK\n";    # probably OK by now
+
+            if ( ( !$Handler->interp->comp_exists( $cgi->path_info ) )
+                && ($Handler->interp->comp_exists( $cgi->path_info . "/index.html" ) )
+              ) {
+                $cgi->path_info( $cgi->path_info . "/index.html" );
+            }
+
+            eval { $Handler->handle_cgi_object($cgi); };
+            $RT::Logger->crit($@) if ($@);
+
+            if ( $RT::Handle->TransactionDepth ) {
+                $RT::Handle->ForceRollback;
+                $RT::Logger->crit( "Transaction not committed. Usually indicates a software fault. Data loss may have occurred");
+            }
+
+        }
+
+    }
+
+}
+
+
+
+sub build_cgi_env {
+        my %args = ( query_string => '',
+                     path => '',
+                     port => undef,
+                     protocol => undef,
+                     localname => undef,
+                     method => undef,
+                     remote_name => undef,
+ 
+
+                        @_);
+                    
+        foreach my $var qw(USER_AGENT CONTENT_LENGTH CONTENT_TYPE
+          COOKIE SERVER_PORT SERVER_PROTOCOL SERVER_NAME
+          PATH_INFO REQUEST_URI REQUEST_METHOD REMOTE_ADDR
+          REMOTE_HOST QUERY_STRING SERVER_SOFTWARE) {
+            delete $ENV{$var};
+          }
+        while (<STDIN>) {
+            s/[\r\l\n\s]+$//;
+            if( /^([\w\-]+): (.+)/i) {
+                my $tag = uc($1);
+                $tag =~ s/^COOKIES$/COOKIE/;
+                my $val = $2;
+                $tag =~ s/-/_/g;
+                $tag = "HTTP_".$tag unless (grep /^$tag$/, qw(CONTENT_LENGTH CONTENT_TYPE COOKIE));
+                if ($ENV{$tag}) {
+                $ENV{$tag} .= "; $val";
+                }
+                else {
+                $ENV{$tag} = $val;
+                }
+            } 
+            last if (/^$/);
+        }
 
-my $server = RT::Interface::Web::Standalone->new;
-$server->port(shift @ARGV) if ($ARGV[0]);
-$server->run();
 
+        $ENV{SERVER_PROTOCOL} = $args{protocol};
+        $ENV{SERVER_PORT}     = $args{port};
+        $ENV{SERVER_NAME}     = $args{'localname'};
+        $ENV{SERVER_URL}      = "http://".$args{'localname'}.":".$args{'port'}."/";
+        $ENV{PATH_INFO}       = $args{'path'};
+        $ENV{REQUEST_URI}     = $args{'request_uri'};
+        $ENV{REQUEST_METHOD}  = $args{method};
+        $ENV{REMOTE_ADDR}     = $args{'peeraddr'};
+        $ENV{REMOTE_HOST}     = $args{'peername'};
+        $ENV{QUERY_STRING}    = $args{'query_string'};
+        $ENV{SERVER_SOFTWARE} = "rt-standalone/$RT::VERSION";
 
+        CGI::initialize_globals();
+} 
diff --git a/rt/bin/webmux.pl.in b/rt/bin/webmux.pl.in
index 73b1014..8779489 100644
--- a/rt/bin/webmux.pl.in
+++ b/rt/bin/webmux.pl.in
@@ -1,9 +1,9 @@
 #!@PERL@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 use strict;
 
 BEGIN {
@@ -53,12 +53,10 @@ BEGIN {
     $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
     $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
 
-    use CGI qw(-private_tempfiles);    #bring this in before mason, to make sure we
-                                   #set private_tempfiles
-
-    die "RT does not support mod_perl 1.99. Please upgrade to mod_perl 2.0"
+    eval { require Apache2; require APR::Table; require MasonX::Apache2Handler; 1 } or
+    eval { require Apache2; require Apache::compat; 1 } or die $@
       if $ENV{'MOD_PERL'}
-      and $ENV{'MOD_PERL'} =~ m{mod_perl/(?:1\.9)};
+      and $ENV{'MOD_PERL'} =~ m{mod_perl/(?:2|1\.9)};
 
 }
 
@@ -67,57 +65,62 @@ use RT;
 
 package RT::Mason;
 
+use CGI qw(-private_tempfiles);    #bring this in before mason, to make sure we
+                                   #set private_tempfiles
+
+use HTML::Mason;    # brings in subpackages: Parser, Interp, etc.
+
 use vars qw($Nobody $SystemUser $Handler $r);
 
 #This drags in RT's config.pm
-BEGIN {
-    RT::LoadConfig();
-    if ($RT::DevelMode) { require Module::Refresh; }
-}
+RT::LoadConfig();
 
+use Carp;
 
 {
 
     package HTML::Mason::Commands;
     use vars qw(%session);
+
+    use RT::Tickets;
+    use RT::Transactions;
+    use RT::Users;
+    use RT::CurrentUser;
+    use RT::Templates;
+    use RT::Queues;
+    use RT::ScripActions;
+    use RT::ScripConditions;
+    use RT::Scrips;
+    use RT::Groups;
+    use RT::GroupMembers;
+    use RT::CustomFields;
+    use RT::CustomFieldValues;
+    use RT::TicketCustomFieldValues;
+
+    use RT::Interface::Web;
+    use MIME::Entity;
+    use Text::Wrapper;
+    use CGI::Cookie;
+    use Time::ParseDate;
+    use HTML::Entities;
+    use HTML::Scrubber;
+    use Text::Quoted;
 }
 
-use RT::Interface::Web;
 use RT::Interface::Web::Handler;
 $Handler = RT::Interface::Web::Handler->new(@RT::MasonParameters);
 
-if ($ENV{'MOD_PERL'} && !$RT::DevelMode) {
-    # Under static_source, we need to purge the component cache
-    # each time we restart, so newer components may be reloaded.
-    #
-    # We can't do this in FastCGI or we'll blow away the component root _every_ time a new server starts
-    # which happens every few hits.
-    
-    use File::Path qw( rmtree );
-    use File::Glob qw( bsd_glob );
-    rmtree([ bsd_glob("$RT::MasonDataDir/obj/*") ], 0, 1);
-}
-
 sub handler {
     ($r) = @_;
 
     local $SIG{__WARN__};
     local $SIG{__DIE__};
 
-    # We don't need to handle non-text, non-xml items
-    if ($r->content_type =~ m/^httpd\b.*\bdirectory/i) {
-        use File::Spec::Unix;
-        # Our DirectoryIndex is always index.html, regardless of httpd settings
-        $r->filename( File::Spec::Unix->catfile( $r->filename, 'index.html' ) );
-    }
-    elsif (defined( $r->content_type )) {
-	$r->content_type =~ m!(^text/|\bxml\b)!i or return -1;
-    }
-
-    Module::Refresh->refresh if $RT::DevelMode;
-
     RT::Init();
 
+    # We don't need to handle non-text, non-xml items
+    return -1 if defined( $r->content_type ) && $r->content_type !~ m!(^text/|\bxml\b)!io;
+
     my %session;
     my $status;
     eval { $status = $Handler->handle_request($r) };
@@ -127,8 +130,12 @@ sub handler {
 
     undef(%session);
 
-    RT::Interface::Web::Handler->CleanupRequest();
-
+    if ( $RT::Handle->TransactionDepth ) {
+        $RT::Handle->ForceRollback;
+        $RT::Logger->crit(
+"Transaction not committed. Usually indicates a software fault. Data loss may have occurred"
+        );
+    }
     return $status;
 }
 
diff --git a/rt/configure b/rt/configure
index 395fc0b..73818e2 100755
--- a/rt/configure
+++ b/rt/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 3070 .
+# From configure.ac Revision: 1.1 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for RT 3.4.4.
+# Generated by GNU Autoconf 2.59 for RT 3.2.2.
 #
 # Report bugs to <rt-bugs@fsck.com>.
 #
@@ -270,13 +270,13 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='RT'
 PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='3.4.4'
-PACKAGE_STRING='RT 3.4.4'
+PACKAGE_VERSION='3.2.2'
+PACKAGE_STRING='RT 3.2.2'
 PACKAGE_BUGREPORT='rt-bugs@fsck.com'
 
 ac_unique_file="lib/RT.pm.in"
 ac_default_prefix=/opt/rt3
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS rt_version_major rt_version_minor rt_version_patch INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PERL SPEEDY_BIN exp_prefix exp_exec_prefix exp_bindir exp_sbindir exp_sysconfdir exp_mandir exp_libdir exp_datadir htmldir exp_htmldir manualdir exp_manualdir exp_localstatedir logfiledir exp_logfiledir masonstatedir exp_masonstatedir sessionstatedir exp_sessionstatedir customdir exp_customdir custometcdir exp_custometcdir customhtmldir exp_customhtmldir customlexdir exp_customlexdir customlibdir exp_customlibdir rt_layout_name BIN_OWNER LIBS_OWNER LIBS_GROUP DB_TYPE DATABASE_ENV_PREF DB_HOST DB_PORT DB_RT_HOST DB_DBA DB_DATABASE DB_RT_USER DB_RT_PASS WEB_USER WEB_GROUP RTGROUP APACHECTL RT_DEVEL_MODE RT_VERSION_MAJOR RT_VERSION_MINOR RT_VERSION_PATCH RT_PATH RT_DOC_PATH RT_LOCAL_PATH RT_LIB_PATH RT_ETC_PATH CONFIG_FILE_PATH RT_BIN_PATH RT_SBIN_PATH RT_VAR_PATH RT_MAN_PATH MASON_DATA_PATH MASON_SESSION_PATH MASON_HTML_PATH LOCAL_ETC_PATH MASON_LOCAL_HTML_PATH LOCAL_LEXICON_PATH LOCAL_LIB_PATH DESTDIR RT_LOG_PATH LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS rt_version_major rt_version_minor rt_version_patch INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PERL SPEEDY_BIN exp_prefix exp_exec_prefix exp_bindir exp_sbindir exp_sysconfdir exp_mandir exp_libdir exp_datadir htmldir exp_htmldir manualdir exp_manualdir exp_localstatedir logfiledir exp_logfiledir masonstatedir exp_masonstatedir sessionstatedir exp_sessionstatedir customdir exp_customdir custometcdir exp_custometcdir customhtmldir exp_customhtmldir customlexdir exp_customlexdir customlibdir exp_customlibdir rt_layout_name RTGROUP BIN_OWNER LIBS_OWNER LIBS_GROUP DB_TYPE DATABASE_ENV_PREF DB_HOST DB_PORT DB_RT_HOST DB_DBA DB_DATABASE DB_RT_USER DB_RT_PASS WEB_USER WEB_GROUP APACHECTL RT_VERSION_MAJOR RT_VERSION_MINOR RT_VERSION_PATCH RT_PATH RT_DOC_PATH RT_LOCAL_PATH RT_LIB_PATH RT_ETC_PATH CONFIG_FILE_PATH RT_BIN_PATH RT_SBIN_PATH RT_VAR_PATH RT_MAN_PATH MASON_DATA_PATH MASON_SESSION_PATH MASON_HTML_PATH LOCAL_ETC_PATH MASON_LOCAL_HTML_PATH LOCAL_LEXICON_PATH LOCAL_LIB_PATH DESTDIR RT_LOG_PATH LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -729,7 +729,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RT 3.4.4 to adapt to many kinds of systems.
+\`configure' configures RT 3.2.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -786,7 +786,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RT 3.4.4:";;
+     short | recursive ) echo "Configuration of RT 3.2.2:";;
    esac
   cat <<\_ACEOF
 
@@ -800,6 +800,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-speedycgi=/path/to/speedy
                           path to your speedycgi binary, if it exists
+  --with-rt-group=GROUP   group to own all files (default: rt)
   --with-bin-owner=OWNER  user that will own RT binaries (default root)
   --with-libs-owner=OWNER user that will own RT libraries (default root)
   --with-libs-group=GROUP group that will own RT binaries (default bin)
@@ -819,11 +820,8 @@ Optional Packages:
                           password for database user (default: rt_pass)
   --with-web-user=USER    user the web server runs as (default: www)
   --with-web-group=GROUP  group the web server runs as (default: www)
-  --with-rt-group=GROUP   group to own all files (default: rt)
   --with-my-user-group    set all users and groups to current user/group
   --with-apachectl        instruct RT where to find your apachectl
-  --with-devel-mode       Turn on development aids that might hurt you in
-                          production
 
 Some influential environment variables:
   PERL        Perl interpreter command
@@ -927,7 +925,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-RT configure 3.4.4
+RT configure 3.2.2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -941,7 +939,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RT $as_me 3.4.4, which was
+It was created by RT $as_me 3.2.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1281,9 +1279,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 rt_version_major=3
 
-rt_version_minor=4
+rt_version_minor=2
 
-rt_version_patch=4
+rt_version_patch=2
 
 test "x$rt_version_major" = 'x' && rt_version_major=0
 test "x$rt_version_minor" = 'x' && rt_version_minor=0
@@ -1772,13 +1770,13 @@ fi
 
 
 
-# ACRT_USER_EXISTS( users, variable, default )
-# - users is a list of users [www apache www-docs]
-#    from highest to lowest priority to high priority (i.e. first match)
-# - variable is what you set with the result
-#
-
-
+# Check whether --with-rt-group or --without-rt-group was given.
+if test "${with_rt_group+set}" = set; then
+  withval="$with_rt_group"
+  RTGROUP=$withval
+else
+  RTGROUP=rt
+fi;
 
 
 
@@ -1917,22 +1915,7 @@ if test "${with_web_user+set}" = set; then
   withval="$with_web_user"
   WEB_USER=$withval
 else
-
-   WEB_USER=www
-   for x in www www-data apache httpd nobody; do
-    echo "$as_me:$LINENO: checking if user $x exists" >&5
-echo $ECHO_N "checking if user $x exists... $ECHO_C" >&6
-     if  $PERL -e"exit( defined getpwnam('$x') ? 0 : 1)" ; then
-   echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; WEB_USER=$x ; break
-else
-   echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-fi
-
-   done
-
-
+  WEB_USER=www
 fi;
 
 
@@ -1942,59 +1925,20 @@ if test "${with_web_group+set}" = set; then
   withval="$with_web_group"
   WEB_GROUP=$withval
 else
-
-   WEB_GROUP=www
-   for x in www www-data apache httpd nogroup nobody; do
-    echo "$as_me:$LINENO: checking if group $x exists" >&5
-echo $ECHO_N "checking if group $x exists... $ECHO_C" >&6
-     if  $PERL -e"exit( defined getgrnam('$x') ? 0 : 1)" ; then
-   echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; WEB_GROUP=$x ; break
-else
-   echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-fi
-
-   done
-
-fi;
-
-
-
-# Check whether --with-rt-group or --without-rt-group was given.
-if test "${with_rt_group+set}" = set; then
-  withval="$with_rt_group"
-  RTGROUP=$withval
-else
-
-   RTGROUP=rt
-   for x in rt3 rt $WEB_GROUP; do
-    echo "$as_me:$LINENO: checking if group $x exists" >&5
-echo $ECHO_N "checking if group $x exists... $ECHO_C" >&6
-     if  $PERL -e"exit( defined getgrnam('$x') ? 0 : 1)" ; then
-   echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; RTGROUP=$x ; break
-else
-   echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-fi
-
-   done
-
+  WEB_GROUP=www
 fi;
 
 
 my_group=$(groups|cut -f1 -d' ')
-my_user=${USER:-$LOGNAME}
 
 # Check whether --with-my-user-group or --without-my-user-group was given.
 if test "${with_my_user_group+set}" = set; then
   withval="$with_my_user_group"
   RTGROUP=$my_group
-            BIN_OWNER=$my_user
-            LIBS_OWNER=$my_user
+            BIN_OWNER=$USER
+            LIBS_OWNER=$USER
             LIBS_GROUP=$my_group
-            WEB_USER=$my_user
+            WEB_USER=$USER
             WEB_GROUP=$my_group
 fi;
 
@@ -2011,15 +1955,6 @@ fi;
 
 
 
-# Check whether --with-devel-mode or --without-devel-mode was given.
-if test "${with_devel_mode+set}" = set; then
-  withval="$with_devel_mode"
-  RT_DEVEL_MODE="1"
-else
-  RT_DEVEL_MODE="0"
-fi;
-
-
 RT_VERSION_MAJOR=${rt_version_major}
 
 RT_VERSION_MINOR=${rt_version_minor}
@@ -2067,10 +2002,7 @@ RT_LOG_PATH=${exp_logfiledir}
 
 
 
-                                                                                          ac_config_files="$ac_config_files sbin/rt-dump-database sbin/rt-setup-database sbin/rt-test-dependencies bin/mason_handler.fcgi bin/mason_handler.scgi bin/standalone_httpd bin/rt-crontool bin/rt-mailgate bin/rt"
-
-
-                                                  ac_config_files="$ac_config_files Makefile etc/RT_Config.pm lib/RT.pm bin/mason_handler.svc bin/webmux.pl"
+                                                                                                                                                                                              ac_config_files="$ac_config_files sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl lib/t/05cronsupport.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/standalone_httpd bin/mason_handler.svc bin/rt-crontool bin/rt-mailgate bin/rt bin/webmux.pl"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2465,7 +2397,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by RT $as_me 3.4.4, which was
+This file was extended by RT $as_me 3.2.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2520,7 +2452,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RT config.status 3.4.4
+RT config.status 3.2.2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -2623,19 +2555,24 @@ for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in
   # Handling of arguments.
-  "sbin/rt-dump-database" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-dump-database" ;;
   "sbin/rt-setup-database" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-setup-database" ;;
   "sbin/rt-test-dependencies" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-test-dependencies" ;;
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "etc/RT_Config.pm" ) CONFIG_FILES="$CONFIG_FILES etc/RT_Config.pm" ;;
+  "lib/RT.pm" ) CONFIG_FILES="$CONFIG_FILES lib/RT.pm" ;;
+  "lib/t/00smoke.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/00smoke.t" ;;
+  "lib/t/01harness.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/01harness.t" ;;
+  "lib/t/02regression.t" ) CONFIG_FILES="$CONFIG_FILES lib/t/02regression.t" ;;
+  "lib/t/03web.pl" ) CONFIG_FILES="$CONFIG_FILES lib/t/03web.pl" ;;
+  "lib/t/04_send_email.pl" ) CONFIG_FILES="$CONFIG_FILES lib/t/04_send_email.pl" ;;
+  "lib/t/05cronsupport.pl" ) CONFIG_FILES="$CONFIG_FILES lib/t/05cronsupport.pl" ;;
   "bin/mason_handler.fcgi" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.fcgi" ;;
   "bin/mason_handler.scgi" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.scgi" ;;
   "bin/standalone_httpd" ) CONFIG_FILES="$CONFIG_FILES bin/standalone_httpd" ;;
+  "bin/mason_handler.svc" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.svc" ;;
   "bin/rt-crontool" ) CONFIG_FILES="$CONFIG_FILES bin/rt-crontool" ;;
   "bin/rt-mailgate" ) CONFIG_FILES="$CONFIG_FILES bin/rt-mailgate" ;;
   "bin/rt" ) CONFIG_FILES="$CONFIG_FILES bin/rt" ;;
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "etc/RT_Config.pm" ) CONFIG_FILES="$CONFIG_FILES etc/RT_Config.pm" ;;
-  "lib/RT.pm" ) CONFIG_FILES="$CONFIG_FILES lib/RT.pm" ;;
-  "bin/mason_handler.svc" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.svc" ;;
   "bin/webmux.pl" ) CONFIG_FILES="$CONFIG_FILES bin/webmux.pl" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -2758,6 +2695,7 @@ s,@exp_customlexdir@,$exp_customlexdir,;t t
 s,@customlibdir@,$customlibdir,;t t
 s,@exp_customlibdir@,$exp_customlibdir,;t t
 s,@rt_layout_name@,$rt_layout_name,;t t
+s,@RTGROUP@,$RTGROUP,;t t
 s,@BIN_OWNER@,$BIN_OWNER,;t t
 s,@LIBS_OWNER@,$LIBS_OWNER,;t t
 s,@LIBS_GROUP@,$LIBS_GROUP,;t t
@@ -2772,9 +2710,7 @@ s,@DB_RT_USER@,$DB_RT_USER,;t t
 s,@DB_RT_PASS@,$DB_RT_PASS,;t t
 s,@WEB_USER@,$WEB_USER,;t t
 s,@WEB_GROUP@,$WEB_GROUP,;t t
-s,@RTGROUP@,$RTGROUP,;t t
 s,@APACHECTL@,$APACHECTL,;t t
-s,@RT_DEVEL_MODE@,$RT_DEVEL_MODE,;t t
 s,@RT_VERSION_MAJOR@,$RT_VERSION_MAJOR,;t t
 s,@RT_VERSION_MINOR@,$RT_VERSION_MINOR,;t t
 s,@RT_VERSION_PATCH@,$RT_VERSION_PATCH,;t t
@@ -3036,27 +2972,6 @@ s,@INSTALL@,$ac_INSTALL,;t t
     rm -f $tmp/out
   fi
 
-  # Run the commands associated with the file.
-  case $ac_file in
-    sbin/rt-dump-database ) chmod ug+x $ac_file
-                ;;
-    sbin/rt-setup-database ) chmod ug+x $ac_file
-                ;;
-    sbin/rt-test-dependencies ) chmod ug+x $ac_file
-                ;;
-    bin/mason_handler.fcgi ) chmod ug+x $ac_file
-                ;;
-    bin/mason_handler.scgi ) chmod ug+x $ac_file
-                ;;
-    bin/standalone_httpd ) chmod ug+x $ac_file
-                ;;
-    bin/rt-crontool ) chmod ug+x $ac_file
-                ;;
-    bin/rt-mailgate ) chmod ug+x $ac_file
-                ;;
-    bin/rt ) chmod ug+x $ac_file
-                ;;
-  esac
 done
 _ACEOF
 
diff --git a/rt/configure.ac b/rt/configure.ac
index 1d0b95f..85f1b00 100644
--- a/rt/configure.ac
+++ b/rt/configure.ac
@@ -3,11 +3,11 @@ dnl
 dnl Process this file with autoconf to produce a configure script
 dnl
 dnl Embed in generated ./configure script the following CVS info:
-AC_REVISION($Revision: 1.1.1.5 $)dnl
+AC_REVISION($Revision: 1.1.1.4 $)dnl
 
 dnl Setup autoconf
 AC_PREREQ(2.53)
-AC_INIT(RT, [3.4.4], [rt-bugs@fsck.com])
+AC_INIT(RT, [3.2.2], [rt-bugs@fsck.com])
 AC_CONFIG_SRCDIR([lib/RT.pm.in])
 
 dnl Extract RT version number components
@@ -43,33 +43,13 @@ dnl Defaults paths for installation
 AC_PREFIX_DEFAULT([/opt/rt3])
 RT_ENABLE_LAYOUT
 
-
-# ACRT_USER_EXISTS( users, variable, default )
-# - users is a list of users [www apache www-docs]
-#    from highest to lowest priority to high priority (i.e. first match)
-# - variable is what you set with the result
-#
-
-AC_DEFUN([ACRT_USER_GUESS],
- [ 
-   $2=$3
-   for x in $1; do
-    AC_MSG_CHECKING([if user $x exists]) 
-     AS_IF([ $PERL -e"exit( defined getpwnam('$x') ? 0 : 1)" ],
-           [ AC_MSG_RESULT([found]); $2=$x ; break],
-           [ AC_MSG_RESULT([not found]) ])
-   done
-  ])
-AC_DEFUN([ACRT_GROUP_GUESS],
- [ 
-   $2=$3
-   for x in $1; do
-    AC_MSG_CHECKING([if group $x exists]) 
-     AS_IF([ $PERL -e"exit( defined getgrnam('$x') ? 0 : 1)" ],
-           [ AC_MSG_RESULT([found]); $2=$x ; break],
-           [ AC_MSG_RESULT([not found]) ])
-   done
-  ])
+dnl RTGROUP
+AC_ARG_WITH(rt-group,
+	    AC_HELP_STRING([--with-rt-group=GROUP],
+	    		   [group to own all files (default: rt)]),
+            RTGROUP=$withval,
+            RTGROUP=rt)
+AC_SUBST(RTGROUP)
 
 dnl BIN_OWNER
 AC_ARG_WITH(bin-owner,
@@ -180,37 +160,27 @@ AC_ARG_WITH(web-user,
 	    AC_HELP_STRING([--with-web-user=USER],
 	    		   [user the web server runs as (default: www)]),
             WEB_USER=$withval,
-            ACRT_USER_GUESS([www www-data apache httpd nobody],[WEB_USER],[www])
-)
+            WEB_USER=www)
 AC_SUBST(WEB_USER)
 
 dnl WEB_GROUP
 AC_ARG_WITH(web-group,
-	    AC_HELP_STRING([--with-web-group=GROUP],
+            AC_HELP_STRING([--with-web-group=GROUP],
 		           [group the web server runs as (default: www)]),
             WEB_GROUP=$withval,
-            ACRT_GROUP_GUESS([www www-data apache httpd nogroup nobody],[WEB_GROUP], [www]))
+            WEB_GROUP=www)
 AC_SUBST(WEB_GROUP)
 
-dnl RTGROUP
-AC_ARG_WITH(rt-group,
-	    AC_HELP_STRING([--with-rt-group=GROUP],
-	    		   [group to own all files (default: rt)]),
-            RTGROUP=$withval,
-            ACRT_GROUP_GUESS([rt3 rt $WEB_GROUP],[RTGROUP], [rt]))
-AC_SUBST(RTGROUP)
-
 dnl INSTALL AS ME
 my_group=$(groups|cut -f1 -d' ')
-my_user=${USER:-$LOGNAME}
 AC_ARG_WITH(my-user-group,
             AC_HELP_STRING([--with-my-user-group],
                            [set all users and groups to current user/group]),
             RTGROUP=$my_group
-            BIN_OWNER=$my_user
-            LIBS_OWNER=$my_user
+            BIN_OWNER=$USER
+            LIBS_OWNER=$USER
             LIBS_GROUP=$my_group
-            WEB_USER=$my_user
+            WEB_USER=$USER
             WEB_GROUP=$my_group)
 
 
@@ -224,14 +194,6 @@ AC_ARG_WITH(apachectl,
             APACHECTL=`which apachectl`)
 AC_SUBST(APACHECTL)
 
-dnl RT's "maintainer mode"
-AC_ARG_WITH(devel-mode,
-            AC_HELP_STRING([--with-devel-mode],
-                           [Turn on development aids that might hurt you in production]),
-
-            RT_DEVEL_MODE="1", 
-            RT_DEVEL_MODE="0")
-AC_SUBST(RT_DEVEL_MODE)
 dnl This section maps the variable names this script 'natively' generates
 dnl to their existing names. They should be removed from here as the .in
 dnl files are changed to use the new names.
@@ -264,26 +226,25 @@ AC_SUBST([RT_LOG_PATH],			${exp_logfiledir})
 
 dnl Configure the output files, and generate them.
 
-dnl Binaries that should be +x
 AC_CONFIG_FILES([
-		 sbin/rt-dump-database
 		 sbin/rt-setup-database
-		 sbin/rt-test-dependencies
+                 sbin/rt-test-dependencies
+                 Makefile
+		 etc/RT_Config.pm
+		 lib/RT.pm
+                 lib/t/00smoke.t
+                 lib/t/01harness.t
+                 lib/t/02regression.t
+                 lib/t/03web.pl
+                 lib/t/04_send_email.pl
+		 lib/t/05cronsupport.pl
  		 bin/mason_handler.fcgi
  		 bin/mason_handler.scgi
  		 bin/standalone_httpd
+ 		 bin/mason_handler.svc
  		 bin/rt-crontool
  		 bin/rt-mailgate
-		 bin/rt],
-		[chmod ug+x $ac_file]
-               )
-
-dnl All other generated files
-AC_CONFIG_FILES([
-		 Makefile
-		 etc/RT_Config.pm
-		 lib/RT.pm
- 		 bin/mason_handler.svc
-		 bin/webmux.pl],
-               )
+		 bin/rt
+ 		 bin/webmux.pl]
+                )
 AC_OUTPUT
diff --git a/rt/docs/design_docs/3.3-schema-redesign.txt b/rt/docs/design_docs/3.3-schema-redesign.txt
deleted file mode 100644
index 518eccd..0000000
--- a/rt/docs/design_docs/3.3-schema-redesign.txt
+++ /dev/null
@@ -1,57 +0,0 @@
--- --------------------------------------- --
---  RT 3.3 Schema redesign v7: 2004-11-08  --
--- --------------------------------------- --
-
-TABLE CustomFields (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  Name varchar(200) NULL  ,
-  Type varchar(200) NULL  ,                 -- Changed: see MaxValues below
-  MaxValues integer,                        -- New: 1 = Single, 0 = Multiple
-  Pattern varchar(255) NULL  ,              -- New: regex to validate against
-  Repeated int2 NOT NULL DEFAULT 0 ,        -- New: repeated table entry
-  LookupType varchar(255) NOT NULL,         -- New: "RT::Queue-RT::Ticket"
-  Description varchar(255) NULL  ,
-  SortOrder integer NOT NULL DEFAULT 0  ,   -- only used on "pick CF" screen
-)
-
--- This table replaces the "Queue" field in CustomFields
-TABLE ObjectCustomFields (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  CustomField int NOT NULL  ,               -- CustomField ID
-  ObjectId integer NOT NULL,                -- Final id of toplevel parent, or 
-                                            -- the object itself if ParentType
-                                            -- is empty; 0 means global as usual
-  SortOrder integer NOT NULL DEFAULT 0  ,   -- this is used to sort the CFs
-);
-
--- This table replaces TicketCustomFieldValues
-TABLE ObjectCustomFieldValues (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  CustomField int NOT NULL  ,
-  ObjectType varchar(255) NOT NULL,         -- Final target of the Object
-  ObjectId int NOT NULL  ,                  -- New: replaces the "Ticket" field
-  SortOrder integer NOT NULL DEFAULT 0  ,   -- New: for Repeated fields
-
-  Content varchar(255) NULL  ,
-  LargeContent LONGTEXT NULL,               -- New: data longer than 255 bytes
-  ContentType varchar(80) NULL,             -- New: MIME type of LargeContent
-  ContentEncoding varchar(80) NULL  ,       -- New: for binary LargeContent
-  Disabled int2 NOT NULL DEFAULT 0 ,        -- New: whether this is deleted
-)
-
-TABLE Transactions (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  ObjectType varchar(255) NULL,             -- Final target of the Object
-  ObjectId integer NOT NULL DEFAULT 0  ,    -- New: replaces the "Ticket" field
-  TimeTaken integer NOT NULL DEFAULT 0  ,
-  Type varchar(20) NULL  ,
-  Field varchar(40) NULL  ,
-  OldValue varchar(255) NULL  ,
-  NewValue varchar(255) NULL  ,
-  ReferenceType varchar(255) NULL,          -- NeW: Currently "RT::OCFV" only
-  OldReference integer NULL  ,              -- New: Id of ReferenceType
-  NewReference integer NULL  ,              -- New: Id of ReferenceType
-  Data varchar(255) NULL  ,
-)
-
--- vim: filetype=mysql shiftwidth=4 expandtab
diff --git a/rt/docs/design_docs/cvs_integration b/rt/docs/design_docs/cvs_integration
index 45a758f..35c8737 100644
--- a/rt/docs/design_docs/cvs_integration
+++ b/rt/docs/design_docs/cvs_integration
@@ -85,14 +85,14 @@ marc: I think the idea is to force you to
        mention the ticket closing in the commit message. ()
 
 jesse@FSCK.COM: but yeah, state changing
-       and 'update messages' are separate concepts that should both be
+       and 'update messages' are seperate concepts that should both be
        supported. ()
 
 jesse@FSCK.COM: part of the idea is to
        drag the commit message into the BTS ()
 
 jhawk: Err, I think it quite frequent that I want
-       to put separate info in both the commit message and the ticket system,
+       to put seperate info in both the commit message and the ticket system,
        and entering them at the same time seems cool. ()
 
 jesse@FSCK.COM: ok. noted. I'll see if
diff --git a/rt/docs/design_docs/link-definitions.txt b/rt/docs/design_docs/link-definitions.txt
index e109744..30b9035 100644
--- a/rt/docs/design_docs/link-definitions.txt
+++ b/rt/docs/design_docs/link-definitions.txt
@@ -92,7 +92,7 @@ For 2.0, those Linking actions should be supported:
 
  Based on user feedback, merged tickets will be displayed as the same ticket
 within RT's user interfaces. but the original tickets' transactions will be
-kept separated in the database. this may require some magic.
+kept seperated in the database. this may require some magic.
  
 4. RefersTo / No Action link (linking)
 
diff --git a/rt/docs/design_docs/realflow.txt b/rt/docs/design_docs/realflow.txt
deleted file mode 100644
index 3717e27..0000000
--- a/rt/docs/design_docs/realflow.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-- I have a MonitoredQueue that sets tickets to "Monitored"
-  if its subject matches /monitored/.
-  
-- I want to have a kind of Ticket that are 'Monitored'.
-- I want all monitored tickets, when they are overdue for
-  14 days, to:
-    - send notification to manager
-    - mark as stalled
-- I want all monitored tickets, when they are overdue for
-  28 days, to:
-    - mark as rejected
-- I want to query all tickets that are monitored as such
-- I want to modify 14 => 15 and have it affect all existing
-  tickets that are monitored
-
-{
-- I want to add a new "overdue for 27 days, add a 'ultimatum'
-  correspondence to it" rule for all monitored tickets.
-- I want to add a new "overdue for 27 days, add a 'ultimatum'
-  correspondence to it" rule for all _new_ monitored tickets
-  without affecting existing ones.
-}
-
-- The user of OrderRequest queue needs to fill a numeric "CF",
-  called "Price".
-- On creation, it needs to create following approvals:
-    - "Manager" approval if CF.Price is > 1000
-    - "President" approval if CF.Price is > 2000
-- When all of "M", "P" are resolved (if any, or if there were none
-  to begin with), Create a new approval, "Finance".
-- If any approvals above is rejected, reject the original ticket.
-- If "Finance" is resolved, resolve original ticket.
-- If "Finance" is rejected, create an approval for "CEO".
-- If "CEO" is resolved, resolve the original ticket.
-- If "CEO" is rejected, reject the original ticket.
-
-[RuleAction CreateTicketWithRuleset]
-  -> ReleaseMyLockOnRuleset $ruleset
-  -> UnlessLockOnRuleset $ruleset
-     # i.e. if no active tickets still have a lock on it
-     -> ForceCreateTicketWithRuleset $ruleset
-
-[Queue OrderRequest]
-  -> Condition: OnCreate
-     Action: AddTicketRuleSet "PurchaseApproval"
-             # Triggers immediately
-
-[RuleSet: PurchaseApproval]
-  -> Condition: OnCreate 
-     Condition: CF.Price > 1000
-     Action: CreateTicketWithRuleset "ManagerApproval"
-  -> Condition: OnCreate 
-     Condition: CF.Price > 2000
-     Action: CreateTicketWithRuleset "PresidentApproval"
-  -> Condition: OnCreate 
-     Action: CreateTicketWithRuleset "FinanceApproval"
-  -> Condition: OnReject
-     Action: DeleteTree
-
-[RuleSet: ManagerApproval]
-  -> Condition: OnCreate
-     Action: Prohibit Ruleset "FinanceApproval"
-  -> Condition: OnResolve
-     Action: CreateTicketWithRuleset "FinanceApproval"
-  -> Condition: OnReject
-     Action: RejectTicket TOP
-
-[RuleSet: PresidentApproval]
-  -> Condition: OnCreate
-     Action: Prohibit CreateTicketWithRuleset "FinanceApproval"
-  -> Condition: OnResolve
-     Action: CreateTicketWithRuleset "FinanceApproval"
-  -> Condition: OnReject
-     Action: RejectTicket TOP
-
-[RuleSet: FinanceApproval]
-  -> Condition: OnCreate
-     Action: Prohibit RuleSet "CEOApproval"
-  -> Condition: OnResolve
-     Action: ResolveTicket TOP
-  -> Condition: OnReject
-     Action: CreateTicketWithRuleset "CEOApproval"
-
-[RuleSet: CEOApproval]
-  -> Condition: OnResolve
-     Action: ResolveTicket TOP
-  -> Condition: OnReject
-     Action: RejectTicket TOP
-
-
-
-Prohibit Ticket Operation:
-		Ruleset CEOApproval
-
-
-
-
-
-
-
-      ,--------.
-[TOP] --> [M] --> [F]
-    ` `-> [P] -'
-     `
-      `-> [X] --> [Y]
-  
-
-[TOP] => [Approval]
-            -> Queue: B
-              -> Rule: yyy
-            -> Workflow: W
-              -> Stage: Approval
-              -> Rule: xxx
-
-isa_ok( $Approval->Type, 'RT::Ticket' );
-is( $Approval->Workflow->Name, 'W' );
-is( $Approval->Stage->Name, 'Approval' );
-
-[Queue: A]
-  -> Workflow: W
-
-[Workflow: W]
-  -> Stage: TOP
-  -> Stage: Approval
-  -> Stage: SUCCESS
-  -> Stage: FAIL
-
-"RuleCollections"
-
-[Stage: TOP]
-  -> Rule: OnCreate RunStage Approval
-
-ok( TicketA->Rules->HasEntry($ApprovalRule) )
-ok( TicketB->Rules->HasEntry($ApprovalRule) )
-
-[Rule: Approval]
-  -> Rule: OnResolve RunStage SUCCESS
-  -> Rule: OnReject RunStage FAIL
-
-[Stage: SUCCESS]
-  -> Rule: OnCreate SetStatus('resolved') TOP
-
-[Stage: FAIL]
-  -> Rule: OnCreate SetStatus('rejected') TOP
-
-[Unassociated]
-  - Rule FOO: OnAnything {
-        CreateTicketIfNotBlocked StageFOO
-        AddLink DependedOnBy TOP to Stage1
-        AssignRule DoStage2 to Stage1
-        AssignRule DoStage3 to Stage1
-    }
-  - Rule BAR: OnAnything {
-        CreateTicketIfNotBlocked StageBAR
-        DoSomethingBizzare
-    }
-
-     ,==> [Stage0] ==>.
-    ,                  .
-[TOP] ==> [Stage1] ==> [Stage3]
-    `                  '
-     `==> [Stage2] ==>'
-
-OnTransaction:
-    $self->Ticket->Queues->Scrips->Apply
-
-OnTransaction:
-    $self->Ticket->Queues->Scrips->Apply
-                 ->Scrips->Apply
-
-OnTransaction:
-    $self->Ticket->Queues->Scrips->Apply
-                 ->Stages->Scrips->Apply
-
-[QueueX]
- - Rule:
-    OnCreate: 
-        RunRule FOO
-
-[QueueY]
- - Rule:
-    OnWhatever: 
-        RunRule FOO
-
-
-[TOP] => [Stage1] => [Stage2] => [END]
-               `- => [Stage3] => [END]
-                ` -> [Stage4]
-
-[Stages]
- -> 
diff --git a/rt/docs/design_docs/rt-mvc b/rt/docs/design_docs/rt-mvc
deleted file mode 100644
index 3518b7d..0000000
--- a/rt/docs/design_docs/rt-mvc
+++ /dev/null
@@ -1,32 +0,0 @@
-Goals:
-
-
-	Never write an init block for a page that just views/edits pages
-	No style embedded in view/edit pages
-
-	Validation / Error display and re-editing.   
-
-
-Implementation.
-
-
-	For a given object's fields:
-
-	print a label for the field
-	print the current values for the field
-	print an edit widget for create
-	print an edit widget for update 
-
-
-
-	for a given form buttons for "perform the action" "don't perform the main action"
-
-
-Edit widgets
-
-
-	text input
-	hidden
-	fixed enum as { dropdown, select multiple, sleect single, radio} 
-	checkbox  	fixed enum
-
diff --git a/rt/docs/rt3-schema-relationships.dot b/rt/docs/rt3-schema-relationships.dot
index e290f8b..77ed35f 100644
--- a/rt/docs/rt3-schema-relationships.dot
+++ b/rt/docs/rt3-schema-relationships.dot
@@ -1,7 +1,7 @@
 digraph g {
 graph [
-rankdir = "RL",
- concentrate = true,
+rankdir = "LR",
+concentrate = true,
 ratio = auto
 ];
 node [
@@ -11,43 +11,40 @@ shape = record, fontsize = 18
 edge [
 ];
 
-"Records" [shape = record, fontsize = 18, label = "(Any RT::Record)" ];
-"Records" -> "Principals" [label = "Creator -> id"];
 "ACL" [shape = record, fontsize = 18, label = "<col0> \N " ];
-"ACL" -> "Principals" [label="PrincipalId -> id"];
-"ACL" -> "Principals" [label="DelegatedBy -> id"];
-"ACL" -> "ACL" [label="DelegatedFrom -> id"];
+"ACL" -> "Principals" [label="PrincipalId -> Id"];
+"ACL" -> "Principals" [label="DelegatedBy -> Id"];
+"ACL" -> "ACL" [label="DelegatedFrom -> Id"];
 
 "Attachments" [shape = record, fontsize = 18, label = "<col0> \N " ];
 "Attachments" -> "Transactions" [label="TransactionId -> id"];
 "Attachments" -> "Attachments" [label="Parent -> id"];
 
 "CachedGroupMemers" [shape = record, fontsize = 18, label = "<col0> \N " ];
-"CachedGroupMemers" -> "Groups" [label="GroupId -> id", weight=2];
-"CachedGroupMemers" -> "Principals" [label="MemberId -> id"];
+"CachedGroupMemers" -> "Groups" [label="GroupId -> Groups.id"];
+"CachedGroupMemers" -> "Principals" [label="MemberId -> Id"];
 "CachedGroupMemers" -> "CachedGroupMemers" [label="Via -> id"];
-"CachedGroupMemers" -> "Groups" [label="ImmediateParentId -> id"];
+"CachedGroupMemers" -> "Groups" [label="ImmediateParentId -> Groups.id"];
 
 "CustomFields" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"CustomFields" -> "Queues" [label="Queue -> id"];
 
 "CustomFieldValues" [shape = record, fontsize = 18, label = "<col0> \N " ];
 "CustomFieldValues" -> "CustomFields" [label="CustomField -> id"];
 
 "GroupMembers" [shape = record, fontsize = 18, label = "<col0> \N " ];
-"GroupMembers" -> "Groups" [label="GroupId -> id", weight=2];
-"GroupMembers" -> "Principals" [label="MemberId -> id", weight = 2];
+"GroupMembers" -> "Groups" [label="GroupId => Groups.Id"];
+"GroupMembers" -> "Principals" [label="MemberId => Id"];
 
 "Groups" [shape = record, fontsize = 18, label = "<col0> \N " ];
 "Groups" -> "Principals" [label="Groups.id -> id"];
 
 "Links" [shape = record, fontsize = 18, label = "<col0> \N " ];
-"Links" -> "Tickets" [label="LocalBase => id (usually)", style="dotted"];
-"Links" -> "Tickets" [label="LocalTarget => id (usually)", style="dotted"];
+"Links" -> "Tickets" [label="LocalBase => id (usually)"];
+"Links" -> "Tickets" [label="LocalTarget => id (usually)"];
 
 "Principals" [shape = record, fontsize = 18, label = "<col0> \N " ];
 
-"Attributes" [shape = record, fontsize = 18, label = "<col0> \N " ];
-"Attributes" -> "Records" [label="ObjectId -> id"];
 
 "Queues" [shape = record, fontsize = 18, label = "<col0> \N " ];
 
@@ -64,22 +61,17 @@ edge [
 "Templates" [shape = record, fontsize = 18, label = "<col0> \N " ];
 "Templates" -> "Queues" [label ="Queue -> id" ];
 
-"ObjectCustomFields" [shape = record, fontsize = 18, label = "<col0> \N " ];
-"ObjectCustomFields" -> "CustomFields" [label="CustomField -> id"];
-"ObjectCustomFields" -> "Records" [label="ObjectId -> id"];
-
-"ObjectCustomFieldValues" [shape = record, fontsize = 18, label = "<col0> \N " ];
-"ObjectCustomFieldValues" -> "CustomFields" [label="CustomField -> id"];
-"ObjectCustomFieldValues" -> "Records" [label="ObjectId -> id"];
+"TicketCustomFieldValues" [shape = record, fontsize = 18, label = "<col0> \N " ];
+"TicketCustomFieldValues" -> "Tickets" [label="Ticket -> id"];
+"TicketCustomFieldValues" -> "CustomFields" [label="CustomField -> id"];
 
 "Tickets" [shape = record, fontsize = 18, label = "<col0> \N " ];
 "Tickets" -> "Tickets" [label="EffectiveId -> id"];
-"Tickets" -> "Principals" [label="Owner -> id"];
-"Queues" -> "Tickets" [style="invis"];
 "Tickets" -> "Queues" [label="Queue -> id"];
+"Tickets" -> "Principals" [label="Owner -> id"];
 
 "Transactions" [shape = record, fontsize = 18, label = "<col0> \N " ];
-"Transactions" -> "Records" [label="ObjectId -> id"];
+"Transactions" -> "Tickets" [label="Ticket -> Id"];
 
 "Users" [shape = record, fontsize = 18, label = "<col0> \N " ];
 
diff --git a/rt/etc/RT_Config.pm.in b/rt/etc/RT_Config.pm.in
index 773e3e2..7f96706 100644
--- a/rt/etc/RT_Config.pm.in
+++ b/rt/etc/RT_Config.pm.in
@@ -17,7 +17,7 @@ use RT::Config;
 
 # {{{ Base Configuration
 
-# $rtname is the string that RT will look for in mail messages to
+# $rtname the string that RT will look for in mail messages to
 # figure out what ticket a new piece of mail belongs to
 
 # Your domain name is recommended, so as not to pollute the namespace.
@@ -26,28 +26,6 @@ use RT::Config;
 
 Set($rtname , "example.com");
 
-
-# This regexp controls what subject tags RT recognizes as its own.
-# If you're not dealing with historical $rtname values, you'll likely
-# never have to enable this feature.
-#
-# Be VERY CAREFUL with it. Note that it overrides $rtname for subject
-# token matching and that you should use only "non-capturing" parenthesis
-# grouping. For example:
-#
-# 	Set($EmailSubjectTagRegex, qr/(?:example.com|example.org)/ );
-#
-# and NOT
-# 
-# 	Set($EmailSubjectTagRegex, qr/(example.com|example.org)/ );
-#
-# This setting would make RT behave exactly as it does without the 
-# setting enabled.
-#
-# Set($EmailSubjectTagRegex, qr/\Q$rtname\E/ );
-
-
-
 # You should set this to your organization's DNS domain. For example,
 # fsck.com or asylum.arkham.ma.us. It's used by the linking interface to
 # guarantee that ticket URIs are unique and easy to construct.
@@ -109,7 +87,7 @@ Set($OwnerEmail , 'root');
 
 Set($LoopsToRTOwner , 1);
 
-# If $StoreLoops is defined, RT will record messages that it believes
+# If $StoreLoopss is defined, RT will record messages that it believes
 # to be part of mail loops.
 # As it does this, it will try to be careful not to send mail to the
 # sender of these messages
@@ -126,12 +104,12 @@ Set($StoreLoops , undef);
 Set($MaxAttachmentSize , 10000000);
 
 # $TruncateLongAttachments: if this is set to a non-undef value,
-# RT will truncate attachments longer than MaxAttachmentSize.
+# RT will truncate attachments longer than MaxAttachmentLength.
 
 Set($TruncateLongAttachments , undef);
 
 # $DropLongAttachments: if this is set to a non-undef value,
-# RT will silently drop attachments longer than MaxAttachmentSize.
+# RT will silently drop attachments longer than MaxAttachmentLength.
 
 Set($DropLongAttachments , undef);
 
@@ -155,8 +133,8 @@ Set($RTAddressRegexp , '^rt\@example.com$');
 # (These values are passed to the CanonicalizeEmailAddress subroutine in RT/User.pm)
 # By default, that routine performs a s/$Match/$Replace/gi on any address passed to it
 
-#Set($CanonicalizeEmailAddressMatch , '@subdomain\.example\.com$');
-#Set($CanonicalizeEmailAddressReplace , '@example.com');
+Set($CanonicalizeEmailAddressMatch   , 'subdomain.example.com$');
+Set($CanonicalizeEmailAddressReplace , 'example.com');
 
 # set this to true and the create new user page will use the values that you
 # enter in the form but use the function CanonicalizeUserInfo in User_Local.pm
@@ -199,7 +177,7 @@ Set($CommentAddress , 'RT_CommentAddressNotSet');
 # If 'sendmailpipe' doesn't work well for you, try 'sendmail'
 #
 # Note that you should remove the '-t' from $SendmailArguments
-# if you use 'sendmail' rather than 'sendmailpipe'
+# if you use 'sendmail rather than 'sendmailpipe'
 
 Set($MailCommand , 'sendmailpipe');
 
@@ -298,7 +276,7 @@ Set($WebPath , "");
 # This is the Scheme, server and port for constructing urls to webrt
 # $WebBaseURL doesn't need a trailing /
 
-Set($WebBaseURL , "http://localhost");
+Set($WebBaseURL , "http://RT::WebBaseURL.not.configured:80");
 
 Set($WebURL , $WebBaseURL . $WebPath . "/");
 
@@ -306,9 +284,9 @@ Set($WebURL , $WebBaseURL . $WebPath . "/");
 
 Set($WebImagesURL , $WebPath . "/NoAuth/images/");
 
-# $LogoURL points to the URL of the RT logo displayed in the web UI
+# $RTLogoURL points to the URL of the RT logo displayed in the web UI
 
-Set($LogoURL , $WebImagesURL . "bplogo.gif");
+Set($LogoURL , $WebImagesURL . "rt.jpg");
 
 # WebNoAuthRegex - What portion of RT's URLspace should not require
 # authentication.
@@ -329,18 +307,12 @@ Set($MessageBoxWrap, "HARD");
 # sent in a request (although there is probably more to it than that)
 Set($TrustHTMLAttachments , undef);
 
-# Should RT redistribute correspondence that it identifies as
-# machine generated? A true value (the default) will do so, setting
-# this to '0' will cause no such messages to be redistributed.
-# You can also use 'privileged', which will redistribute only to
-# privileged users. This is seful if you get malformed bounces caused by
-# autocreated requestors with bogus addresses.
-Set($RedistributeAutoGeneratedMessages, 1);
 
 # If PreferRichText is set to a true value, RT will show HTML/Rich text
 # messages in preference to their plaintext alternatives. RT "scrubs" the 
 # html to show only a minimal subset of HTML to avoid possible contamination
 # by cross-site-scripting attacks.
+
 Set($PreferRichText, undef);
 
 # If $WebExternalAuth is defined, RT will defer to the environment's
@@ -370,16 +342,6 @@ Set($WebExternalAuto , undef);
 
 # Set($WebSessionClass , 'Apache::Session::File');
 
-# By default, RT clears its database cache after every page view.
-# This ensures that you've always got the most current information 
-# when working in a multi-process (mod_perl or FastCGI) Environment
-# Setting $WebFlushDbCacheEveryRequest to '0' will turn this off,
-# which will speed RT up a bit, at the expense of a tiny bit of data 
-# accuracy
-
-Set($WebFlushDbCacheEveryRequest, '1');
-
-
 # $MaxInlineBody is the maximum attachment size that we want to see
 # inline when viewing a transaction. 13456 is a random sane-sounding
 # default.
@@ -400,9 +362,8 @@ Set($MyRequestsLength, 10);
 
 # @MasonParameters is the list of parameters for the constructor of
 # HTML::Mason's Apache or CGI Handler.  This is normally only useful
-# for debugging, eg. profiling individual components with:
-#     use MasonX::Profiler; # available on CPAN
-#     @MasonParameters = (preamble => 'my $p = MasonX::Profiler->new($m, $r);');
+# for debugging, eg. profiling individual components with
+#     (preamble => 'my $p = MasonX::Profiler->new($m, $r);');
 
 @MasonParameters = () unless (@MasonParameters);
 
@@ -428,8 +389,8 @@ Set ($DefaultSearchResultFormat, qq{
 # {{{ RT UTF-8 Settings
 
 # An array that contains languages supported by RT's internationalization
-# interface.  Defaults to all *.po lexicons; setting it to qw(en ja) will make
-# RT bilingual instead of multilingual, but will save some memory.
+# interface.  Defaults to all *.po lexicons; set it to qw(en ja) will make
+# RT bilingual instead of multilingual, but will save same memory.
 
 @LexiconLanguages = qw(*) unless (@LexiconLanguages);
 
@@ -459,35 +420,4 @@ Set($AmbiguousDayInPast , 1);
 
 # }}}
 
-# {{{ Miscellaneous RT Settings
-
-# You can define new statuses and even reorder existing statuses here.
-# WARNING. DO NOT DELETE ANY OF THE DEFAULT STATUSES. If you do, RT
-# will break horribly.
-
-@ActiveStatus = qw(new open stalled) unless @ActiveStatus;
-@InactiveStatus = qw(resolved rejected deleted) unless @InactiveStatus;
-
-# }}}
-
-
-# {{{ Development Mode
-#
-# RT comes with a "Development mode" setting. 
-# This setting, as a convenience for developers, turns on 
-# all sorts of development options that you most likely don't want in 
-# production:
-#
-# * Turns off Mason's 'static_source' directive. By default, you can't 
-#   edit RT's web ui components on the fly and have RT magically pick up
-#   your changes. (It's a big performance hit)
-#
-#  * More to come
-#
-
-Set($DevelMode, '@RT_DEVEL_MODE@');
-
-# }}}
-
-
 1;
diff --git a/rt/etc/RT_SiteConfig.pm b/rt/etc/RT_SiteConfig.pm
index affd36b..572a2ba 100644
--- a/rt/etc/RT_SiteConfig.pm
+++ b/rt/etc/RT_SiteConfig.pm
@@ -1,21 +1,3 @@
-# Any configuration directives you include  here will override 
-# RT's default configuration file, RT_Config.pm
-#
-# To include a directive here, just copy the equivalent statement
-# from RT_Config.pm and change the value. We've included a single
-# sample value below.
-#
-# This file is actually a perl module, so you can include valid
-# perl code, as well.
-#
-# The converse is also true, if this file isn't valid perl, you're
-# going to run into trouble. To check your SiteConfig file, use
-# this comamnd:
-#
-#   perl -c /path/to/your/etc/RT_SiteConfig.pm
-
-#Set( $rtname, 'example.com');
-
 $RT::rtname = '%%%RT_DOMAIN%%%';
 $RT::Organization = '%%%RT_DOMAIN%%%';
 
@@ -28,13 +10,4 @@ $RT::WebExternalAuth = 1;
 $RT::WebFallbackToInternal = 1; #no
 $RT::WebExternalAuto = 1;
 
-$RT::URI::freeside::IntegrationType = 'Internal';
-$RT::URI::freeside::URL = '%%%FREESIDE_URL%%%';
-
-Set($DatabaseHost   , '');
-
-#perl 5.8.0 - 5.8.2 experiment
-#@EmailInputEncodings = qw(iso-8859-1 us-ascii utf-8); # unless (@EmailInputEncodings);
-#Set($EmailOutputEncoding , 'iso-8859-1');
-
 1;
diff --git a/rt/etc/acl.Pg b/rt/etc/acl.Pg
index fb62559..49f938e 100755
--- a/rt/etc/acl.Pg
+++ b/rt/etc/acl.Pg
@@ -10,39 +10,37 @@ sub acl {
       Attributes
       attributes_id_seq
       queues_id_seq
- Queues 
+      Queues
       links_id_seq
- Links 
+      Links
       principals_id_seq
- Principals 
+      Principals
       groups_id_seq
- Groups 
+      Groups
       scripconditions_id_seq
- ScripConditions 
+      ScripConditions
       transactions_id_seq
- Transactions 
+      Transactions
       scrips_id_seq
- Scrips 
+      Scrips
       acl_id_seq
- ACL 
+      ACL
       groupmembers_id_seq
- GroupMembers 
+      GroupMembers
       cachedgroupmembers_id_seq
- CachedGroupMembers 
+      CachedGroupMembers
       users_id_seq
- Users 
+      Users
       tickets_id_seq
- Tickets 
+      Tickets
       scripactions_id_seq
- ScripActions 
+      ScripActions
       templates_id_seq
- Templates 
- objectcustomfieldvalues_id_s
- ObjectCustomFieldValues 
+      Templates
+      ticketcustomfieldvalues_id_s
+      TicketCustomFieldValues
       customfields_id_seq
- CustomFields 
- objectcustomfields_id_s
- ObjectCustomFields 
+      CustomFields
       customfieldvalues_id_seq
       CustomFieldValues
       sessions
diff --git a/rt/etc/acl.mysql b/rt/etc/acl.mysql
index 621ef12..5bd8834 100755
--- a/rt/etc/acl.mysql
+++ b/rt/etc/acl.mysql
@@ -1,5 +1,4 @@
 sub acl {
-return () if !$RT::DatabaseUser or $RT::DatabaseUser eq 'root';
 return  (
 "USE mysql;",
 "DELETE FROM user WHERE user = '${RT::DatabaseUser}';",
diff --git a/rt/etc/initialdata b/rt/etc/initialdata
index 3a21ce1..d5d3b20 100644
--- a/rt/etc/initialdata
+++ b/rt/etc/initialdata
@@ -351,7 +351,7 @@ batch-process all your pending approvals.
        Name        => "Approval Passed",    # loc
        Description =>
          "Notify Owner of their ticket has been approved by some approver", # loc
-       Content => 'Subject: Ticket Approved: {$Ticket->Subject}
+       Content => 'Subject: Ticket Rejected: {$Ticket->Subject}
 
 Greetings,
 
@@ -363,7 +363,7 @@ Other approvals may be pending.
        Name        => "All Approvals Passed",    # loc
        Description =>
          "Notify Owner of their ticket has been approved by all approvers", # loc
-       Content => 'Subject: Ticket Approved: {$Ticket->Subject}
+       Content => 'Subject: Ticket Rejected: {$Ticket->Subject}
 
 Greetings,
 
diff --git a/rt/etc/schema.Informix b/rt/etc/schema.Informix
index 6a4e533..20c607e 100644
--- a/rt/etc/schema.Informix
+++ b/rt/etc/schema.Informix
@@ -103,22 +103,20 @@ CREATE TABLE ScripConditions (
 
 CREATE TABLE Transactions (
   	id 			SERIAL,
-  	ObjectType 		VARCHAR(255),
-  	ObjectId 		INTEGER DEFAULT 0 NOT NULL,
+  	EffectiveTicket 	INTEGER DEFAULT 0 NOT NULL,
+  	Ticket 			INTEGER DEFAULT 0 NOT NULL,
   	TimeTaken 		INTEGER DEFAULT 0 NOT NULL,
   	Type 			VARCHAR(20),
   	Field 			VARCHAR(40),
   	OldValue 		VARCHAR(255),
   	NewValue 		VARCHAR(255),
-  	ReferenceType 		VARCHAR(255),
-	OldReference		INTEGER DEFAULT 0,
-	NewReference		INTEGER DEFAULT 0,
   	Data 			VARCHAR(255),
   	Creator 		INTEGER DEFAULT 0 NOT NULL,
   	Created 		DATETIME YEAR TO SECOND,
         PRIMARY KEY (id)
 );
-CREATE INDEX Transactions1 ON Transactions (ObjectType, ObjectId);
+CREATE INDEX Transactions1 ON Transactions (Ticket);
+CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
 
 
 CREATE TABLE Scrips (
@@ -307,9 +305,7 @@ CREATE TABLE CustomFields (
 	id		SERIAL,
 	Name		VARCHAR(200),
 	Type		VARCHAR(200),
-	MaxValues	INTEGER DEFAULT 0 NOT NULL,
-	Pattern		VARCHAR(255),
-	LookupType	VARCHAR(255),
+	Queue		INTEGER DEFAULT 0 NOT NULL,
 	Description	VARCHAR(255),
 	SortOrder	INTEGER DEFAULT 0 NOT NULL,
 	Creator		INTEGER DEFAULT 0 NOT NULL,
@@ -319,6 +315,7 @@ CREATE TABLE CustomFields (
 	Disabled	SMALLINT DEFAULT 0 NOT NULL,
         PRIMARY KEY (id)
 );
+CREATE INDEX CustomFields1 ON CustomFields (Disabled, Queue);
 
 
 CREATE TABLE CustomFieldValues (
diff --git a/rt/etc/schema.Pg b/rt/etc/schema.Pg
index 2d45a94..a5b68b3 100755
--- a/rt/etc/schema.Pg
+++ b/rt/etc/schema.Pg
@@ -57,7 +57,7 @@ CREATE TABLE Queues (
   Created TIMESTAMP NULL  ,
   LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated TIMESTAMP NULL  ,
-  Disabled integer NOT NULL DEFAULT 0 ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
 
 );
@@ -108,7 +108,7 @@ CREATE TABLE Principals (
         id INTEGER DEFAULT nextval('principals_id_seq') not null,
         PrincipalType VARCHAR(16) not null,
         ObjectId integer, 
-        Disabled integer NOT NULL DEFAULT 0 ,
+        Disabled int2 NOT NULL DEFAULT 0 ,
         PRIMARY KEY (id)
 
 );
@@ -183,16 +183,13 @@ CREATE SEQUENCE transactions_id_seq;
 
 CREATE TABLE Transactions (
   id INTEGER DEFAULT nextval('transactions_id_seq'),
-  ObjectType varchar(255) NOT NULL  ,
-  ObjectId integer NOT NULL DEFAULT 0  ,
+  EffectiveTicket integer NOT NULL DEFAULT 0  ,
+  Ticket integer NOT NULL DEFAULT 0  ,
   TimeTaken integer NOT NULL DEFAULT 0  ,
   Type varchar(20) NULL  ,
   Field varchar(40) NULL  ,
   OldValue varchar(255) NULL  ,
   NewValue varchar(255) NULL  ,
-  ReferenceType varchar(255) NULL,
-  OldReference integer NULL  ,
-  NewReference integer NULL  ,
   Data varchar(255) NULL  ,
 
   Creator integer NOT NULL DEFAULT 0  ,
@@ -200,7 +197,8 @@ CREATE TABLE Transactions (
   PRIMARY KEY (id)
 
 );
-CREATE INDEX Transactions1 ON Transactions (ObjectType, ObjectId);
+CREATE INDEX Transactions1 ON Transactions (Ticket);
+CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
 
 -- }}}
 
@@ -301,7 +299,7 @@ CREATE TABLE CachedGroupMembers (
         MemberId int, 
         Via int, 
         ImmediateParentId int, 
-        Disabled integer NOT NULL DEFAULT 0 , 
+        Disabled int2 NOT NULL DEFAULT 0 , 
         PRIMARY KEY (id)
 
 );
@@ -408,7 +406,7 @@ CREATE TABLE Tickets (
   LastUpdated TIMESTAMP NULL  ,
   Creator integer NOT NULL DEFAULT 0  ,
   Created TIMESTAMP NULL  ,
-  Disabled integer NOT NULL DEFAULT 0 ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
 
 );
@@ -476,7 +474,7 @@ CREATE TABLE Templates (
 
 -- }}}
 
--- {{{ ObjectCustomFieldValues 
+-- {{{ TicketCustomFieldValues 
 
 
 
@@ -484,31 +482,24 @@ CREATE TABLE Templates (
 -- Sequences for table TICKETCUSTOMFIELDVALUES
 --
 
-CREATE SEQUENCE objectcustomfieldvalues_id_s;
+CREATE SEQUENCE ticketcustomfieldvalues_id_s;
 
-CREATE TABLE ObjectCustomFieldValues (
-  id INTEGER DEFAULT nextval('objectcustomfieldvalues_id_s'),
+CREATE TABLE TicketCustomFieldValues (
+  id INTEGER DEFAULT nextval('ticketcustomfieldvalues_id_s'),
+  Ticket int NOT NULL  ,
   CustomField int NOT NULL  ,
-  ObjectType varchar(255) NULL  ,
-  ObjectId int NOT NULL  ,
-  SortOrder integer NOT NULL DEFAULT 0  ,
-
   Content varchar(255) NULL  ,
-  LargeContent text NULL,
-  ContentType varchar(80) NULL,
-  ContentEncoding varchar(80) NULL  ,
 
   Creator integer NOT NULL DEFAULT 0  ,
   Created TIMESTAMP NULL  ,
   LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated TIMESTAMP NULL  ,
-  Disabled integer NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
 
 );
 
-CREATE INDEX ObjectCustomFieldValues1 ON ObjectCustomFieldValues (CustomField,ObjectType,ObjectId,Content); 
-CREATE INDEX ObjectCustomFieldValues2 ON ObjectCustomFieldValues (CustomField,ObjectType,ObjectId); 
+CREATE INDEX TicketCustomFieldValues1 ON TicketCustomFieldValues (CustomField,Ticket,Content); 
+CREATE INDEX TicketCustomFieldValues2 ON TicketCustomFieldValues (CustomField,Ticket); 
 
 -- }}}
 
@@ -526,10 +517,7 @@ CREATE TABLE CustomFields (
   id INTEGER DEFAULT nextval('customfields_id_seq'),
   Name varchar(200) NULL  ,
   Type varchar(200) NULL  ,
-  MaxValues integer NOT NULL DEFAULT 0  ,
-  Repeated integer NOT NULL DEFAULT 0 , 
-  Pattern varchar(255) NULL  ,
-  LookupType varchar(255) NOT NULL  ,
+  Queue integer NOT NULL DEFAULT 0 ,
   Description varchar(255) NULL  ,
   SortOrder integer NOT NULL DEFAULT 0  ,
 
@@ -537,27 +525,7 @@ CREATE TABLE CustomFields (
   Created TIMESTAMP NULL  ,
   LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated TIMESTAMP NULL  ,
-  Disabled integer NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
-
-);
-
--- }}}
-
--- {{{ ObjectCustomFields 
-
-CREATE SEQUENCE objectcustomfields_id_s;
-
-CREATE TABLE ObjectCustomFields (
-  id INTEGER DEFAULT nextval('objectcustomfields_id_s'),
-  CustomField integer NOT NULL,
-  ObjectId integer NOT NULL,
-  SortOrder integer NOT NULL DEFAULT 0  ,
-
-  Creator integer NOT NULL DEFAULT 0  ,
-  Created TIMESTAMP NULL  ,
-  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
-  LastUpdated TIMESTAMP NULL  ,
+  Disabled int2 NOT NULL DEFAULT 0 ,
   PRIMARY KEY (id)
 
 );
@@ -605,7 +573,7 @@ CREATE TABLE Attributes (
   Content text,
   ContentType varchar(16),
   ObjectType varchar(64),
-  ObjectId integer, 
+  ObjectId integer, # foreign key to anything
   Creator integer NOT NULL DEFAULT 0  ,
   Created TIMESTAMP NULL  ,
   LastUpdatedBy integer NOT NULL DEFAULT 0  ,
diff --git a/rt/etc/schema.SQLite b/rt/etc/schema.SQLite
index 8791bb4..1746646 100644
--- a/rt/etc/schema.SQLite
+++ b/rt/etc/schema.SQLite
@@ -112,23 +112,21 @@ CREATE TABLE ScripConditions (
 --- {{{ Transactions
 CREATE TABLE Transactions (
   id INTEGER PRIMARY KEY  ,
-  ObjectType varchar(255) NULL  ,
-  ObjectId integer NULL  ,
+  EffectiveTicket integer NULL  ,
+  Ticket integer NULL  ,
   TimeTaken integer NULL  ,
   Type varchar(20) NULL  ,
   Field varchar(40) NULL  ,
   OldValue varchar(255) NULL  ,
   NewValue varchar(255) NULL  ,
-  ReferenceType varchar(255) NULL  ,
-  OldReference integer NULL  ,
-  NewReference integer NULL  ,
   Data varchar(255) NULL  ,
 
   Creator integer NULL  ,
   Created DATETIME NULL  
   
 ) ;
-CREATE INDEX Transactions1 ON Transactions (ObjectType, ObjectId);
+CREATE INDEX Transactions1 ON Transactions (Ticket);
+CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
 
 --- }}}
 
@@ -331,94 +329,65 @@ CREATE TABLE Templates (
 
 --- }}}
 
+--- {{{ TicketCustomFieldValues 
 
-
-# {{{ ObjectCustomFieldValues 
-
-CREATE TABLE ObjectCustomFieldValues (
-  id INTEGER NOT NULL  ,
+CREATE TABLE TicketCustomFieldValues (
+  id INTEGER PRIMARY KEY  ,
+  Ticket int NOT NULL  ,
   CustomField int NOT NULL  ,
-  ObjectType varchar(255) NOT NULL,	    # Final target of the Object
-  ObjectId int NOT NULL  ,		    # New -- Replaces Ticket
-  SortOrder integer NOT NULL DEFAULT 0  ,
-
   Content varchar(255) NULL  ,
-  LargeContent LONGTEXT NULL,		    # New -- to hold 255+ strings
-  ContentType varchar(80) NULL,		    # New -- only text/* gets searched
-  ContentEncoding varchar(80) NULL  ,	    # New -- for binary Content
 
-  Creator integer NOT NULL DEFAULT 0  ,
+  Creator integer NULL  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
-  LastUpdated DATETIME NULL  ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL  
+  
 ) ;
 
-CREATE INDEX ObjectCustomFieldValues1 ON ObjectCustomFieldValues (Content); 
-CREATE INDEX ObjectCustomFieldValues2 ON ObjectCustomFieldValues (CustomField,ObjectType,ObjectId); 
+CREATE INDEX TicketCustomFieldValues1 ON TicketCustomFieldValues (CustomField,Ticket,Content); 
+CREATE INDEX TicketCustomFieldValues2 ON TicketCustomFieldValues (CustomField,Ticket); 
 
-# }}}
+--- }}}
 
-# {{{ CustomFields
+--- {{{ CustomFields
 
 CREATE TABLE CustomFields (
-  id INTEGER NOT NULL  ,
+  id INTEGER PRIMARY KEY  ,
   Name varchar(200) NULL  ,
-  Type varchar(200) NULL  ,	# Changed -- 'Single' and 'Multiple' is moved out
-  MaxValues integer,		# New -- was 'Single'(1) and 'Multiple'(0)
-  Pattern varchar(255) NULL  ,	# New -- Must validate against this
-  Repeated int2 NOT NULL DEFAULT 0 , # New -- repeated table entry
+  Type varchar(200) NULL  ,
+  Queue int NULL ,
   Description varchar(255) NULL  ,
-  SortOrder integer NOT NULL DEFAULT 0  ,
-  LookupType varchar(255) NOT NULL,
-
-  Creator integer NOT NULL DEFAULT 0  ,
-  Created DATETIME NULL  ,
-  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
-  LastUpdated DATETIME NULL  ,
-  Disabled int2 NOT NULL DEFAULT 0 ,
-  PRIMARY KEY (id)
-) ;
-
-# }}}
-
-# {{{ ObjectCustomFields 
+  SortOrder integer NULL  ,
 
-CREATE TABLE ObjectCustomFields (
-  id INTEGER NOT NULL  ,
-  CustomField int NOT NULL  ,
-  ObjectId integer NOT NULL,
-  SortOrder integer NOT NULL DEFAULT 0  ,
-
-  Creator integer NOT NULL DEFAULT 0  ,
+  Creator integer NULL  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
-  LastUpdated DATETIME NULL  ,
-  PRIMARY KEY (id)
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL ,
+  Disabled int2 NOT NULL DEFAULT 0 
+  
 ) ;
 
-# }}}
+--- }}}
 
-# {{{ CustomFieldValues 
+--- {{{ CustomFieldValues 
 
 CREATE TABLE CustomFieldValues (
-  id INTEGER NOT NULL  ,
+  id INTEGER PRIMARY KEY  ,
   CustomField int NOT NULL  ,
   Name varchar(200) NULL  ,
   Description varchar(255) NULL  ,
-  SortOrder integer NOT NULL DEFAULT 0  ,
+  SortOrder integer NULL  ,
 
-  Creator integer NOT NULL DEFAULT 0  ,
+  Creator integer NULL  ,
   Created DATETIME NULL  ,
-  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
-  LastUpdated DATETIME NULL  ,
-  PRIMARY KEY (id)
+  LastUpdatedBy integer NULL  ,
+  LastUpdated DATETIME NULL 
+  
 ) ;
 
 CREATE INDEX CustomFieldValues1 ON CustomFieldValues (CustomField);
- 
-# }}}
+
+--- }}}
 
 --- {{{ Attributes
 CREATE TABLE Attributes (
diff --git a/rt/etc/schema.mysql b/rt/etc/schema.mysql
index 60f1aba..0ab42e7 100755
--- a/rt/etc/schema.mysql
+++ b/rt/etc/schema.mysql
@@ -118,23 +118,21 @@ CREATE TABLE ScripConditions (
 # {{{ Transactions
 CREATE TABLE Transactions (
   id INTEGER NOT NULL  AUTO_INCREMENT,
-  ObjectType varchar(64) NOT NULL,
-  ObjectId integer NOT NULL DEFAULT 0  ,
+  EffectiveTicket integer NOT NULL DEFAULT 0  ,
+  Ticket integer NOT NULL DEFAULT 0  ,
   TimeTaken integer NOT NULL DEFAULT 0  ,
   Type varchar(20) NULL  ,
   Field varchar(40) NULL  ,
   OldValue varchar(255) NULL  ,
   NewValue varchar(255) NULL  ,
-  ReferenceType varchar(255) NULL,
-  OldReference integer NULL  ,
-  NewReference integer NULL  ,
   Data varchar(255) NULL  ,
 
   Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
   PRIMARY KEY (id)
 ) TYPE=InnoDB;
-CREATE INDEX Transactions1 ON Transactions (ObjectType, ObjectId);
+CREATE INDEX Transactions1 ON Transactions (Ticket);
+CREATE INDEX Transactions2 ON Transactions (EffectiveTicket);
 
 # }}}
 
@@ -339,30 +337,22 @@ CREATE TABLE Templates (
 
 # }}}
 
-# {{{ ObjectCustomFieldValues 
+# {{{ TicketCustomFieldValues 
 
-CREATE TABLE ObjectCustomFieldValues (
+CREATE TABLE TicketCustomFieldValues (
   id INTEGER NOT NULL  AUTO_INCREMENT,
+  Ticket int NOT NULL  ,
   CustomField int NOT NULL  ,
-  ObjectType varchar(255) NOT NULL,	    # Final target of the Object
-  ObjectId int NOT NULL  ,		    # New -- Replaces Ticket
-  SortOrder integer NOT NULL DEFAULT 0  ,   # New -- ordering for multiple values
-
   Content varchar(255) NULL  ,
-  LargeContent LONGTEXT NULL,		    # New -- to hold 255+ strings
-  ContentType varchar(80) NULL,		    # New -- only text/* gets searched
-  ContentEncoding varchar(80) NULL  ,	    # New -- for binary Content
 
   Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
   LastUpdatedBy integer NOT NULL DEFAULT 0  ,
   LastUpdated DATETIME NULL  ,
-  Disabled int2 NOT NULL DEFAULT 0 ,        # New -- whether the value was current
   PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
-CREATE INDEX ObjectCustomFieldValues1 ON ObjectCustomFieldValues (Content); 
-CREATE INDEX ObjectCustomFieldValues2 ON ObjectCustomFieldValues (CustomField,ObjectType,ObjectId); 
+CREATE INDEX TicketCustomFieldValues1 ON TicketCustomFieldValues (CustomField,Ticket,Content); 
 
 # }}}
 
@@ -371,13 +361,10 @@ CREATE INDEX ObjectCustomFieldValues2 ON ObjectCustomFieldValues (CustomField,Ob
 CREATE TABLE CustomFields (
   id INTEGER NOT NULL  AUTO_INCREMENT,
   Name varchar(200) NULL  ,
-  Type varchar(200) NULL  ,	# Changed -- 'Single' and 'Multiple' is moved out
-  MaxValues integer,		# New -- was 'Single'(1) and 'Multiple'(0)
-  Pattern varchar(255) NULL  ,	# New -- Must validate against this
-  Repeated int2 NOT NULL DEFAULT 0 , # New -- repeated table entry
+  Type varchar(200) NULL  ,
+  Queue integer NOT NULL DEFAULT 0 ,
   Description varchar(255) NULL  ,
   SortOrder integer NOT NULL DEFAULT 0  ,
-  LookupType varchar(255) NOT NULL,
 
   Creator integer NOT NULL DEFAULT 0  ,
   Created DATETIME NULL  ,
@@ -387,22 +374,8 @@ CREATE TABLE CustomFields (
   PRIMARY KEY (id)
 ) TYPE=InnoDB;
 
-# }}}
-
-# {{{ ObjectCustomFields 
-
-CREATE TABLE ObjectCustomFields (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  CustomField int NOT NULL  ,
-  ObjectId integer NOT NULL,
-  SortOrder integer NOT NULL DEFAULT 0  ,
+CREATE INDEX CustomFields1 on CustomFields (Disabled, Queue);
 
-  Creator integer NOT NULL DEFAULT 0  ,
-  Created DATETIME NULL  ,
-  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
-  LastUpdated DATETIME NULL  ,
-  PRIMARY KEY (id)
-) TYPE=InnoDB;
 
 # }}}
 
diff --git a/rt/etc/upgrade/3.1.0/schema.Pg b/rt/etc/upgrade/3.1.0/schema.Pg
index 94c3fe7..67ea738 100755
--- a/rt/etc/upgrade/3.1.0/schema.Pg
+++ b/rt/etc/upgrade/3.1.0/schema.Pg
@@ -9,7 +9,7 @@ CREATE TABLE Attributes (
   Content text,
   ContentType varchar(16),
   ObjectType varchar(64),
-  ObjectId integer, 
+  ObjectId integer, -- foreign key to anything
   Creator integer NOT NULL DEFAULT 0  ,
   Created TIMESTAMP NULL  ,
   LastUpdatedBy integer NOT NULL DEFAULT 0  ,
diff --git a/rt/etc/upgrade/3.1.0/schema.SQLite b/rt/etc/upgrade/3.1.0/schema.SQLite
index 1dd466f..87a1cc4 100644
--- a/rt/etc/upgrade/3.1.0/schema.SQLite
+++ b/rt/etc/upgrade/3.1.0/schema.SQLite
@@ -13,8 +13,7 @@ CREATE TABLE Attributes (
   LastUpdated DATETIME NULL  
  
 ) ;
-
-CREATE INDEX Attributes1 on Attributes(Name);
+CREATE INDEX Attributes1 on Attributes(Name)
 CREATE INDEX Attributes2 on Attributes(ObjectType, ObjectId);
 
 --- }}}
diff --git a/rt/etc/upgrade/3.3.0/acl.Informix b/rt/etc/upgrade/3.3.0/acl.Informix
deleted file mode 100644
index 73c16ae..0000000
--- a/rt/etc/upgrade/3.3.0/acl.Informix
+++ /dev/null
@@ -1,4 +0,0 @@
-sub acl {
-    return ();
-}
-1;
diff --git a/rt/etc/upgrade/3.3.0/acl.Oracle b/rt/etc/upgrade/3.3.0/acl.Oracle
deleted file mode 100644
index 73c16ae..0000000
--- a/rt/etc/upgrade/3.3.0/acl.Oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-sub acl {
-    return ();
-}
-1;
diff --git a/rt/etc/upgrade/3.3.0/acl.Pg b/rt/etc/upgrade/3.3.0/acl.Pg
deleted file mode 100644
index 2069a19..0000000
--- a/rt/etc/upgrade/3.3.0/acl.Pg
+++ /dev/null
@@ -1,20 +0,0 @@
-sub acl {
-    my $dbh = shift;
-
-    my @acls;
-
-    my @tables = qw (
-    objectcustomfieldvalues
-    objectcustomfields_id_s
-    objectcustomfields
-    );
-
-    foreach my $table (@tables) {
-        push @acls,
-          "GRANT SELECT, INSERT, UPDATE, DELETE ON $table to "
-          . $RT::DatabaseUser . ";";
-
-    }
-    return (@acls);
-}
-1;
diff --git a/rt/etc/upgrade/3.3.0/acl.SQLite b/rt/etc/upgrade/3.3.0/acl.SQLite
deleted file mode 100644
index 73c16ae..0000000
--- a/rt/etc/upgrade/3.3.0/acl.SQLite
+++ /dev/null
@@ -1,4 +0,0 @@
-sub acl {
-    return ();
-}
-1;
diff --git a/rt/etc/upgrade/3.3.0/acl.mysql b/rt/etc/upgrade/3.3.0/acl.mysql
deleted file mode 100644
index 73c16ae..0000000
--- a/rt/etc/upgrade/3.3.0/acl.mysql
+++ /dev/null
@@ -1,4 +0,0 @@
-sub acl {
-    return ();
-}
-1;
diff --git a/rt/etc/upgrade/3.3.0/schema.Oracle b/rt/etc/upgrade/3.3.0/schema.Oracle
deleted file mode 100644
index f81feeb..0000000
--- a/rt/etc/upgrade/3.3.0/schema.Oracle
+++ /dev/null
@@ -1,65 +0,0 @@
-alter Table Transactions ADD ObjectType VARCHAR2(64);
-UPDATE Transactions set ObjectType = 'RT::Ticket';
-ALTER TABLE Transactions modify ObjectType NOT NULL;
-ALTER TABLE Transactions drop column EffectiveTicket;
-ALTER TABLE Transactions ADD ReferenceType VARCHAR2(255) NULL;
-ALTER TABLE Transactions ADD OldReference NUMBER(11,0) NULL;      
-ALTER TABLE Transactions ADD NewReference NUMBER(11,0) NULL;
-DROP INDEX transactions1;            
-ALTER TABLE Transactions rename column Ticket to ObjectId;
-CREATE INDEX Transactions1 ON Transactions (ObjectType, ObjectId);
-
-ALTER TABLE TicketCustomFieldValues rename to ObjectCustomFieldValues;
-ALTER TABLE ObjectCustomFieldValues  rename column Ticket to ObjectId;
-ALTER TABLE ObjectCustomFieldValues ADD ObjectType VARCHAR2(255);
-UPDATE ObjectCustomFieldValues set ObjectType = 'RT::Ticket';
-ALTER TABLE ObjectCustomFieldValues MODIFY ObjectType NOT NULL;
-ALTER TABLE ObjectCustomFieldValues ADD Disabled NUMBER(11,0);
-ALTER TABLE ObjectCustomFieldValues MODIFY Disabled  default 0;  
-UPDATE ObjectCustomFieldValues SET Disabled = 0;
-ALTER TABLE ObjectCustomFieldValues MODIFY Disabled NOT NULL;
-ALTER TABLE ObjectCustomFieldValues ADD LargeContent CLOB NULL;
-ALTER TABLE ObjectCustomFieldValues ADD ContentType VARCHAR2(80) NULL;
-ALTER TABLE ObjectCustomFieldValues ADD ContentEncoding VARCHAR2(80) NULL;
-ALTER TABLE ObjectCustomFieldValues ADD SortOrder NUMBER(11,0) DEFAULT 0 NOT NULL;
-
-
-
-CREATE INDEX ObjectCustomFieldValues1 on ObjectCustomFieldValues (CustomField,ObjectType,ObjectId,Content); 
-CREATE INDEX ObjectCustomFieldValues2  on ObjectCustomFieldValues (CustomField,ObjectType,ObjectId); 
-
-
-
-CREATE SEQUENCE OBJECTCUSTOMFIELDS_seq;
-CREATE TABLE ObjectCustomFields (
-        id              NUMBER(11,0)
-                 CONSTRAINT ObjectCustomFields_Key PRIMARY KEY,
-        CustomField       NUMBER(11,0)  NOT NULL,
-        ObjectId              NUMBER(11,0)  NOT NULL,
-        SortOrder       NUMBER(11,0) DEFAULT 0 NOT NULL,
-        Creator         NUMBER(11,0) DEFAULT 0 NOT NULL,
-        Created         DATE,
-        LastUpdatedBy   NUMBER(11,0) DEFAULT 0 NOT NULL,
-        LastUpdated     DATE
-);
-
-
-INSERT into ObjectCustomFields (id, CustomField, ObjectId, SortOrder, Creator, LastUpdatedBy) SELECT  objectcustomfields_seq.nextval, id, Queue, SortOrder, Creator, LastUpdatedBy from CustomFields;
-
-ALTER TABLE CustomFields ADD LookupType VARCHAR2(255);
-ALTER TABLE CustomFields ADD Repeated NUMBER(11,0);
-ALTER TABLE CustomFields ADD Pattern VARCHAR2(255) NULL;
-ALTER TABLE CustomFields ADD MaxValues NUMBER(11,0);
-
-UPDATE CustomFields SET MaxValues = 0 WHERE Type LIKE '%Multiple';
-UPDATE CustomFields SET MaxValues = 1 WHERE Type LIKE '%Single';
-UPDATE CustomFields SET Type = 'Select' WHERE Type LIKE 'Select%';
-UPDATE CustomFields SET Type = 'Freeform' WHERE Type LIKE 'Freeform%';
-UPDATE CustomFields Set LookupType = 'RT::Queue-RT::Ticket';
-ALTER TABLE CustomFields MODIFY LookupType NOT NULL;
-UPDATE CustomFields Set Repeated = 0;
-ALTER TABLE CustomFields MODIFY Repeated DEFAULT 0;
-ALTER TABLE CustomFields MODIFY Repeated  NOT NULL;
-ALTER TABLE CustomFields drop column Queue; 
-
-
diff --git a/rt/etc/upgrade/3.3.0/schema.Pg b/rt/etc/upgrade/3.3.0/schema.Pg
deleted file mode 100644
index 427eae7..0000000
--- a/rt/etc/upgrade/3.3.0/schema.Pg
+++ /dev/null
@@ -1,74 +0,0 @@
-alter Table Transactions ADD Column ObjectType varchar(64);
-update Transactions set ObjectType = 'RT::Ticket';
-ALTER TABLE Transactions ALTER COLUMN ObjectType SET NOT NULL;
-alter table Transactions drop column EffectiveTicket;
-alter table Transactions add column ReferenceType varchar(255) NULL;
-alter table Transactions add column OldReference integer NULL;      
-alter table Transactions add column NewReference integer NULL;
-drop index transactions1;            
-alter table Transactions rename column Ticket to ObjectId;
-
-
-CREATE INDEX Transactions1 ON Transactions (ObjectType, ObjectId);
-
-alter table TicketCustomFieldValues rename to ObjectCustomFieldValues;
-
-alter table ObjectCustomFieldValues  rename column Ticket to ObjectId;
-
-alter table objectcustomfieldvalues add column ObjectType varchar(255);
-
-update objectcustomfieldvalues set ObjectType = 'RT::Ticket';
-
-ALTER TABLE objectcustomfieldvalues ALTER COLUMN ObjectType SET NOT NULL;
-
-alter table objectcustomfieldvalues add column Current int;
-
-alter table objectcustomfieldvalues alter column Current SET  default 1;  
-
-UPDATE objectcustomfieldvalues SET Current = 1;
-
-alter table objectcustomfieldvalues add column LargeContent TEXT NULL;
-
-alter table objectcustomfieldvalues add column ContentType varchar(80) NULL;
-
-alter table objectcustomfieldvalues add column ContentEncoding varchar(80) NULL;
-
-create index ObjectCustomFieldValues1 on objectcustomfieldvalues (CustomField,ObjectType,ObjectId,Content); 
-
-create index ObjectCustomFieldValues2  on objectcustomfieldvalues (CustomField,ObjectType,ObjectId); 
-
-
-CREATE SEQUENCE objectcustomfields_id_s;
-
-CREATE TABLE ObjectCustomFields (
-  id INTEGER DEFAULT nextval('objectcustomfields_id_s'),
-  CustomField integer NOT NULL,
-  ObjectId integer NOT NULL,
-  SortOrder integer NOT NULL DEFAULT 0  ,
-
-  Creator integer NOT NULL DEFAULT 0  ,
-  Created TIMESTAMP NULL  ,
-  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
-  LastUpdated TIMESTAMP NULL  ,
-  PRIMARY KEY (id)
-
-);
-
-
-INSERT into ObjectCustomFields (CustomField, ObjectId, SortOrder, Creator, LastUpdatedBy) SELECT  id, Queue, SortOrder, Creator, LastUpdatedBy from CustomFields;
-
-alter table CustomFields add column LookupType varchar(255);
-alter table CustomFields add column Repeated int2;
-alter table CustomFields add column Pattern varchar(255) NULL;
-alter table CustomFields add column MaxValues integer;
-
-UPDATE CustomFields SET MaxValues = 0 WHERE Type LIKE '%Multiple';
-UPDATE CustomFields SET MaxValues = 1 WHERE Type LIKE '%Single';
-UPDATE CustomFields SET Type = 'Select' WHERE Type LIKE 'Select%';
-UPDATE CustomFields SET Type = 'Freeform' WHERE Type LIKE 'Freeform%';
-UPDATE CustomFields Set LookupType = 'RT::Queue-RT::Ticket';
-ALTER TABLE CustomFields ALTER COLUMN LookupType SET NOT NULL;
-UPDATE CustomFields Set Repeated = 0;
-ALTER TABLE CustomFields ALTER COLUMN Repeated SET DEFAULT 0;
-ALTER TABLE CustomFields ALTER COLUMN Repeated SET NOT NULL;
-alter table CustomFields drop column Queue; 
diff --git a/rt/etc/upgrade/3.3.0/schema.mysql b/rt/etc/upgrade/3.3.0/schema.mysql
deleted file mode 100644
index 0e33a28..0000000
--- a/rt/etc/upgrade/3.3.0/schema.mysql
+++ /dev/null
@@ -1,65 +0,0 @@
-alter Table Transactions ADD Column (ObjectType varchar(64) not null);
-update Transactions set ObjectType = 'RT::Ticket';
-alter table Transactions drop column EffectiveTicket;
-alter table Transactions add column ReferenceType varchar(255) NULL;
-alter table Transactions add column OldReference integer NULL;      
-alter table Transactions add column NewReference integer NULL;
-alter table Transactions drop index transactions1;            
-alter table Transactions change Ticket ObjectId integer NOT NULL DEFAULT 0  ;
-
-CREATE INDEX Transactions1 ON Transactions (ObjectType, ObjectId);
-
-alter table TicketCustomFieldValues rename ObjectCustomFieldValues;
-
-alter table ObjectCustomFieldValues  change Ticket ObjectId integer NOT NULL DEFAULT 0  ;
-
-alter table ObjectCustomFieldValues add column ObjectType varchar(255) not null;
-
-update ObjectCustomFieldValues set ObjectType = 'RT::Ticket';
-
-alter table ObjectCustomFieldValues add column Current bool default 1;  
-
-alter table ObjectCustomFieldValues add column LargeContent LONGTEXT NULL;
-
-alter table ObjectCustomFieldValues add column ContentType varchar(80) NULL;
-
-alter table ObjectCustomFieldValues add column ContentEncoding varchar(80) NULL;
-
-# These could fail if there's no such index and there's no "drop index if exists" syntax
-#alter table ObjectCustomFieldValues drop index ticketcustomfieldvalues1;
-#alter table ObjectCustomFieldValues drop index ticketcustomfieldvalues2;
-
-alter table ObjectCustomFieldValues add index ObjectCustomFieldValues1 (Content); 
-
-alter table ObjectCustomFieldValues add index ObjectCustomFieldValues2 (CustomField,ObjectType,ObjectId); 
-
-
-CREATE TABLE ObjectCustomFields (
-  id INTEGER NOT NULL  AUTO_INCREMENT,
-  CustomField int NOT NULL  ,
-  ObjectId integer NOT NULL,
-  SortOrder integer NOT NULL DEFAULT 0  ,
-
-  Creator integer NOT NULL DEFAULT 0  ,
-  Created DATETIME NULL  ,
-  LastUpdatedBy integer NOT NULL DEFAULT 0  ,
-  LastUpdated DATETIME NULL  ,
-  PRIMARY KEY (id)
-) TYPE=InnoDB;
-
-
-INSERT into ObjectCustomFields (id, CustomField, ObjectId, SortOrder, Creator, LastUpdatedBy) SELECT  null, id, Queue, SortOrder, Creator, LastUpdatedBy from CustomFields;
-
-alter table CustomFields add column LookupType varchar(255) NOT NULL;
-alter table CustomFields add column Repeated int2 NOT NULL DEFAULT 0 ;
-alter table CustomFields add column Pattern varchar(255) NULL;
-alter table CustomFields add column MaxValues integer;
-# See above
-# alter table CustomFields drop index CustomFields1;
-
-UPDATE CustomFields SET MaxValues = 0 WHERE Type LIKE '%Multiple';
-UPDATE CustomFields SET MaxValues = 1 WHERE Type LIKE '%Single';
-UPDATE CustomFields SET Type = 'Select' WHERE Type LIKE 'Select%';
-UPDATE CustomFields SET Type = 'Freeform' WHERE Type LIKE 'Freeform%';
-UPDATE CustomFields Set LookupType = 'RT::Queue-RT::Ticket';
-alter table CustomFields drop column Queue; 
diff --git a/rt/etc/upgrade/3.3.11/acl.Oracle b/rt/etc/upgrade/3.3.11/acl.Oracle
deleted file mode 100644
index 73c16ae..0000000
--- a/rt/etc/upgrade/3.3.11/acl.Oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-sub acl {
-    return ();
-}
-1;
diff --git a/rt/etc/upgrade/3.3.11/acl.Pg b/rt/etc/upgrade/3.3.11/acl.Pg
deleted file mode 100644
index 73c16ae..0000000
--- a/rt/etc/upgrade/3.3.11/acl.Pg
+++ /dev/null
@@ -1,4 +0,0 @@
-sub acl {
-    return ();
-}
-1;
diff --git a/rt/etc/upgrade/3.3.11/acl.SQLite b/rt/etc/upgrade/3.3.11/acl.SQLite
deleted file mode 100644
index 73c16ae..0000000
--- a/rt/etc/upgrade/3.3.11/acl.SQLite
+++ /dev/null
@@ -1,4 +0,0 @@
-sub acl {
-    return ();
-}
-1;
diff --git a/rt/etc/upgrade/3.3.11/acl.mysql b/rt/etc/upgrade/3.3.11/acl.mysql
deleted file mode 100644
index 73c16ae..0000000
--- a/rt/etc/upgrade/3.3.11/acl.mysql
+++ /dev/null
@@ -1,4 +0,0 @@
-sub acl {
-    return ();
-}
-1;
diff --git a/rt/etc/upgrade/3.3.11/content b/rt/etc/upgrade/3.3.11/content
deleted file mode 100644
index 0afc604..0000000
--- a/rt/etc/upgrade/3.3.11/content
+++ /dev/null
@@ -1 +0,0 @@
-1;
diff --git a/rt/etc/upgrade/3.3.11/schema.Oracle b/rt/etc/upgrade/3.3.11/schema.Oracle
deleted file mode 100644
index e69de29..0000000
--- a/rt/etc/upgrade/3.3.11/schema.Oracle
+++ /dev/null
diff --git a/rt/etc/upgrade/3.3.11/schema.Pg b/rt/etc/upgrade/3.3.11/schema.Pg
deleted file mode 100644
index 6ab5d65..0000000
--- a/rt/etc/upgrade/3.3.11/schema.Pg
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE ObjectCustomFieldValues ADD COLUMN SortOrder INTEGER;
-UPDATE ObjectCustomFieldValues SET SortOrder = 0;
-ALTER TABLE ObjectCustomFieldValues ALTER COLUMN SortOrder SET DEFAULT 0;
-ALTER TABLE ObjectCustomFieldValues ALTER COLUMN SortOrder SET NOT NULL;
-ALTER TABLE ObjectCustomFieldValues ADD COLUMN Disabled INTEGER;
-UPDATE ObjectCustomFieldValues SET Disabled = 1 WHERE Current = 0;
-UPDATE ObjectCustomFieldValues SET Disabled = 0 WHERE Current != 0;
-ALTER TABLE ObjectCustomFieldValues ALTER COLUMN Disabled SET DEFAULT 0;
-ALTER TABLE ObjectCustomFieldValues ALTER COLUMN Disabled SET NOT NULL;
-
-ALTER TABLE ObjectCustomFieldValues DROP COLUMN Current;
diff --git a/rt/etc/upgrade/3.3.11/schema.SQLite b/rt/etc/upgrade/3.3.11/schema.SQLite
deleted file mode 100644
index e69de29..0000000
--- a/rt/etc/upgrade/3.3.11/schema.SQLite
+++ /dev/null
diff --git a/rt/etc/upgrade/3.3.11/schema.mysql b/rt/etc/upgrade/3.3.11/schema.mysql
deleted file mode 100644
index cc35d40..0000000
--- a/rt/etc/upgrade/3.3.11/schema.mysql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE ObjectCustomFieldValues ADD COLUMN SortOrder INTEGER NOT NULL DEFAULT 0;
-ALTER TABLE ObjectCustomFieldValues ADD COLUMN Disabled int2 NOT NULL DEFAULT 0;
-
-UPDATE ObjectCustomFieldValues SET Disabled = 1 WHERE Current = 0;
-ALTER TABLE ObjectCustomFieldValues DROP COLUMN Current;
diff --git a/rt/html/Admin/CustomFields/GroupRights.html b/rt/html/Admin/CustomFields/GroupRights.html
deleted file mode 100644
index 380fee4..0000000
--- a/rt/html/Admin/CustomFields/GroupRights.html
+++ /dev/null
@@ -1,170 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/CustomFieldTabs,
-    id => $id,
-    current_tab => "Admin/CustomFields/GroupRights.html?id=".$id,
-    Title => $title
-&>
-<& /Elements/ListActions, actions => \@results &>
-
-  <FORM METHOD=POST ACTION="GroupRights.html">
-    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $CustomFieldObj->id %>">
-      
-      
-<h1><&|/l&>System groups</&></h1>
-<TABLE>
-% $Groups = RT::Groups->new($session{'CurrentUser'});
-% $Groups->LimitToSystemInternalGroups();
-%	while (my $Group = $Groups->Next()) {
-  <TR ALIGN=RIGHT> 
-	<TD VALIGN=TOP>
-	    <% loc($Group->Type) %>
-		  </TD>
-	  <TD>
-	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
-        Object => $CustomFieldObj  &>
-	  </TD>
-	</TR>
-% }
-</TABLE>
-<h1><&|/l&>User defined groups</&></h1>
-<TABLE>
-% $Groups = RT::Groups->new($session{'CurrentUser'});
-% $Groups->LimitToUserDefinedGroups();    
-%	while (my $Group = $Groups->Next()) {
-  <TR ALIGN=RIGHT> 
-	<TD VALIGN=TOP>
-	    <% $Group->Name %>
-		  </TD>
-	  <TD>
-	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
-        Object => $CustomFieldObj  &>
-	  </TD>
-	</TR>
-% }
-</TABLE>
-            
-      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
-      
-  </FORM>
-  
-<%INIT>
- 
-
-
-
-  
-
-if (!defined $id) {
-    $m->comp("/Elements/Error", Why => loc("No CustomField defined"));
-}
-
-my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
-$CustomFieldObj->Load($id) || $m->comp("/Elements/Error", Why => loc("Couldn't load CustomField [_1]",$id));
-
-my $Groups;
-  
-  my ( $ACL, @results );
-
-    foreach my $arg (keys %ARGS) {
-        if ($arg =~ /GrantRight-(\d+)-(.*?)-(\d+)$/) {
-            my $principal_id = $1;
-            my $object_type = $2;
-            my $object_id = $3;
-            my $rights = $ARGS{$arg};
-
-            my $principal = RT::Principal->new($session{'CurrentUser'});
-            $principal->Load($principal_id);
-            my $obj;
-
-            if ($object_type eq 'RT::CustomField') {
-                $obj = RT::CustomField->new($session{'CurrentUser'});
-                $obj->Load($object_id);
-            } else {
-                push (@results, loc("System Error").
-                                loc("Rights could not be granted for [_1]", $object_type));
-                next;
-            }
-
-            my @rights = ref($ARGS{$arg}) eq 'ARRAY' ? @{$ARGS{$arg}} : ($ARGS{$arg});
-            foreach my $right (@rights) {
-                next unless ($right);
-                my ($val, $msg) = $principal->GrantRight(Object => $obj, Right => $right);
-                push (@results, $msg);
-            }
-        }
-     elsif ($arg =~ /RevokeRight-(\d+)-(.*?)-(\d+)-(.*?)$/) {
-            my $principal_id = $1;
-            my $object_type = $2;
-            my $object_id = $3;
-            my $right = $4;
-
-            my $principal = RT::Principal->new($session{'CurrentUser'});
-            $principal->Load($principal_id);
-            next unless ($right);
-            my $obj;
-
-            if ($object_type eq 'RT::CustomField') {
-                $obj = RT::CustomField->new($session{'CurrentUser'});
-                $obj->Load($object_id);
-            } else {
-                push (@results, loc("System Error").
-                                loc("Rights could not be revoked for [_1]", $object_type));
-                next;
-            }
-            my ($val, $msg) = $principal->RevokeRight(Object => $obj, Right => $right);
-            push (@results, $msg);
-        }
-} 
-
-my $title = loc('Modify group rights for custom field [_1]', $CustomFieldObj->Name);
-    
-</%INIT>
-
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/html/Admin/CustomFields/Modify.html b/rt/html/Admin/CustomFields/Modify.html
deleted file mode 100644
index 4c3c921..0000000
--- a/rt/html/Admin/CustomFields/Modify.html
+++ /dev/null
@@ -1,212 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/CustomFieldTabs,
-    id => $CustomFieldObj->Id ,
-    current_tab => $current_tab,
-    Title => $title &>
-<& /Elements/ListActions, actions => \@results &>
-
-
-<FORM METHOD="POST" ACTION="Modify.html" NAME="ModifyCustomField">
-<INPUT TYPE=HIDDEN NAME="id" VALUE="<%$id %>">
-<table>
-<tr>
-<td class="label"><&|/l&>Name</&></td>
-<td><input name="Name" VALUE="<%$CustomFieldObj->Name%>" SIZE=20></td></tr>
-<tr>
-<td class="label"><&|/l&>Description</&></td>
-<td><input name="Description" VALUE="<%$CustomFieldObj->Description%>" SIZE=80></td>
-</tr>
-
-<tr>
-<td class="label"><&|/l&>Type</&></td>
-<td><& /Admin/Elements/SelectCustomFieldType, 
-        Name => "TypeComposite", 
-        Default => $CustomFieldObj->TypeComposite, &>
-</td>
-</tr>
-<tr>
-<td class="label"><&|/l&>Applies to</&></td>
-<td><& /Admin/Elements/SelectCustomFieldLookupType, 
-        Name => "LookupType", 
-        Default => $CustomFieldObj->LookupType, &>
-</td>
-</tr>
-<tr>
-<td class="label">&nbsp;</td>
-<td>
-<INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
-<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this custom field)</&>
-</td>
-</tr>
-</table>
-<BR>
-% if ($CustomFieldObj->Id && $CustomFieldObj->Type =~ /^Select/i) {
-<H2><&|/l&>Values</&></H2>
-<div>
-<& /Admin/Elements/EditCustomFieldValues, CustomField => $CustomFieldObj &>
-<& /Admin/Elements/AddCustomFieldValue, CustomField => $CustomFieldObj &>
-</div>
-% }
-<&/Elements/Submit&>
-</FORM>
-
-
-
-<%INIT>
-
-
-
-my $CustomFieldObj = RT::CustomField->new( $session{'CurrentUser'} );
-my ( $title, @results, $EnabledChecked, $Disabled);
-$EnabledChecked = "CHECKED";
-
-if ( !$id ) {
-    $title = loc("Create a CustomField");
-    $id    = 'new';
-}
-else {
-
-    if ( $id eq 'new' ) {
-        my ( $val, $msg ) = $CustomFieldObj->Create(Name        => $Name,
-                                                    TypeComposite => $TypeComposite,
-                                                    LookupType => $LookupType,
-                                                    Description => $Description,);
-        $m->comp("/Elements/Error", Why =>  loc( "Could not create CustomField", $msg ) ) unless ($val);
-        push @results, $msg;
-        $title = loc( 'Created CustomField [_1]', $CustomFieldObj->Name() );
-    }
-    else {
-        $CustomFieldObj->Load($id) || $m->comp("/Elements/Error", Why =>  loc('No CustomField') );
-        $title = loc( 'Editing CustomField [_1]', $CustomFieldObj->Name() );
-
-        my @attribs = qw( Name TypeComposite LookupType Description);
-        my @aresults = UpdateRecordObject( AttributesRef => \@attribs,
-                                           Object        => $CustomFieldObj,
-                                           ARGSRef       => \%ARGS );
-
-        push @results, @aresults;
-
-	#we're asking about enabled on the web page but really care about disabled.
-	if ($Enabled == 1) {
-	    $Disabled = 0;
-	}	
-	else {
-	    $Disabled = 1;
-	}
-	if  ( ($SetEnabled) and ( $Disabled != $CustomFieldObj->Disabled) ) { 
-	    my  ($code, $msg) = $CustomFieldObj->SetDisabled($Disabled);
-	    push @results, loc('Enabled status: [_1]', loc_fuzzy($msg));
-	}
-	
-	if ($CustomFieldObj->Disabled()) {
-	    $EnabledChecked ="";
-	}
-    }
-
-    $id = $CustomFieldObj->id;
-}
-
-
-
-
-my $paramtag = "CustomField-".$CustomFieldObj->Id."-Value-";
-# Delete any fields that want to be deleted
-foreach my $key (keys %ARGS) {
-	
-	next unless ($key =~ /^Delete-$paramtag(\d+)$/);
-	my ($val, $msg) = $CustomFieldObj->DeleteValue($1);
-	push (@results, $msg);
-
-
-}
-# Update any existing values
-my $values = $CustomFieldObj->ValuesObj;
-while (my $value = $values->Next) {
-	foreach my $attr qw(Name Description SortOrder) {
-	my $param = $paramtag.$value->Id."-".$attr;
-
-	if ( $ARGS{$param} && ($value->$attr() ne $ARGS{$param}))  {
-		my $mutator = "Set$attr";
-		my ($id, $msg) = $value->$mutator($ARGS{$param});
-        push (@results, $msg);
-		}
-	}
-
-
-}
-
-
-
-# Add any new values
-if ($ARGS{$paramtag."new-Name"}) {
-	my ($id, $msg) = $CustomFieldObj->AddValue ( Name => $ARGS{$paramtag."new-Name"},
-						 Description => $ARGS{$paramtag."new-Description"},
-						 SortOrder => $ARGS{$paramtag."new-SortOrder"});
-	push (@results, $msg);
-}
-
-my $current_tab;
-if ($ARGS{'Create'}){ 
-    $current_tab = "Admin/CustomFields/Modify.html?Create=1";
-} else {
-    $current_tab = "Admin/CustomFields/Modify.html?id=".$id;
-    }
-
-
-</%INIT>
-<%ARGS>
-$id => undef
-$TypeComposite => undef
-$LookupType => undef
-$MaxValues => undef
-$SortOrder => undef
-$Description => undef
-$Name => undef
-$SetEnabled => undef
-$Enabled => undef
-</%ARGS>
diff --git a/rt/html/Admin/CustomFields/Objects.html b/rt/html/Admin/CustomFields/Objects.html
deleted file mode 100644
index 8f9e365..0000000
--- a/rt/html/Admin/CustomFields/Objects.html
+++ /dev/null
@@ -1,145 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/CustomFieldTabs,
-    id => $id,
-    current_tab => "Admin/CustomFields/Objects.html?id=".$id,
-    Title => $title
-    &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM ACTION="Objects.html" METHOD=POST>
-<INPUT TYPE=HIDDEN NAME="id" VALUE="<% $id %>">
-<INPUT TYPE=HIDDEN NAME="UpdateObjs" VALUE="1">
-
-<h2><&|/l&>Selected objects</&></h2>
-<& /Admin/Elements/PickObjects, Objects => \@AssignedObjs, id => $id, Checked => 1 &>
-<h2><&|/l&>Unselected objects</&></h2>
-<& /Admin/Elements/PickObjects, Objects => \@UnassignedObjs, id => $id &>
-
-<& /Elements/Submit, CheckAll => 1, ClearAll => 1 &>
-</FORM>
-
-<%INIT>
-my $CF = RT::CustomField->new($session{'CurrentUser'});
-$CF->Load($id) or Abort(loc("Could not load CustomField [_1]"), $id);
-my $LookupType = $CF->LookupType;
-$LookupType =~ /^(.*?)-/ ||
-     Abort(loc("Object of type [_1] cannot take custom fields", $LookupType));
-
-my $Class = $1;
-my $CollectionClass;
-if (UNIVERSAL::can($Class.'Collection', 'new') ) {
-$CollectionClass = $Class.'Collection';
-
-} elsif (UNIVERSAL::can($Class.'es', 'new') ) {
-    $CollectionClass = $Class.'es';
-
-} elsif (UNIVERSAL::can($Class.'s', 'new') ) {
-    $CollectionClass = $Class.'s';
-
-} else {
-    Abort(loc("Can't find a collection class for '[_1]'", $Class));
-}
-
-
-my $title = loc('Modify associated objects for [_1]', $CF->Name);
-
-my $Objects = $CollectionClass->new($session{'CurrentUser'});
-my (@results);
-my (@AssignedObjs, @UnassignedObjs);
-
-$Objects->UnLimit;
-$Objects->OrderBy( FIELD => 'Name' );
-
-
-my $ObjectCFs;
-$ObjectCFs = RT::ObjectCustomFields->new($session{'CurrentUser'});
-$ObjectCFs->UnLimit;
-$ObjectCFs->LimitToCustomField($id);
-
-my %seen;
-while (my $OCF = $ObjectCFs->Next) {
-    $seen{$OCF->ObjectId}++;
-}
-
-while (my $obj = $Objects->Next) { 
-    my $obj_id = $obj->Id;
-
-    if ($UpdateObjs) {
-	# Go through and delete all the custom field relationships that this object
-	# no longer has
-	my $key = "Object-$obj_id-CF-$id";
-	if ($ARGS{$key}) {
-	    if (!$seen{$obj_id}) {
-		my ($val, $msg) = $CF->AddToObject($obj);
-		push (@results, $msg);
-		push @UnassignedObjs, $obj if !$val;
-	    }
-	}
-	else {
-	    push @UnassignedObjs, $obj;
-	    if ($seen{$obj_id}) {
-		my ($val, $msg) = $CF->RemoveFromObject($obj);
-		push (@results, $msg);
-		pop @UnassignedObjs if !$val;
-	    }
-	}
-    }
-    elsif (!$seen{$obj_id}) {
-	push @UnassignedObjs, $obj;
-    }
-    next if @UnassignedObjs and $UnassignedObjs[-1] == $obj;
-    push @AssignedObjs, $obj;
-}
-
-</%INIT>
-<%ARGS>
-$id => undef
-$FindDisabledObjects => 0
-$UpdateObjs => 0
-</%ARGS>
diff --git a/rt/html/Admin/CustomFields/UserRights.html b/rt/html/Admin/CustomFields/UserRights.html
deleted file mode 100644
index e2df3a0..0000000
--- a/rt/html/Admin/CustomFields/UserRights.html
+++ /dev/null
@@ -1,168 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/CustomFieldTabs, id => $id, 
-current_tab => "Admin/CustomFields/UserRights.html?id=".$id,
-Title => $title, &>
-<& /Elements/ListActions, actions => \@results &>
-
-  <FORM METHOD=POST ACTION="UserRights.html">
-    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $CustomFieldObj->id %>">
-      
-      
-<TABLE>
-        
-%	while (my $Member = $Users->Next()) {
-% my $UserObj = $Member->MemberObj->Object();
-% my $group = RT::Group->new($session{'CurrentUser'});
-% $group->LoadACLEquivalenceGroup($Member->MemberObj);
-  <TR ALIGN=RIGHT> 
-	<TD VALIGN=TOP>
-	    <% $UserObj->Name %>
-		  </TD>
-	  <TD>
-	    <& /Admin/Elements/SelectRights, PrincipalId=> $group->PrincipalId,
-        Object => $CustomFieldObj  &>
-	  </TD>
-	</TR>
-% }
-      </TABLE>
-            
-      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
-      
-  </FORM>
-  
-<%INIT>
- 
-  #Update the acls.
-  my @results;
-foreach my $arg (keys %ARGS) {
-        if ($arg =~ /GrantRight-(\d+)-(.*?)-(\d+)$/) {
-            my $principal_id = $1;
-            my $object_type = $2;
-            my $object_id = $3;
-            my $rights = $ARGS{$arg};
-
-            my $principal = RT::Principal->new($session{'CurrentUser'});
-            $principal->Load($principal_id);
-            my $obj;
-
-            if ($object_type eq 'RT::CustomField') {
-                $obj = RT::CustomField->new($session{'CurrentUser'});
-                $obj->Load($object_id);
-
-            } else {
-                push (@results, loc("System Error").
-                                loc("Rights could not be granted for [_1]",
-$object_type));
-                next;
-            }
-
-            my @rights = ref($ARGS{$arg}) eq 'ARRAY' ? @{$ARGS{$arg}} :
-($ARGS{$arg});
-            foreach my $right (@rights) {
-                next unless ($right);
-                my ($val, $msg) = $principal->GrantRight(Object => $obj, Right
-=> $right);
-                push (@results, $msg);
-            }
-        }
-     elsif ($arg =~ /RevokeRight-(\d+)-(.*?)-(\d+)-(.*?)$/) {
-            my $principal_id = $1;
-            my $object_type = $2;
-            my $object_id = $3;
-            my $right = $4;
-
-            my $principal = RT::Principal->new($session{'CurrentUser'});
-            $principal->Load($principal_id);
-            next unless ($right);
-            my $obj;
-
-            if ($object_type eq 'RT::CustomField') {
-                $obj = RT::CustomField->new($session{'CurrentUser'});
-                $obj->Load($object_id);
-            } else {
-                push (@results, loc("System Error").
-                                loc("Rights could not be revoked for [_1]",
-$object_type));
-                next;
-            }
-            my ($val, $msg) = $principal->RevokeRight(Object => $obj, Right =>
-$right);
-            push (@results, $msg);
-        }
-} 
-  
-
-# {{{ Deal with setting up the display of current rights.
-
-
-
-if (!defined $id) {
-    $m->comp("/Elements/Error", Why => loc("No Class defined"));
-}
-
-my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
-$CustomFieldObj->Load($id) || $m->comp("/Elements/Error", Why => loc("Couldn't load Class [_1]",$id));
-
-# Find out which users we want to display ACL selects for
-my $Privileged = RT::Group->new($session{'CurrentUser'});
-$Privileged->LoadSystemInternalGroup('Privileged');
-my $Users = $Privileged->MembersObj();
-
-    
-my $title = loc('Modify user rights for custom field [_1]', $CustomFieldObj->Name);
-  
-# }}}
-    
-</%INIT>
-
-<%ARGS>
-$id => undef
-$UserString => undef
-$UserOp => undef
-$UserField => undef
-</%ARGS>
diff --git a/rt/html/Admin/CustomFields/index.html b/rt/html/Admin/CustomFields/index.html
deleted file mode 100644
index 9854fb0..0000000
--- a/rt/html/Admin/CustomFields/index.html
+++ /dev/null
@@ -1,76 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => loc('Select a Custom Field') &>
-<& /Admin/Elements/CustomFieldTabs,
-    current_tab => 'Admin/CustomFields/', 
-    Title => loc('Select a Custom Field') &>
-
-% my $prev_lookup = '';
-% while (my $CustomFieldObj = $CustomFields->Next) { 
-%    $CustomFieldObj->CurrentUserHasRight('AdminCustomField') or next;
-%    my $lookup = $CustomFieldObj->FriendlyLookupType;
-%    if ($lookup ne $prev_lookup) {
-%        if ($prev_lookup) {
-</UL>
-%        }
-<H2><% loc("Custom Fields for [_1]", $lookup) %></H2>
-<UL>
-%        $prev_lookup = $lookup;
-%    }
-%    
-<LI>
-<A HREF="Modify.html?id=<%$CustomFieldObj->id()%>"><%$CustomFieldObj->Name%>: <%$CustomFieldObj->Description%></a>
-</LI>
-% }
-% if ($prev_lookup) {
-</UL>
-% }
-
-<%INIT>
-my $CustomFields = RT::CustomFields->new($session{'CurrentUser'});
-$CustomFields->UnLimit();
-$CustomFields->OrderByCols( { FIELD => 'LookupType' }, { FIELD => 'Name' } );
-</%INIT>
diff --git a/rt/html/Admin/Elements/AddCustomFieldValue b/rt/html/Admin/Elements/AddCustomFieldValue
index 3e3f414..0e59fe3 100644
--- a/rt/html/Admin/Elements/AddCustomFieldValue
+++ b/rt/html/Admin/Elements/AddCustomFieldValue
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,20 +42,20 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <b><&|/l&>Add Value</&></b></b></b></b>
 <TABLE BORDER="0">
 <TR><TD><small>
 <&|/l&>Sort</&>:<br>
-<input size=3 name="CustomField-<%$CustomField->Id%>-Value-new-SortOrder" >
+<input name="CustomField-<% $CustomField->Id %>-AddValue-SortOrder" size="5">
 </TD>
 <TD><small>
 <&|/l&>Name</&>:<br>
-<input type="text" size=30 name="CustomField-<%$CustomField->Id%>-Value-new-Name" >
+<input size=20 name="CustomField-<% $CustomField->Id %>-AddValue-Name">
 </TD>
 <TD><small>
 <&|/l&>Description</&>:<br>
-<input type="text" size=50 name="CustomField-<%$CustomField->Id%>-Value-new-Description">
+<input size="60" name="CustomField-<% $CustomField->Id %>-AddValue-Description">
 </TD></TR>
 </TABLE>
 
diff --git a/rt/html/Admin/Elements/CreateUserCalled b/rt/html/Admin/Elements/CreateUserCalled
index 0dc6ac7..01fa9fe 100644
--- a/rt/html/Admin/Elements/CreateUserCalled
+++ b/rt/html/Admin/Elements/CreateUserCalled
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <FORM METHOD=get ACTION="<% $RT::WebPath %>/Admin/Users/Create.html">
 <&|/l&>New user called</&> <INPUT NAME="Name" size=10><input type=submit value="<&|/l&>Create</&>">
 </form>
diff --git a/rt/html/Admin/Elements/CustomFieldTabs b/rt/html/Admin/Elements/CustomFieldTabs
deleted file mode 100644
index d7acf33..0000000
--- a/rt/html/Admin/Elements/CustomFieldTabs
+++ /dev/null
@@ -1,116 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Tabs, 
-    current_tab => 'Admin/CustomFields/',
-    subtabs => $tabs, 
-    current_subtab => $current_tab, 
-    Title => $Title &>
-<%INIT>
-my $tabs;
-
-if ($id) {
-    my $cf = RT::CustomField->new( $session{'CurrentUser'} );
-    $cf->Load($id);
-    $tabs = {
-        this => {
-            title => $cf->Name,
-            path  => "Admin/CustomFields/Modify.html?id=" . $id,
-            current_subtab => $current_tab,
-
-            subtabs => {
-
-                C => { title => loc('Basics'),
-                       path  => "Admin/CustomFields/Modify.html?id=" . $id,
-                },
-                F => { title => loc('Group Rights'),
-                       path  => "Admin/CustomFields/GroupRights.html?id="
-                         . $id, },
-                G => {
-                    title => loc('User Rights'),
-                    path => "Admin/CustomFields/UserRights.html?id=" . $id,
-                },
-
-            } }
-
-    };
-
-
-    if ($cf->LookupType =~ /^RT::Queue/io) {
-	$tabs->{'this'}->{subtabs}->{D} = {
-	title => loc('Applies to'),
-	    path  => "Admin/CustomFields/Objects.html?id=" . $id,
-	};
-    }
-}
-
-if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminCustomField')) {
-  $tabs->{"A"} = { title => loc('Select custom field'),
-                        path => "Admin/CustomFields/",
-                           };
-  $tabs->{"B"} = { title => loc('New custom field'),
-                        path => "Admin/CustomFields/Modify.html?Create=1",
-                        separator => 1,
-                           };
-}
-
-  # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
-
-foreach my $tab (sort keys %{$tabs->{'this'}->{'subtabs'}}) {
-    if ($tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab) {
-	$tabs->{'this'}->{'subtabs'}->{$tab}->{'subtabs'} = $subtabs;
-	$tabs->{'this'}->{'subtabs'}->{$tab}->{'current_subtab'} = $current_subtab;
-    }
-}
-if( $id ) { $current_tab = "Admin/CustomFields/Modify.html?id=" . $id }
-</%INIT>
-<%ARGS>
-$Title => undef
-$id => undef
-$current_tab => undef
-$subtabs => undef
-$current_subtab => undef
-</%ARGS>
diff --git a/rt/html/Admin/Elements/EditCustomField b/rt/html/Admin/Elements/EditCustomField
index d8c5b29..5657d43 100644
--- a/rt/html/Admin/Elements/EditCustomField
+++ b/rt/html/Admin/Elements/EditCustomField
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/ListActions, actions => \@results &>
 
 
diff --git a/rt/html/Admin/Elements/EditCustomFieldValues b/rt/html/Admin/Elements/EditCustomFieldValues
index 9cc3858..79b6501 100644
--- a/rt/html/Admin/Elements/EditCustomFieldValues
+++ b/rt/html/Admin/Elements/EditCustomFieldValues
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,42 +42,22 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-% if (!$values->Count) {
-<p><em><&|/l&>(no values)</&></em></p>
-%    return;
-% }
+%# }}} END BPS TAGGED BLOCK
 <i><&|/l&>(Check box to delete)</&></i>
-<table>
-<tr>
-<td>&nbsp;</td>
-<td><&|/l&>Sort</&></td>
-<td><&|/l&>Name</&></td>
-<td><&|/l&>Description</&></td>
-</tr>
-% while (my $value = $values->Next) {
-<tr>
-<td>
-<input type="checkbox" name="Delete-CustomField-<%$CustomField->Id%>-Value-<%$value->Id%>">
-</td>
-<td>
-<input size=3 name="CustomField-<%$CustomField->Id%>-Value-<%$value->Id%>-SortOrder" value="<%$value->SortOrder%>">
-</td>
-<td>
-<input type="text" size=30 name="CustomField-<%$CustomField->Id%>-Value-<%$value->Id%>-Name" value="<%$value->Name%>">
-</td>
-<td>
-<font size="-1">
-<input type="text" size=50 name="CustomField-<%$CustomField->Id%>-Value-<%$value->Id%>-Description" value="<%$value->Description%>">
-</font>
-</td>
-</tr>
+<ul>
+% while (my $v = $values->Next) {
+<li>
+<INPUT TYPE="text" SIZE="2" NAME="CustomField-<%$CustomField->Id%>-SortOrder<%$v->Id()%>" VALUE="<%$v->SortOrder()%>">
+<input type="checkbox" name="CustomField-<%$CustomField->Id%>-DeleteValue" value="<%$v->id%>">
+<%$v->Name%>
+% if ($v->Description) {
+<i>(<%$v->Description%>)</i>
+% }
+</li>
 % }
-</table>
+</ul>
 <%init>
-
-my $values = $CustomField->ValuesObj();
-
+my $values = $CustomField->Values();
 </%init>
 <%args>
 $CustomField => undef
diff --git a/rt/html/Admin/Elements/EditCustomFields b/rt/html/Admin/Elements/EditCustomFields
index 1cd3df5..d901b21 100644
--- a/rt/html/Admin/Elements/EditCustomFields
+++ b/rt/html/Admin/Elements/EditCustomFields
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,64 +42,95 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<& /Elements/ListActions, actions => \@results &>
-
-<FORM ACTION="<%$RT::WebPath%><% $m->request_comp->path |n %>" METHOD="POST" NAME="EditCustomFields">
-<INPUT TYPE=HIDDEN NAME="id" VALUE="<% $Object->Id %>"/>
-<INPUT TYPE=HIDDEN NAME="ObjectType" VALUE="<% $ObjectType %>"/>
-<INPUT TYPE=HIDDEN NAME="SubType" VALUE="<% $SubType %>"/>
-<INPUT TYPE=HIDDEN NAME="UpdateCFs" VALUE="1"/>
-
-% if ($Object->Id) {
-<h2><&|/l&>Global Custom Fields</&></h2>
-<& PickCustomFields, CustomFields => \@GlobalCFs, ReadOnly => 1, id => $id, SubType => $SubType &>
+%# }}} END BPS TAGGED BLOCK
+<& /Elements/ListActions, actions => \@actions &>
+
+<TABLE>
+<TR>
+<TD VALIGN=TOP>
+<h2><%$caption%></h2>
+</TD></TR></TABLE>
+% if ($CustomFields->Count == 0 ) {
+<P><i><&|/l&>(No custom fields)</&></i></P>
+% } else {
+<TABLE cellspacing=0 cellpadding=2>
+% my $count;
+% while (my $CustomFieldObj = $CustomFields->Next) { 
+<TR>
+  <TD valign="TOP">
+% if ($CustomFieldObj->Name) {
+    <A HREF="CustomField.html?Queue=<%$id%>&CustomField=<%$CustomFieldObj->id()%>"><b><%$CustomFieldObj->Name%></b></a><br>
+% } else {
+    <A HREF="CustomField.html?Queue=<%$id%>&CustomField=<%$CustomFieldObj->id()%>"><i>(<%loc("no name")%>)</i></a><br>
+% }
+    <%$CustomFieldObj->Description%>
+  </TD>
+  <TD valign="TOP">
+    <i><% $CustomFieldObj->FriendlyType %></i>
+  </TD>
+%  # show 'move up' unless it's the first item
+%  if ($count++) {
+  <TD valign="TOP">
+    <a href="CustomFields.html?id=<%$id%>&CustomField=<%$CustomFieldObj->id%>&Move=-1"><&|/l&>Move up</&></a>
+%  } else {
+  <TD valign="TOP" ALIGN=RIGHT>
+%  }
+
+%  # show 'move down' unless it's the last item
+%  if (!$CustomFields->IsLast) {
+%  $m->print(' | ') if $count > 1;
+    <a href="CustomFields.html?id=<%$id%>&CustomField=<%$CustomFieldObj->id%>&Move=1"><&|/l&>Move down</&></a>
+%  }
+</TD>
+</TR>
 % }
-<h2><&|/l&>Selected Custom Fields</&></h2>
-<& PickCustomFields, CustomFields => [$ObjectCFs->CustomFields], id => $id, Checked => 1, SubType => $SubType &>
-<h2><&|/l&>Unselected Custom Fields</&></h2>
-<& PickCustomFields, CustomFields => \@UnassignedCFs, id => $id, SubType => $SubType &>
 
-<& /Elements/Submit, CheckAll => 1, ClearAll => 1 &>
+</TABLE>
+% }
+<FORM METHOD=GET ACTION="CustomFields.html">
+% if ($id) {
+<INPUT TYPE="Hidden" NAME="id" VALUE="<%$id%>">
+% }
+<input type="checkbox" name="FindDisabledCustomFields"> <&|/l&>Include disabled custom fields in listing.</&>
+<input type=submit value="<&|/l&>Go!</&>">
 </FORM>
 
 
 <%INIT>
 my $CustomFields = RT::CustomFields->new($session{'CurrentUser'});
-my @results;
-my (@GlobalCFs, @UnassignedCFs);
+my $QueueObj = RT::Queue->new($session{'CurrentUser'});
+my $caption;
 
-my $id = $Object->Id;
-if ($id and !$Object->CurrentUserHasRight('AssignCustomFields')) {
-    $m->out('<P><i>', loc('(No custom fields)'), '</i></P>');
-    return;
+if ($id)  {
+        $QueueObj->Load($id);                        
 }
 
-my $lookup = $ObjectType;
-$lookup .= "-$SubType" if $SubType;
-
-$CustomFields->LimitToLookupType($lookup);
-$CustomFields->OrderBy( FIELD => 'Name' );
-
-
-my ($GlobalCFs, $ObjectCFs);
-$ObjectCFs = RT::ObjectCustomFields->new($session{'CurrentUser'});
-$ObjectCFs->UnLimit;
-$ObjectCFs->LimitToObjectId($id);
-$ObjectCFs->LimitToLookupType($lookup);
+if ($QueueObj->id) {
+	$CustomFields->LimitToQueue($id);
+}                                            
+else {                                       
+        $CustomFields->LimitToGlobal();
+}                                           
+
+if ($FindDisabledCustomFields) {
+    $caption = loc("All Custom Fields");
+    $CustomFields->{'find_disabled_rows'} = 1;
+} else {
+    $caption = loc("Enabled Custom Fields");
+}
 
 # {{{ deal with moving sortorder of custom fields
 if ($CustomField and $Move) {
-    my $SourceObj = RT::ObjectCustomField->new($session{'CurrentUser'});
-    $SourceObj->LoadByCols( ObjectId => $id, CustomField => $CustomField );
+    my $SourceObj = RT::CustomField->new($session{'CurrentUser'});
+    $SourceObj->Load($CustomField) || Abort(loc('No CustomField'));
 
     my $TargetObj;
     my $target_order = $SourceObj->SortOrder + $Move;
-    while (my $ObjectCF = $ObjectCFs->Next) { 
-	my $this_order = $ObjectCF->SortOrder;
+    while (my $CustomFieldObj = $CustomFields->Next) { 
+	my $this_order = $CustomFieldObj->SortOrder;
 
 	# if we have an exact match, finish the loop now
-	($TargetObj = $ObjectCF, last) if $this_order == $target_order;
+	($TargetObj = $CustomFieldObj, last) if $this_order == $target_order;
 
 	# otherwise, we need to apropos toward the general direction
 	# ... first, check the sign is correct
@@ -113,7 +144,7 @@ if ($CustomField and $Move) {
 	    next if $orig_delta < $this_delta;
 	}
 
-	$TargetObj = $ObjectCF;
+	$TargetObj = $CustomFieldObj;
     }
 
     if ($TargetObj) {
@@ -122,68 +153,83 @@ if ($CustomField and $Move) {
 	$TargetObj->SetSortOrder($s);
 	$SourceObj->SetSortOrder($t);
 	# because order changed, we must redo search for subsequent uses
+	$CustomFields->RedoSearch;
     }
 
-    $ObjectCFs->GotoFirstItem;
+    $CustomFields->GotoFirstItem;
 }
 # }}}
 
-if ($id) {
-    $GlobalCFs = RT::ObjectCustomFields->new($session{'CurrentUser'});
-    $GlobalCFs->LimitToObjectId(0);
-    $GlobalCFs->LimitToLookupType($lookup);
-}
-
-while (my $cf = $CustomFields->Next) { 
-    my $cf_id = $cf->Id;
-
-    if ($GlobalCFs and $GlobalCFs->HasEntryForCustomField($cf_id)) {
-	push @GlobalCFs, $cf;
-	next;
+# {{{ now process the 'copy queue' action
+my @actions;
+if ($Source and $Source ne $id) {
+    my $SourceQueue = RT::Queue->new($session{'CurrentUser'});
+    $SourceQueue->Load($Source) || Abort(loc("Couldn't load queue"));
+    my $SourceCustomFields = RT::CustomFields->new($session{'CurrentUser'});
+    $SourceCustomFields->LimitToQueue($SourceQueue->id);
+
+    # delete old fields
+    foreach my $CustomFieldObj ( @{$CustomFields->ItemsArrayRef} ) { 
+	$CustomFieldObj->Delete;
     }
 
-    if ($UpdateCFs) {
-	# Go through and delete all the custom field relationships that this object
-	# no longer has
-	my $key = "Object-$id-CF-$cf_id";
-	if ($ARGS{$key}) {
-	    if (!$ObjectCFs->HasEntryForCustomField($cf_id)) {
-		my ($val, $msg) = $cf->AddToObject($Object);
-		push (@results, $msg);
-		push @UnassignedCFs, $cf if !$val;
-	    }
-	}
-	else {
-	    push @UnassignedCFs, $cf;
-	    if ($ObjectCFs->HasEntryForCustomField($cf_id)) {
-		my ($val, $msg) = $cf->RemoveFromObject($Object);
-		push (@results, $msg);
-		pop @UnassignedCFs if !$val;
-	    }
+    # add new fields
+    while (my $SourceCustomFieldObj = $SourceCustomFields->Next) {
+	my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
+	my ($val, $msg) =  $CustomFieldObj->Create(
+	    id => $SourceCustomFieldObj->id,
+	    Queue => $id,
+	    Name => $SourceCustomFieldObj->Name,
+	    Type => $SourceCustomFieldObj->Type,
+	    Description => $SourceCustomFieldObj->Description,
+	);
+	Abort(loc("Could not create CustomField") . ": $msg") unless ($val);
+	push @actions, $msg;
+
+	$CustomFieldObj->SetSortOrder($SourceCustomFieldObj->SortOrder);
+
+	# add new values
+	my $values = $SourceCustomFieldObj->Values();
+	while (my $v = $values->Next) {
+	    my ( $addval, $addmsg ) = $CustomFieldObj->AddValue(
+		Name => $v->Name,
+		Description => $v->Description,
+		SortOrder => $v->SortOrder
+	    );
 	}
     }
-    elsif (!$ObjectCFs->HasEntryForCustomField($cf_id)) {
-	push @UnassignedCFs, $cf;
-    }
-        else {
-        }
+
+    # because content changed, we must redo search for subsequent uses
+    $CustomFields->RedoSearch;
+    $CustomFields->GotoFirstItem;
 }
+# }}}
 
-# redo search...
-$ObjectCFs = RT::ObjectCustomFields->new($session{'CurrentUser'});
-$ObjectCFs->UnLimit;
-$ObjectCFs->LimitToObjectId($id);
-$ObjectCFs->LimitToLookupType($lookup);
+# {{{ deal with deleting existing custom fields
+foreach my $key (keys %ARGS) {
+  # {{{ if we're trying to delete the custom field
+  if ($key =~ /^DeleteCustomField-(\d+)/) {
+    my $id = $1;
+    my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
+    $CustomFieldObj->Load($id);
+    my ($retval, $msg) = $CustomFieldObj->Delete;
+    if ($retval) {
+      push @actions, loc("Custom field deleted");
+    }
+    else {
+      push @actions, $msg;
+    }
+  }
+  # }}}
+}
+# }}}
 
 </%INIT>
 <%ARGS>
+$id => 0
 $title => undef
 $Move => undef
 $Source => undef
 $CustomField => undef
 $FindDisabledCustomFields => undef
-$UpdateCFs => 0
-$Object
-$ObjectType
-$SubType => ''
 </%ARGS>
diff --git a/rt/html/Admin/Elements/EditQueueWatchers b/rt/html/Admin/Elements/EditQueueWatchers
index c93bf81..f6559e7 100644
--- a/rt/html/Admin/Elements/EditQueueWatchers
+++ b/rt/html/Admin/Elements/EditQueueWatchers
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %if ($Members->Count == 0 ) {
 <ul>
 <li><i><&|/l&>none</&></i>
@@ -51,7 +51,8 @@
 <ul>
 % while (my $watcher=$Members->Next) {
 <li>
-<INPUT TYPE=CHECKBOX NAME="Queue-<%$QueueObj->Id%>-DeleteWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" value="1"
+<INPUT  TYPE=CHECKBOX 
+        NAME="Queue-<%$QueueObj->Id%>-DeleteWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" 
         UNCHECKED>
 % if ($watcher->MemberObj->IsUser) { 
 <a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->MemberObj->ObjectId%>">
diff --git a/rt/html/Admin/Elements/EditScrip b/rt/html/Admin/Elements/EditScrip
index 907ae9a..4207114 100644
--- a/rt/html/Admin/Elements/EditScrip
+++ b/rt/html/Admin/Elements/EditScrip
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/ListActions, actions => \@actions &>
 
   
diff --git a/rt/html/Admin/Elements/EditScrips b/rt/html/Admin/Elements/EditScrips
index 9526118..8959f6c 100644
--- a/rt/html/Admin/Elements/EditScrips
+++ b/rt/html/Admin/Elements/EditScrips
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,13 +42,13 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/ListActions, actions => \@actions &>
 
 <form action="Scrips.html" method="post">
 <input type="hidden" name="id" value="<%$id%>">
 
-<h2><&|/l&>Current Scrips</&></h2>
+<P><&|/l&>Current Scrips</&>:</P>
 % if ($Scrips->Count == 0 ) {
 <P><i><&|/l&>(No scrips)</&></i></P>
 % } else {
@@ -58,7 +58,7 @@
 %   while (my $scrip = $Scrips->Next ) {
 <TR>
 <TD>
-<input type="checkbox" name="DeleteScrip-<%$scrip->Id%>" value="1">
+<input type="checkbox" name="DeleteScrip-<%$scrip->Id%>">
 </TD>
 <TD>
 <a href="Scrip.html?id=<%$scrip->Id%>&Queue=<%$id%>"><% $scrip->Description || "<i>(".loc('no value').")</i>" |n %></a><br>
diff --git a/rt/html/Admin/Elements/EditTemplates b/rt/html/Admin/Elements/EditTemplates
index 207ffd0..6ac56c2 100644
--- a/rt/html/Admin/Elements/EditTemplates
+++ b/rt/html/Admin/Elements/EditTemplates
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/ListActions, actions => \@actions &>
 
 <FORM METHOD=GET ACTION="Templates.html">
@@ -63,7 +63,7 @@
 % while (my $TemplateObj = $Templates->Next) { 
 <TR>
 <TD>
-<input type="checkbox" name="DeleteTemplate-<%$TemplateObj->Id%>" value="1">
+<input type="checkbox" name="DeleteTemplate-<%$TemplateObj->Id%>">
 </TD>
 <TD>
 <A HREF="Template.html?Queue=<%$id%>&Template=<%$TemplateObj->id()%>">
diff --git a/rt/html/Admin/Elements/EditUserComments b/rt/html/Admin/Elements/EditUserComments
index fb96dc0..bc23f77 100644
--- a/rt/html/Admin/Elements/EditUserComments
+++ b/rt/html/Admin/Elements/EditUserComments
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => "Comments about $name" &>
 <&|/l&>These comments aren't generally visible to the user</&>:<br>
 <input type="hidden" name="id" value="<%$id%>">
diff --git a/rt/html/Admin/Elements/GlobalCustomFieldTabs b/rt/html/Admin/Elements/GlobalCustomFieldTabs
deleted file mode 100755
index 8d4eaca..0000000
--- a/rt/html/Admin/Elements/GlobalCustomFieldTabs
+++ /dev/null
@@ -1,93 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/SystemTabs, subtabs => $tabs, 
-    current_tab => 'Admin/Global/CustomFields/index.html', 
-    current_subtab => $current_tab, 
-    Title => $Title &>
-<%INIT>
-
-
-  my $tabs = {
-                
-               A => { title => loc('Users'),
-                           text => loc('Modify scrips which apply to all queues'),
-                           path => 'Admin/Global/CustomFields/Users.html',
-                         },
-               B => { title => loc('Groups'),
-                        text => loc('Edit system templates'),
-                        path => 'Admin/Global/CustomFields/Groups.html',
-                      },
-              
-                F => { title => loc('Tickets'),
-                text => loc('Modify global custom fields'),
-                        path => 'Admin/Global/CustomFields/Queue-Tickets.html',
-                        },
-
-                        G => { title => loc('Ticket Transactions'),
-                                text => loc('Modify global group rights'),
-                                path => 'Admin/Global/CustomFields/Queue-Transactions.html',
-                      },
- 
-};
-  # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
-
-  foreach my $tab (sort keys %{$tabs}) {
-    if ($tabs->{$tab}->{'path'} eq $current_tab) {
-      $tabs->{$tab}->{"subtabs"} = $subtabs;
-      $tabs->{$tab}->{"current_subtab"} = $current_subtab;
-    }
-  }
-</%INIT>
-
-  
-<%ARGS>
-$id => undef
-$current_tab => undef
-$subtabs => undef
-$current_subtab => undef
-$Title => undef
-</%ARGS>
diff --git a/rt/html/Admin/Elements/GroupTabs b/rt/html/Admin/Elements/GroupTabs
index 60edda4..de39ec1 100644
--- a/rt/html/Admin/Elements/GroupTabs
+++ b/rt/html/Admin/Elements/GroupTabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Tabs, 
     subtabs => $tabs, 
     current_tab => 'Admin/Groups/', 
@@ -67,8 +67,6 @@ $tabs->{"this"} = { class => "currentnav",
                path  => "Admin/Groups/GroupRights.html?id=" . $GroupObj->id, },
         G => { title => loc('User Rights'),
                path  => "Admin/Groups/UserRights.html?id=" . $GroupObj->id, },
-        H => { title => loc('History'),
-               path  => "Admin/Groups/History.html?id=" . $GroupObj->id },
     }
 }
 }
@@ -76,7 +74,7 @@ $tabs->{"A"} = { title => loc('Select group'),
                  path  => "Admin/Groups/", };
 $tabs->{"B"} = { title     => loc('New group'),
                  path      => "Admin/Groups/Modify.html?Create=1",
-		 separator => 1, };
+                 separator => 1, };
 
 # Now let callbacks add their extra tabs
 $m->comp( '/Elements/Callback', tabs => $tabs, %ARGS );
diff --git a/rt/html/Admin/Elements/Header b/rt/html/Admin/Elements/Header
index b809080..69a3ccd 100644
--- a/rt/html/Admin/Elements/Header
+++ b/rt/html/Admin/Elements/Header
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,8 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<& /Elements/Header, %ARGS &>
+%# }}} END BPS TAGGED BLOCK
+<& /Elements/Header, Title => $Title &>
 
 <%ARGS>
 $Title => undef
diff --git a/rt/html/Admin/Elements/ListGlobalCustomFields b/rt/html/Admin/Elements/ListGlobalCustomFields
index 3df9d62..abca290 100644
--- a/rt/html/Admin/Elements/ListGlobalCustomFields
+++ b/rt/html/Admin/Elements/ListGlobalCustomFields
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %   my $count = 0;
 %   while (my $CustomFieldObj = $CustomFields->Next) { 
 %   $count++;
diff --git a/rt/html/Admin/Elements/ListGlobalScrips b/rt/html/Admin/Elements/ListGlobalScrips
index 2e37912..cb3f89a 100644
--- a/rt/html/Admin/Elements/ListGlobalScrips
+++ b/rt/html/Admin/Elements/ListGlobalScrips
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,32 +42,16 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-
-% if ($Scrips->Count == 0) {
-
-<P><i><&|/l&>(No scrips)</&></i></P>
-
-% } else {
-
-<UL>
-
+%# }}} END BPS TAGGED BLOCK
+%   my $count = 0;
 %   while (my $scrip = $Scrips->Next ) {
-<LI>
-<a href="<%$RT::WebPath%>/Admin/Global/Scrip.html?id=<%$scrip->Id%>&Queue=<%0%>">
-% if ($scrip->Description) {
-<%   $scrip->Description %> 
-% } else {
-<i>(<&|/l, $scrip->Id&>Scrip #[_1]</&>)</i>
-% }
-</a><br>
-<small><&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name) &>[_1] [_2] with template [_3]</&></small>
-</LI>
+%   $count++;
+<font size="-1"><&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name) &>[_1] [_2] with template [_3]</&></font>
+<BR>
+%   }
+%   if (!$count) {
+<font size="-1"><&|/l&>(No scrips)</&></font>
 %   }
-
-</UL>
-
-% }
 
 <%init>
 my $Scrips = new RT::Scrips ($session{'CurrentUser'});
diff --git a/rt/html/Admin/Elements/ModifyTemplate b/rt/html/Admin/Elements/ModifyTemplate
index 6749f3e..acd87a7 100644
--- a/rt/html/Admin/Elements/ModifyTemplate
+++ b/rt/html/Admin/Elements/ModifyTemplate
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
 <TR>
 <TD ALIGN=RIGHT>
diff --git a/rt/html/Admin/Elements/ObjectCustomFields b/rt/html/Admin/Elements/ObjectCustomFields
deleted file mode 100644
index a87e157..0000000
--- a/rt/html/Admin/Elements/ObjectCustomFields
+++ /dev/null
@@ -1,109 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title &>
-<& $ObjectTabs,
-$id ? (
-    id => $Object->id, 
-    current_tab => "Admin/$Types/CustomFields.html?$sub_type_url&id=".$id, 
-    current_subtab => "Admin/$Types/CustomFields.html?$sub_type_url&id=".$id, 
-    "${Type}Obj" => $Object,
-) : (
-    current_tab => "Admin/Global/CustomFields/${QualifiedType}s.html",
-),
-    Title => $title
-    &>
-
-<& /Admin/Elements/EditCustomFields, %ARGS, title => $title, Object => $Object &>
-<%INIT>
-# XXX TODO: Validate here?
-#$ObjectType =~ /^RT::(Queue|User|Group)$/
-#    or Abort(loc("Object of type [_1] cannot take custom fields", $ObjectType));
-
-
-
-my $Type = $1;
-my $Types = $Type.'s';
-my $ObjectTabs;
-my $Object = $ObjectType->new($session{'CurrentUser'});
-
-
-my $QualifiedType;
-my $FriendlySubTypes;
-if ($SubType =~/^RT::(.*)$/)  {
-    $FriendlySubTypes = RT::CustomField->new($session{'CurrentUser'})->FriendlyLookupType($Object->CustomFieldLookupType);
-   $QualifiedType = "$Type-$1"; 
-} else {
-    $QualifiedType = $Type;
-}
-
-if ($id) { 
-    $Object->Load($id) || Abort(loc("Couldn't load object [_1]", $id));
-    $ObjectTabs = "/Admin/Elements/${Type}Tabs";
-} else {
-    $ObjectTabs = "/Admin/Elements/GlobalCustomFieldTabs";
-
-} 
-
-my $title; 
-if ($id) {
-$title =  loc('Edit Custom Fields for [_1]', $Object->Name);
-}
-elsif ($SubType) {
-
-    $title=   loc("Modify Custom Fields which apply to [_1] for all [_2]", loc(lc($FriendlySubTypes)), loc(lc($Types)));
-} else {
- $title =loc("Modify Custom Fields which apply to all [_1]", loc(lc($Types)));
-
-}
-my $sub_type_url;
-$sub_type_url = "SubType=$SubType" if $SubType;
-
-</%INIT>
-<%ARGS>
-$id => undef
-$ObjectType
-$SubType => undef
-</%ARGS>
diff --git a/rt/html/Admin/Elements/PickCustomFields b/rt/html/Admin/Elements/PickCustomFields
deleted file mode 100644
index c2a30f9..0000000
--- a/rt/html/Admin/Elements/PickCustomFields
+++ /dev/null
@@ -1,96 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-% if (@CustomFields == 0) {
-<p><i><&|/l&>(None)</&></i></p>
-% } else {
-<TABLE cellspacing=0 cellpadding=2>
-% my $count;
-% foreach my $CustomFieldObj (@CustomFields) {
-<TR>
-%   if (!$ReadOnly) {
-  <TD valign="TOP">
-<input type="checkbox" name="Object-<%$id%>-CF-<%$CustomFieldObj->Id%>" value="1" <% $Checked ? 'CHECKED' : '' %>
->
-  </TD>
-%   }
-  <TD valign="TOP">
-    <A HREF="<%$RT::WebPath%>/Admin/CustomFields/Modify.html?id=<%$CustomFieldObj->id()%>">
-% if ($CustomFieldObj->Name) {
-<b><%$CustomFieldObj->Name%></b>
-% } else {
-<i>(<&|/l&>no name</&>)</i>
-% }
-</a><br>
-    <%$CustomFieldObj->Description%>
-  </TD>
-  <TD valign="TOP">
-    <i><% $CustomFieldObj->FriendlyTypeComposite %></i>
-  </TD>
-%  # show 'move up' unless it's the first item
-%  if ($count++ and $Checked) {
-  <TD valign="TOP">
-    [<a href="<%$RT::WebPath%><% $m->request_comp->path |n %>?id=<%$id%>&SubType=<%$SubType%>&CustomField=<%$CustomFieldObj->id%>&Move=-1"><&|/l&>Move up</&></a>]
-%  } else {
-  <TD valign="TOP" ALIGN=RIGHT>
-%  }
-
-%  # show 'move down' unless it's the last item
-%  if ($count != @CustomFields and $Checked) {
-%  $m->print(' | ') if $count > 1;
-    [<a href="<%$RT::WebPath%><% $m->request_comp->path |n %>?id=<%$id%>&SubType=<%$SubType%>&CustomField=<%$CustomFieldObj->id%>&Move=1"><&|/l&>Move down</&></a>]
-%  }
-  </TD>
-</TR>
-% }
-</TABLE>
-% }
-<%ARGS>
-@CustomFields
-$id
-$ReadOnly => 0
-$Checked => 0
-$SubType
-</%ARGS>
diff --git a/rt/html/Admin/Elements/PickObjects b/rt/html/Admin/Elements/PickObjects
deleted file mode 100644
index b07a882..0000000
--- a/rt/html/Admin/Elements/PickObjects
+++ /dev/null
@@ -1,80 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-% if (@Objects == 0) {
-<P><i><&|/l&>(None)</&></i></P>
-% } else {
-<TABLE cellspacing=0 cellpadding=2>
-% my $count;
-% foreach my $Object (@Objects) {
-<TR>
-%   if (!$ReadOnly) {
-  <TD valign="TOP">
-<input type="checkbox" name="Object-<%$Object->id%>-CF-<%$id%>" value="1" <% $Checked ? 'CHECKED' : ''%>
->
-  </TD>
-%   }
-  <TD valign="TOP">
-% if ($Object->Name) {
-    <b><%$Object->Name%></b><br>
-% } else {
-    <i>(<%loc("no name")%>)</i><br>
-% }
-    <%$Object->can('Description') && $Object->Description%>
-  </TD>
-%#  <TD valign="TOP">
-%#    <i><% $CustomFieldObj->FriendlyTypeComposite %></i>
-%#  </TD>
-  </TD>
-</TR>
-% }
-</TABLE>
-% }
-<%ARGS>
-@Objects
-$id
-$ReadOnly => 0
-$Checked => 0
-</%ARGS>
diff --git a/rt/html/Admin/Elements/QueueRightsForUser b/rt/html/Admin/Elements/QueueRightsForUser
index 01f294a..57b5fd8 100644
--- a/rt/html/Admin/Elements/QueueRightsForUser
+++ b/rt/html/Admin/Elements/QueueRightsForUser
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,11 +42,11 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <UL>
 %while(my $ACE = $ACL->Next) {
 
-<LI><checkbox name="delete_ace_<%$ACE->id%>" value="1"> <% loc($ACE->RightName) %> (<%$ACE->UserObj->RealName%>)
+<LI><checkbox name="delete_ace_<%$ACE->id%>"> <% loc($ACE->RightName) %> (<%$ACE->UserObj->RealName%>)
 
 %}
 </UL>
diff --git a/rt/html/Admin/Elements/QueueTabs b/rt/html/Admin/Elements/QueueTabs
index 93522d0..0eec1fc 100644
--- a/rt/html/Admin/Elements/QueueTabs
+++ b/rt/html/Admin/Elements/QueueTabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Tabs, 
     subtabs => $tabs, 
     current_tab => 'Admin/Queues/', 
@@ -71,12 +71,8 @@ if ($id) {
 				path => "Admin/Queues/Templates.html?id=".$id,
 			      },
 
-                 G1 => { title => loc('Ticket Custom Fields'),
-                        path => 'Admin/Queues/CustomFields.html?SubType=RT::Ticket&id='.$id,
-                        },
-
-                 G2 => { title => loc('Transaction Custom Fields'),
-                        path => 'Admin/Queues/CustomFields.html?SubType=RT::Ticket-RT::Transaction&id='.$id,
+                 G => { title => loc('Custom Fields'),
+                        path => 'Admin/Queues/CustomFields.html?id='.$id,
                         },
 
 		 H => { title => loc('Group Rights'),
@@ -94,7 +90,8 @@ if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminQue
 			   };
   $tabs->{"B"} = { title => loc('New queue'),
   		     	path => "Admin/Queues/Modify.html?Create=1",
-		 separator => 1, };
+			separator => 1,
+			   };
 }
 
   # Now let callbacks add their extra tabs
diff --git a/rt/html/Admin/Elements/SelectCustomFieldLookupType b/rt/html/Admin/Elements/SelectCustomFieldLookupType
deleted file mode 100644
index ec9f740..0000000
--- a/rt/html/Admin/Elements/SelectCustomFieldLookupType
+++ /dev/null
@@ -1,58 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<SELECT NAME ="<%$Name%>">
-%for my $option ($cf->LookupTypes) {
-<OPTION VALUE="<%$option%>" <%$option eq $Default && "SELECTED"%>><% $cf->FriendlyLookupType($option) %></OPTION>
-%}
-</SELECT>
-<%INIT>
-my $cf = RT::CustomField->new($session{'CurrentUser'});
-
-</%INIT>
-<%ARGS>
-$Default=>undef
-$Name => 'LookupType'
-</%ARGS>
diff --git a/rt/html/Admin/Elements/SelectCustomFieldType b/rt/html/Admin/Elements/SelectCustomFieldType
index 3f25b8e..76606c4 100644
--- a/rt/html/Admin/Elements/SelectCustomFieldType
+++ b/rt/html/Admin/Elements/SelectCustomFieldType
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,10 +42,10 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
-%for my $option ($cf->TypeComposites) {
-<OPTION VALUE="<%$option%>" <%$option eq $Default && "SELECTED"%>><% $cf->FriendlyTypeComposite($option) %></OPTION>
+%for my $option ($cf->Types) {
+<OPTION VALUE="<%$option%>" <%$option eq $Default && "SELECTED"%>><% $cf->FriendlyType($option) %></OPTION>
 %}
 </SELECT>
 <%INIT>
@@ -54,5 +54,5 @@ my $cf = RT::CustomField->new($session{'CurrentUser'});
 </%INIT>
 <%ARGS>
 $Default=>undef
-$Name => 'TypeComposite'
+$Name => 'Type'
 </%ARGS>
diff --git a/rt/html/Admin/Elements/SelectGroups b/rt/html/Admin/Elements/SelectGroups
index 92bd475..175ce06 100644
--- a/rt/html/Admin/Elements/SelectGroups
+++ b/rt/html/Admin/Elements/SelectGroups
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT MULTIPLE NAME="<%$Name%>"  SIZE=10>
 %while (my $group = $groups->Next) {
 <OPTION VALUE="<%$group->id%>"><%$group->Name%>
diff --git a/rt/html/Admin/Elements/SelectModifyGroup b/rt/html/Admin/Elements/SelectModifyGroup
index 272e1f0..b33eaea 100644
--- a/rt/html/Admin/Elements/SelectModifyGroup
+++ b/rt/html/Admin/Elements/SelectModifyGroup
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %while ( $Group = $Groups->Next) {
 <A HREF="Modify.html?id=<%$Group->id%>"><%$Group->id%>: <%$Group->Name%></a><BR>
 %}
diff --git a/rt/html/Admin/Elements/SelectModifyQueue b/rt/html/Admin/Elements/SelectModifyQueue
index 3a30d09..2ca6bd8 100644
--- a/rt/html/Admin/Elements/SelectModifyQueue
+++ b/rt/html/Admin/Elements/SelectModifyQueue
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %while ( $queue = $queues->Next) {
 <A HREF="Modify.html?id=<%$queue->id%>"><%$queue->id%>: <%$queue->Name%></a><BR>
 %}
diff --git a/rt/html/Admin/Elements/SelectModifyUser b/rt/html/Admin/Elements/SelectModifyUser
index fc6c012..97411c9 100644
--- a/rt/html/Admin/Elements/SelectModifyUser
+++ b/rt/html/Admin/Elements/SelectModifyUser
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %while ( $user = $users->Next) {
 <A HREF="Modify.html?id=<%$user->id%>"><%$user->id%>: <%$user->Name%></a><BR>
 %}
diff --git a/rt/html/Admin/Elements/SelectNewGroupMembers b/rt/html/Admin/Elements/SelectNewGroupMembers
index 95056ae..90f9a0b 100644
--- a/rt/html/Admin/Elements/SelectNewGroupMembers
+++ b/rt/html/Admin/Elements/SelectNewGroupMembers
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % if ($Show ne 'Groups') {
 <b><&|/l&>Users</&></b>
 <SELECT MULTIPLE NAME="<%$Name%>Users"  SIZE=10>
diff --git a/rt/html/Admin/Elements/SelectRights b/rt/html/Admin/Elements/SelectRights
index 3e61d50..61a9e42 100644
--- a/rt/html/Admin/Elements/SelectRights
+++ b/rt/html/Admin/Elements/SelectRights
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,30 +42,27 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <INPUT TYPE=HIDDEN NAME="CheckACL"  VALUE="<%$ACLDesc%>">
      <TABLE BORDER=0>
 <TR>
 <TD valign=top width="180" align="left"> 
-%  my %current_rights;
 <h3><&|/l&>Current rights</&></h3>
-% if ($ACLObj->Count() == 0) {
-<i><&|/l&>No rights granted.</&></i> <BR>    
-% } else {
+% if ($ACLObj->Count() > 0) {
 <i>(<&|/l&>Check box to revoke right</&>)</i> <BR>
+% } else {
+<i><&|/l&>No rights granted.</&></i> <BR>    
+% }
 % while (my $right = $ACLObj->Next()) {
 % if ($right->RightName) {
-% $current_rights{$right->RightName} = 1;
 <input type=checkbox value="<%$right->Id%>" name="RevokeRight-<%$ACLDesc%>-<%$right->RightName%>"> <% loc($right->RightName) %><br>
 % }
 %  }
-% }
 </TD>
 <TD valign=top>
 <h3><&|/l&>New rights</&></h3> 
 <SELECT SIZE=5  MULTIPLE  NAME="GrantRight-<%$ACLDesc%>">
 % foreach $right (sort keys %Rights) {
-% next if $current_rights{$right};
       <OPTION VALUE="<%$right%>"  
 	><% loc($right) %></OPTION>
 % }
@@ -103,7 +100,7 @@
     } 
 
         else {
-                %Rights = ( loc('System Error') => loc("No rights found") );
+                %Rights = { loc('System Error') => loc("No rights found")};
         }
         
     $ACLDesc = "$PrincipalId-".ref($Object)."-".$Object->Id;
diff --git a/rt/html/Admin/Elements/SelectScrip b/rt/html/Admin/Elements/SelectScrip
index a9e9796..7fce6d5 100644
--- a/rt/html/Admin/Elements/SelectScrip
+++ b/rt/html/Admin/Elements/SelectScrip
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME=<%$Name%>>
 <OPTION VALUE="" 
 <% $Default eq undef && 'SELECTED' %>
diff --git a/rt/html/Admin/Elements/SelectScripAction b/rt/html/Admin/Elements/SelectScripAction
index 8d88d64..17cd6a1 100644
--- a/rt/html/Admin/Elements/SelectScripAction
+++ b/rt/html/Admin/Elements/SelectScripAction
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,14 +42,14 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME=<%$Name%>>
 <OPTION VALUE="" 
-<% ! defined $Default && 'SELECTED' %>
+<% $Default eq undef && 'SELECTED' %>
 >-</OPTION>
 %while  (my $ScripAction = $ScripActions->Next) {
 <OPTION VALUE=<%$ScripAction->Id%>
-<% defined $Default && $ScripAction->Id == $Default && 'SELECTED' %>
+<% $ScripAction->Id == $Default && 'SELECTED' %>
 ><% loc($ScripAction->Name) %>
 </OPTION>
 %}
diff --git a/rt/html/Admin/Elements/SelectScripCondition b/rt/html/Admin/Elements/SelectScripCondition
index faa99fd..021132b 100644
--- a/rt/html/Admin/Elements/SelectScripCondition
+++ b/rt/html/Admin/Elements/SelectScripCondition
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,14 +42,14 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME=<%$Name%>>
 <OPTION VALUE="" 
-<% ! defined $Default && 'SELECTED' %>
+<% $Default eq undef && 'SELECTED' %>
 >-</OPTION>
 %while  (my $ScripCondition = $ScripConditions->Next) {
 <OPTION VALUE=<%$ScripCondition->Id%>
-<% defined $Default && $ScripCondition->Id == $Default && 'SELECTED' %>
+<% $ScripCondition->Id == $Default && 'SELECTED' %>
 ><% loc($ScripCondition->Name) %>
 </OPTION>
 %}
diff --git a/rt/html/Admin/Elements/SelectSingleOrMultiple b/rt/html/Admin/Elements/SelectSingleOrMultiple
index 5716950..9b19826 100644
--- a/rt/html/Admin/Elements/SelectSingleOrMultiple
+++ b/rt/html/Admin/Elements/SelectSingleOrMultiple
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
   <select name="<%$Name%>">
     <option value="1" <%$SingleDefault%>><&|/l&>Single</&></option>
     <option value="0" <%$MultipleDefault%>><&|/l&>Multiple</&></option>
diff --git a/rt/html/Admin/Elements/SelectStage b/rt/html/Admin/Elements/SelectStage
index 0fbf5c6..0472d2f 100644
--- a/rt/html/Admin/Elements/SelectStage
+++ b/rt/html/Admin/Elements/SelectStage
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,9 +42,9 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME=<%$Name%>>
-% foreach my $stage (@stages) {
+% foreach my $stage (qw(TransactionCreate TransactionBatch Disabled)) {
 <OPTION VALUE=<%$stage%>
 <% ($stage eq $Default) && 'SELECTED' %>
 ><% loc($stage) %>
@@ -54,9 +54,6 @@
 if ($Default eq '') {
     $Default = 'TransactionCreate';
 }
-my @stages = 'TransactionCreate';
-push @stages, 'TransactionBatch' if $RT::UseTransactionBatch;
-push @stages, 'Disabled';
 </%INIT>
 <%ARGS>
 $Default => 'TransactionCreate'
diff --git a/rt/html/Admin/Elements/SelectTemplate b/rt/html/Admin/Elements/SelectTemplate
index 7d83b67..f489483 100644
--- a/rt/html/Admin/Elements/SelectTemplate
+++ b/rt/html/Admin/Elements/SelectTemplate
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME=<%$Name%>>
 <OPTION VALUE="" 
 <% $Default eq 'none' && 'SELECTED' %>
diff --git a/rt/html/Admin/Elements/SelectUsers b/rt/html/Admin/Elements/SelectUsers
index a88aa8f..31ac3e4 100644
--- a/rt/html/Admin/Elements/SelectUsers
+++ b/rt/html/Admin/Elements/SelectUsers
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT MULTIPLE NAME="<%$Name%>"  SIZE=10>
 %while (my $user = $users->Next) {
 <OPTION VALUE="<%$user->id%>"><%$user->Name%>
diff --git a/rt/html/Admin/Elements/SystemTabs b/rt/html/Admin/Elements/SystemTabs
index 646f552..4409695 100644
--- a/rt/html/Admin/Elements/SystemTabs
+++ b/rt/html/Admin/Elements/SystemTabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Tabs, subtabs => $tabs, 
     current_tab => 'Admin/Global/', 
     current_subtab => $current_tab, 
@@ -59,7 +59,7 @@
                       },
               
                 F => { title => loc('Custom Fields'),
-                        path => 'Admin/Global/CustomFields/index.html',
+                        path => 'Admin/Global/CustomFields.html',
                         },
 
                 G => { title => loc('Group Rights'),
diff --git a/rt/html/Admin/Elements/Tabs b/rt/html/Admin/Elements/Tabs
index f90a629..39eaa72 100644
--- a/rt/html/Admin/Elements/Tabs
+++ b/rt/html/Admin/Elements/Tabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Tabs, 
     tabs => $tabs, 
     current_toptab => 'Admin/', 
@@ -59,13 +59,10 @@
 	       C => { title => loc('Queues'),
 			   path => 'Admin/Queues/',
 			 },
-	       D => { 'title' => loc('Custom Fields'),
-			   path => 'Admin/CustomFields/',
-			 },
-	       E => { 'title' => loc('Global'),
+	       D => { 'title' => loc('Global'),
 			   path => 'Admin/Global/',
 			 },
-	       F => { 'title' => loc('Tools'),
+	       E => { 'title' => loc('Tools'),
 			   path => 'Admin/Tools/',
 			 },
 	     };
diff --git a/rt/html/Admin/Elements/ToolTabs b/rt/html/Admin/Elements/ToolTabs
index 773b810..606bd12 100755
--- a/rt/html/Admin/Elements/ToolTabs
+++ b/rt/html/Admin/Elements/ToolTabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Tabs, subtabs => $tabs, 
     current_tab => 'Admin/Tools/', 
     current_subtab => $current_tab, 
diff --git a/rt/html/Admin/Elements/UserTabs b/rt/html/Admin/Elements/UserTabs
index 0ffd29b..671bd6d 100644
--- a/rt/html/Admin/Elements/UserTabs
+++ b/rt/html/Admin/Elements/UserTabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,61 +42,52 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Tabs, 
+%# }}} END BPS TAGGED BLOCK
+<& /Admin/Elements/Tabs,
     subtabs => $tabs,
-    current_tab => 'Admin/Users/', 
-    current_subtab => $current_tab, 
+    current_tab => 'Admin/Users/',
+    current_subtab => $current_tab,
     Title => $Title &>
 <%INIT>
 my $tabs;
 if ($id) {
-$tabs->{'this'} = { title => eval { $UserObj->Name },
-
+	$tabs->{'this'} = {
+		title => eval { $UserObj->Name },
 		path => "Admin/Users/Modify.html?id=".$id,
-subtabs => {
-	       Basics => { title => loc('Basics'),
+		current_subtab => $current_tab,
+		subtabs => {
+			A => { title => loc('Basics'),
 				path => "Admin/Users/Modify.html?id=".$id
 			},
-	       Memberships => { title => loc('Memberships'),
-			   path => "Admin/Users/Memberships.html?id=".$id
-			 },
-	       History => { title => loc('History'),
-			   path => "Admin/Users/History.html?id=".$id
-			 },
-#	       Scrips => { title => loc('Rights'),
-#			   path => "Admin/Users/Rights.html?id=".$id
-#			 }
-	       
+		}
 	}
 }
-}
-if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers')) {
-  $tabs->{"A"} = { title => loc('Select user'),
-  		     	path => "Admin/Users/",
-			   };
-  $tabs->{"B"} = { title => loc('New user'),
-  		     	path => "Admin/Users/Modify.html?Create=1",
+
+if ( $session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers') ) {
+	$tabs->{"A"} = {
+		title => loc('Select user'),
+		path => "Admin/Users/",
+	};
+	$tabs->{"B"} = {
+		title => loc('New user'),
+		path => "Admin/Users/Modify.html?Create=1",
 		separator => 1,
 	};
 }
 
-  # Now let callbacks add their extra tabs
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
-                                                                                
-#foreach my $tab ( sort keys %{$tabs} ) {                                        
-#    if ( $tabs->{$tab}->{'path'} eq $current_subtab ) {                         
-#        $tabs->{$tab}->{"current_subtab"} = $current_subtab;                    
-#    }                                                                           
-#}                                                                               
-foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {  
-    if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
-        $tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"}        = $subtabs; 
-        $tabs->{'this'}->{'subtabs'}->{$tab}->{"current_subtab"} = $current_subtab; 
-    }                                                                           
-}   
-$tabs->{'this'}->{"current_subtab"} = $current_tab; 
+# Now let callbacks add their extra tabs
+$m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
+
+foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {
+	if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
+		$tabs->{'this'}->{"current_subtab"} = $current_tab; 
+		$tabs->{'this'}->{'subtabs'}->{$tab}->{"current_subtab"} = $current_subtab; 
+		$tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"} = $subtabs; 
+	}
+}
+
 $current_tab = "Admin/Users/Modify.html?id=".$id if $id;
+
 </%INIT>
 <%ARGS>
 $UserObj => undef
diff --git a/rt/html/Elements/EditCustomFieldFreeform b/rt/html/Admin/Global/CustomField.html
index c097ee0..3871d89 100644
--- a/rt/html/Elements/EditCustomFieldFreeform
+++ b/rt/html/Admin/Global/CustomField.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,27 +42,45 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-% if ($Multiple) {
-<textarea cols=<%$Cols%> rows=<%$Rows%> name="<%$NamePrefix%><%$CustomField->Id%>-Values"><%$Default%></textarea>
-% } else {
-<input name="<%$NamePrefix%><%$CustomField->Id%>-Value" size="<%$Cols%>" value="<%$Default ? $Default : ''%>">
-% }
+%# }}} END BPS TAGGED BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/SystemTabs, 
+    current_tab => 'Admin/Global/CustomFields.html',
+    current_subtab => $current_subtab, 
+    subtabs => $subtabs, 
+    Title => $title &>
+
+<& /Admin/Elements/EditCustomField, title => $title, %ARGS &>
+
 <%INIT>
-if ($Multiple and $Values) {
-    $Default = '';
-    while (my $value = $Values->Next ) {
-	$Default .= $value->Content."\n";
-    }
+my ($title, $current_subtab);
+
+my $subtabs = {
+		 A => { title => loc('Select custom field'),
+  		     	path => "Admin/Global/CustomFields.html"
+			   },
+		 B => { title => loc('New custom field'),
+  		     	path => "Admin/Global/CustomField.html?create=1&Queue=0",
+			separator => 1,
+			   }
+	      };
+if ( $ARGS{'create'} ) {
+    $current_subtab = "Admin/Global/CustomField.html?create=1&Queue=0";
+    $title          = loc('Create a CustomField which applies to all queues');
+}
+else {
+    $current_subtab =
+      "Admin/Global/CustomField.html?CustomField=" . $CustomField . "&Queue=0";
+    $title = loc('Modify a CustomField which applies to all queues');
+    $subtabs->{"C"} = {
+        title => loc( 'Custom Field #[_1]', $CustomField ),
+        path => "Admin/Global/CustomField.html?CustomField=" . $CustomField . "&Queue=0"
+    };
 }
 </%INIT>
 <%ARGS>
-$Object => undef
 $CustomField => undef
-$NamePrefix => undef
-$Default => undef
-$Values => undef
-$Multiple => undef
-$Cols
-$Rows
 </%ARGS>
+<%ATTR>
+AutoFlush => 0
+</%ATTR>
diff --git a/rt/html/Admin/Users/History.html b/rt/html/Admin/Global/CustomFields.html
index 024a90b..5930402 100644
--- a/rt/html/Admin/Users/History.html
+++ b/rt/html/Admin/Global/CustomFields.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,24 +42,27 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title  &>
-<& /Admin/Elements/UserTabs, 
-    id => $id, 
-    UserObj => $UserObj,
-    current_tab => $current_tab, 
+%# }}} END BPS TAGGED BLOCK
+<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/SystemTabs, 
+    current_tab => 'Admin/Global/CustomFields.html',
+    current_subtab => 'Admin/Global/CustomFields.html', 
+    subtabs => $subtabs, 
     Title => $title &>
 
-<& /Ticket/Elements/ShowHistory,
-    Ticket => $UserObj,
-    ShowHeaderModes => 0,
-&>
+<& /Admin/Elements/EditCustomFields, title => $title, %ARGS &>
 
 <%INIT>
-my $current_tab = 'Admin/Users/History.html?id='.$id;
-my $UserObj = new RT::User($session{'CurrentUser'});
-$UserObj->Load($id) || Abort("Couldn't load user '$id'");
-my $title = loc("History of the user [_1]", $UserObj->Name);
+my $subtabs = {
+		 A => { title => loc('Select custom field'),
+  		     	path => "Admin/Global/CustomFields.html"
+			   },
+		 B => { title => loc('New custom field'),
+  		     	path => "Admin/Global/CustomField.html?create=1&Queue=0",
+			separator => 1,
+			   }
+	      };
+my $title = loc("Modify Custom Fields which apply to all queues");
 </%INIT>
 <%ARGS>
 $id => undef
diff --git a/rt/html/Admin/Global/CustomFields/Groups.html b/rt/html/Admin/Global/CustomFields/Groups.html
deleted file mode 100644
index bffde01..0000000
--- a/rt/html/Admin/Global/CustomFields/Groups.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/GlobalCustomFieldTabs,
-    current_tab => "Admin/Global/CustomFields/Groups.html",
-    current_subtab => "Admin/Global/CustomFields/Groups.html",
-    Title => $title
-    &>
-    <& /Admin/Elements/EditCustomFields, %ARGS, title => $title, ObjectType => 'RT::Group', Object=> $object &>
-<%INIT>
-  my $title = loc( 'Edit Custom Fields for all groups');
-  my $object = RT::Group->new($session{'CurrentUser'});
-</%INIT>
diff --git a/rt/html/Admin/Global/CustomFields/Queue-Tickets.html b/rt/html/Admin/Global/CustomFields/Queue-Tickets.html
deleted file mode 100755
index 396559a..0000000
--- a/rt/html/Admin/Global/CustomFields/Queue-Tickets.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/GlobalCustomFieldTabs,
-    current_tab => "Admin/Global/CustomFields/Queue-Tickets.html",
-    current_subtab => "Admin/Global/CustomFields/Queue-Tickets.html",
-    Title => $title
-    &>
-    <& /Admin/Elements/EditCustomFields, %ARGS, title => $title, ObjectType => 'RT::Queue', Object=> $object, SubType => 'RT::Ticket' &>
-<%INIT>
-  my $title = loc( 'Edit Custom Fields for tickets in all queues');
-  my $object = RT::Queue->new($session{'CurrentUser'});
-</%INIT>
diff --git a/rt/html/Admin/Global/CustomFields/Queue-Transactions.html b/rt/html/Admin/Global/CustomFields/Queue-Transactions.html
deleted file mode 100755
index 63b4cfe..0000000
--- a/rt/html/Admin/Global/CustomFields/Queue-Transactions.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/GlobalCustomFieldTabs,
-    current_tab => "Admin/Global/CustomFields/Queue-Transactions.html",
-    current_subtab => "Admin/Global/CustomFields/Queue-Transactions.html",
-    Title => $title
-    &>
-    <& /Admin/Elements/EditCustomFields, %ARGS, title => $title, ObjectType => 'RT::Queue', Object=> $object, SubType => 'RT::Ticket-RT::Transaction' &>
-<%INIT>
-  my $title = loc( 'Edit Custom Fields for tickets in all queues');
-  my $object = RT::Queue->new($session{'CurrentUser'});
-</%INIT>
diff --git a/rt/html/Admin/Global/CustomFields/Users.html b/rt/html/Admin/Global/CustomFields/Users.html
deleted file mode 100644
index 6b79743..0000000
--- a/rt/html/Admin/Global/CustomFields/Users.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/GlobalCustomFieldTabs,
-    current_tab => "Admin/Global/CustomFields/Users.html",
-    current_subtab => "Admin/Global/CustomFields/Users.html",
-    Title => $title
-    &>
-    <& /Admin/Elements/EditCustomFields, %ARGS, title => $title, ObjectType => 'RT::User', Object=> $object &>
-<%INIT>
-  my $title = loc( 'Edit Custom Fields for all users');
-  my $object = RT::User->new($session{'CurrentUser'});
-</%INIT>
diff --git a/rt/html/Admin/Global/CustomFields/index.html b/rt/html/Admin/Global/CustomFields/index.html
deleted file mode 100644
index 9cdcfd5..0000000
--- a/rt/html/Admin/Global/CustomFields/index.html
+++ /dev/null
@@ -1,91 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Elements/Callback, tabs => $tabs, %ARGS &>
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/GlobalCustomFieldTabs, Title => $title &>
-
-<ul>
-% foreach my $key (sort keys %$tabs) {
-<li><font size="+2"><a href="<% $tabs->{$key}{path} %>"><% $tabs->{$key}{title} %></a></font><br>
-<% $tabs->{$key}{text} %>
-</li>
-% }
-</ul>
-
-<%INIT>
-my $title = loc("Global custom field configuration");
-
-my $tabs = {
-
-    A => {
-        title => loc('Users'),
-        text  => loc('Select custom fields for all users'),
-        path  => 'Users.html',
-    },
-    B => {
-        title => loc('Groups'),
-        text  => loc('Select custom fields for all user groups'),
-        path  => 'Groups.html',
-    },
-
-    F => {
-        title => loc('Tickets'),
-        text  => loc('Select custom fields for tickets in all queues'),
-        path  => 'Queue-Tickets.html',
-    },
-
-    G => {
-        title => loc('Ticket Transactions'),
-        text  =>
-          loc('Select custom fields for transactions on tickets in all queues'),
-        path => 'Queue-Transactions.html',
-    },
-
-};
-
-
-$m->comp('/Elements/Callback', tabs => $tabs);
-</%INIT>
diff --git a/rt/html/Admin/Global/GroupRights.html b/rt/html/Admin/Global/GroupRights.html
index 8d71432..68718b9 100644
--- a/rt/html/Admin/Global/GroupRights.html
+++ b/rt/html/Admin/Global/GroupRights.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify global group rights') &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/GroupRights.html', 
diff --git a/rt/html/Admin/Global/Scrip.html b/rt/html/Admin/Global/Scrip.html
index 4e0c1f4..2e63fe7 100644
--- a/rt/html/Admin/Global/Scrip.html
+++ b/rt/html/Admin/Global/Scrip.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title  &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/Scrips.html', 
diff --git a/rt/html/Admin/Global/Scrips.html b/rt/html/Admin/Global/Scrips.html
index dcfa6ff..37bd2c7 100644
--- a/rt/html/Admin/Global/Scrips.html
+++ b/rt/html/Admin/Global/Scrips.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title  &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/Scrips.html', 
diff --git a/rt/html/Admin/Global/Template.html b/rt/html/Admin/Global/Template.html
index 17da59b..a289eb6 100644
--- a/rt/html/Admin/Global/Template.html
+++ b/rt/html/Admin/Global/Template.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc("Modify template [_1]", $TemplateObj->id)  &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/Templates.html', 
diff --git a/rt/html/Admin/Global/Templates.html b/rt/html/Admin/Global/Templates.html
index 387326c..da3395a 100644
--- a/rt/html/Admin/Global/Templates.html
+++ b/rt/html/Admin/Global/Templates.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,8 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title, FeedURI => 'templates' &>
+%# }}} END BPS TAGGED BLOCK
+<& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/Templates.html', 
     current_subtab => 'Admin/Global/Templates.html', 
diff --git a/rt/html/Admin/Global/UserRights.html b/rt/html/Admin/Global/UserRights.html
index 14a4de3..a65e7c2 100644
--- a/rt/html/Admin/Global/UserRights.html
+++ b/rt/html/Admin/Global/UserRights.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify global user rights') &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/UserRights.html',
diff --git a/rt/html/Admin/Global/index.html b/rt/html/Admin/Global/index.html
index af7a9dd..3a70e7c 100644
--- a/rt/html/Admin/Global/index.html
+++ b/rt/html/Admin/Global/index.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Callback, tabs => $tabs, %ARGS &>
 <& /Admin/Elements/Header, Title => loc('Admin/Global configuration') &>
 <& /Admin/Elements/SystemTabs, 
@@ -69,8 +69,8 @@
                       },
               
                 F => { title => loc('Custom Fields'),
-                text => loc('Modify global custom fields'),
-                        path => 'CustomFields/index.html',
+                        text => loc('Modify Custom Fields which apply to all queues'),
+                        path => 'CustomFields.html',
                         },
 
                 G => { title => loc('Group Rights'),
diff --git a/rt/html/Admin/Groups/CustomFields.html b/rt/html/Admin/Groups/CustomFields.html
deleted file mode 100644
index c2336b0..0000000
--- a/rt/html/Admin/Groups/CustomFields.html
+++ /dev/null
@@ -1,46 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/ObjectCustomFields, %ARGS, ObjectType => 'RT::Group' &>
diff --git a/rt/html/Admin/Groups/GroupRights.html b/rt/html/Admin/Groups/GroupRights.html
index d95bdae..55e2a65 100644
--- a/rt/html/Admin/Groups/GroupRights.html
+++ b/rt/html/Admin/Groups/GroupRights.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify group rights for group [_1]', $GroupObj->Name) &>
 <& /Admin/Elements/GroupTabs, 
     GroupObj => $GroupObj, 
diff --git a/rt/html/Admin/Groups/History.html b/rt/html/Admin/Groups/History.html
deleted file mode 100644
index 40dab46..0000000
--- a/rt/html/Admin/Groups/History.html
+++ /dev/null
@@ -1,66 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title  &>
-<& /Admin/Elements/GroupTabs, 
-    id => $id, 
-    GroupObj => $GroupObj,
-    current_subtab => $current_tab, 
-    Title => $title &>
-
-<& /Ticket/Elements/ShowHistory,
-    Ticket => $GroupObj,
-    ShowHeaderModes => 0,
-&>
-
-<%INIT>
-my $current_tab = 'Admin/Groups/History.html?id='.$id;
-my $GroupObj = new RT::Group($session{'CurrentUser'});
-$GroupObj->Load($id) || Abort("Couldn't load group '$id'");
-my $title = loc("History of the group [_1]", $GroupObj->Name);
-</%INIT>
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/html/Admin/Groups/Members.html b/rt/html/Admin/Groups/Members.html
index fd25b2d..779df95 100644
--- a/rt/html/Admin/Groups/Members.html
+++ b/rt/html/Admin/Groups/Members.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => "RT/Admin/Edit the group ". $Group->Name &>
 <& /Admin/Elements/GroupTabs, GroupObj => $Group, 
     current_tab => 'Admin/Groups/Members.html?id='.$id, 
@@ -78,7 +78,7 @@
 % $UserMembers->LimitToUsers();
 <UL>
 % while (my $member = $UserMembers->Next()) {
-<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>" value="1">
+<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>">
 <%$member->MemberObj->Object->Name%> (<%$member->MemberObj->Object->RealName%>)
 % }
 </ul>
@@ -87,7 +87,7 @@
 % my $GroupMembers = $Group->MembersObj;
 % $GroupMembers->LimitToGroups();
 % while (my $member = $GroupMembers->Next()) {
-<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>" value="1">
+<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>">
 <%$member->MemberObj->Object->Name%>
 % }
 % }
diff --git a/rt/html/Admin/Groups/Modify.html b/rt/html/Admin/Groups/Modify.html
index 94c0203..0140a57 100644
--- a/rt/html/Admin/Groups/Modify.html
+++ b/rt/html/Admin/Groups/Modify.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title  &>
 
 <& /Admin/Elements/GroupTabs, 
@@ -53,7 +53,7 @@
 
 
 
-<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Modify.html" METHOD=POST ENCTYPE="multipart/form-data">
+<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Modify.html" METHOD=POST>
 
 %unless ($Group->Id) {
 <INPUT TYPE=HIDDEN NAME=id VALUE="new">
@@ -65,27 +65,16 @@
 <&|/l&>Name</&>:
 </TD>
 <TD><INPUT name="Name" value="<%$Group->Name%>"></TD>
-</TR>
-<TR>
+</TR><TR>
 <TD ALIGN=RIGHT>
 <&|/l&>Description</&>:</TD><TD COLSPAN=3><INPUT name="Description" value="<%$Group->Description%>" size=60></TD>
-</TR>
-% my $CFs = $Group->CustomFields;
-% while (my $CF = $CFs->Next) {
-<TR VALIGN="TOP"><TD ALIGN="RIGHT">
-<% $CF->Name %>:
-</TD><TD>
-<& /Elements/EditCustomField, CustomField => $CF, Object => $Group &>
-</TD></TR>
-% }
-<TR>
+</TR><TR>
 <TD COLSPAN=2>
 <INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
 <INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this group)</&><BR>
 </TR>
-<& /Elements/Callback, GroupObj => $Group, results => \@results, %ARGS &>
 </TABLE>
-<& /Elements/Submit, Label => loc('Save Changes'), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
 </form>
 <%INIT>
 
@@ -135,7 +124,6 @@ if ($id) {
 					    Object => $Group,
 					    ARGSRef => \%ARGS );
     push (@results,@fieldresults);
-    push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $Group );
 }
 
 #we're asking about enabled on the web page but really care about disabled.
diff --git a/rt/html/Admin/Groups/UserRights.html b/rt/html/Admin/Groups/UserRights.html
index 5237b15..3f17baa 100644
--- a/rt/html/Admin/Groups/UserRights.html
+++ b/rt/html/Admin/Groups/UserRights.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify user rights for group [_1]', $GroupObj->Name) &>
 <& /Admin/Elements/GroupTabs, 
     GroupObj => $GroupObj, 
diff --git a/rt/html/Admin/Groups/index.html b/rt/html/Admin/Groups/index.html
index 0734406..7c2cd50 100644
--- a/rt/html/Admin/Groups/index.html
+++ b/rt/html/Admin/Groups/index.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,66 +42,36 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/GroupTabs, current_tab => 'Admin/Groups/',
     current_subtab => 'Admin/Groups/', 
     Title => $title &>
-<%$caption%>:<BR> <UL> 
-%if ($Groups->Count == 0) {
-<LI> <i><&|/l&>No groups matching search criteria found.</&></i>
-% }
-%my @ids;
+
+
+<UL>
 %while ( my $Group = $Groups->Next) {
-%    push @ids, $Group->Id;
 <LI><A HREF="Modify.html?id=<%$Group->id%>"><%$Group->Name || loc('(empty)')%></a><BR>
 %}
 </UL>
-%if (my $ids = join(',', @ids)) {
-<em>(<a href="<%$RT::WebPath%>/Download/Tabular/Group/<% $ids %>/Groups.tsv"><&|/l&>Download as a tab-delimited file</&></a>)</em><br>
-%}
 <br><br>
 <FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Groups/index.html">
-<input type="checkbox" name="FindDisabledGroups" value="1"> <&|/l&>Include disabled groups in listing.</&>
+<input type="checkbox" name="FindDisabledGroups"> <&|/l&>Include disabled groups in listing.</&>
 <BR>
 <div align=right><input type=submit value="<&|/l&>Go!</&>"></div> 
 </FORM>
 
-<br><br>
-<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Groups/index.html">
-<&|/l&>Find groups whose</&> <& /Elements/SelectGroups &><BR>
-<div align=right><input type=submit value="<&|/l&>Go!</&>"></div> 
-</FORM>
 <%INIT>
 my $Groups = RT::Groups->new($session{'CurrentUser'});
+
+if ($FindDisabledGroups) {
+  $Groups->{'find_disabled_rows'} = 1;
+}
+
 $Groups->LimitToUserDefinedGroups();
 my $title = loc('Select a group');
-my $caption;
 
-if (length $GroupString) {
-    $caption = loc("Groups matching search criteria");
-    if ($GroupField =~ /^CustomField-(\d+)/) {
-	$Groups->LimitCustomField(
-	    CUSTOMFIELD => $1,
-	    OPERATOR => $GroupOp,
-	    VALUE => $GroupString,
-	); 
-    }
-    else {
-	$Groups->Limit(
-	    FIELD => $GroupField,
-	    OPERATOR => $GroupOp,
-	    VALUE => $GroupString,
-	); 
-    }
-}
-else {
-    $caption = loc("User-defined groups");
-}
 </%INIT>
 <%ARGS>
-$GroupString => undef
-$GroupOp => '='
-$GroupField => 'Name'
 $FindDisabledGroups => 0
 </%ARGS>
diff --git a/rt/html/Admin/Queues/CustomField.html b/rt/html/Admin/Queues/CustomField.html
index 5beba58..a865dba 100644
--- a/rt/html/Admin/Queues/CustomField.html
+++ b/rt/html/Admin/Queues/CustomField.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $QueueObj->Id, 
     QueueObj => $QueueObj,                                                      
@@ -78,7 +78,7 @@ my $subtabs = {
 </%INIT>
 <%ARGS>
 $CustomField => undef
-$Queue => 0
+$Queue => undef
 </%ARGS>
 <%ATTR>
 AutoFlush => 0
diff --git a/rt/html/Admin/Queues/CustomFields.html b/rt/html/Admin/Queues/CustomFields.html
index 4d7e088..507c02d 100644
--- a/rt/html/Admin/Queues/CustomFields.html
+++ b/rt/html/Admin/Queues/CustomFields.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,29 +42,30 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
-<&    /Admin/Elements/QueueTabs,
-    id => $Object->id, 
-    current_tab => "Admin/Queues/CustomFields.html?SubType=$SubType&id=$id", 
-    current_subtab => "Admin/Queues/CustomFields.html?SubType=$SubType&id=$id", 
-    QueueObj => $Object,
+<& /Admin/Elements/QueueTabs, id => $Queue->id, 
+    current_tab => 'Admin/Queues/CustomFields.html?id='.$id, 
+    QueueObj => $Queue,                                                      
+    subtabs => $subtabs,
     Title => $title
     &>
 
-    <& /Admin/Elements/EditCustomFields, %ARGS, title => $title, Object => $Object, ObjectType => 'RT::Queue' &>
+<& /Admin/Elements/EditCustomFields, title => $title, %ARGS &>
 <%INIT>
-my $Object = RT::Queue->new( $session{'CurrentUser'} );
+my $Queue = new RT::Queue($session{'CurrentUser'});
+$Queue->Load($id) || Abort(loc("Couldn't load queue", $id));
 
-$Object->Load($id) || Abort( loc( "Couldn't load object [_1]", $id ) );
-my $FriendlySubTypes =
-  RT::CustomField->new( $session{'CurrentUser'} )
-  ->FriendlyLookupType( $Object->CustomFieldLookupType );
-
-my $title = loc( 'Edit Custom Fields for [_1]', $Object->Name );
+my $CustomFields = RT::CustomFields->new($RT::SystemUser);
+$CustomFields->LimitToQueue($Queue->Id);
+my $subtabs = {
+	 A => { title => loc('New custom field'),
+	     	path => "Admin/Queues/CustomField.html?create=1&Queue=".$id,
+			   }
+	      };
 
+my $title=  loc('Edit Custom Fields for [_1]', $Queue->Name);
 </%INIT>
 <%ARGS>
 $id => undef
-$SubType => 'RT::Queue-RT::Ticket'
 </%ARGS>
diff --git a/rt/html/Admin/Queues/GroupRights.html b/rt/html/Admin/Queues/GroupRights.html
index c5a12bf..5e0d5b9 100644
--- a/rt/html/Admin/Queues/GroupRights.html
+++ b/rt/html/Admin/Queues/GroupRights.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify group rights for queue [_1]', $QueueObj->Name) &>
 <& /Admin/Elements/QueueTabs, id => $id, 
     QueueObj => $QueueObj,                                                      
diff --git a/rt/html/Admin/Queues/Modify.html b/rt/html/Admin/Queues/Modify.html
index 5517a80..717a83a 100644
--- a/rt/html/Admin/Queues/Modify.html
+++ b/rt/html/Admin/Queues/Modify.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $QueueObj->id, 
     QueueObj => $QueueObj,
@@ -72,13 +72,13 @@
 <&|/l&>Reply Address</&>:
 </TD><TD>
 <INPUT name="CorrespondAddress" value="<% ($Create) ? "" : $QueueObj->CorrespondAddress %>">
-<BR><font size="-1"><i><&|/l , $RT::CorrespondAddress&>(If left blank, will default to [_1])</&></i></font>
+<BR><font size="-1"><i><&|/l , $RT::CorrespondAddress&>(If left blank, will default to [_1]</&></i></font>
 </TD>
 <TD ALIGN=RIGHT>
 
 <&|/l&>Comment Address</&>: </TD><TD>
 <INPUT NAME="CommentAddress" value="<% ($Create) ? "" : $QueueObj->CommentAddress %>">
-<BR><font size="-1"><i><&|/l , $RT::CommentAddress&>(If left blank, will default to [_1])</&></i></font>
+<BR><font size="-1"><i><&|/l , $RT::CommentAddress&>(If left blank, will default to [_1]</&></i></font>
 </TD>
 </TR><TR>
 
@@ -159,7 +159,7 @@ my @attribs= qw(Description CorrespondAddress CommentAddress Name
   }
   if  ( ($SetEnabled) and ( $Disabled != $QueueObj->Disabled) ) { 
       my  ($code, $msg) = $QueueObj->SetDisabled($Disabled);
-      push @results, loc('Enabled status: [_1]', loc_fuzzy($msg));
+      push @results, loc('Enabled status [_1]', loc_fuzzy($msg));
   }
   
   if ($QueueObj->Disabled()) {
diff --git a/rt/html/Admin/Queues/People.html b/rt/html/Admin/Queues/People.html
index e29b9d3..1a5caee 100644
--- a/rt/html/Admin/Queues/People.html
+++ b/rt/html/Admin/Queues/People.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc('Modify people related to queue [_1]', $QueueObj->Name) &>
 <& /Admin/Elements/QueueTabs, id => $id, 
     QueueObj => $QueueObj,                                                      
@@ -79,7 +79,7 @@
 <& /Elements/SelectUsers &>
 <input type=submit name="OnlySearchForPeople" value="<&|/l&>Go!</&>">
 <BR>
-<&|/l&>Find groups whose</&><BR>
+<&|/l&>Find group whose</&><BR>
 <& /Elements/SelectGroups &>
 <input type=submit name="OnlySearchForGroup" value="<&|/l&>Go!</&>">
 
diff --git a/rt/html/Admin/Queues/Scrip.html b/rt/html/Admin/Queues/Scrip.html
index 1223fbf..be9226f 100644
--- a/rt/html/Admin/Queues/Scrip.html
+++ b/rt/html/Admin/Queues/Scrip.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $QueueObj->Id, 
     QueueObj => $QueueObj,                                                      
diff --git a/rt/html/Admin/Queues/Scrips.html b/rt/html/Admin/Queues/Scrips.html
index e7092fb..5d10e44 100644
--- a/rt/html/Admin/Queues/Scrips.html
+++ b/rt/html/Admin/Queues/Scrips.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $QueueObj->id, 
     QueueObj => $QueueObj,                                                      
diff --git a/rt/html/Admin/Queues/Template.html b/rt/html/Admin/Queues/Template.html
index c60a909..066e7dd 100644
--- a/rt/html/Admin/Queues/Template.html
+++ b/rt/html/Admin/Queues/Template.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $Queue, 
     QueueObj => $QueueObj,
diff --git a/rt/html/Admin/Queues/Templates.html b/rt/html/Admin/Queues/Templates.html
index 888fdbc..e921848 100644
--- a/rt/html/Admin/Queues/Templates.html
+++ b/rt/html/Admin/Queues/Templates.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title &>
 <& /Admin/Elements/QueueTabs, id => $QueueObj->id, 
     current_tab => 'Admin/Queues/Templates.html?id='.$id, 
diff --git a/rt/html/Admin/Queues/UserRights.html b/rt/html/Admin/Queues/UserRights.html
index 399992a..6aaaab9 100644
--- a/rt/html/Admin/Queues/UserRights.html
+++ b/rt/html/Admin/Queues/UserRights.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Modify user rights for queue [_1]', $QueueObj->Name) &>
 <& /Admin/Elements/QueueTabs, id => $id,
     QueueObj => $QueueObj,                                                      
diff --git a/rt/html/Admin/Queues/index.html b/rt/html/Admin/Queues/index.html
index 28adf53..80998bd 100644
--- a/rt/html/Admin/Queues/index.html
+++ b/rt/html/Admin/Queues/index.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc("Admin queues") &>
 <& /Admin/Elements/QueueTabs, current_tab => 'Admin/Queues/', 
     current_subtab => 'Admin/Queues/', 
@@ -50,19 +50,18 @@
 
 
 
-<h1><%$caption%></h1>
-<p><&|/l&>Select a queue</&>:</p>
+<%$caption%>:<BR>
 <UL>
 %if ($queues->Count == 0) {
-<li><i><&|/l&>No queues matching search criteria found.</&></i></li>
+<LI> <i><&|/l&>No queues matching search criteria found.</&></i>
 % }
 %while ( $queue = $queues->Next) {
-<li><A HREF="Modify.html?id=<%$queue->id%>"><%$queue->Name%></a></li>
+<LI><A HREF="Modify.html?id=<%$queue->id%>"><%$queue->Name%></a></LI>
 %}
 </UL>
 <BR>
 <FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Queues/index.html">
-<input type="checkbox" name="FindDisabledQueues" value="1"> <&|/l&>Include disabled queues in listing.</&>
+<input type="checkbox" name="FindDisabledQueues"> <&|/l&>Include disabled queues in listing.</&>
 <div align=right><input type=submit value="<&|/l&>Go!</&>"></div> 
 </FORM>
 
diff --git a/rt/html/Admin/Tools/Configuration.html b/rt/html/Admin/Tools/Configuration.html
index bc5ca69..24d9b73 100644
--- a/rt/html/Admin/Tools/Configuration.html
+++ b/rt/html/Admin/Tools/Configuration.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%init>
 require  Module::Versions::Report;
 my $title = loc('System Configuration');
@@ -80,7 +80,7 @@ unless ($session{'CurrentUser'}->HasRight( Object=> $RT::System, Right => 'Super
 % next if (ref ${'RT::'.$key} );
 <tr><td>RT::<%$key%></td>
 <td>
-% if ($key =~ /Password(?!Length)/i) { 
+% if ($key =~ /Password/i) { 
 <i>Password not printed</i>
 % } else {
 <%${'RT::'.$key} %>
diff --git a/rt/html/Admin/Tools/index.html b/rt/html/Admin/Tools/index.html
index 49cfac3..c9a5873 100644
--- a/rt/html/Admin/Tools/index.html
+++ b/rt/html/Admin/Tools/index.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%init>
 my $title = loc('System Tools');
 </%init>
diff --git a/rt/html/Admin/Users/CustomFields.html b/rt/html/Admin/Users/CustomFields.html
deleted file mode 100644
index 5662c6c..0000000
--- a/rt/html/Admin/Users/CustomFields.html
+++ /dev/null
@@ -1,69 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title &>
-<&    /Admin/Elements/UserTabs,
-    id => $Object->id, 
-    current_tab => "Admin/Users/CustomFields.html?$id=".$id, 
-    current_subtab => "Admin/Users/CustomFields.html?id=".$id, 
-    UserObj => $Object,
-    Title => $title
-    &>
-
-    <& /Admin/Elements/EditCustomFields, %ARGS, title => $title, Object => $Object, ObjectType => 'RT::User' &>
-<%INIT>
-my $Object = RT::User->new( $session{'CurrentUser'} );
-
-$Object->Load($id) || Abort( loc( "Couldn't load object [_1]", $id ) );
-my $FriendlySubTypes =
-  RT::CustomField->new( $session{'CurrentUser'} )
-  ->FriendlyLookupType( $Object->CustomFieldLookupType );
-
-my $title = loc( 'Edit Custom Fields for [_1]', $Object->Name );
-
-</%INIT>
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/html/Admin/Users/Memberships.html b/rt/html/Admin/Users/Memberships.html
deleted file mode 100644
index 3e63239..0000000
--- a/rt/html/Admin/Users/Memberships.html
+++ /dev/null
@@ -1,65 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title  &>
-<& /Admin/Elements/UserTabs, 
-    id => $id, 
-    UserObj => $UserObj,
-    current_tab => $current_tab, 
-    Title => $title &>
-
-<h2><&|/l&>Groups</&></h2>
-
-<& /Elements/ShowMemberships, UserObj => $UserObj &>
-
-<%INIT>
-my $UserObj = RT::User->new($session{'CurrentUser'});
-$UserObj->Load($id) || Abort("Couldn't load user '$id'");
-my $title = loc("Memberships of the user [_1]", $UserObj->Name);
-my $current_tab = 'Admin/Users/Memberships.html?id='.$id;
-</%INIT>
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/html/Admin/Users/Modify.html b/rt/html/Admin/Users/Modify.html
index 8a24f9c..efa1f80 100644
--- a/rt/html/Admin/Users/Modify.html
+++ b/rt/html/Admin/Users/Modify.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => $title  &>
 <& /Admin/Elements/UserTabs, 
     id => $id, 
@@ -52,7 +52,7 @@
 
 <& /Elements/ListActions, actions => \@results &>
 
-<FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST ENCTYPE="multipart/form-data">
+<FORM ACTION="<%$RT::WebPath%>/Admin/Users/Modify.html" METHOD=POST>
 %if ($Create) {
 <INPUT TYPE=HIDDEN NAME=id VALUE="new">
 % } else {
@@ -91,11 +91,6 @@
 <input name="Gecos" value="<%$UserObj->Gecos%>">
 </TD></TR>
 <TR><TD ALIGN="RIGHT">
-<&|/l&>Language</&>: 
-</TD><TD>
-<& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang &>
-</TD></TR>
-<TR><TD ALIGN="RIGHT">
 <&|/l&>Extra info</&>: 
 </TD><TD>
 <textarea name="FreeformContactInfo" cols=20 rows=5><%$UserObj->FreeformContactInfo%></TEXTAREA>
@@ -204,30 +199,17 @@
 <TR>
 </TR>
 </TABLE>
-<BR>
-<& /Elements/TitleBoxStart, title => loc('Custom Fields') &>
-<TABLE>
-% my $CFs = $UserObj->CustomFields;
-% while (my $CF = $CFs->Next) {
-<TR VALIGN="TOP"><TD ALIGN="RIGHT">
-<% $CF->Name %>:
-</TD><TD>
-<& /Elements/EditCustomField, %ARGS, Object => $UserObj, CustomField => $CF &>
-</TD></TR>
-% }
-<TR>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
 <TR>
 <TD colspan="2">
 <& /Elements/TitleBoxStart, title => loc('Comments about this user') &>
-<TEXTAREA class="comments" name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL><%$UserObj->Comments%></TEXTAREA>
+<TEXTAREA name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL><%$UserObj->Comments%>
+</TEXTAREA>
 <& /Elements/TitleBoxEnd &>
 %if ($UserObj->Privileged) {
 <BR>
 <& /Elements/TitleBoxStart, title => loc('Signature') &>
-<TEXTAREA class="signature" COLS=80 ROWS=5 name="Signature" WRAP=HARD><%$UserObj->Signature%></TEXTAREA>
+<TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
+<%$UserObj->Signature%></TEXTAREA>
 <& /Elements/TitleBoxEnd &>
 % }
 
@@ -254,44 +236,46 @@ else {
 
     $current_tab = 'Admin/Users/Modify.html?id='.$id;
     if ($id eq 'new') {
-	( $val, $msg ) = $UserObj->Create(
-	    Name                  => $Name,
-	    EmailAddress          => $ARGS{'EmailAddress'},
-	    Name                  => $ARGS{'Name'},
-	    Comments              => $ARGS{'Comments'},
-	    Signature             => $ARGS{'Signature'},
-	    EmailAddress          => $ARGS{'EmailAddress'},
-	    FreeformContactInfo   => $ARGS{'FreeformContactInfo'},
-	    Organization          => $ARGS{'Organization'},
-	    RealName              => $ARGS{'RealName'},
-	    NickName              => $ARGS{'NickName'},
-	    Lang                  => $ARGS{'Lang'},
-	    EmailEncoding         => $ARGS{'EmailEncoding'},
-	    WebEncoding           => $ARGS{'WebEncoding'},
-	    ExternalContactInfoId => $ARGS{'ExternalContactInfoId'},
-	    ContactInfoSystem     => $ARGS{'ContactInfoSystem'},
-	    Gecos                 => $ARGS{'Gecos'},
-	    ExternalAuthId        => $ARGS{'ExternalAuthId'},
-	    AuthSystem            => $ARGS{'AuthSystem'},
-	    HomePhone             => $ARGS{'HomePhone'},
-	    WorkPhone             => $ARGS{'WorkPhone'},
-	    MobilePhone           => $ARGS{'MobilePhone'},
-	    PagerPhone            => $ARGS{'PagerPhone'},
-	    Address1              => $ARGS{'Address1'},
-	    Address2              => $ARGS{'Address2'},
-	    City                  => $ARGS{'City'},
-	    State                 => $ARGS{'State'},
-	    Zip                   => $ARGS{'Zip'},
-	    Country               => $ARGS{'Country'},
-	    Privileged           => $ARGS{'Privileged'},
-	    Disabled            => ($ARGS{'Enabled'} ? 0 : 1)
-	);
-
+    ( $val, $msg ) = $UserObj->Create(
+        Name                  => $Name,
+        EmailAddress          => $ARGS{'EmailAddress'},
+        Name                  => $ARGS{'Name'},
+        Comments              => $ARGS{'Comments'},
+        Signature             => $ARGS{'Signature'},
+        EmailAddress          => $ARGS{'EmailAddress'},
+        FreeformContactInfo   => $ARGS{'FreeformContactInfo'},
+        Organization          => $ARGS{'Organization'},
+        RealName              => $ARGS{'RealName'},
+        NickName              => $ARGS{'NickName'},
+        Lang                  => $ARGS{'Lang'},
+        EmailEncoding         => $ARGS{'EmailEncoding'},
+        WebEncoding           => $ARGS{'WebEncoding'},
+        ExternalContactInfoId => $ARGS{'ExternalContactInfoId'},
+        ContactInfoSystem     => $ARGS{'ContactInfoSystem'},
+        Gecos                 => $ARGS{'Gecos'},
+        ExternalAuthId        => $ARGS{'ExternalAuthId'},
+        AuthSystem            => $ARGS{'AuthSystem'},
+        HomePhone             => $ARGS{'HomePhone'},
+        WorkPhone             => $ARGS{'WorkPhone'},
+        MobilePhone           => $ARGS{'MobilePhone'},
+        PagerPhone            => $ARGS{'PagerPhone'},
+        Address1              => $ARGS{'Address1'},
+        Address2              => $ARGS{'Address2'},
+        City                  => $ARGS{'City'},
+        State                 => $ARGS{'State'},
+        Zip                   => $ARGS{'Zip'},
+        Country               => $ARGS{'Country'},
+        Privileged           => $ARGS{'Privileged'},
+        Disabled            => ($ARGS{'Enabled'} ? 0 : 1) 
+				       );
 	if ($val) {
 		push @results, $msg;
 	} else {
 		push @results, loc('User could not be created: [_1]', $msg);
-	}
+	}	
+
+	# set the id, so the the menu will have the right info
+	$id = $UserObj->Id;	
     } else {
 	$UserObj->Load($id) || $UserObj->Load($Name) || Abort("Couldn't load user '$Name'");
 	$val = $UserObj->Id();
@@ -299,13 +283,14 @@ else {
 
     if ($val) {
 	$title = loc("Modify the user [_1]", $UserObj->Name);
-    }
+    }	
 
     # If the create failed
     else {
 	$title = loc("Create a new user");
 	$Create = 1;
-    }
+    }    
+
 }
 
 
@@ -313,55 +298,49 @@ else {
 
 # If we have a user to modify, lets try. 
 if ($UserObj->Id && $id ne 'new') {
-
+    
     my @fields = qw(Name Comments Signature EmailAddress FreeformContactInfo 
 		    Organization RealName NickName Lang EmailEncoding WebEncoding 
 		    ExternalContactInfoId ContactInfoSystem Gecos ExternalAuthId 
 		    AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
-		    Address2 City State Zip Country 
+		Address2 City State Zip Country 
 		   );
-
+    
     my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
 					    Object => $UserObj,
 					    ARGSRef => \%ARGS );
     push (@results,@fieldresults);
-    push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $UserObj );
 
 
-    # {{{ Deal with special fields: Privileged, Enabled
-    if  ( $SetPrivileged and $Privileged != $UserObj->Privileged ) {
-         my ($code, $msg) = $UserObj->SetPrivileged($Privileged);
-         push @results, loc('Privileged status: [_1]', loc_fuzzy($msg));
-    }
-
-    #we're asking about enabled on the web page but really care about disabled.
-    $Disabled = $Enabled ? 0 : 1;
+# {{{ Deal with special fields: Privileged, Enabled and Password
+if  ( ($SetPrivileged) and ( $Privileged != $UserObj->Privileged) ) {
+my  ($code, $msg) = $UserObj->SetPrivileged($Privileged);
+     push @results, loc('Privileged status: [_1]', loc_fuzzy($msg));
+}
 
-    if  ( ($SetEnabled) and ( $Disabled != $UserObj->Disabled) ) { 
-        my  ($code, $msg) = $UserObj->SetDisabled($Disabled);
-        push @results, loc('Enabled status [_1]', loc_fuzzy($msg));
-    }
+#we're asking about enabled on the web page but really care about disabled.
+if ($Enabled == 1) {
+    $Disabled = 0;
+}	
+else {
+    $Disabled = 1;
+}
+if  ( ($SetEnabled) and ( $Disabled != $UserObj->Disabled) ) { 
+    my  ($code, $msg) = $UserObj->SetDisabled($Disabled);
+    push @results, loc('Enabled status [_1]', loc_fuzzy($msg));
+}
 
 
-    # }}}
+#TODO: make this report errors properly
+if ((defined $Pass1) and ($Pass1 ne '') and ($Pass1 eq $Pass2) and (!$UserObj->IsPassword($Pass1))) {
+    my ($code, $msg);
+    ($code, $msg) = $UserObj->SetPassword($Pass1);
+    push @results, loc('Password: [_1]', loc_fuzzy($msg));
+} elsif ( $Pass1 && ($Pass1 ne $Pass2)) {
+    push @results, loc("Passwords do not match.");
 }
 
-if ( $UserObj->Id ) {
-    my $password_not_set;
-    # Deal with Password field
-    if ( !$Pass1 and !$Pass2 ) {
-	$password_not_set = 1;
-    } elsif ( $Pass1 ne $Pass2 ) {
-	$password_not_set = 1;
-        push @results, loc("Passwords do not match.");
-    } elsif ( $Pass1 eq $Pass2 and !$UserObj->IsPassword($Pass1) ) {
-        my ($code, $msg) = $UserObj->SetPassword($Pass1);
-        push @results, loc_fuzzy($msg);
-	$password_not_set = 1 unless $code;
-    }
-    if ($id eq 'new' and $password_not_set) {
-	push @results, loc("A password was not set, so user won't be able to login.");
-    } 
+# }}}
 }
 
 
@@ -375,11 +354,6 @@ if ($UserObj->Privileged()) {
 }
 
 # }}}
-
-# set the id, so the the menu will have the right info, this needs to
-# be done here to avoid creating and then modifying a user
-$id = $UserObj->Id;
-
 </%INIT>
 
 
diff --git a/rt/html/Admin/Users/index.html b/rt/html/Admin/Users/index.html
index 1bbe867..f4cf2f0 100644
--- a/rt/html/Admin/Users/index.html
+++ b/rt/html/Admin/Users/index.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,33 +42,30 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('Select a user') &>
 <& /Admin/Elements/UserTabs, current_tab => 'Admin/Users/', 
     current_subtab => 'Admin/Users/',
     Title => loc('Select a user') &>
 
-<h1><%$caption%></h1>
-<p><&|/l&>Select a user</&>:</p>
-<ul>
+
+
+
+<%$caption%>:<BR>
+<UL>
 %if ($users->Count == 0) {
-<li><i><&|/l&>No users matching search criteria found.</&></i></li>
+<LI> <i><&|/l&>No users matching search criteria found.</&></i>
 % }
-%my @ids;
 %while ( $user = $users->Next) {
-%    push @ids, $user->Id;
 <LI><A HREF="Modify.html?id=<%$user->id%>"><%$user->Name || loc('(no name listed)')%></a></LI>
 %}
-</UL>
-%if (my $ids = join(',', @ids)) {
-<em>(<a href="<%$RT::WebPath%>/Download/Tabular/User/<% $ids %>/Users.tsv"><&|/l&>Download as a tab-delimited file</&></a>)</em><br>
-%}
 
+</UL>
 <br><br>
 <FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Users/index.html">
 
 <&|/l&>Find people whose</&> <& /Elements/SelectUsers &><BR>
-<input type="checkbox" name="FindDisabledUsers" value="1"> <&|/l&>Include disabled users in search.</&>
+<input type="checkbox" name="FindDisabledUsers"> <&|/l&>Include disabled users in search.</&>
 <BR>
 <div align=right><input type=submit value="<&|/l&>Go!</&>"></div> 
 </FORM>
@@ -81,26 +78,19 @@ if ($FindDisabledUsers) {
 	$users->{'find_disabled_rows'} = 1;
 }
 
-if (length $UserString) {
-    $caption = loc("Users matching search criteria");
-    if ($UserField =~ /^CustomField-(\d+)/) {
-	$users->LimitCustomField(
-	    CUSTOMFIELD => $1,
-	    OPERATOR => $UserOp,
-	    VALUE => $UserString,
-	); 
-    }
-    else {
-	$users->Limit(
-	    FIELD => $UserField,
-	    OPERATOR => $UserOp,
-	    VALUE => $UserString,
-	); 
-    }
+unless (defined $UserString) {
+    $users->LimitToPrivileged();
+    $caption = loc("Privileged users");
 }
 else {
-    $caption = loc("Privileged users");
-    $users->LimitToPrivileged;
+    $caption = loc("Users matching search criteria");
+
+  if ($UserString) {
+	$users->Limit( FIELD => $UserField,
+		        OPERATOR => $UserOp,
+		       VALUE => $UserString); 
+
+}
 }
 </%INIT>
 <%ARGS>
diff --git a/rt/html/Admin/autohandler b/rt/html/Admin/autohandler
deleted file mode 100644
index def6101..0000000
--- a/rt/html/Admin/autohandler
+++ /dev/null
@@ -1,51 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<%init>
-$m->call_next(%ARGS) if $session{'CurrentUser'}->UserObj->HasRight(
-    Right => 'ShowConfigTab',
-    Object => $RT::System,
-);
-</%init>
\ No newline at end of file
diff --git a/rt/html/Admin/index.html b/rt/html/Admin/index.html
index 01ba24d..5aec88b 100644
--- a/rt/html/Admin/index.html
+++ b/rt/html/Admin/index.html
@@ -1,11 +1,11 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
-%# (Except where explicitly superseded by other copyright notices),
+%# (Except where explicitly superseded by other copyright notices)
 %# 
 %# 
 %# LICENSE:
@@ -31,7 +31,7 @@
 %# to you to modify and distribute this software under the terms of
 %# the GNU General Public License and is only of importance to you if
 %# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.),
+%# community by submitting them to Best Practical Solutions, LLC.)
 %# 
 %# By intentionally submitting any modifications, corrections or
 %# derivatives to this work, or any other work intended for use with
@@ -42,58 +42,21 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Admin/Elements/Header, Title => loc('RT Administration') &>
 <& /Admin/Elements/Tabs, Title => loc('RT Administration') &>
 
 <ul>
-%    foreach my $key (sort keys %$tabs) {
-<li><font size="+2"><a href="<%$RT::WebPath%>/<%$tabs->{$key}->{'path'}|n %>"><%$tabs->{$key} ->{'title'}%></a></font><br>
-<%$tabs->{$key}->{description}%>
+<li><font size="+2"><a href="Users/"><&|/l&>Users</&></a></font><br>
+<&|/l&>Manage users and passwords</&>
+</li>
+<li><font size="+2"><a href="Groups/"><&|/l&>Groups</&></a></font><br>
+<&|/l&>Manage groups and group membership</&>
+</li>
+<li><font size="+2"><a href="Queues/"><&|/l&>Queues</&></a></font><br>
+<&|/l&>Manage queues and queue-specific properties</&>
+</li>
+<li><font size="+2"><a href="Global/"><&|/l&>Global</&></a></font><br>
+<&|/l&>Manage properties and configuration which apply to all queues</&>
 </li>
-%}
 </ul>
-<%init>
-
-
-
-my $tabs = {
-    A => {
-        title       => loc('Users'),
-        path        => 'Admin/Users/index.html',
-        description => loc('Manage users and passwords'),
-    },
-    B => {
-        title => loc('Groups'),
-        path  => 'Admin/Groups/index.html',
-        description => loc('Manage groups and group membership'),
-    },
-    C => {
-        title       => loc('Queues'),
-        path        => 'Admin/Queues/index.html',
-        description => loc('Manage queues and queue-specific properties'),
-    },
-    D => {
-        'title'     => loc('Custom Fields'),
-        description => loc('Manage custom fields and custom field values'),
-          path      => 'Admin/CustomFields/index.html',
-    },
-    E => {
-        'title'     => loc('Global'),
-        path        => 'Admin/Global/index.html',
-        description =>
-          loc('Manage properties and configuration which apply to all queues'),
-    },
-    F => {
-        'title'     => loc('Tools'),
-        path        => 'Admin/Tools/index.html',
-        description => loc('Use other RT administrative tools')
-    },
-};
-
-  $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
-
-
-
-
-</%init>
diff --git a/rt/html/Approvals/Display.html b/rt/html/Approvals/Display.html
index d9d6df5..8b5a6c3 100644
--- a/rt/html/Approvals/Display.html
+++ b/rt/html/Approvals/Display.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title =>  $title &>
 
 <& Elements/Tabs, 
diff --git a/rt/html/Approvals/Elements/Approve b/rt/html/Approvals/Elements/Approve
index bf786fb..f4f015f 100644
--- a/rt/html/Approvals/Elements/Approve
+++ b/rt/html/Approvals/Elements/Approve
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <tr bgcolor="#b9b9ff">
 <td colspan=2><font size="3">
 <a href="<%$RT::WebPath%>/Approvals/Display.html?id=<%$ticket->Id%>"><% loc("#[_1]: [_2]", $ticket->Id, $ticket->Subject) %></a> (<%loc($ticket->Status)%>)</font></td>
diff --git a/rt/html/Approvals/Elements/PendingMyApproval b/rt/html/Approvals/Elements/PendingMyApproval
index f13ddf0..abc76cc 100644
--- a/rt/html/Approvals/Elements/PendingMyApproval
+++ b/rt/html/Approvals/Elements/PendingMyApproval
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <table width="100%">
 % my ($i, $class);
 % my %done;
diff --git a/rt/html/Approvals/Elements/ShowDependency b/rt/html/Approvals/Elements/ShowDependency
index e8d0b00..b867096 100644
--- a/rt/html/Approvals/Elements/ShowDependency
+++ b/rt/html/Approvals/Elements/ShowDependency
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % my $approving = $Ticket->DependedOnBy();
 % if ($approving->Count) {
 <h3><&|/l&>Tickets which depend on this approval:</&></h3>
diff --git a/rt/html/Approvals/Elements/Tabs b/rt/html/Approvals/Elements/Tabs
index 03bdc26..99cdec8 100644
--- a/rt/html/Approvals/Elements/Tabs
+++ b/rt/html/Approvals/Elements/Tabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Tabs,
     tabs => $tabs, 
     current_toptab => 'Approvals/', 
diff --git a/rt/html/Approvals/index.html b/rt/html/Approvals/index.html
index 88c277c..93d979a 100644
--- a/rt/html/Approvals/index.html
+++ b/rt/html/Approvals/index.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("My approvals") &>
 <& /Approvals/Elements/Tabs, Title => loc("My approvals") &>
 
diff --git a/rt/html/Download/CustomFieldValue/dhandler b/rt/html/Download/CustomFieldValue/dhandler
deleted file mode 100644
index 5219680..0000000
--- a/rt/html/Download/CustomFieldValue/dhandler
+++ /dev/null
@@ -1,75 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<%perl>
-my $id;
-my $arg = $m->dhandler_arg;                # get rest of path
-if ($arg =~ /^(\d+)\//) {
-    $id = $1;
-}
-else {
-    Abort("Corrupted customfieldvalue URL.");
-}
-my $OCFV = RT::ObjectCustomFieldValue->new($session{'CurrentUser'});
-$OCFV->Load($id) || Abort("OCFV '$id' could not be loaded");
-
-unless ($OCFV->id) {
-    Abort("Bad OCFV id. Couldn't find OCFV '$id'\n");
-}
-
-my $content_type = $OCFV->ContentType || 'text/plain';
-    
-unless ($RT::TrustHTMLAttachments) {
-    $content_type = 'text/plain' if ($content_type =~ /^text\/html/i);
-}
-
-$r->content_type( $content_type );
-$m->clear_buffer();
-$m->out($OCFV->LargeContent);
-$m->abort; 
-</%perl>
-<%attr>
-AutoFlush => 0
-</%attr>
diff --git a/rt/html/Download/Tabular/dhandler b/rt/html/Download/Tabular/dhandler
deleted file mode 100644
index 3965a99..0000000
--- a/rt/html/Download/Tabular/dhandler
+++ /dev/null
@@ -1,74 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<%perl>
-my ($class, $filename, @ids);
-my $arg = $m->dhandler_arg;                # get rest of path
-if ($arg =~ /^(\w+)\/([,\d]+)(?:\/([^\/]+))?/) {
-    $class = "RT::$1";
-    $filename = $3 || "$1s.tsv";
-    @ids = sort split(/,+/, $2);
-}
-else {
-    Abort("Corrupted tabular URL.");
-}
-
-my @cols = $class->BasicColumns or return;
-
-#$r->content_type( 'application/octet-stream' );
-$r->content_type( 'text/plain' );
-$r->headers_out->{'Content-Disposition'} = "attachment; filename=$filename";
-$m->clear_buffer();
-$m->out(join("\t", "Id", map $_->[1], @cols), "\n");
-foreach my $id (@ids) {
-    my $obj = $class->new;
-    $obj->Load($id) or next;
-    $m->out(join("\t", map $obj->$_, "Id", map $_->[0], @cols), "\n");
-}
-$m->abort; 
-</%perl>
-<%attr>
-AutoFlush => 0
-</%attr>
diff --git a/rt/html/Elements/BevelBoxRaisedEnd b/rt/html/Elements/BevelBoxRaisedEnd
index e1d1edb..f1c794b 100644
--- a/rt/html/Elements/BevelBoxRaisedEnd
+++ b/rt/html/Elements/BevelBoxRaisedEnd
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
   </TD>
 </TR>
 </table>
diff --git a/rt/html/Elements/BevelBoxRaisedStart b/rt/html/Elements/BevelBoxRaisedStart
index 6c5a613..ca504e4 100644
--- a/rt/html/Elements/BevelBoxRaisedStart
+++ b/rt/html/Elements/BevelBoxRaisedStart
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <table cellspacing=0 cellpadding=0 width=100% height=100%>
       <TR>
         <TD width=100% height=100%> 
diff --git a/rt/html/Elements/Callback b/rt/html/Elements/Callback
index 937e923..cbec188 100644
--- a/rt/html/Elements/Callback
+++ b/rt/html/Elements/Callback
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,45 +42,43 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%once>
-my %cache;
+my (%cache, $check);
 </%once>
 <%init>
+# checks for inode change time for each callback directory
+my $new_check = join(
+    $;, map { $_->[1] => (stat("$_->[1]/Callbacks"))[10] } $m->interp->resolver->comp_root_array
+) or return;
+
 $Page = $m->callers(1)->path unless ($Page);
 
-my $CacheKey = "Callback--$Page--$_CallbackName";
-my $callbacks = $cache{$CacheKey} || $m->notes($CacheKey);
+my $callbacks;
+if ($new_check eq $check) {
+    $callbacks = $cache{$Page,$_CallbackName};
+}
+else {
+    $check = $new_check;
+}
 
 if (!$callbacks) {
-    my $path  = "/Callbacks/*$Page/$_CallbackName";
+    my $path = "/Callbacks/*$Page/$_CallbackName";
+    $callbacks = [ $m->interp->resolver->glob_path($path) ];
+    @$callbacks = grep !/^\.|~$/, @$callbacks; #skip backup files
+
+    #skip files without a package
+    my $invalid_base = "/Callbacks/$Page/$_CallbackName";
+    @$callbacks = grep !/^$invalid_base$/, @$callbacks;
+
+
 
-    # Due to API changes after Mason 1.28, we have to check for which
-    # version we're running when getting the component roots
-    my @roots = map { $_->[1] }
-                    $HTML::Mason::VERSION <= 1.28
-                        ? $m->interp->resolver->comp_root_array
-                        : $m->interp->comp_root_array;
-    
-    my %seen;
-    
-    for my $root (@roots) {
-        push @$callbacks,
-            # Skip backup files, files without a leading package name,
-            # and files we've already seen
-            grep {     !/^\.|~$/
-                   and $_ ne "/Callbacks/$Page/$_CallbackName"
-                   and not $seen{$_}++ }
-                 $m->interp->resolver->glob_path($path, $root);
-    }
-    
-    $m->notes($CacheKey => $callbacks);
-    $cache{$Page,$_CallbackName} = $callbacks if !$RT::DevelMode;
+    $cache{$Page,$_CallbackName} = $callbacks;
 }
 
 my @rv;
 foreach my $comp (sort @$callbacks) {
-    push @rv, $m->comp($comp, %ARGS);
+        push @rv, $m->comp($comp, %ARGS) if $m->comp_exists($comp);
 }
 return @rv;
 </%init>
diff --git a/rt/html/Elements/Checkbox b/rt/html/Elements/Checkbox
index f2256fb..146de6a 100644
--- a/rt/html/Elements/Checkbox
+++ b/rt/html/Elements/Checkbox
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,8 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<INPUT TYPE="Checkbox" NAME="<%$Name%>" value="1" <%$IsChecked%>>
+%# }}} END BPS TAGGED BLOCK
+<INPUT TYPE="Checkbox" NAME ="<%$Name%>" <%$IsChecked%>>
 
 <%ARGS>
 $Name => undef
diff --git a/rt/html/Elements/CollectionAsTable/Header b/rt/html/Elements/CollectionAsTable/Header
index 9ed4be8..2d1574d 100644
--- a/rt/html/Elements/CollectionAsTable/Header
+++ b/rt/html/Elements/CollectionAsTable/Header
@@ -1,14 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# BEGIN LICENSE BLOCK;
 %# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 %# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
+%# (Except where explictly superceded by other copyright notices)
 %# 
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
@@ -20,32 +14,16 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
 %# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
 %# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
+%# END LICENSE BLOCK
+
 <%ARGS>
 @Format => undef
-$FormatString => undef
 $AllowSorting => undef
 $Order=>undef
 $BaseURL => undef
@@ -54,63 +32,53 @@ $Rows => undef
 $Page => undef
 $maxitems => undef
 </%ARGS>
-<TR class="collection-as-table">
+<TR>
 <%perl>
 
-my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page, Format => $FormatString );
+my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page );
 
 my $item = 0;
+$$maxitems = 0;
 foreach my $col (@Format) {
     $item++;
+    $$maxitems = $item if $item > $$maxitems;
     if ( $col->{title} eq 'NEWLINE' ) {
-        while ( $item < $maxitems ) {
-            $m->out(qq{<th class="collection-as-table">&nbsp;</th>\n});
-            $item++;
-        }
-
-        $item = 0;
-        $m->out(qq{</TR>\n<TR class="collection-as-table">});
+        $m->out('</TR>       <TR>');
+	$item = 0;
     }
     else {
-        $m->out('<TH class="collection-as-table">');
+        $m->out('<TH align="center">');
         my $title = $col->{title};
         $title =~ s/^__(.*)__$/$1/o;
-        $title = (
-            $m->comp(
-                '/Elements/RT__Ticket/ColumnMap',
-                Name => $title,
-                Attr => 'title'
-              )
-              || $title
-        );
-        if (
-               $AllowSorting
+        $title = ( $m->comp('/Elements/RT__Ticket/ColumnMap', 
+                     Name => $title, 
+                     Attr => 'title' 
+                 )  
+                     || $title
+                 );
+        if (   $AllowSorting
             && $col->{'attribute'}
-            && $m->comp(
-                '/Elements/RT__Ticket/ColumnMap',
-                Name => $col->{'attribute'},
-                Attr => 'attribute'
-            )
-          )
+            && $m->comp('/Elements/RT__Ticket/ColumnMap',
+                          Name => $col->{'attribute'},
+                          Attr => 'attribute' ) 
+           )
         {
 
             $m->out(
-                '<a href="' . $BaseURL
+                '<a href="' . $BaseURL 
                   . $m->comp(
                     '/Elements/QueryString',
                     %generic_query_args,
                     OrderBy => (
-                        $m->comp(
-                            '/Elements/RT__Ticket/ColumnMap',
-                            Name => $col->{'attribute'},
-                            Attr => 'attribute'
-                          )
+                        $m->comp('/Elements/RT__Ticket/ColumnMap',
+                          Name => $col->{'attribute'},
+                          Attr => 'attribute' 
+                    )
                           || $col->{'attribute'}
                     ),
                     Order => ( $ARGS{'Order'} eq 'ASC' ? 'DESC' : 'ASC' )
-                  )
-                  . '">'
-                  . loc($title) . '</a>'
+                  ).
+                  '">' . loc($title) . '</a>'
             );
         }
         else {
diff --git a/rt/html/Elements/CollectionAsTable/ParseFormat b/rt/html/Elements/CollectionAsTable/ParseFormat
index 57434ef..c7b709b 100644
--- a/rt/html/Elements/CollectionAsTable/ParseFormat
+++ b/rt/html/Elements/CollectionAsTable/ParseFormat
@@ -1,14 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# BEGIN LICENSE BLOCK;
 %# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 %# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
+%# (Except where explictly superceded by other copyright notices)
 %# 
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
@@ -20,59 +14,44 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
 %# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
 %# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
+%# END LICENSE BLOCK
+
 <%ARGS>
 $Format
 </%ARGS>
 
 <%init>
-use Regexp::Common;
+use Regexp::Common qw(delimited);
 my @Columns;
+#my $quoted = qr[$RE{delimited}{-delim=>qq{\'\"}}|(?:\{|\}|\w|\.)+];
+my $justquoted = qr[$RE{delimited}{-delim=>qq{\'\"}}];
+#my $quoted =        $RE{quoted}{-esc};
+my $word = qr [(?:\{|\}|\w|\.)+];
 
-while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) {
+while ($Format =~ /($justquoted|$word)/igx) {
     my $col = $1;
 
-    if ($col =~ /^$RE{quoted}$/o) {
+    if ($col =~ /^$RE{quoted}{-esc}$/) {
         substr($col,0,1) = "";
         substr($col,-1,1) = "";
     }
 
     my $colref;
-
-    if ( $col =~ s!/STYLE:([^/]+)!!io ) {
+    if ( $col =~ s/\/STYLE:(.*?)$//io ) {
         $colref->{'style'} = $1;
     }
-    if ( $col =~ s!/CLASS:([^/]+)!!io ) {
+    if ( $col =~ s/\/CLASS:(.*?)$//io ) {
         $colref->{'class'} = $1;
     }
-    if ( $col =~ s!/TITLE:([^/]+)!!io ) {
+    if ( $col =~ s/\/TITLE:(.*?)$//io ) {
         $colref->{'title'} = $1;
     }
-    if ( $col =~ s!/ALIGN:([^\/]+)!!io ) {
-        $colref->{'align'} = $1;
-    }
     if ( $col =~ /__(.*?)__/gio ) {
         my @subcols;
         while ( $col =~ s/^(.*?)__(.*?)__//o ) {
diff --git a/rt/html/Elements/CollectionAsTable/Row b/rt/html/Elements/CollectionAsTable/Row
index 3316bc0..701966f 100644
--- a/rt/html/Elements/CollectionAsTable/Row
+++ b/rt/html/Elements/CollectionAsTable/Row
@@ -1,14 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# BEGIN LICENSE BLOCK;
 %# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 %# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
+%# (Except where explictly superceded by other copyright notices)
 %# 
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
@@ -20,29 +14,14 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
 %# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# END LICENSE BLOCK
+
 <%ARGS>
 $i => undef
 @Format => undef
@@ -53,56 +32,42 @@ $Warning => undef
 </%ARGS>
 
 <%PERL>
-$m->out('<TR class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
+$m->out( '<TR class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
 my $item;
 foreach my $column (@Format) {
     if ( $column->{title} eq 'NEWLINE' ) {
-        while ( $item < $maxitems ) {
-            $m->out(qq{<td class="collection-as-table">&nbsp;</td>\n});
-            $item++;
-        }
-        $item = 0;
+	while ($item < $maxitems) {
+	    $m->out("<td>&nbsp;</td>\n");
+	    $item++;
+	}
+	$item = 0;
         $m->out('</TR>');
-        $m->out('<TR class="'
-              . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' )
-              . '" >' );
+        $m->out( '<TR class="' . 
+               ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
         next;
     }
     $item++;
-    $m->out('<td class="collection-as-table" ');
-    $m->out( 'align="' . $column->{align} . '"' ) if ( $column->{align} );
-    $m->out('>');
+    $m->out('<td align="left">');
     foreach my $subcol ( @{ $column->{output} } ) {
         if ( $subcol =~ /^__(.*?)__$/o ) {
-            my $col   = $1;
-            my $value = $m->comp(
-                '/Elements/RT__Ticket/ColumnMap',
-                Name => $col,
-                Attr => 'value'
-            );
-            my @out;
-
-            if ( $value && ref($value) ) {
-
-                # All HTML snippets are returned by the callback function
-                # as scalar references.  Data fetched from the objects are
-                # plain scalars, and needs to be escaped properly.
-                @out =
-                    map {
-                        ref($_) ? $$_ : $m->interp->apply_escapes( $_ => 'h' )
-                      } &{$value}( $record, $i )
-                ;
-            }
-            else {
+            my $col = $1;
+            my $value = $m->comp('/Elements/RT__Ticket/ColumnMap', Name => $col, Attr => 'value');
 
-                # Simple value; just escape it.
-                @out = $m->interp->apply_escapes( $value => 'h' );
+            if ( $value && ref($value)) {
+            	# All HTML snippets are returned by the callback function
+		# as scalar references.  Data fetched from the objects are
+		# plain scalars, and needs to be escaped properly.
+		$m->out( 
+		    map { ref($_) ? $$_ : $m->interp->apply_escapes( $_ => 'h' ) }
+		    &{ $value } ( $record, $i )
+	        );
+            } else {
+		# Simple value; just escape it.
+                $m->out( $m->interp->apply_escapes( $value => 'h' ) );
             }
-            s/\n/<br>/gs for @out;
-            $m->out( @out );
         }
         else {
-            $m->out($subcol);
+            $m->out( Encode::decode_utf8($subcol) );
         }
     }
     $m->out('</td>');
diff --git a/rt/html/Elements/CreateTicket b/rt/html/Elements/CreateTicket
index bd60bbd..70c94e7 100644
--- a/rt/html/Elements/CreateTicket
+++ b/rt/html/Elements/CreateTicket
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<FORM ACTION="<% $RT::WebPath %>/Ticket/Create.html" NAME="CreateTicketInQueue">
+%# }}} END BPS TAGGED BLOCK
+<FORM ACTION="<% $RT::WebPath%>/Ticket/Create.html">
 <&|/l, $m->scomp('/Elements/SelectNewTicketQueue')&><input type="submit" value="New ticket in">&nbsp;[_1]</&>
 </FORM>
diff --git a/rt/html/Elements/EditCustomField b/rt/html/Elements/EditCustomField
deleted file mode 100644
index d2398c9..0000000
--- a/rt/html/Elements/EditCustomField
+++ /dev/null
@@ -1,89 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<%INIT>
-my $Values;
-if ($Object) {
-    $Values = $Object->CustomFieldValues($CustomField->id);
-    $Values->Columns( qw( id CustomField ObjectType ObjectId Disabled Content ContentType ContentEncoding ) );
-    $NamePrefix ||= join('-', 'Object', ref($Object), $Object->Id, 'CustomField', '');
-}
-my $Type = $CustomField->Type;
-
-return unless ($Type); # if we can't see the type, all hell will break loose.
-
-my $MaxValues = $CustomField->MaxValues;
-if ($MaxValues == 1 and $Object and $Values) {
-    # what exactly is this doing?  Without the "unless" it breaks RTFM
-    # transaction extraction into articles.
-    $Default = ($Values->First ? $Values->First->Content : '') unless $Default;
-    $Values->GotoFirstItem;
-}
-# The "Magic" hidden input causes RT to know that we were trying to edit the field, even if 
-# we don't see a value later, since browsers aren't compelled to submit empty form fields
-$m->out("\n".'<input type="hidden" name="'.$NamePrefix.$CustomField->Id.'-Values-Magic" value="1">'."\n");
-
-return $m->comp(
-    "EditCustomField$Type",
-    %ARGS,
-    Rows => $Rows,
-    Cols => $Cols,
-    Default => $Default,
-    Object => $Object,
-    Values => $Values,
-    MaxValues => $MaxValues,
-    Multiple => ($MaxValues != 1),
-    NamePrefix => $NamePrefix,
-    CustomField => $CustomField,
-);
-</%INIT>
-<%ARGS>
-$Object => undef
-$CustomField => undef
-$NamePrefix => undef
-$Rows => 5
-$Cols => 15
-$Default => undef
-</%ARGS>
diff --git a/rt/html/Elements/EditCustomFieldBinary b/rt/html/Elements/EditCustomFieldBinary
deleted file mode 100644
index 0028256..0000000
--- a/rt/html/Elements/EditCustomFieldBinary
+++ /dev/null
@@ -1,60 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-% while ($Values and my $value = $Values->Next ) {
-%# XXX - let user download the file(s) here?
-<input type="checkbox" name="<%$NamePrefix%><%$CustomField->Id%>-DeleteValueIds" value="<% $value->Id %>"><a href="<%$RT::WebPath%>/Download/CustomFieldValue/<% $value->Id %>/<% $value->Content %>"><% $value->Content %></a><br>
-% }
-% if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
-<input type="file" name="<%$NamePrefix%><%$CustomField->Id%>-Upload">
-% }
-<%ARGS>
-$Object => undef
-$CustomField => undef
-$NamePrefix => undef
-$Default => undef
-$Values => undef
-$MaxValues => undef
-</%ARGS>
diff --git a/rt/html/Elements/EditCustomFieldImage b/rt/html/Elements/EditCustomFieldImage
deleted file mode 100644
index b378cea..0000000
--- a/rt/html/Elements/EditCustomFieldImage
+++ /dev/null
@@ -1,60 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-% while ($Values and my $value = $Values->Next ) {
-<input type="checkbox" name="<%$NamePrefix%><%$CustomField->Id%>-DeleteValueIds" value="<% $value->Id %>"><& ShowCustomFieldImage, Object => $value &>
-<br>
-% }
-% if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
-<input type="file" name="<%$NamePrefix%><%$CustomField->Id%>-Upload">
-% }
-<%ARGS>
-$Object => undef
-$CustomField => undef
-$NamePrefix => undef
-$Default => undef
-$Values => undef
-$MaxValues => undef
-</%ARGS>
diff --git a/rt/html/Elements/EditCustomFieldSelect b/rt/html/Elements/EditCustomFieldSelect
deleted file mode 100644
index db33a68..0000000
--- a/rt/html/Elements/EditCustomFieldSelect
+++ /dev/null
@@ -1,71 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-      <select name="<%$NamePrefix%><%$CustomField->Id%>-Values"
-        size="<%$Rows%>"
-        <% $Multiple && 'MULTIPLE' %>>
-% my $selected;
-% my $CFVs = $CustomField->Values;
-% while ($CFVs and my $value = $CFVs->Next ) {
-        <option value="<%$value->Name%>" 
-% if ($Values) {
-            <% $Values->HasEntry($value->Name) && ($selected = 1) && 'SELECTED' %>
-% } elsif ($Default) {
-            <% ($Default eq $value->Name) && ($selected = 1) && 'SELECTED' %>
-% }
-            ><% $value->Name%></option>
-% }
-        <option value="" <% !$selected && 'SELECTED' %>><&|/l&>(no value)</&></option>
-      </select>
-<%ARGS>
-$Object => undef
-$CustomField => undef
-$NamePrefix => undef
-$Default => undef
-$Values => undef
-$Multiple => 0
-$Cols
-$Rows
-</%ARGS>
diff --git a/rt/html/Elements/EditCustomFieldText b/rt/html/Elements/EditCustomFieldText
deleted file mode 100644
index 1aac328..0000000
--- a/rt/html/Elements/EditCustomFieldText
+++ /dev/null
@@ -1,65 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-% while ($Values and my $value = $Values->Next ) {
-<textarea cols=<%$Cols%> rows=<%$Rows%> name="<%$NamePrefix%><%$CustomField->Id%>-Values"><% $value->Content %></textarea><br>
-% }
-% if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
-<textarea cols=<%$Cols%> rows=<%$Rows%> name="<%$NamePrefix%><%$CustomField->Id%>-Values"><% $Default %></textarea>
-% }
-<%INIT>
-# XXX - MultiValue textarea is for now outlawed.
-$MaxValues = 1;
-</%INIT>
-<%ARGS>
-$Object => undef
-$CustomField => undef
-$NamePrefix => undef
-$Default => undef
-$Values => undef
-$MaxValues => undef
-$Cols
-$Rows
-</%ARGS>
diff --git a/rt/html/Elements/EditCustomFieldWikitext b/rt/html/Elements/EditCustomFieldWikitext
deleted file mode 100644
index 1aac328..0000000
--- a/rt/html/Elements/EditCustomFieldWikitext
+++ /dev/null
@@ -1,65 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-% while ($Values and my $value = $Values->Next ) {
-<textarea cols=<%$Cols%> rows=<%$Rows%> name="<%$NamePrefix%><%$CustomField->Id%>-Values"><% $value->Content %></textarea><br>
-% }
-% if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
-<textarea cols=<%$Cols%> rows=<%$Rows%> name="<%$NamePrefix%><%$CustomField->Id%>-Values"><% $Default %></textarea>
-% }
-<%INIT>
-# XXX - MultiValue textarea is for now outlawed.
-$MaxValues = 1;
-</%INIT>
-<%ARGS>
-$Object => undef
-$CustomField => undef
-$NamePrefix => undef
-$Default => undef
-$Values => undef
-$MaxValues => undef
-$Cols
-$Rows
-</%ARGS>
diff --git a/rt/html/Elements/EditLinks b/rt/html/Elements/EditLinks
index 68c08dd..b66291f 100755
--- a/rt/html/Elements/EditLinks
+++ b/rt/html/Elements/EditLinks
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <TABLE width=100%>
   <TR>
     <TD VALIGN=TOP WIDTH=50%>
@@ -57,7 +57,7 @@
     <td class="labeltop"><&|/l&>Depends on</&>:</td>
     <td class="value">
 % while (my $link = $Object->DependsOn->Next) {
-      <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1">
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
         <& ShowLink, URI => $link->TargetURI &><br>
 % }
     </td>
@@ -67,7 +67,7 @@
     <td class="value">
 % while (my $link = $Object->DependedOnBy->Next) {
 % my $member = $link->BaseObj;
-      <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1">
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
         <& ShowLink, URI => $link->BaseURI &><br>
 % }
     </td>
@@ -76,7 +76,7 @@
     <td class="labeltop"><&|/l&>Parents</&>:</td>
     <td class="value">
 % while (my $link = $Object->MemberOf->Next) {
-      <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1">
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
         <& ShowLink, URI => $link->TargetURI &><br>
 % }
     </td>
@@ -85,7 +85,7 @@
     <td class="labeltop"><&|/l&>Children</&>:</td>
     <td class="value">
 % while (my $link = $Object->Members->Next) {
-      <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1">
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
         <& ShowLink, URI => $link->BaseURI &><br>
 % }
     </td>
@@ -94,7 +94,7 @@
     <td class="labeltop"><&|/l&>Refers to</&>:</td>
     <td class="value">
 % while (my $link = $Object->RefersTo->Next) {
-      <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>" value="1">
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
         <& ShowLink, URI => $link->TargetURI &><br>
 %}
     </td>
@@ -103,7 +103,7 @@
     <td class="labeltop"><&|/l&>Referred to by</&>:</td>
     <td class="value">
 % while (my $link = $Object->ReferredToBy->Next) {
-      <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-" value="1">
+      <INPUT TYPE=CHECKBOX NAME="DeleteLink-<%$link->Base%>-<%$link->Type%>-">
         <& ShowLink, URI => $link->BaseURI &><br>
 % }
     </td>
@@ -114,12 +114,9 @@
 <TD VALIGN=TOP>
 <h3><&|/l&>New Links</&></h3>
 % if (ref($Object) eq 'RT::Ticket') {
-<i><&|/l&>Enter tickets or URIs to link tickets to. Separate multiple entries with spaces.</&>
-<& /Elements/Callback, _CallbackName => 'ExtraLinkInstructions' &>
-</i><br>
+<i><&|/l&>Enter tickets or URIs to link tickets to. Separate multiple entries with spaces.</&></i><br>
 % } elsif (ref($Object) eq 'RT::Queue') {
-<i><&|/l&>Enter queues or URIs to link queues to. Separate multiple entries with spaces.</&>
-</i><br>
+<i><&|/l&>Enter queues or URIs to link queues to. Separate multiple entries with spaces.</&></i><br>
 % } else {
 <i><&|/l&>Enter objects or URIs to link objects to. Separate multiple entries with spaces.</&></i><br>
 % }
diff --git a/rt/html/Elements/Error b/rt/html/Elements/Error
index bc5a188..3aa77a5 100644
--- a/rt/html/Elements/Error
+++ b/rt/html/Elements/Error
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Callback, %ARGS, error => $error &>
 <& /Elements/Header, Code => $Code, Why => $Why &>
 <& /Elements/Tabs &>
@@ -53,11 +53,9 @@
 <%$Details%>
 </font>
 <& /Elements/TitleBoxEnd &>
+</body>
+</HTML>
 
-<%cleanup>
-$m->comp('/Elements/Footer');
-$m->abort();
-</%cleanup>
 
 <%args>
 $Code => undef
diff --git a/rt/html/Elements/Footer b/rt/html/Elements/Footer
index 78a116f..12432ca 100644
--- a/rt/html/Elements/Footer
+++ b/rt/html/Elements/Footer
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % if ($Menu) {
 </td>
 </tr>
@@ -52,13 +52,21 @@
 <& /Elements/Callback, %ARGS &>
 <!--
 <div class="bpscredits">
-<&|/l,     '&#187;&#124;&#171;', $RT::VERSION, '2005', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&><br>
+<&|/l,     '&#187;&#124;&#171;', 
+     $RT::VERSION, 
+     '2004', 
+    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',
+&>[_1] RT [_2] Copyright 1996-[_3] [_4].</&><br>
 % if (!$Menu) {
 <&|/l&>Distributed under version 2 <a href="http://www.gnu.org/copyleft/gpl.html"> of the GNU GPL.</a></&><br>
 <&|/l, '<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>' &>To inquire about support, training, custom development or licensing, please contact [_1].</&><br>
 % }
 </div>
 -->
+% if ($Debug) {
+<HR>
+<b><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></b>
+% }
 % if ($Debug >= 2 ) {
 % require Data::Dumper;
 % my $d = Data::Dumper->new([\%ARGS], [qw(%ARGS)]);
@@ -66,7 +74,6 @@
 <%$d->Dump() %>
 </pre>
 % }
-<div class="page-stats"><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></div>
 % if ($Menu) {
 </TD>
 </TR>
diff --git a/rt/html/Elements/GotoTicket b/rt/html/Elements/GotoTicket
index 869d57e..393b28f 100644
--- a/rt/html/Elements/GotoTicket
+++ b/rt/html/Elements/GotoTicket
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,5 +42,5 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <FORM ACTION="<%$RT::WebPath%>/Ticket/Display.html"><input type=submit value="<&|/l&>Goto ticket</&>">&nbsp;<input size=5 name=id accesskey="0"></FORM>
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index a2563fe..27658df 100644
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %#<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
@@ -77,17 +77,15 @@ ONLOAD="
 >
 <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
   <tr> 
-    <td colspan=2 rowspan=2><img border=0 alt="freeside" src="<%$RT::WebImagesURL%>/small-logo.png" width="92" height="62"></td>
-    <td align="left" rowspan=2><font size=6><% &RT::URI::freeside::FreesideGetConfig('company_name') %> Ticketing</font></td>
+    <td rowspan=2><img border=0 alt="freeside" src="<%$RT::WebImagesURL%>/small-logo.png" width="92" height="62"></td>
+    <td align="left" rowspan=2><font size=6><% FS::Conf->new->config('company_name') %> Ticketing</font></td>
     <td align="right" valign="top">
 % if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) {
 <SPAN STYLE="display: none"><A HREF="#skipnav"><&|/l&>Skip Menu</&></A> |</SPAN>
-%if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) {
 <A  HREF="<%$RT::WebPath%><% $Prefs %>" ><&|/l&>Preferences</&></A>
-% }
 <& /Elements/Callback, %ARGS &>
 % unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
-| <A  HREF="<%$RT::WebPath%>/NoAuth/Logout.html<%$URL ? "?URL=".$URL : ''%>"><&|/l&>Logout</&></a>
+| <A  HREF="<%$RT::WebPath%>/NoAuth/Logout.html<%$URL && "?URL=".$URL%>"><&|/l&>Logout</&></a>
 % }
 <BR>
 <&|/l, "<b>".$session{'CurrentUser'}->Name."</b>" &>Logged in as [_1]</&>
@@ -104,7 +102,7 @@ ONLOAD="
         <tr>
           <td align=right>
             <FONT SIZE="-3">
-              <A HREF="http://www.sisd.com/freeside">Freeside</A>&nbsp;v<% &RT::URI::freeside::FreesideVersion() %><BR>
+              <A HREF="http://www.sisd.com/freeside">Freeside</A>&nbsp;v<% $FS::VERSION %><BR>
              <A HREF="../docs/">Documentation</A><BR>
             </FONT>
           </td>
@@ -126,13 +124,12 @@ ONLOAD="
 
 $r->headers_out->{'Pragma'} = 'no-cache';
 $r->headers_out->{'Cache-control'} = 'no-cache';
-require RT::URI::freeside;
 </%INIT>
 
 <%ARGS>
 $Prefs => '/User/Prefs.html'
 $Focus => 'focus'
-$Title =>  'RT'
+$Title => undef
 $Code => undef
 $Refresh => 0
 $Why => undef
diff --git a/rt/html/Elements/ListActions b/rt/html/Elements/ListActions
index 8433d17..344fe9e 100644
--- a/rt/html/Elements/ListActions
+++ b/rt/html/Elements/ListActions
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % if ($actions[0] ) {
 <& /Elements/TitleBoxStart, title => loc('Results') &>
 <UL>
diff --git a/rt/html/Elements/Login b/rt/html/Elements/Login
index 1d4bfd5..25ded9f 100644
--- a/rt/html/Elements/Login
+++ b/rt/html/Elements/Login
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 if ($m->request_comp->path =~ '^/REST/\d+\.\d+/') {
     $r->content_type("text/plain");
@@ -67,7 +67,7 @@ if ($m->request_comp->path =~ '^/REST/\d+\.\d+/') {
 contentbg=>"#cccccc" &>
 
 % unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
-<FORM id="login" name="login" METHOD=POST ACTION="<% (UNIVERSAL::can($r, 'uri') && ($r->uri) =~ m!.*/(.*)!) %>" >
+<FORM METHOD=POST ACTION="<% (UNIVERSAL::can($r, 'uri') && ($r->uri) =~ m!.*/(.*)!) %>" >
 <TABLE BORDER=0 WIDTH=100%>
 <TR ALIGN=RIGHT>
 <TD ALIGN=RIGHT><&|/l&>Username</&>:</TD><TD ALIGN=LEFT><input name=user value="<%$user%>"></TD></TR>
diff --git a/rt/html/Elements/Menu b/rt/html/Elements/Menu
index 398e3ab..0e57585 100644
--- a/rt/html/Elements/Menu
+++ b/rt/html/Elements/Menu
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# font size depends on level
 % if ($level ge 3) {
 %   $size = $basesize-(6);
@@ -69,17 +69,16 @@
 % } 
 % my $style="";
 % if ($sep) {
-% $style="minor";
+% $style="border-top: solid #999 1px; padding-top: .1em; margin-top: .5em;";
 % } elsif ($level == 0 ) {
-% $style="major";
+% $style="border-bottom: solid white 1px; padding-top: .25em; padding-bottom: .5em;" ;
 % }
 % if ($toptabs->{$tab}->{'separator'}) {
 % $sep=1;
 % } else {
 % $sep=0;
 % }
-% my $url = $toptabs->{$tab}->{'path'} =~ /^https?:/i ? $toptabs->{$tab}->{'path'} : $RT::WebPath . "/" . $toptabs->{$tab}->{'path'};
-<li class="<%$class%>-<%$level%>-<%$style%>"><A HREF="<% $url %>" class="<%$class%>-<%$level%>" 
+<li style="<%$style%>"><A HREF="<%$RT::WebPath%>/<%$toptabs->{$tab}->{'path'}%>" style="font-size: <%$size%>;" class="<%$class%>" 
 <%($class eq 'currenttopnav') ? "name='focus'" : ""|n %> 
 <% !$level && "accesskey='".$accesskey++."'" |n%>><% $toptabs->{$tab}->{'title'}%></A>
 %# Second-level items
diff --git a/rt/html/Elements/MessageBox b/rt/html/Elements/MessageBox
index dd48bec..5faa957 100644
--- a/rt/html/Elements/MessageBox
+++ b/rt/html/Elements/MessageBox
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,8 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<textarea class="messagebox" COLS=<%$Width%> ROWS=<%$Height%> WRAP=<%$Wrap%> NAME="<%$Name%>"><& /Elements/Callback, %ARGS &><% $Default %><%$message%><%$IncludeSignature ? $signature : ''%></textarea>
+%# }}} END BPS TAGGED BLOCK
+<TEXTAREA COLS=<%$Width%> ROWS=<%$Height%> WRAP=<%$Wrap%> NAME="<%$Name%>"><& /Elements/Callback, %ARGS &><% $Default %><%$message%><%$IncludeSignature ? $signature : ''%></TEXTAREA>
 <%INIT>
 
 my ($message);
diff --git a/rt/html/Elements/MyRequests b/rt/html/Elements/MyRequests
index 172b4a4..4e1bf3e 100644
--- a/rt/html/Elements/MyRequests
+++ b/rt/html/Elements/MyRequests
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <&|/Elements/TitleBox, 
         title => loc("[_1] newest unowned tickets", $rows),
 	title_href => "Search/Results.html".$QueryString &>
@@ -61,10 +61,9 @@ my $rows = $RT::MyRequestsLength;
 
 my $Query = "Owner = 'Nobody' AND ( Status = 'new' OR Status = 'open')";
 
-my $QueryString = "";
-$QueryString = '?' . $m->comp('/Elements/QueryString', 
-                              Query => $Query,
-                              Order => 'DESC',
-                              OrderBy => 'Priority') if ($Query);
+my $QueryString = '?' . $m->comp('/Elements/QueryString', 
+            Query => $Query,
+            Order => 'DESC',
+            OrderBy => 'Priority') if ($Query);
 
 </%init>
diff --git a/rt/html/Elements/MyTickets b/rt/html/Elements/MyTickets
index cf5225a..9f30a89 100644
--- a/rt/html/Elements/MyTickets
+++ b/rt/html/Elements/MyTickets
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <&|/Elements/TitleBox, 
 	title => loc('[_1] highest priority tickets I own', $rows),
 	title_href => "Search/Results.html".$QueryString &>
@@ -61,11 +61,10 @@ my $rows = $RT::MyTicketsLength;
 
 my $Query = " Owner = '".$session{'CurrentUser'}->Id."' AND ( Status = 'new' OR Status = 'open')";
 
-my $QueryString = "";
-$QueryString = '?' . $m->comp('/Elements/QueryString', 
-                              Query => $Query,
-                              Order => 'DESC',
-                              OrderBy => 'Priority') if ($Query);
+my $QueryString = '?' . $m->comp('/Elements/QueryString', 
+            Query => $Query,
+            Order => 'DESC',
+            OrderBy => 'Priority') if ($Query);
 
 </%init>
 
diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout
index 94bdbe1..41eae78 100644
--- a/rt/html/Elements/PageLayout
+++ b/rt/html/Elements/PageLayout
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <table class="lightgray" border=0 cellspacing=0 cellpadding=0 width="100%">
   <th class="lightgray" align="left" width=42%><span class="rtname"><%$AppName%></span>
   </th>
@@ -76,7 +76,7 @@
 % if ($actions->{"$action"}->{'html'}) {
 % push @actions, $actions->{"$action"}->{'html'}; 
 % } else {
-% push @actions,  qq|<a class="nav" href="|.$RT::WebPath."/".$actions->{$action}->{'path'}.qq|">|.$actions->{$action}->{'title'}."</a>";
+% push @actions,  "<A class='nav' HREF=\"".$RT::WebPath."/".$actions->{$action}->{'path'}."\">".$actions->{$action}->{'title'}."</A>";
 % }
 %  }
 %#<% join(" | ", @actions) | n %>
@@ -94,12 +94,11 @@
 </tr>
 <TR valign="top">
 <TD valign="top" width="100%" height="100%" class="mainbody" >
-<& /Elements/Callback, _CallbackName => 'BeforeBody',  %ARGS &>
-%$m->flush_buffer(); # we've got the page laid out, let's flush the buffer;
+
 <%INIT>
 
   foreach my $tab (sort keys %{$toptabs}) {
-    if ($current_toptab && $toptabs->{$tab}->{'path'} eq $current_toptab) {
+    if ($toptabs->{$tab}->{'path'} eq $current_toptab) {
       $toptabs->{$tab}->{"subtabs"} = $tabs;
       $toptabs->{$tab}->{"current_subtab"} = $current_tab;
     }
diff --git a/rt/html/Elements/QueryString b/rt/html/Elements/QueryString
index 7d41f15..cbec29a 100644
--- a/rt/html/Elements/QueryString
+++ b/rt/html/Elements/QueryString
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%init>
 my @params;
 while ( (my $key, my $value) = each %ARGS ){
diff --git a/rt/html/Elements/QuickCreate b/rt/html/Elements/QuickCreate
index 0d2489c..10cfbd3 100644
--- a/rt/html/Elements/QuickCreate
+++ b/rt/html/Elements/QuickCreate
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title => loc('Quick ticket creation') &>
 <form method="post" action="<%$RT::WebPath%>/index.html">
 <input type="hidden" name="QuickCreate" value="1">
diff --git a/rt/html/Elements/Quicksearch b/rt/html/Elements/Quicksearch
index d54f72e..103c760 100644
--- a/rt/html/Elements/Quicksearch
+++ b/rt/html/Elements/Quicksearch
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,40 +42,42 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title => loc("Quick search"), bodyclass => "" &>
 
 <TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>                       
 <tr>                                                                          
-       <th class="collection-as-table" align=left><&|/l&>Queue</&></th>                                         
-       <th class="collection-as-table" align=right><&|/l&>New</&></th>
-       <th class="collection-as-table" align=right><&|/l&>Open</&></th>          
+       <th align=left><&|/l&>Queue</&></th>                                         
+       <th align=right><font size=-1><&|/l&>New</&></font></th>
+       <th align=right><font size=-1><&|/l&>Open</&></font></th>          
 </tr>
 
 <%PERL>
 my $i;
 while (my $queue = $Queues->Next) {
-  next unless ($queue->CurrentUserHasRight('ShowTicket'));
+        my $new_q = "Queue = '".$queue->Name."' AND Status = 'new'";
+        my $open_q = "Queue = '".$queue->Name."' AND Status = 'open'";
+        my $all_q = "Queue = '".$queue->Name."' AND (Status = 'open' OR Status = 'new')";
 
-  my $name = $queue->Name;
-  $name =~ s|(['\\])|\\$1|g;
-  
-  my $new_q = "Queue = '$name' AND Status = 'new'";
-  my $open_q = "Queue = '$name' AND Status = 'open'";
-  my $all_q = "Queue = '$name' AND (Status = 'open' OR Status = 'new')";
 
-  $Tickets->FromSQL($open_q);
-  my $open = $Tickets->Count();
+     $Tickets->ClearRestrictions;                                           
+     $Tickets->LimitStatus(VALUE => "open");                                
+     $Tickets->LimitQueue(VALUE => $queue->Name, OPERATOR => '=');            
+     my $open = $Tickets->Count();
+
+     $Tickets->ClearRestrictions;                                           
+     $Tickets->LimitStatus(VALUE => "new");
+     $Tickets->LimitQueue(VALUE => $queue->Name, OPERATOR => '=');            
+     my $new = $Tickets->Count();
+
 
-  $Tickets->FromSQL($new_q);
-  my $new = $Tickets->Count();
 
-  $i++;
 </%PERL>
+% $i++;                                                                         
 <TR class="<% $i%2 ? 'oddline' : 'evenline'%>" >                                
-<td><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$all_q |nu%>&Rows=50" TITLE="<% $queue->Description %>"><%$queue->Name%></a></TD>
-<td align="right"><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$new_q |nu%>&Rows=50"><%$new%></a></TD>
-<td align="right"><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$open_q |nu%>&Rows=50"><%$open%></a></TD>
+<td><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$all_q%>&Rows=50" TITLE="<% $queue->Description %>"><%$queue->Name%></a></TD>
+<td align="right"><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$new_q%>&Rows=50"><%$new%></a></TD>
+<td align="right"><A HREF="<% $RT::WebPath%>/Search/Results.html?Query=<%$open_q%>&Rows=50"><%$open%></a></TD>
 </TR>
 % }
 </TABLE>
diff --git a/rt/html/Elements/RT__Ticket/ColumnMap b/rt/html/Elements/RT__Ticket/ColumnMap
index dade914..a6d387c 100644
--- a/rt/html/Elements/RT__Ticket/ColumnMap
+++ b/rt/html/Elements/RT__Ticket/ColumnMap
@@ -1,14 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# BEGIN LICENSE BLOCK;
 %# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 %# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
+%# (Except where explictly superceded by other copyright notices)
 %# 
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
@@ -20,37 +14,25 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
 %# 
-%# CONTRIBUTION SUBMISSION POLICY:
 %# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
+%# END LICENSE BLOCK
+
 <%ARGS>
 $Name => undef
 $Attr => undef
 </%ARGS>
 
+<%perl>
+return ColumnMap($Name, $Attr);
+</%perl>
 
-<%ONCE>
-our ( $COLUMN_MAP );
+<%INIT>
+our ( $COLUMN_MAP, $CUSTOM_FIELD_MAP );
 
 sub ColumnMap {
     my $name = shift;
@@ -63,52 +45,46 @@ sub ColumnMap {
 
     # now, let's deal with harder things, like Custom Fields
 
-    elsif ( $name =~ /^(?:CF|CustomField)\.\{(.+)\}$/ ) {
+    elsif ( $name =~ /^(?:CF|CustomField).(.*)$/ ) {
         my $field = $1;
+        my $cf;
+        if ( $CUSTOM_FIELD_MAP->{$field} ) {
+            $cf = $CUSTOM_FIELD_MAP->{$field};
+        }
+        else {
+
+            $cf = RT::CustomField->new( $session{'CurrentUser'} );
+
+            if ( $field =~ /^(.+?)\.{(.+)}$/ ) {
+                $cf->LoadByNameAndQueue( Queue => $1, Name => $2 );
+            }
+            else {
+                $field = $1 if $field =~ /^{(.+)}$/;    # trim { }
+                $cf->LoadByNameAndQueue( Queue => "0", Name => $field );
+            }
+            $CUSTOM_FIELD_MAP->{$field} = $cf if ( $cf->id );
+        }
+
+        unless ( $cf->id ) {
+            return undef;
+        }
 
         if ( $attr eq 'attribute' ) {
             return (undef);
         }
         elsif ( $attr eq 'title' ) {
-            return ( $field );
+            return ( $cf->Name );
         }
         elsif ( $attr eq 'value' ) {
-	    # Display custom field contents, separated by newlines.
-            # For Image custom fields we also show a thumbnail here.
-            return sub {
-                my $values = $_[0]->CustomFieldValues($field);
-                return map {
-                    (
-                        ($_->CustomFieldObj->Type eq 'Image')
-                            ? \($m->scomp( '/Elements/ShowCustomFieldImage', Object => $_ ))
-                            : $_->Content
-                    ),
-                    \'<br>',
-                } @{ $values->ItemsArrayRef }
-	    };
+            my $value = eval "sub {
+                    my \$values = \$_[0]->CustomFieldValues('" . $cf->id . "');
+                    return ( join( ', ', map { \$_->Content } \@{ \$values->ItemsArrayRef } ))
+                  }" || die $@;
+            return ($value);
         }
     }
 }
 
-sub LinkCallback {
-    my $method = shift;
-
-    my $mode            = $RT::Ticket::LINKTYPEMAP{$method}{Mode};
-    my $type            = $RT::Ticket::LINKTYPEMAP{$method}{Type};
-    my $mode_uri        = $mode.'URI';
-    my $local_type      = 'Local'.$mode;
-
-    return sub {
-        map {
-            \'<A HREF="',
-            $_->$mode_uri->Resolver->HREF,
-            \'">',
-            ( $_->$mode_uri->IsLocal ? $_->$local_type : $_->$mode ),
-            \'</A><BR>',
-        } @{ $_[0]->Links($mode,$type)->ItemsArrayRef }
-    }
-}
-
 $COLUMN_MAP = {
     QueueName => {
         attribute => 'Queue',
@@ -127,7 +103,7 @@ $COLUMN_MAP = {
     },
     Status => {
         attribute => 'Status',
-        value     => sub { return loc($_[0]->Status) }
+        value     => sub { return $_[0]->Status }
     },
     Subject => {
         attribute => 'Subject',
@@ -143,10 +119,10 @@ $COLUMN_MAP = {
                 if (   $Ticket->HasUnresolvedDependencies( Type => 'approval' )
                     or $Ticket->HasUnresolvedDependencies( Type => 'code' ) )
                 {
-                    return \'<em>', loc('(pending approval)'), \'</em>';
+                    return "<em>" . loc('(pending approval)') . "</em>";
                 }
                 else {
-                    return \'<em>', loc('(pending other Collection)'), \'</em>';
+                    return "<em>" . loc('(pending other Collection)') . "</em>";
                 }
             }
             else {
@@ -161,12 +137,10 @@ $COLUMN_MAP = {
     },
     InitialPriority => {
         attribute => 'InitialPriority',
-        name => 'Initial Priority',
         value     => sub { return $_[0]->InitialPriority }
     },
     FinalPriority => {
         attribute => 'FinalPriority',
-        name => 'Final Priority',
         value     => sub { return $_[0]->FinalPriority }
     },
     EffectiveId => {
@@ -179,17 +153,14 @@ $COLUMN_MAP = {
     },
     TimeWorked => {
         attribute => 'TimeWorked',
-        title => 'Time Worked',
         value     => sub { return $_[0]->TimeWorked }
     },
     TimeLeft => {
         attribute => 'TimeLeft',
-        title     => 'Time Left',
         value     => sub { return $_[0]->TimeLeft }
     },
     TimeEstimated => {
         attribute => 'TimeEstimated',
-        title => 'Time Estimated',
         value     => sub { return $_[0]->TimeEstimated }
     },
     Requestors => {
@@ -217,7 +188,7 @@ $COLUMN_MAP = {
         value     => sub { return $_[0]->CreatedObj->AgeAsString }
     },
     LastUpdatedRelative => {
-        title     => 'Last Updated',
+        title     => 'LastUpdated',
         attribute => 'LastUpdated',
         value     => sub { return $_[0]->LastUpdatedObj->AgeAsString }
     },
@@ -232,7 +203,7 @@ $COLUMN_MAP = {
         value     => sub { 
 	    my $date = $_[0]->DueObj;
 	    if ($date && $date->Unix > 0 && $date->Unix < time()) {
-		return (\'<span class="overdue">' , $date->AgeAsString , \'</span>');
+		return '<span class="overdue">' . $date->AgeAsString . '</span>';
 	    } else {
 		return $date->AgeAsString;
 	    }
@@ -257,17 +228,14 @@ $COLUMN_MAP = {
     },
     CreatedBy => {
         attribute => 'CreatedBy',
-        title => 'Created By',
         value     => sub { return $_[0]->CreatorObj->Name }
     },
     LastUpdated => {
         attribute => 'LastUpdated',
-        title     => 'Last Updated',
         value     => sub { return $_[0]->LastUpdatedObj->AsString }
     },
     LastUpdatedBy => {
         attribute => 'LastUpdatedBy',
-        title     => 'Last Updated By',
         value     => sub { return $_[0]->LastUpdatedByObj->Name }
     },
     Told => {
@@ -283,18 +251,144 @@ $COLUMN_MAP = {
         value     => sub { return $_[0]->ResolvedObj->AsString }
     },
 
-    # Everything from LINKTYPEMAP
-    (map {
-        $_ => { value => LinkCallback( $_ ) }
-    } keys %RT::Ticket::LINKTYPEMAP),
+    DependedOnBy => {
+        value => sub {
+            my $links = $_[0]->DependedOnBy;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->BaseURI->Resolver->HREF . '">'
+                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    Members => {
+        value => sub {
+            my $links = $_[0]->Members;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->BaseURI->Resolver->HREF . '">'
+                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    Children => {
+        value => sub {
+            my $links = $_[0]->Members;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->BaseURI->Resolver->HREF . '">'
+                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    ReferredToBy => {
+        value => sub {
+            my $links = $_[0]->ReferredToBy;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->BaseURI->Resolver->HREF . '">'
+                          . ( $_->BaseIsLocal ? $_->LocalBase : $_->Base )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+
+    DependsOn => {
+        value => sub {
+            my $links = $_[0]->DependsOn;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->TargetURI->Resolver->HREF . '">'
+                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    MemberOf => {
+        value => sub {
+            my $links = $_[0]->MemberOf;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->TargetURI->Resolver->HREF . '">'
+                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    Parents => {
+        value => sub {
+            my $links = $_[0]->MemberOf;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->TargetURI->Resolver->HREF . '">'
+                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
+    RefersTo => {
+        value => sub {
+            my $links = $_[0]->RefersTo;
+            return (
+                join(
+                    "<br>",
+                    map {
+                            '<A HREF="'
+                          . $_->TargetURI->Resolver->HREF . '">'
+                          . ( $_->TargetIsLocal ? $_->LocalTarget : $_->Target )
+                          . '</A>'
+                      } @{ $links->ItemsArrayRef }
+                )
+            );
+          }
+    },
 
     '_CLASS' => {
         value => sub { return $_[1] % 2 ? 'oddline' : 'evenline' }
     },
 
 };
-</%ONCE>
-<%init>
+
+
+
+# }}}
 $m->comp( '/Elements/Callback', COLUMN_MAP    => $COLUMN_MAP, _CallbackName => 'ColumnMap');
-return ColumnMap($Name, $Attr);
-</%init>
+</%INIT>
diff --git a/rt/html/Elements/Refresh b/rt/html/Elements/Refresh
index 9f241d2..3cfb7c6 100644
--- a/rt/html/Elements/Refresh
+++ b/rt/html/Elements/Refresh
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 <OPTION VALUE="-1"
 %unless ($Default) {
diff --git a/rt/html/Elements/ScrubHTML b/rt/html/Elements/ScrubHTML
index 94a7299..57495bc 100644
--- a/rt/html/Elements/ScrubHTML
+++ b/rt/html/Elements/ScrubHTML
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%init>
 my $scrubber = HTML::Scrubber->new();
 
diff --git a/rt/html/Elements/Section b/rt/html/Elements/Section
index afbb9cf..5bf7270 100644
--- a/rt/html/Elements/Section
+++ b/rt/html/Elements/Section
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <TABLE WIDTH=100%>
 <TR>
 <TD>
diff --git a/rt/html/Elements/SelectAttachmentField b/rt/html/Elements/SelectAttachmentField
index ea1528c..cd16bba 100644
--- a/rt/html/Elements/SelectAttachmentField
+++ b/rt/html/Elements/SelectAttachmentField
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 <OPTION VALUE="Subject"><&|/l&>Subject</&></OPTION>
 <OPTION VALUE="Content"><&|/l&>Content</&></OPTION>
diff --git a/rt/html/Elements/SelectBoolean b/rt/html/Elements/SelectBoolean
index a3f08fd..d176060 100644
--- a/rt/html/Elements/SelectBoolean
+++ b/rt/html/Elements/SelectBoolean
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 <OPTION VALUE="<%$TrueVal%>" <%$TrueDefault%>><%$True%></OPTION>
 <OPTION VALUE="<%$FalseVal%>" <%$FalseDefault%>><%$False%></OPTION>
diff --git a/rt/html/Elements/SelectCustomFieldOperator b/rt/html/Elements/SelectCustomFieldOperator
index 8f7ea61..2264f2d 100644
--- a/rt/html/Elements/SelectCustomFieldOperator
+++ b/rt/html/Elements/SelectCustomFieldOperator
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 % while (my $option = shift @Options) {
 % my $value = shift @Values;
diff --git a/rt/html/Elements/SelectCustomFieldValue b/rt/html/Elements/SelectCustomFieldValue
index 27d6c49..de9f540 100644
--- a/rt/html/Elements/SelectCustomFieldValue
+++ b/rt/html/Elements/SelectCustomFieldValue
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Callback, %ARGS &>
 % if ($CustomField->Type =~ /Select/i) {
 % my $values = $CustomField->Values;
diff --git a/rt/html/Elements/SelectDate b/rt/html/Elements/SelectDate
index d381579..aaf2534 100644
--- a/rt/html/Elements/SelectDate
+++ b/rt/html/Elements/SelectDate
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <INPUT NAME="<%$Name%>" VALUE="<%$Default%>" size=<%$Size%>> 
 
 <%init>
diff --git a/rt/html/Elements/SelectDateRelation b/rt/html/Elements/SelectDateRelation
index ccf0c11..b3f3868 100644
--- a/rt/html/Elements/SelectDateRelation
+++ b/rt/html/Elements/SelectDateRelation
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 <OPTION VALUE="&lt;"><%$Before%></OPTION>
 <OPTION VALUE="="><%$On%></OPTION>
diff --git a/rt/html/Elements/SelectDateType b/rt/html/Elements/SelectDateType
index 7b3f099..79bc994 100644
--- a/rt/html/Elements/SelectDateType
+++ b/rt/html/Elements/SelectDateType
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 <OPTION VALUE="Created"><&|/l&>Created</&></OPTION>
 <OPTION VALUE="Started"><&|/l&>Started</&></OPTION>
diff --git a/rt/html/Elements/SelectEqualityOperator b/rt/html/Elements/SelectEqualityOperator
index 0f8deea..5e5d1a4 100644
--- a/rt/html/Elements/SelectEqualityOperator
+++ b/rt/html/Elements/SelectEqualityOperator
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 % while (my $option = shift @Options) {
 % my $value = shift @Values;
@@ -58,5 +58,5 @@ SELECTED
 $Name => undef
 @Options => (loc('less than'), loc('equal to'), loc('greater than'), loc('not equal to'))
 @Values => qw(< = > !=)
-$Default =>'' 
+$Default => undef
 </%ARGS>
diff --git a/rt/html/Elements/SelectGroups b/rt/html/Elements/SelectGroups
index bc37fd6..f6f9dae 100644
--- a/rt/html/Elements/SelectGroups
+++ b/rt/html/Elements/SelectGroups
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,19 +42,10 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <select name="GroupField">
-% foreach my $col (RT::Group->BasicColumns) {
-<option value="<% $col->[0] %>"><% loc($col->[1]) %>
-% }
-% while (my $CF = $CFs->Next) {
-<option value="CustomField-<% $CF->Id %>"><&|/l&>CustomField</&>: <% $CF->Name %>
-% }
+<option value="Name"><&|/l&>Name</&>
+<option value="Description"><&|/l&>Description</&>
 </select>
 <& /Elements/SelectMatch, Name=> 'GroupOp' &>
 <input size=8 name="GroupString">
-<%INIT>
-my $CFs = RT::CustomFields->new($session{'CurrentUser'});
-$CFs->LimitToChildType('RT::Group');
-$CFs->OrderBy( FIELD => 'Name' );
-</%INIT>
diff --git a/rt/html/Elements/SelectLang b/rt/html/Elements/SelectLang
index a439ea3..46d3784 100644
--- a/rt/html/Elements/SelectLang
+++ b/rt/html/Elements/SelectLang
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 % if ($ShowNullOption) {
 <OPTION VALUE="">-</OPTION>
diff --git a/rt/html/Elements/SelectLinkType b/rt/html/Elements/SelectLinkType
index 28cb441..d782e08 100644
--- a/rt/html/Elements/SelectLinkType
+++ b/rt/html/Elements/SelectLinkType
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 <OPTION VALUE="MemberOf"><&|/l&>Member of</&></OPTION>
 <OPTION VALUE="DependsOn"><&|/l&>Depends on</&></OPTION>
diff --git a/rt/html/Elements/SelectMatch b/rt/html/Elements/SelectMatch
index 60949d9..18a948d 100644
--- a/rt/html/Elements/SelectMatch
+++ b/rt/html/Elements/SelectMatch
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 <OPTION VALUE="LIKE" <%$LikeDefault%>><%$Like%></OPTION>
 <OPTION VALUE="NOT LIKE" <%$NotLikeDefault%>><%$NotLike%></OPTION>
diff --git a/rt/html/Elements/SelectNewTicketQueue b/rt/html/Elements/SelectNewTicketQueue
index d47b58a..fefb1bc 100644
--- a/rt/html/Elements/SelectNewTicketQueue
+++ b/rt/html/Elements/SelectNewTicketQueue
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <LABEL ACCESSKEY="9">
 <SELECT NAME ="<%$Name%>">
 % foreach my $queue (@{$session{'create_in_queues'}}) {
@@ -76,6 +76,6 @@ while (my $queue=$q->Next) {
 
 <%ARGS>
 $Name => 'Queue'
-$Verbose =>  0
-$Default => 0
+$Verbose => undef
+$Default => undef
 </%ARGS>
diff --git a/rt/html/Elements/SelectOwner b/rt/html/Elements/SelectOwner
index 85843e5..2a818cd 100644
--- a/rt/html/Elements/SelectOwner
+++ b/rt/html/Elements/SelectOwner
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,67 +42,44 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 %if ($DefaultValue) {
-<OPTION <% !$Default ? "SELECTED" : '' %> VALUE=""><%$DefaultLabel%></OPTION>
+<OPTION <% !$Default && "SELECTED" %> VALUE=""><%$DefaultLabel%></OPTION>
 %}
-%foreach my $User ( @users)  {
-<OPTION <% ($User->Id == $Default) ? "SELECTED" : ''%>
-%if ($ValueAttribute eq 'id') {
-    value="<%$User->id%>"
-%} elsif ($ValueAttribute eq 'Name') {
-    value="<%$User->Name%>"
-%}
-><%$User->Name()%></OPTION>
+<OPTION <% ($RT::Nobody->Id() == $Default) && "SELECTED" %> VALUE="<%$RT::Nobody->Id%>"><%$RT::Nobody->Name%></OPTION>
+%while ( my $User = $Users->Next())  {
+<OPTION <% ($User->Id == $Default)         && "SELECTED" %> VALUE="<%$User->Id()%>"><%$User->Name()%></OPTION>
 %}
 </SELECT>
+
 <%INIT>
-my @objects;
-my @users;
+my $Users = RT::Users->new($session{CurrentUser});
+my $object;
+
 
 if ($TicketObj) {
-        @objects = ($TicketObj);
+        $object = $TicketObj;
 }
 elsif ($QueueObj) {
-        @objects = ($QueueObj);
-} 
-elsif ($cfqueues) {
-	@objects = keys %{$cfqueues};
+        $object = $QueueObj;
 }
-else {
-    # Let's check rights on an empty queue object. that will do a search for any queue.
-    my $queue = RT::Queue->new($session{'CurrentUser'});
-	      push( @objects, $queue );
+if ($object) {
+        $Users->WhoHaveRight(Right => 'OwnTicket',
+                     Object => $object,
+                     IncludeSystemRights => 1,
+                     IncludeSuperusers => 1);
+} else {
+        $Users->LimitToPrivileged;
 }
-
-my %user_uniq_hash;
-
-
-foreach my $object (@objects) {
-	my $Users = RT::Users->new($session{CurrentUser});
-        $Users->WhoHaveRight(Right => 'OwnTicket', Object => $object, IncludeSystemRights => 1, IncludeSuperusers => 0); 
-        while (my $User = $Users->Next()) {
-                next if ($User->id == $RT::Nobody->id); # skip nobody here, so we can make them first later
-	      $user_uniq_hash{$User->Id()} = $User;
-        }
-}
-
-@users = sort { uc($a->Name) cmp uc($b->Name) } values %user_uniq_hash; 
-unshift(@users, $RT::Nobody);
-
-
-
 </%INIT>
 
 <%ARGS>
 $QueueObj => undef
 $Name => undef
-$Default => 0
+$Default => undef
 $User => undef
 $TicketObj => undef
 $DefaultValue => 1
 $DefaultLabel => "-"
-$ValueAttribute => 'id'
-$cfqueues => undef
 </%ARGS>
diff --git a/rt/html/Elements/SelectQueue b/rt/html/Elements/SelectQueue
index 56aede8..57d4236 100644
--- a/rt/html/Elements/SelectQueue
+++ b/rt/html/Elements/SelectQueue
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % if ($Lite) {
 % my $d = new RT::Queue($session{'CurrentUser'});
 % $d->Load($Default);
@@ -53,7 +53,7 @@
 <OPTION VALUE="">-</OPTION>
 % }
 % while (my $queue=$q->Next) {
-% if ($ShowAllQueues || $queue->CurrentUserHasRight($CheckQueueRight)) {
+% if ($ShowAllQueues || $queue->CurrentUserHasRight('CreateTicket')) {
 <OPTION VALUE="<%($NamedValues ? $queue->Name : $queue->Id) %>" <%( $queue->Id eq $Default ? 'SELECTED' : '')%>><%$queue->Name%>
 %   if (($Verbose) and ($queue->Description) ){
 (<%$queue->Description%>)
@@ -64,7 +64,6 @@
 </SELECT>
 % }
 <%ARGS>
-$CheckQueueRight => 'CreateTicket'
 $ShowNullOption => 1
 $ShowAllQueues => 1
 $Name => undef
diff --git a/rt/html/Elements/SelectResultsPerPage b/rt/html/Elements/SelectResultsPerPage
index 65ed536..82f7035 100644
--- a/rt/html/Elements/SelectResultsPerPage
+++ b/rt/html/Elements/SelectResultsPerPage
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# TODO: Better default handling
 
 <SELECT NAME ="<%$Name%>">
diff --git a/rt/html/Elements/SelectSortOrder b/rt/html/Elements/SelectSortOrder
index f6dd70d..ea1a305 100644
--- a/rt/html/Elements/SelectSortOrder
+++ b/rt/html/Elements/SelectSortOrder
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 %foreach my $order (@orders) {
 <OPTION VALUE="<%$order%>" <%$order eq $Default && 'SELECTED' %>>
diff --git a/rt/html/Elements/SelectStatus b/rt/html/Elements/SelectStatus
index fa76a3e..694957a 100644
--- a/rt/html/Elements/SelectStatus
+++ b/rt/html/Elements/SelectStatus
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 %if ($DefaultValue) {
 <OPTION <% !$Default && "SELECTED" %> VALUE=""><%$DefaultLabel%></OPTION>
@@ -58,7 +58,7 @@ my @status = $queue->StatusArray();
 </%ONCE>
 <%ARGS>
 $Name => undef
-$Default => ''
+$Default => undef
 $SkipDeleted => 0
 $DefaultValue => 1
 $DefaultLabel => "-"
diff --git a/rt/html/Elements/SelectTicketSortBy b/rt/html/Elements/SelectTicketSortBy
index 3e05dcc..bf4b0be 100644
--- a/rt/html/Elements/SelectTicketSortBy
+++ b/rt/html/Elements/SelectTicketSortBy
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 % foreach my $field (@sortfields) {
 <OPTION VALUE="<%$field%>" <% $field eq $Default && 'SELECTED'%>><% loc($field) %></OPTION>
diff --git a/rt/html/Elements/SelectTicketTypes b/rt/html/Elements/SelectTicketTypes
index a905f60..c6912c8 100644
--- a/rt/html/Elements/SelectTicketTypes
+++ b/rt/html/Elements/SelectTicketTypes
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 %foreach (@Types) {
 <OPTION VALUE="<% $_ %>" <% ($_ eq $Default) && "SELECTED" %>><&|/l&><% $_ %></&>
diff --git a/rt/html/Elements/SelectUsers b/rt/html/Elements/SelectUsers
index dfe816e..be2230a 100644
--- a/rt/html/Elements/SelectUsers
+++ b/rt/html/Elements/SelectUsers
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,19 +42,12 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <select name="UserField">
-% foreach my $col (RT::User->BasicColumns) {
-<option value="<% $col->[0] %>"><% loc($col->[1]) %>
-% }
-% while (my $CF = $CFs->Next) {
-<option value="CustomField-<% $CF->Id %>"><&|/l&>CustomField</&>: <% $CF->Name %>
-% }
+<option value="Name"><&|/l&>User Id</&>
+<option value="EmailAddress"><&|/l&>Email</&>
+<option value="RealName"><&|/l&>Name</&>
+<option value="Organization"><&|/l&>Organization</&>
 </select>
 <& /Elements/SelectMatch, Name=> 'UserOp' &>
 <input size=8 name="UserString">
-<%INIT>
-my $CFs = RT::CustomFields->new($session{'CurrentUser'});
-$CFs->LimitToChildType('RT::User');
-$CFs->OrderBy( FIELD => 'Name' );
-</%INIT>
diff --git a/rt/html/Elements/SelectWatcherType b/rt/html/Elements/SelectWatcherType
index 6ba9c7a..bb098ab 100644
--- a/rt/html/Elements/SelectWatcherType
+++ b/rt/html/Elements/SelectWatcherType
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 % if ($AllowNull) {
 <OPTION VALUE="">-</OPTION>
diff --git a/rt/html/Elements/SetupSessionCookie b/rt/html/Elements/SetupSessionCookie
index bd78613..e72f458 100644
--- a/rt/html/Elements/SetupSessionCookie
+++ b/rt/html/Elements/SetupSessionCookie
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%init>
 return if $m->is_subrequest; # avoid reentrancy, as suggested by masonbook
 
@@ -75,25 +75,18 @@ my $pm = "$session_class.pm"; $pm =~ s|::|/|g; require $pm;
 
         # If the session is invalid, create a new session.
         if ( $@ =~ /Object does not/i ) {
-            tie %session, $session_class, undef, $backends{$RT::DatabaseType}
-              ? {
+            tie %session, $session_class, undef,
+	      $backends{$RT::DatabaseType} ? {
                 Handle     => $RT::Handle->dbh,
                 LockHandle => $RT::Handle->dbh,
-              }
-              : {
+              } : {
                 Directory     => $RT::MasonSessionDir,
                 LockDirectory => $RT::MasonSessionDir,
               };
             undef $cookies{$cookiename};
         }
         else {
-            die loc("RT couldn't store your session.") . "\n"
-              . loc(
-"This may mean that that the directory '[_1]' isn't writable or a database table is missing or corrupt.",
-                $RT::MasonSessionDir
-              )
-              . "\n\n"
-              . $@;
+            die "RT Couldn't write to session directory '$RT::MasonSessionDir': $@. Check that this dir ectory's permissions are correct.";
         }
     }
 
diff --git a/rt/html/Elements/ShowCustomFieldBinary b/rt/html/Elements/ShowCustomFieldBinary
deleted file mode 100644
index ea9e5ae..0000000
--- a/rt/html/Elements/ShowCustomFieldBinary
+++ /dev/null
@@ -1,49 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<a href="<%$RT::WebPath%>/Download/CustomFieldValue/<% $Object->Id %>/<% $Object->Content %>"><% $Object->Content %></a>
-<%ARGS>
-$Object => undef
-</%ARGS>
diff --git a/rt/html/Elements/ShowCustomFieldImage b/rt/html/Elements/ShowCustomFieldImage
deleted file mode 100644
index 7fa5e46..0000000
--- a/rt/html/Elements/ShowCustomFieldImage
+++ /dev/null
@@ -1,51 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-%    my $url = $RT::WebPath . "/Download/CustomFieldValue/".$Object->Id.'/'.$Object->Content;
-<a href="<% $url %>"><% $Object->Content %></a>
-<img type="<% $Object->ContentType %>" height=64 src="<% $url %>" align="middle">
-<%ARGS>
-$Object
-</%ARGS>
diff --git a/rt/html/Elements/ShowCustomFieldWikitext b/rt/html/Elements/ShowCustomFieldWikitext
deleted file mode 100644
index ab7c27b..0000000
--- a/rt/html/Elements/ShowCustomFieldWikitext
+++ /dev/null
@@ -1,55 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-% my $content = $Object->LargeContent || $Object->Content;
-% $content = $m->comp('/Elements/ScrubHTML', Content => $content);
-% my $wiki_content = Text::WikiFormat::format( $content."\n" , {}, { extended => 1, absolute_links => 1 });
-<%$wiki_content|n%>
-<%init>
-use Text::WikiFormat;
-</%init>
-<%ARGS>
-$Object
-</%ARGS>
diff --git a/rt/html/Elements/ShowCustomFields b/rt/html/Elements/ShowCustomFields
deleted file mode 100644
index 7591fa3..0000000
--- a/rt/html/Elements/ShowCustomFields
+++ /dev/null
@@ -1,77 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<table>
-% my @entry_fields;
-% while (my $CustomField = $CustomFields->Next()) {
-% my $Values = $Object->CustomFieldValues($CustomField->Id);
-  <tr>
-    <td class="label"><%$CustomField->Name%>:</td>
-    <td class="value">
-<ul>
-% while (my $Value = $Values->Next()) {
-<li>
-% my $comp = "ShowCustomField".$CustomField->Type;
-% if ($m->comp_exists($comp)) {
-<& $comp, Object => $Value &>
-%   } else {
-<%$Value->Content%>
-%   }
-</li>
-% }
-% unless ($Values->Count()) {
-<li><i><&|/l&>(no value)</&></i></li>
-% }
-</ul>
-    </td>
-  </tr>
-% }
-</table>
-<%INIT>
-my $CustomFields = $Object->CustomFields;
-</%INIT>
-<%ARGS>
-$Object => undef
-</%ARGS>
diff --git a/rt/html/Elements/ShowLink b/rt/html/Elements/ShowLink
index 5929a96..520d689 100644
--- a/rt/html/Elements/ShowLink
+++ b/rt/html/Elements/ShowLink
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <A href="<%$URI->Resolver->HREF%>">
 % if ($URI->IsLocal) {
 % my $member = $URI->Object;
diff --git a/rt/html/Elements/ShowLinks b/rt/html/Elements/ShowLinks
index c9279a5..2ba62b8 100755
--- a/rt/html/Elements/ShowLinks
+++ b/rt/html/Elements/ShowLinks
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <table>
   <tr>
     <td class="labeltop"><&|/l&>Depends on</&>:</td>
diff --git a/rt/html/Elements/ShowMemberships b/rt/html/Elements/ShowMemberships
deleted file mode 100644
index 3936d50..0000000
--- a/rt/html/Elements/ShowMemberships
+++ /dev/null
@@ -1,86 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<ul>
-% while ( my $GroupMember = $GroupMembers->Next ) {
-%    my $Group = RT::Group->new($session{'CurrentUser'});
-%    $Group->Load($GroupMember->GroupId) or next;
-%    if ($Group->Domain eq 'UserDefined') {
-<li><a href="<%$RT::WebPath%>/Admin/Groups/Modify.html?id=<% $Group->Id %>"><% $Group->Name %></a></li>
-%    } elsif ($Group->Domain eq 'SystemInternal') {
-<li><em><% loc($Group->Type) %></em></li>
-%    }
-% }
-</ul>
-<%INIT>
-my $GroupMembers = RT::GroupMembers->new($session{'CurrentUser'});
-$GroupMembers->Limit( FIELD => 'MemberId', VALUE => $UserObj->Id );
-my $alias = $GroupMembers->Join(
-    TYPE       => 'left',
-    ALIAS1     => 'main',
-    FIELD1     => 'GroupId',
-    TABLE2     => 'Groups',
-    FIELD2     => 'id'
-);
-$GroupMembers->Limit(
-    ALIAS      => $alias,
-    FIELD      => 'Domain',
-    OPERATOR   => '=',
-    VALUE      => 'SystemInternal',
-);
-$GroupMembers->Limit(
-    ALIAS      => $alias,
-    FIELD      => 'Domain',
-    OPERATOR   => '=',
-    VALUE      => 'UserDefined',
-);
-$GroupMembers->OrderByCols(
-    { ALIAS => $alias, FIELD => 'Domain' },
-    { ALIAS => $alias, FIELD => 'Name' },
-);
-</%INIT>
-<%ARGS>
-$UserObj
-</%ARGS>
diff --git a/rt/html/Elements/SimpleSearch b/rt/html/Elements/SimpleSearch
index e76f801..213aa7e 100644
--- a/rt/html/Elements/SimpleSearch
+++ b/rt/html/Elements/SimpleSearch
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <form action="<% $RT::WebPath %>/index.html">
 <input size="12" name="q" autocomplete="off" accesskey="0">
 <input type="submit" value="<&|/l&>Search tickets</&>">&nbsp;
diff --git a/rt/html/Elements/Submit b/rt/html/Elements/Submit
index 9d8dca2..0b42aab 100644
--- a/rt/html/Elements/Submit
+++ b/rt/html/Elements/Submit
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,33 +42,16 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-% if ($CheckAll or $ClearAll) {
-<script><!--
-function set_checkbox (obj, val) {
-    var i;
-    var myfield = obj.form.getElementsByTagName('input');
-    for (i = 0; i < myfield.length; i++) {
-	if (myfield[i].type == 'checkbox') {
-	    myfield[i].checked = val;
-	}
-    }
-}
---></script>
-% }
+%# }}} END BPS TAGGED BLOCK
 <TABLE WIDTH=100% BGCOLOR="<%$color%>" CELLSPACING=0 BORDER=0 CELLPADDING=0 >
 <TR>
-<TD>
-% if ($CheckAll) {
-<INPUT TYPE=BUTTON VALUE="<%$CheckAllLabel%>" ONCLICK="set_checkbox(this, true)">
-% }
-% if ($ClearAll) {
-<INPUT TYPE=BUTTON VALUE="<%$ClearAllLabel%>" ONCLICK="set_checkbox(this, false)">
-% }
 % if ($Reset) {
+<TD>
+<FONT COLOR=#ffd800 >
 <INPUT TYPE=RESET VALUE="<%$ResetLabel%>">
-%}
+</FONT>
 </TD>
+%}
 <TD>
 &nbsp;
 </TD>
@@ -91,15 +74,11 @@ NAME="<%$Name%>"
 </TABLE>
 <%ARGS>
 $color => "#336699"
-$Caption => ''
+$Caption => undef
 $AlternateCaption => undef
 $AlternateLabel => undef
 $Label => loc('Submit')
 $Name => undef
-$CheckAll => undef
-$CheckAllLabel => loc('Check All')
-$ClearAll => undef
-$ClearAllLabel => loc('Clear All')
 $Reset => undef
 $ResetLabel => loc('Reset')
 </%ARGS>
diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs
index f5839a9..4fc229b 100644
--- a/rt/html/Elements/Tabs
+++ b/rt/html/Elements/Tabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/PageLayout,
     current_toptab => $current_toptab,
     current_tab => $current_tab,
@@ -64,7 +64,7 @@ my $basetopactions = {
 	};
 my $basetabs = {
                   ' A'=> { title => 'Billing Main',
-                           path  => &RT::URI::freeside::FreesideURL(),
+                           path  => '../',
                          },
                     A => { #title => loc('Homepage'),
                            title => 'Ticketing Main',
@@ -76,33 +76,23 @@ my $basetabs = {
                     C => { title => loc('Tools'),
                            path => 'Tools/Offline.html'
                          },
+                    E => { title => loc('Configuration'),
+                           path => 'Admin/'
+                         },
+                    K => { title => loc('Preferences'),
+                        path => 'User/Prefs.html'
+                      },
                     P => { title => loc('Approval'),
                            path => 'Approvals/'
                          },
                  };
 
-if ($session{'CurrentUser'}->HasRight( Right => 'ShowConfigTab', 
-				       Object => $RT::System )) {
-    $basetabs->{E} = { title => loc('Configuration'),
-                       path => 'Admin/',
-		     };
-}
-
-if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', 
-				       Object => $RT::System )) {
-    $basetabs->{K} = { title => loc('Preferences'),
-                       path => 'User/Prefs.html'
-		     };
-}
-
 if (!defined $toptabs) {
    $toptabs = $basetabs;
 }
 if (!defined $topactions) {
    $topactions = $basetopactions;
 }
-
-  require RT::URI::freeside;
                     
   # Now let callbacks add their extra tabs
   $m->comp('/Elements/Callback', 
diff --git a/rt/html/Elements/TicketList b/rt/html/Elements/TicketList
index 1a53127..80d59f8 100644
--- a/rt/html/Elements/TicketList
+++ b/rt/html/Elements/TicketList
@@ -1,14 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# BEGIN LICENSE BLOCK;
 %# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
+%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 %# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
+%# (Except where explictly superceded by other copyright notices)
 %# 
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
@@ -20,35 +14,23 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
+%# Unless otherwise specified, all modifications, corrections or
+%# extensions to this work which alter its source code become the
+%# property of Best Practical Solutions, LLC when submitted for
+%# inclusion in the work.
 %# 
-%# CONTRIBUTION SUBMISSION POLICY:
 %# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
+%# END LICENSE BLOCK
+
+%# If you're having TicketList display a single record, you need
+%# to wrap the calls in your own table(s).
+% unless (defined $SingleRecord) {
 <TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
+% }
 
 % if ($ShowHeader) {
 <& /Elements/CollectionAsTable/Header, 
     Format => \@Format, 
-    FormatString => $Format,
     AllowSorting => $AllowSorting, 
     Order => $Order, 
     Query => $Query,
@@ -56,46 +38,42 @@
     Page => $Page,
     OrderBy => $OrderBy , 
     BaseURL => $BaseURL,
-    maxitems => $maxitems &> 
+    maxitems => \$maxitems &> 
 % }
 
+% if (defined $SingleRecord) {
+<&   /Elements/CollectionAsTable/Row, Format => \@Format, i => 0, record => $SingleRecord, maxitems => $maxitems &>
+% } else {
 %   my $i;
 %   while (my $record = $Collection->Next) {
 %   $i++;
-% # Every ten rows, flush the buffer and put something on the page.
-% $m->flush_buffer() unless ($i % 10);
 <&   /Elements/CollectionAsTable/Row, Format => \@Format, i => $i, record => $record, maxitems => $maxitems &>
 %   }
+% }
 
+% unless (defined $SingleRecord) {
 </TABLE>
+% }
 
-% if ($Rows && $ShowNavigation) {
+% if ($ShowNavigation) {
 <hr>
-% my $oddRows;
-% if (($TotalFound % $Rows) == 0) {
-% $oddRows = 0;
-% } else { $oddRows = 1; }
-<&|/l, $Page, int($TotalFound/$Rows)+$oddRows&>Page [_1] of [_2]</&>
+<&|/l, $Page, int($TotalFound/$Rows)+1&>Page [_1] of [_2]</&>
 
 <%perl>
-my $prev = $m->comp(
-    '/Elements/QueryString',
-    Query   => $Query,
-    Format  => $Format,
-    Rows    => $Rows,
-    OrderBy => $OrderBy,
-    Order   => $Order,
-    Page    => ( $Page - 1 )
-);
-my $next = $m->comp(
-    '/Elements/QueryString',
-    Query   => $Query,
-    Format  => $Format,
-    Rows    => $Rows,
-    OrderBy => $OrderBy,
-    Order   => $Order,
-    Page    => ( $Page + 1 )
-);
+my $prev =  $m->comp('/Elements/QueryString',
+                     Query => $Query,
+                     Format => $Format,
+                     Rows => $Rows,
+                     OrderBy => $OrderBy,
+                     Order => $Order,
+                     Page => ($Page-1));
+my $next =  $m->comp('/Elements/QueryString',
+                     Query => $Query,
+                     Format => $Format,
+                     Rows => $Rows,
+                     OrderBy => $OrderBy,
+                     Order => $Order,
+                     Page => ($Page+1));
 </%perl>
 % if ($Page > 1) {
 <A href="<%$BaseURL%><%$prev%>"><&|/l&>Previous Page</&></a>
@@ -105,12 +83,13 @@ my $next = $m->comp(
 % }
 % }
 <%INIT>
-my $maxitems = 0;
+my $maxitems;
 
 $Format ||= $RT::DefaultSearchResultFormat;
 # Scrub the html of the format string to remove any potential nasties.
 $Format = $m->comp('/Elements/ScrubHTML', Content => $Format);
 
+$Rows ||= '25'; # we need a positive value
 
 unless ($Collection) {
         $Collection = RT::Tickets->new($session{'CurrentUser'});
@@ -119,31 +98,19 @@ unless ($Collection) {
 
 my (@Format) = $m->comp('/Elements/CollectionAsTable/ParseFormat', Format => $Format);
 
-# Find the maximum number of items in any row, so we can pad the table.
-my $item = 0;
-foreach my $col (@Format) {
-    $item++;
-    if ( $col->{title} eq 'NEWLINE' ) {
-        $item = 0;
-    }
-    else {
-        $maxitems = $item if $item > $maxitems;
-    }
-}
-
-
 $Collection->OrderBy(FIELD => $OrderBy, ORDER => $Order); 
-$Collection->RowsPerPage($Rows) if ($Rows);
+$Collection->RowsPerPage($Rows);
 $Collection->GotoPage($Page-1); # SB uses page 0 as the first page
 my $TotalFound =  $Collection->CountAll();
 
 </%INIT>
 <%ARGS>
 $Query => undef
-$Rows => 50
+$Rows => 10
 $Page => 1
 $Title => 'Ticket Search'
 $Collection => undef
+$SingleRecord => undef
 $AllowSorting => undef
 $Order => undef
 $OrderBy => undef
diff --git a/rt/html/Elements/TitleBox b/rt/html/Elements/TitleBox
index 3c638e2..5913936 100644
--- a/rt/html/Elements/TitleBox
+++ b/rt/html/Elements/TitleBox
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,5 +42,5 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& TitleBoxStart, %ARGS&><%$m->content|n%><& TitleBoxEnd&>
diff --git a/rt/html/Elements/TitleBoxEnd b/rt/html/Elements/TitleBoxEnd
index d791e3a..1c050bc 100644
--- a/rt/html/Elements/TitleBoxEnd
+++ b/rt/html/Elements/TitleBoxEnd
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,13 +42,10 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
     </TD>
   </TR>
 </TABLE>
-% #Manually flush the content buffer after each titlebox is displayed
-% $m->flush_buffer();
-
 <%ARGS>
 $title => undef
 $content => undef
diff --git a/rt/html/Elements/TitleBoxStart b/rt/html/Elements/TitleBoxStart
index 804e5cf..a0c7335 100644
--- a/rt/html/Elements/TitleBoxStart
+++ b/rt/html/Elements/TitleBoxStart
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <TABLE CLASS="box <%$class|n%>" 
         BGCOLOR="<%$color%>" 
         CELLSPACING=0
@@ -74,7 +74,7 @@ $class =>  undef
 $bodyclass => undef
 $title_href => undef
 $title => undef
-$title_class => ''
+$title_class => undef
 
 $titleright_href => undef
 $titleright => undef
diff --git a/rt/html/NoAuth/Logout.html b/rt/html/NoAuth/Logout.html
index b6a238b..85fbc9e 100644
--- a/rt/html/NoAuth/Logout.html
+++ b/rt/html/NoAuth/Logout.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <HTML>
 <HEAD>
 <TITLE>RT: Logout</TITLE>
diff --git a/rt/html/NoAuth/Reminder.html b/rt/html/NoAuth/Reminder.html
index 0793f6c..90c282a 100644
--- a/rt/html/NoAuth/Reminder.html
+++ b/rt/html/NoAuth/Reminder.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, title => loc('Password Reminder') &>
 
 <&|/l&>Not yet implemented.</&>
diff --git a/rt/html/NoAuth/images/autohandler b/rt/html/NoAuth/images/autohandler
index 2e428c1..86f3b22 100644
--- a/rt/html/NoAuth/images/autohandler
+++ b/rt/html/NoAuth/images/autohandler
@@ -15,10 +15,7 @@ if ($file =~ /\.(gif|png|jpe?g)$/i) {
 die unless (-f $file && -r $file);
 $r->content_type($type);
 open (FILE, "<$file") || die;
-{
-    local $/ = \16384;
-    $m->out($_) while (<FILE>);
-    close(FILE);
-}
+$m->out($_) while (<FILE>);
+close(FILE);
 $m->abort;
 </%init>
diff --git a/rt/html/NoAuth/images/back_home.gif b/rt/html/NoAuth/images/back_home.gif
new file mode 100644
index 0000000..40b19c1
--- /dev/null
+++ b/rt/html/NoAuth/images/back_home.gif
diff --git a/rt/html/NoAuth/images/head_requestracker.gif b/rt/html/NoAuth/images/head_requestracker.gif
new file mode 100644
index 0000000..73315e9
--- /dev/null
+++ b/rt/html/NoAuth/images/head_requestracker.gif
diff --git a/rt/html/NoAuth/images/rt.jpg b/rt/html/NoAuth/images/rt.jpg
new file mode 100644
index 0000000..a137a93
--- /dev/null
+++ b/rt/html/NoAuth/images/rt.jpg
diff --git a/rt/html/NoAuth/images/spacer.gif b/rt/html/NoAuth/images/spacer.gif
new file mode 100644
index 0000000..5bfd67a
--- /dev/null
+++ b/rt/html/NoAuth/images/spacer.gif
diff --git a/rt/html/NoAuth/images/squares_blue.gif b/rt/html/NoAuth/images/squares_blue.gif
new file mode 100644
index 0000000..a28da5c
--- /dev/null
+++ b/rt/html/NoAuth/images/squares_blue.gif
diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index bc688ac..4f8d8ed 100644
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 font-size: 12px;
 %#	 color: #FFFFFF;
@@ -72,109 +72,6 @@ SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 color: #000000;
 	 text-decoration: none;
 	 white-space: nowrap}
-
-%# .topnav is the original RT class for the sidebar navigation tabs.
-%# Font-sizing by level depth was originally hard-coded into Elements/Menu.
-%# This modification sets a different class name for each level, allowing
-%# style sheet control over the formats.
-
-a.topnav-0 {  font-family: Verdana, sans-serif;
-	 font-size: 16px;
-	 font-weight: normal;
-	 color: #000000;
-	 text-decoration: none;
-	 white-space: nowrap}
-a.topnav-1 {  font-family: Verdana, sans-serif;
-	 font-size: 14px;
-	 font-weight: normal;
-	 color: #000000;
-	 text-decoration: none;
-	 white-space: nowrap}
-a.topnav-2 {  font-family: Verdana, sans-serif;
-	 font-size: 12px;
-	 font-weight: normal;
-	 color: #000000;
-	 text-decoration: none;
-	 white-space: nowrap}
-a.topnav-3 {  font-family: Verdana, sans-serif;
-	 font-size: 11px;
-	 font-weight: normal;
-	 color: #000000;
-	 text-decoration: none;
-	 white-space: nowrap}
-a.topnav-4 {  font-family: Verdana, sans-serif;
-	 font-size: 11px;
-	 font-weight: normal;
-	 color: #000000;
-	 text-decoration: none;
-	 white-space: nowrap}
-a.topnav-5 {  font-family: Verdana, sans-serif;
-	 font-size: 11px;
-	 font-weight: normal;
-	 color: #000000;
-	 text-decoration: none;
-	 white-space: nowrap}
-li.topnav-0-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.topnav-1-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.topnav-2-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.topnav-3-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.topnav-4-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.topnav-5-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.topnav-0-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-li.topnav-1-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-li.topnav-2-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-li.topnav-3-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-li.topnav-4-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-li.topnav-5-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-
 .currenttopnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 font-size: 16px;
          font-weight: bold;
@@ -182,109 +79,6 @@ li.topnav-5-major {
 	 color: #000000; background-color: #cccccc;
 	 text-decoration: none;
 	 white-space: nowrap}
-
-%# .currenttopnav is the original RT class for the sidebar navigation tabs.
-%# Font-sizing by level depth was originally hard-coded into Elements/Menu.
-%# This modification sets a different class name for each level, allowing
-%# style sheet control over the formats
-
-a.currenttopnav-0 {  font-family: Verdana, sans-serif;
-	 font-size: 16px;
-         font-weight: bold;
-	 color: #000000; background-color: #cccccc;
-	 text-decoration: none;
-	 white-space: nowrap}
-a.currenttopnav-1 {  font-family: Verdana, sans-serif;
-	 font-size: 14px;
-         font-weight: bold;
-	 color: #000000; background-color: #cccccc;
-	 text-decoration: none;
-	 white-space: nowrap}
-a.currenttopnav-2 {  font-family: Verdana, sans-serif;
-	 font-size: 12px;
-         font-weight: normal;
-	 color: #000000; background-color: #cccccc;
-	 text-decoration: none;
-	 white-space: nowrap}
-a.currenttopnav-3 {  font-family: Verdana, sans-serif;
-	 font-size: 11px;
-         font-weight: normal;
-	 color: #000000; background-color: #cccccc;
-	 text-decoration: none;
-	 white-space: nowrap}
-a.currenttopnav-4 {  font-family: Verdana, sans-serif;
-	 font-size: 11px;
-         font-weight: normal;
-	 color: #000000; background-color: #cccccc;
-	 text-decoration: none;
-	 white-space: nowrap}
-a.currenttopnav-5 {  font-family: Verdana, sans-serif;
-	 font-size: 11px;
-         font-weight: normal;
-	 color: #000000; background-color: #cccccc;
-	 text-decoration: none;
-	 white-space: nowrap}
-li.currenttopnav-0-minor {
-	 border-top: solid #999999 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.currenttopnav-1-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.currenttopnav-2-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.currenttopnav-3-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.currenttopnav-4-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.currenttopnav-5-minor {
-	 border-top: solid #777777 1px;
-	 padding-top: .1em;
-	 margin-top: .5em;
-}
-li.currenttopnav-0-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-li.currenttopnav-1-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-li.currenttopnav-2-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-li.currenttopnav-3-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-li.currenttopnav-4-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-li.currenttopnav-5-major {
-	 border-bottom: solid black 1px;
-	 padding-top: .25em;
-	 padding-bottom: .5em;
-}
-
 .topactions {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 font-size: 10px;
 	 color: #FFFFFF;
@@ -319,12 +113,12 @@ li.currenttopnav-5-major {
 	 vertical-align: top;
 	 text-align: left;
          }
-%# Actually the "topactions" section
-.blueright {  background-color: #4682B4;
+.blueright {
+	 background-color: #4682B4;
+%#	 background-color: #eeeeee;
 	 background-position: left top;
 	 vertical-align: top;
 	 text-align: right;
-         padding-right: 1em;
          }
 .olddarkblue {  background-color: #003399;
 	 background-position: left top;
@@ -390,7 +184,7 @@ div.messagebody {
 
 
 div.downloadattachment {
-    font-size: 10px;
+    font size: 10px;
     text-align: right;
 
 }
@@ -595,21 +389,32 @@ SPAN.attribution {
 SPAN.label { font-size: 0.8em; 
 }
 
-DIV.page-stats { font-size: 0.8em;
-                  color: #cccccc;
-                  text-align: right;
-              }
-
-
 BLOCKQUOTE {
   font-style: italic;
+  /* color: #990; */
+}
+
+ADDRESS { 
+  text-align: right;
+  font-weight: bold;
+  font-style: italic 
+}
+
+BLOCKQUOTE P {			/* Try to avoid space above the attribution */
+  margin-bottom: 0;
+}
+BLOCKQUOTE ADDRESS {
+  margin: 0;
 }
 
+
 .emphasized {
   font-weight: bold
 }
 
 
+P.map-also { font-style: italic; margin-left: 15%; text-align: right }
+
 .oddline { 
         background-color : #ccccee;
 }
@@ -625,43 +430,6 @@ ul.topnav {
 	margin-bottom:0;
 }
 
-.menu-major-separator {
-	border-bottom: solid white 1px;
-	padding-top: .25em;
-	padding-bottom: .5em;
-}
-
-.menu-minor-separator {
-        border-top: solid #999999 1px;
-	padding-top: .1em;
-	margin-top: .5em;
-}
-
-TH.collection-as-table {  text-align: center;
-                          font-size: 0.8em; 
-                          padding-left: .5em;
-                          padding-right: .5em;
-                          color: #333333;
-                          background-color: #cccccc;
-                          white-space: nowrap;
-                  }
-
-TD.collection-as-table {  text-align: left;
-                          padding-left: .5em;
-                          padding-right: .5em;
-                        }
-
-textarea.signature {
-    width: 100%;
-}
-textarea.comments {
-    width: 100%;
-}
-
-textarea.messagebox {
-    width: 100%;
-}
-
 %# Provide a callback for adding/modifying the style sheet.
 %# http://www.w3.org/TR/REC-CSS1 - section 3.2, says:
 %#   "latter specified rule wins"
@@ -671,5 +439,5 @@ inherit => undef
 </%flags>
 <%init>
 $r->content_type('text/css');
-#$r->headers_out->{'Expires'} = '+30m';
+$r->headers_out->{'Expires'} = '+30m';
 </%init>
diff --git a/rt/html/REST/1.0/Forms/queue/default b/rt/html/REST/1.0/Forms/queue/default
index c87c33c..1041684 100644
--- a/rt/html/REST/1.0/Forms/queue/default
+++ b/rt/html/REST/1.0/Forms/queue/default
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/queue/default
 %#
 <%ARGS>
diff --git a/rt/html/REST/1.0/Forms/queue/ns b/rt/html/REST/1.0/Forms/queue/ns
index b0ba003..bc722d8 100644
--- a/rt/html/REST/1.0/Forms/queue/ns
+++ b/rt/html/REST/1.0/Forms/queue/ns
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/queue/ns
 %#
 <%ARGS>
diff --git a/rt/html/REST/1.0/Forms/ticket/attachments b/rt/html/REST/1.0/Forms/ticket/attachments
index ca75ce0..944e125 100644
--- a/rt/html/REST/1.0/Forms/ticket/attachments
+++ b/rt/html/REST/1.0/Forms/ticket/attachments
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/ticket/attachments
 %#
 <%ARGS>
@@ -80,7 +80,7 @@ if ($aid) {
         return [ "# Invalid attachment id: $aid", [], {}, 1 ];
     }
     if ($content) {
-	$c = $attachment->OriginalContent;
+	$c = $attachment->Content;
     } else {
 	my @data;
 	push @data, [ id    => $attachment->Id   ];
diff --git a/rt/html/REST/1.0/Forms/ticket/default b/rt/html/REST/1.0/Forms/ticket/default
index 78f6c95..d231f7b 100644
--- a/rt/html/REST/1.0/Forms/ticket/default
+++ b/rt/html/REST/1.0/Forms/ticket/default
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/ticket/default
 %#
 <%ARGS>
diff --git a/rt/html/REST/1.0/Forms/ticket/history b/rt/html/REST/1.0/Forms/ticket/history
index 4663e97..f60615a 100644
--- a/rt/html/REST/1.0/Forms/ticket/history
+++ b/rt/html/REST/1.0/Forms/ticket/history
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/ticket/history
 %#
 <%ARGS>
@@ -97,6 +97,8 @@ if ($tid) {
     $t->Load($tid);
 
     push @data, [ id    => $t->Id   ];
+    push @data, [ EffectiveTicket    => $t->EffectiveTicket   ]
+	if (!%$fields || exists $fields->{lc 'EffectiveTicket'});
     push @data, [ Ticket    => $t->Ticket   ]
 	if (!%$fields || exists $fields->{lc 'Ticket'});
     push @data, [ TimeTaken    => $t->TimeTaken   ]
diff --git a/rt/html/REST/1.0/Forms/ticket/links b/rt/html/REST/1.0/Forms/ticket/links
index 9f14da4..a3dab28 100644
--- a/rt/html/REST/1.0/Forms/ticket/links
+++ b/rt/html/REST/1.0/Forms/ticket/links
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/ticket/links
 %#
 <%ARGS>
diff --git a/rt/html/REST/1.0/Forms/user/default b/rt/html/REST/1.0/Forms/user/default
index ad2ebd5..3694416 100644
--- a/rt/html/REST/1.0/Forms/user/default
+++ b/rt/html/REST/1.0/Forms/user/default
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/user/default
 %#
 <%ARGS>
diff --git a/rt/html/REST/1.0/Forms/user/ns b/rt/html/REST/1.0/Forms/user/ns
index 4061563..8c7f16e 100644
--- a/rt/html/REST/1.0/Forms/user/ns
+++ b/rt/html/REST/1.0/Forms/user/ns
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/Forms/user/ns
 %#
 <%ARGS>
diff --git a/rt/html/REST/1.0/NoAuth/mail-gateway b/rt/html/REST/1.0/NoAuth/mail-gateway
index 5252c19..09e3e3c 100644
--- a/rt/html/REST/1.0/NoAuth/mail-gateway
+++ b/rt/html/REST/1.0/NoAuth/mail-gateway
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,19 +42,18 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%flags>
 inherit => undef # inhibit UTF8 conversion done in /autohandler
 </%flags>
 <%ARGS>
+$message
 $queue => 1
 $action => "correspond"
 $ticket => undef
 </%ARGS>
 <%init>
 use RT::Interface::Email; 
-$r->content_type('text/plain; charset=utf-8');
-$m->error_format('text');
 my ( $status, $error, $Ticket ) = RT::Interface::Email::Gateway(\%ARGS);
  if ($status == -75 ) {
 $m->out("temporary failure - ". $error);
@@ -72,6 +71,4 @@ $m->out('Requestor: '. $Ticket->Requestors->MemberEmailAddressesAsString );
  }   else { 
 $m->out('not ok - '.$error);
  }
-
-$m->abort();
 </%init>
diff --git a/rt/html/REST/1.0/autohandler b/rt/html/REST/1.0/autohandler
index 8e3fb16..c952319 100644
--- a/rt/html/REST/1.0/autohandler
+++ b/rt/html/REST/1.0/autohandler
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,12 +42,12 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/autohandler
 %#
 <%INIT>
 use RT::Interface::REST;
-$r->content_type('text/plain; charset=utf-8');
+$r->content_type('text/plain');
 $m->error_format('text');
 $m->call_next();
 $m->abort();
diff --git a/rt/html/REST/1.0/dhandler b/rt/html/REST/1.0/dhandler
index 6cf45b0..725a617 100644
--- a/rt/html/REST/1.0/dhandler
+++ b/rt/html/REST/1.0/dhandler
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/dhandler
 %#
 <%ARGS>
diff --git a/rt/html/REST/1.0/logout b/rt/html/REST/1.0/logout
index 470cb09..9f04376 100644
--- a/rt/html/REST/1.0/logout
+++ b/rt/html/REST/1.0/logout
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%PERL>
 tied(%session)->delete if (defined %session);
 </%PERL>
diff --git a/rt/html/REST/1.0/search/dhandler b/rt/html/REST/1.0/search/dhandler
index 1915a46..8c61f72 100644
--- a/rt/html/REST/1.0/search/dhandler
+++ b/rt/html/REST/1.0/search/dhandler
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/search/dhandler
 %#
 <%INIT>
diff --git a/rt/html/REST/1.0/search/ticket b/rt/html/REST/1.0/search/ticket
index d0ab59e..6b52ac8 100644
--- a/rt/html/REST/1.0/search/ticket
+++ b/rt/html/REST/1.0/search/ticket
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/search/ticket
 %#
 <%ARGS>
@@ -135,7 +135,7 @@ if ($n == 0 && $format ne "i") {
 $output = form_compose(\@output) if @output;
 
 OUTPUT:
-$m->out("RT/". $RT::VERSION . " " . $status ."\n\n");
+$m->out("RT/". $RT::VERSION . " " . $status);
 
 $m->out($output );
 </%INIT>
diff --git a/rt/html/REST/1.0/ticket/comment b/rt/html/REST/1.0/ticket/comment
index e27bfcc..4915c64 100644
--- a/rt/html/REST/1.0/ticket/comment
+++ b/rt/html/REST/1.0/ticket/comment
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/ticket/comment
 %#
 <%ARGS>
diff --git a/rt/html/REST/1.0/ticket/link b/rt/html/REST/1.0/ticket/link
index 6556a5e..7507c07 100644
--- a/rt/html/REST/1.0/ticket/link
+++ b/rt/html/REST/1.0/ticket/link
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/ticket/link
 %#
 <%ARGS>
diff --git a/rt/html/REST/1.0/ticket/merge b/rt/html/REST/1.0/ticket/merge
index 3db5211..7cc8b4b 100644
--- a/rt/html/REST/1.0/ticket/merge
+++ b/rt/html/REST/1.0/ticket/merge
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# REST/1.0/ticket/merge
 %#
 <%ARGS>
diff --git a/rt/html/Search/Build.html b/rt/html/Search/Build.html
index cb64626..bbf2a1d 100644
--- a/rt/html/Search/Build.html
+++ b/rt/html/Search/Build.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,27 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-%#
-%# Data flow here:
-%#   The page receives a Query from the previous page, and maybe arguments
-%#   corresponding to actions.  (If it doesn't get a Query argument, it pulls
-%#   one out of the session hash.  Also, it could be getting just a raw query from
-%#   Build/Edit.html (Advanced).)
-%#
-%#   After doing some stuff with default arguments and saved searches, the ParseQuery
-%#   function (which is similar to, but not the same as, _parser in RT/Tickets_Overlay_SQL)
-%#   converts the Query into a RT::Interface::Web::QueryBuilder::Tree.  This mason file
-%#   then adds stuff to or modifies the tree based on the actions that had been requested
-%#   by clicking buttons.  It then calls GetQueryAndOptionList on the tree to generate
-%#   the SQL query (which is saved as a hidden input) and the option list for the Clauses
-%#   box in the top right corner.
-%#
-%#   Worthwhile refactoring: the tree manipulation code for the actions could use some cleaning
-%#   up.  The node-adding code is different in the "add" actions from in ParseQuery, which leads
-%#   to things like ParseQuery correctly not quoting numbers in numerical fields, while the "add"
-%#   action does quote it (this breaks SQLite).
-%#
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title &>
 <& /Ticket/Elements/Tabs, 
     current_tab => "Search/Build.html".$QueryString, 
@@ -78,28 +58,36 @@
 <input type=hidden name=SearchId value="<%$SearchId%>">
 <input type=hidden name=Query value="<%$Query%>">
 <input type=hidden name=Format value="<%$Format%>">
-<table width=100% border="0" cellpadding="5">
-<tr valign="top">
-<td class="boxcontainer" rowspan="2" width="65%">
-<& Elements/PickCriteria, query => $Query, cfqueues => $queues &>
+<table width=100%>
+<tr>
+<td valign=top class="boxcontainer">
+<& Elements/PickCriteria, query => $Query, cfqueues => \%queues &>
 <& /Elements/Submit, Caption => loc('Add additional criteria'), Label => loc('Add'), Name => 'AddClause'&>
-</td>
 
-<td>
-<& Elements/EditQuery,
-    %ARGS,
-    actions => \@actions,
-    optionlist => $optionlist,
-    Description => $Description &>
 </td>
-</tr>
-
-<tr valign="top">
-<td>
+<td valign=top class="boxcontainer">
+<& /Elements/TitleBoxStart, title => loc("Query") . ": " .$Description &>
+<& Elements/NewListActions, actions => \@actions &>
+<select size="10" name="clauses" style="width: 100%">
+<%$optionlist|n%>
+</select>
+</td></tr><tr><td bgcolor="#dddddd" colspan="2">
+<center>
+<input type=submit name="Up" value="^">
+<input type=submit name="Down" value="v">
+<input type=submit name="Left" value="<">
+<input type=submit name="Right" value=">">
+<input type=submit name="DeleteClause" value="Delete">
+<br />
+<input type=submit name="Clear" value="Clear">
+<input type=submit name="Toggle" value="And/Or">
+%#<input type=submit name="EditQuery" value="Advanced">
+</center>
+<& /Elements/TitleBoxEnd &>
+<br>
 <& Elements/EditSearches, CurrentSearch => $search_hash, Dirty => $dirty, SearchId => $SearchId &>
 </td>
 </tr>
-
 <tr>
 <td colspan=2 class="boxcontainer">
 
@@ -107,35 +95,27 @@
 AvailableColumns => $AvailableColumns,  CurrentFormat => $CurrentFormat, RowsPerPage => $RowsPerPage, OrderBy => $OrderBy, Order => $Order &>
 </td>
 </tr>
-<tr>
-<td colspan=2 class="boxcontainer">
-<& /Elements/Submit, Caption => loc("Do the Search"), Label => loc('Search'), Name => 'DoSearch'&>
-</td>
-</tr>
 </table>
 </FORM>
 
 <%INIT>
-use RT::Interface::Web::QueryBuilder;
-use RT::Interface::Web::QueryBuilder::Tree;
+use Tree::Simple;
 
 my $search_hash = {};
 my $search;
 my $title = loc("Query Builder");
 
 # {{{ Clear out unwanted data
-if ( $NewQuery or $ARGS{'Delete'} ) {
-
+if ($NewQuery or $ARGS{'Delete'}) {
     # Wipe all data-carrying variables clear if we want a new
     # search, or we're deleting an old one..
-    $Query       = '';
-    $Format      = '';
+    $Query = '';
+    $Format = '';
     $Description = '';
-    $SearchId    = '';
-    $Order       = '';
-    $OrderBy     = '';
+    $SearchId = '';
+    $Order = '';
+    $OrderBy = '';
     $RowsPerPage = '';
-
     # ($search hasn't been set yet; no need to clear)
 
     # ..then wipe the session out..
@@ -144,7 +124,6 @@ if ( $NewQuery or $ARGS{'Delete'} ) {
     # ..and the search results.
     $session{'tickets'}->CleanSlate() if defined $session{'tickets'};
 }
-
 # }}}
 
 # {{{ Attempt to load what we can from the session, set defaults
@@ -154,71 +133,61 @@ $search_hash = $session{'CurrentSearchHash'};
 
 # These variables are what define a search_hash; this is also
 # where we give sane defaults.
-$Query       ||= $search_hash->{'Query'};
-$Format      ||= $search_hash->{'Format'};
+$Query ||= $search_hash->{'Query'};
+$Format ||= $search_hash->{'Format'};
 $Description ||= $search_hash->{'Description'};
-$SearchId    ||= $search_hash->{'SearchId'} || 'new';
-$Order       ||= $search_hash->{'Order'} || 'ASC';
-$OrderBy     ||= $search_hash->{'OrderBy'} || 'id';
-$RowsPerPage = ( $search_hash->{'RowsPerPage'} || 50 )
-  unless defined($RowsPerPage);
+$SearchId ||= $search_hash->{'SearchId'} || 'new';
+$Order ||= $search_hash->{'Order'} || 'ASC';
+$OrderBy ||= $search_hash->{'OrderBy'} || 'id';
+$RowsPerPage = ($search_hash->{'RowsPerPage'} || 50) unless defined ($RowsPerPage);
 $search ||= $search_hash->{'Object'};
-
 # }}}
 
 my @actions = ();
+my %queues;
 
 # Clean unwanted junk from the format
-$Format = $m->comp( '/Elements/ScrubHTML', Content => $Format ) if ($Format);
+$Format = $m->comp('/Elements/ScrubHTML', Content => $Format) if ($Format);
 
 # {{{ If we're asked to delete the current search, make it go away and reset the search parameters
 if ( $ARGS{'Delete'} ) {
-
     # We set $SearchId to 'new' above already, so peek into the %ARGS
     if ( $ARGS{'SearchId'} =~ /^(.*?)-(\d+)-SavedSearch-(\d+)$/ ) {
         my $obj_type  = $1;
         my $obj_id    = $2;
         my $search_id = $3;
-
+	
         my $container_object;
-        if ( $obj_type eq 'RT::User' && $obj_id == $session{'CurrentUser'}->Id )
-        {
-            $container_object = $session{'CurrentUser'}->UserObj;
+        if ( $obj_type eq 'RT::User' && $obj_id == $session{'CurrentUser'}->Id)  {
+            $container_object =    $session{'CurrentUser'}->UserObj;
         }
-        elsif ( $obj_type eq 'RT::Group' ) {
-            $container_object = RT::Group->new( $session{'CurrentUser'} );
+        elsif ($obj_type eq 'RT::Group') {
+            $container_object = RT::Group->new($session{'CurrentUser'});
             $container_object->Load($obj_id);
         }
 
-        if ( $container_object->id ) {
-
-            # We have the object the entry is an attribute on; delete
-            # the entry..
-            $container_object->Attributes->DeleteEntry(
-                Name => 'SavedSearch',
-                id   => $search_id
-            );
-        }
+        if ($container_object->id ) { 
+	    # We have the object the entry is an attribute on; delete
+	    # the entry..
+	    $container_object->Attributes->DeleteEntry( Name => 'SavedSearch', id   => $search_id);
+	}
 
     }
 }
-
 # }}}
 
 # {{{ If the user wants to copy a search, uncouple from the one that this was based on, but don't erase the $Query or $Format
 if ( $ARGS{'CopySearch'} ) {
-    $SearchId    = 'new';
-    $search      = undef;
-    $Description = loc( "[_1] copy", $Description );
+    $SearchId = 'new';
+    $search = undef;
+    $Description = loc("[_1] copy", $Description);
 }
-
 # }}}
 
 # {{{ if we're asked to revert the current search, we just want to load it
 if ( $ARGS{'Revert'} ) {
     $ARGS{'LoadSavedSearch'} = $SearchId;
 }
-
 # }}}
 
 # {{{ if we're asked to load a search, load it.
@@ -227,18 +196,15 @@ if ( $ARGS{'LoadSavedSearch'} =~ /^(.*?)-(\d+)-SavedSearch-(\d+)$/ ) {
     my $obj_type  = $1;
     my $obj_id    = $2;
     my $search_id = $3;
-
+    
     # We explicitly list out the available types (user and group) and
     # don't trust user input here
-    if (   ( $obj_type eq 'RT::User' )
-        && ( $obj_id == $session{'CurrentUser'}->id ) )
-    {
-        $search =
-          $session{'CurrentUser'}->UserObj->Attributes->WithId($search_id);
-
+    if (   ( $obj_type eq 'RT::User' ) && ( $obj_id == $session{'CurrentUser'}->id ) ) {
+        $search = $session{'CurrentUser'}->UserObj->Attributes->WithId($search_id);
+	
     }
-    elsif ( $obj_type eq 'RT::Group' ) {
-        my $group = RT::Group->new( $session{'CurrentUser'} );
+    elsif ($obj_type eq 'RT::Group')  {
+        my $group = RT::Group->new($session{'CurrentUser'});
         $group->Load($obj_id);
         $search = $group->Attributes->WithId($search_id);
     }
@@ -265,227 +231,260 @@ if ( $actions[0] ) {
     $m->abort();
 }
 
+my @options;
+my $optionlist;
 $Query  = "";
+%queues = ();
 
-my @options = $tree->GetDisplayedNodes;
+# Build the optionlist from the tree, so we can do additions and movements based on it
+$optionlist = build_array( \$Query, $ARGS{clauses}, $tree, \@options, \%queues );
 
-my @current_values = grep { defined } @options[@clauses];
+my $currentkey;
+$currentkey = $options[$ARGS{clauses}] if defined $ARGS{clauses};
 
 # {{{ Try to find if we're adding a clause
 foreach my $arg ( keys %ARGS ) {
-    if (
-        $arg =~ m/^ValueOf(.+)/
-        && ( ref $ARGS{$arg} eq "ARRAY"
-            ? grep { $_ ne "" } @{ $ARGS{$arg} }
-            : $ARGS{$arg} ne "" )
-      )
-    {
-
-        # We're adding a $1 clause
-        my $field = $1;
-        my ( $keyword, $op, $value );
-
-        #figure out if it's a grouping
-        if ( $ARGS{ $field . "Field" } ) {
-            $keyword = $ARGS{ $field . "Field" };
-        }
-        else {
-            $keyword = $field;
-        }
-
-        my ( @ops, @values );
-        if ( ref $ARGS{ 'ValueOf' . $field } eq "ARRAY" ) {
-
-            # we have many keys/values to iterate over, because there is
-            # more than one CF with the same name.
-            @ops    = @{ $ARGS{ $field . 'Op' } };
-            @values = @{ $ARGS{ 'ValueOf' . $field } };
-        }
-        else {
-            @ops    = ( $ARGS{ $field . 'Op' } );
-            @values = ( $ARGS{ 'ValueOf' . $field } );
-        }
-        $RT::Logger->error("Bad Parameters passed into Query Builder")
-          unless @ops == @values;
-
-        for my $i ( 0 .. @ops - 1 ) {
-            my ( $op, $value ) = ( $ops[$i], $values[$i] );
-            next if $value eq "";
-
-            if ( $value eq 'NULL' && $op =~ /=/ ) {
-                if ( $op eq '=' ) {
-                    $op = "IS";
-                }
-                elsif ( $op eq '!=' ) {
-                    $op = "IS NOT";
-                }
-
-                # This isn't "right", but...
-                # It has to be this way until #5182 is fixed
-                $value = "'NULL'";
+    if ( $arg =~ m/ValueOf(.+)/ && $ARGS{$arg} ne "") {
+	# We're adding a $1 clause
+	my $field = $1;
+	my ($keyword, $op, $value);
+
+	#figure out if it's a grouping
+	if ( $ARGS{ $field . "Field" } ) {
+	    $keyword = $ARGS{ $field . "Field" };
+	}
+	else {
+	    $keyword = $field;
+	}
+
+        $value = $ARGS{'ValueOf' . $field};
+        $op = $ARGS{ $field . 'Op' };
+	if ( $value eq 'NULL' && $op =~ /=/) {
+            if ($op eq '=') {
+                $op = "IS";
+            } elsif ($op eq '!=') {
+                $op = "IS NOT";
             }
-            else {
-                $value = "'$value'";
-            }
-
-            my $clause = {
-                Key   => $keyword,
-                Op    => $op,
-                Value => $value
-            };
 
-            my $newnode = RT::Interface::Web::QueryBuilder::Tree->new($clause);
-            if (@current_values) {
-                foreach my $value (@current_values) {
-                    my $newindex = $value->getIndex() + 1;
-                    $value->insertSibling( $newindex, $newnode );
-                    $value = $newnode;
-                }
-            }
-            else {
-                $tree->getChild(0)->addChild($newnode);
-                @current_values = $newnode;
-            }
-            $newnode->getParent()->setNodeValue( $ARGS{'AndOr'} );
+            # This isn't "right", but...
+            # It has to be this way until #5182 is fixed
+            $value = "'NULL'";
+	} else {
+            $value = "'$value'";
         }
+
+	my $clause = {
+            Key   => $keyword,
+            Op    => $op,
+            Value => $value
+        };
+	    
+	my $newnode = Tree::Simple->new($clause);
+	if ($currentkey) {
+	    my $newindex = $currentkey->getIndex() + 1;
+	    if (!$currentkey->getParent->getParent()->isRoot()) {
+	    }
+	    $currentkey->insertSibling($newindex, $newnode);
+	    $currentkey = $newnode;
+	}
+	else {
+	    $tree->getChild(0)->addChild($newnode);
+	    $currentkey = $newnode;
+	}
+	$newnode->getParent()->setNodeValue($ARGS{'AndOr'});
     }
 }
-
 # }}}
 
 # {{{ Move things around
 if ( $ARGS{"Up"} ) {
-    if (@current_values) {
-        foreach my $value (@current_values) {
-            my $index = $value->getIndex();
-            if ( $value->getIndex() > 0 ) {
-                my $parent = $value->getParent();
-                $parent->removeChild($index);
-                $parent->insertChild( $index - 1, $value );
-                $value = $parent->getChild( $index - 1 );
-            }
-            else {
-                push( @actions, [ loc("error: can't move up"), -1 ] );
-            }
+    if ($currentkey) {
+	my $index = $currentkey->getIndex();
+	if ( $currentkey->getIndex() > 0 ) {
+	    my $parent = $currentkey->getParent();
+	    $parent->removeChild($index);
+	    $parent->insertChild($index - 1, $currentkey);
+	    $currentkey = $parent->getChild($index - 1);
+	}
+        else {
+            push( @actions, [ "error: can't move up", -1 ] );
         }
     }
     else {
-        push( @actions, [ loc("error: nothing to move"), -1 ] );
+        push( @actions, [ "error: nothing to move", -1 ] );
     }
 }
 elsif ( $ARGS{"Down"} ) {
-    if (@current_values) {
-        foreach my $value (@current_values) {
-            my $index  = $value->getIndex();
-            my $parent = $value->getParent();
-            if ( $value->getIndex() < ( $parent->getChildCount - 1 ) ) {
-                $parent->removeChild($index);
-                $parent->insertChild( $index + 1, $value );
-                $value = $parent->getChild( $index + 1 );
-            }
-            else {
-                push( @actions, [ loc("error: can't move down"), -1 ] );
-            }
+    if ($currentkey) {
+	my $index = $currentkey->getIndex();
+	my $parent = $currentkey->getParent();
+	if ( $currentkey->getIndex() < ($parent->getChildCount - 1) ) {
+	    $parent->removeChild($index);
+	    $parent->insertChild($index + 1, $currentkey);
+	    $currentkey = $parent->getChild($index + 1);
+	}
+        else {
+            push( @actions, [ "error: can't move down", -1 ] );
         }
     }
     else {
-        push( @actions, [ loc("error: nothing to move"), -1 ] );
+        push( @actions, [ "error: nothing to move", -1 ] );
     }
 }
 elsif ( $ARGS{"Left"} ) {
-    if (@current_values) {
-        foreach my $value (@current_values) {
-            my $parent      = $value->getParent();
-            my $grandparent = $parent->getParent();
-            if ( !$grandparent->isRoot ) {
-                my $index = $parent->getIndex();
-                $parent->removeChild($value);
-                $grandparent->insertChild( $index, $value );
-                if ( $parent->isLeaf() ) {
-                    $grandparent->removeChild($parent);
-                }
-            }
-            else {
-                push( @actions, [ loc("error: can't move left"), -1 ] );
-            }
+    if ($currentkey) {
+	my $parent = $currentkey->getParent();
+	my $grandparent = $parent->getParent();
+	if (!$grandparent->isRoot) {
+	    my $index = $parent->getIndex();
+	    $parent->removeChild($currentkey);
+	    $grandparent->insertChild($index, $currentkey);
+	    if ($parent->isLeaf()) {
+		$grandparent->removeChild($parent);
+	    }
+        }
+        else {
+            push( @actions, [ "error: can't move left", -1 ] );
         }
     }
     else {
-        push( @actions, [ loc("error: nothing to move"), -1 ] );
+        push( @actions, [ "error: nothing to move", -1 ] );
     }
 }
 elsif ( $ARGS{"Right"} ) {
-    if (@current_values) {
-        foreach my $value (@current_values) {
-            my $parent = $value->getParent();
-            my $index  = $value->getIndex();
-            my $newparent;
-            if ( $index > 0 ) {
-                my $sibling = $parent->getChild( $index - 1 );
-                if ( ref( $sibling->getNodeValue ) ) {
-                    $parent->removeChild($value);
-                    my $newtree = RT::Interface::Web::QueryBuilder::Tree->new( 'AND', $parent );
-                    $newtree->addChild($value);
-                }
-                else {
-                    $parent->removeChild($index);
-                    $sibling->addChild($value);
-                }
-            }
-            else {
-                $parent->removeChild($value);
-                $newparent = RT::Interface::Web::QueryBuilder::Tree->new( 'AND', $parent );
-                $newparent->addChild($value);
-            }
-        }
-    }
-    else {
-        push( @actions, [ loc("error: nothing to move"), -1 ] );
+    if ($currentkey) {
+	my $parent = $currentkey->getParent();
+	my $index = $currentkey->getIndex();
+	my $newparent;
+	if ($index > 0 ) {
+	    my $sibling = $parent->getChild($index - 1);
+	    if (ref($sibling->getNodeValue)) {
+		$parent->removeChild($currentkey);
+		my $newtree = Tree::Simple->new('AND', $parent);
+		$newtree->addChild($currentkey);
+	    } else {
+		$parent->removeChild($index);
+		$sibling->addChild($currentkey);
+	    }
+	}
+	else {
+	    $parent->removeChild($currentkey);
+	    $newparent = Tree::Simple->new('AND', $parent);
+	    $newparent->addChild($currentkey);
+	}
+    } else {
+        push( @actions, [ "error: nothing to move", -1 ] );
     }
 }
 elsif ( $ARGS{"DeleteClause"} ) {
-    if (@current_values) {
-        $_->getParent()->removeChild($_) for @current_values;
+    if ($currentkey) {
+	$currentkey->getParent()->removeChild($currentkey);
     }
     else {
-        push( @actions, [ loc("error: nothing to delete"), -1 ] );
+        push( @actions, [ "error: nothing to delete", -1 ] );
     }
 }
 elsif ( $ARGS{"Toggle"} ) {
     my $ea;
-    if (@current_values) {
-        foreach my $value (@current_values) {
-            my $parent = $value->getParent();
-
-            if ( $parent->getNodeValue eq 'AND' ) {
-                $parent->setNodeValue('OR');
-            }
-            else {
-                $parent->setNodeValue('AND');
-            }
-        }
+    if ($currentkey) {
+	my $value = $currentkey->getNodeValue();
+	my $parent = $currentkey->getParent();
+	my $parentvalue = $parent->getNodeValue();
+
+	if ( $parentvalue eq 'AND') {
+            $parent->setNodeValue('OR');
+	}
+        else {
+	    $parent->setNodeValue('AND');
+	}
     }
     else {
-        push( @actions, [ loc("error: nothing to toggle"), -1 ] );
+        push( @actions, [ "error: nothing to toggle", -1 ] );
     }
 }
-
-$tree->PruneChildlessAggregators;
-
+elsif ( $ARGS{"Clear"} ) {
+    $tree = Tree::Simple->new(Tree::Simple->ROOT);
+}
 # }}}
 
 # {{{ Rebuild $Query based on the additions / movements
-$Query      = "";
-my $optionlist_arrayref;
-
-($Query, $optionlist_arrayref) = $tree->GetQueryAndOptionList(\@current_values);
-  
-my $optionlist = join "\n", map { qq(<option value="$_->{INDEX}" $_->{SELECTED}>) 
-                                  . ("&nbsp;" x (5 * $_->{DEPTH}))
-                                  . $m->interp->apply_escapes($_->{TEXT}, 'h') . qq(</option>) } @$optionlist_arrayref;
-
+$Query   = "";
+@options = ();
+%queues  = ();
+$optionlist = build_array( \$Query, $currentkey, $tree, \@options, \%queues );
+
+sub build_array {
+    my $Query     = shift;
+    my $currentkey = shift;
+    my $tree = shift;
+    my ($keys, $queues)    = @_;
+    my $i = 0;
+    my $optionlist;
+    my $depth = 0;
+    my %parens;
+
+    $tree->traverse( sub {
+	my ($_tree) = @_;
+
+	return if $_tree->getParent->isRoot();
+
+	push @$keys, $_tree;
+	my $clause = $_tree->getNodeValue();
+	my $str;
+	my $ea = $_tree->getParent()->getNodeValue();
+	if (ref($clause)) {
+	    $str .= $ea . " " if $_tree->getIndex() > 0;
+	    $str .= $clause->{Key} . " " . $clause->{Op} . " " . $clause->{Value};
+	
+	    if ( $clause->{Key} eq "Queue" ) {
+		$queues->{ $clause->{Value} } = 1;
+	    }
+	} else {
+	    $str = $ea if $_tree->getIndex() > 0;
+	}
+
+	my $selected;
+	if ($_tree == $currentkey) {
+	    $selected = "SELECTED";
+	}
+	else {
+	    $selected = "";
+	}
+
+	foreach my $p (keys %parens) {
+	    if ($p > $_tree->getDepth) {
+		$$Query .= ')' x $parens{$p};
+		$parens{$p}--;
+	    }
+	}
+
+	$optionlist .= "<option value=$i $selected>" .
+	  ("&nbsp;" x 5 x ($_tree->getDepth() - 1)) . "$str</option>\n";
+	my $parent = $_tree->getParent();
+	if (!($parent->isRoot || $parent->getParent()->isRoot) &&
+	    !ref($parent->getNodeValue())) {
+	    if ( $_tree->getIndex() == 0) {
+		$$Query .= '(';
+		$parens{$_tree->getDepth}++;
+	    }
+	}
+	$$Query .= " " . $str . " ";
+
+	if ($_tree->getDepth < $depth) {
+	    $$Query .= ')';
+	    $parens{$depth}--;
+	}
+
+	$i++;
+    });
+
+    foreach my $p (keys %parens) {
+	$$Query .= ") " x $parens{$p};
+    }
 
+    return $optionlist;
 
+}
 
 use Regexp::Common qw /delimited/;
 
@@ -497,18 +496,18 @@ use constant PAREN   => 8;
 use constant KEYWORD => 16;
 
 sub ParseQuery {
-    my $string  = shift;
-    my $tree    = shift;
+    my $string = shift;
+    my $tree = shift;
     my @actions = shift;
-    my $want    = KEYWORD | PAREN;
-    my $last    = undef;
+    my $want   = KEYWORD | PAREN;
+    my $last   = undef;
 
     my $depth = 1;
 
     # make a tree root
-    $$tree = RT::Interface::Web::QueryBuilder::Tree->new;
-    my $root       = RT::Interface::Web::QueryBuilder::Tree->new( 'AND', $$tree );
-    my $lastnode   = $root;
+    $$tree = Tree::Simple->new(Tree::Simple->ROOT);
+    my $root = Tree::Simple->new('AND', $$tree);
+    my $lastnode = $root;
     my $parentnode = $root;
 
     # get the FIELDS from Tickets_Overlay
@@ -522,20 +521,17 @@ sub ParseQuery {
     my $re_aggreg  = qr[(?i:AND|OR)];
     my $re_value   = qr[$RE{delimited}{-delim=>qq{\'\"}}|\d+];
     my $re_keyword = qr[$RE{delimited}{-delim=>qq{\'\"}}|(?:\{|\}|\w|\.)+];
-    my $re_op      =
-      qr[=|!=|>=|<=|>|<|(?i:IS NOT)|(?i:IS)|(?i:NOT LIKE)|(?i:LIKE)]
-      ;    # long to short
+    my $re_op      = qr[=|!=|>=|<=|>|<|(?i:IS NOT)|(?i:IS)|(?i:NOT LIKE)|(?i:LIKE)] ;    # long to short
     my $re_paren = qr'\(|\)';
 
-    # assume that $ea is AND if it is not set
+    # assume that $ea is AND if it's not set
     my ( $ea, $key, $op, $value ) = ( "AND", "", "", "" );
 
     # order of matches in the RE is important.. op should come early,
     # because it has spaces in it.  otherwise "NOT LIKE" might be parsed
     # as a keyword or value.
 
-    while (
-        $string =~ /(
+    while ( $string =~ /(
                       $re_aggreg
                       |$re_op
                       |$re_keyword
@@ -560,15 +556,7 @@ sub ParseQuery {
             # Error
             # FIXME: I will only print out the highest $want value
             my $token = $tokens[ ( ( log $want ) / ( log 2 ) ) ];
-            push @actions,
-              [
-                loc(
-"current: $current, want $want, Error near ->$val<- expecting a "
-                      . $token
-                      . " in '$string'\n"
-                ),
-                -1
-              ];
+            push @actions, [ "current: $current, want $want, Error near ->$val<- expecting a " . $token . " in '$string'\n", -1 ];
         }
 
         # State Machine:
@@ -577,21 +565,20 @@ sub ParseQuery {
         # Parens are highest priority
         if ( $current & PAREN ) {
             if ( $val eq "(" ) {
-                $depth++;
-
-                # make a new node that the clauses can be children of
-                $parentnode = RT::Interface::Web::QueryBuilder::Tree->new( $ea, $parentnode );
+		$depth++;
+		# make a new node that the clauses can be children of
+		$parentnode = Tree::Simple->new($ea, $parentnode);
             }
             else {
-                $depth--;
-                $parentnode = $parentnode->getParent();
-                $lastnode   = $parentnode;
+		$depth--;
+		$parentnode = $parentnode->getParent();
+		$lastnode = $parentnode;
             }
 
             $want = KEYWORD | PAREN | AGGREG;
         }
         elsif ( $current & AGGREG ) {
-            $ea   = $val;
+            $ea = $val;
             $want = KEYWORD | PAREN;
         }
         elsif ( $current & KEYWORD ) {
@@ -629,27 +616,27 @@ sub ParseQuery {
                 $val = "'$val'";
             }
 
-            push @actions, [ loc("Unknown field: $key"), -1 ] unless $class;
+            push @actions, [ "Unknown field: $key", -1 ] unless $class;
 
             $want = PAREN | AGGREG;
         }
         else {
-            push @actions, [ loc("I'm lost"), -1 ];
+            push @actions, [ "I'm lost", -1 ];
         }
 
         if ( $current & VALUE ) {
-            if ( $key =~ /^CF./ ) {
-                $key = "'" . $key . "'";
-            }
+	    if ( $key =~ /^CF./ ) {
+	        $key = "'" . $key . "'";
+	    }
             my $clause = {
                 Key   => $key,
                 Op    => $op,
                 Value => $val
             };
 
-            # explicity add a child to it
-            $lastnode = RT::Interface::Web::QueryBuilder::Tree->new( $clause, $parentnode );
-            $lastnode->getParent()->setNodeValue($ea);
+	    # explicity add a child to it
+	    $lastnode = Tree::Simple->new($clause, $parentnode);
+	    $lastnode->getParent()->setNodeValue($ea);
 
             ( $ea, $key, $op, $value ) = ( "", "", "", "" );
         }
@@ -657,14 +644,14 @@ sub ParseQuery {
         $last = $current;
     }    # while
 
-    push @actions, [ loc("Incomplete query"), -1 ]
+    push @actions, [ "Incomplete query", -1 ]
       unless ( ( $want | PAREN ) || ( $want | KEYWORD ) );
 
-    push @actions, [ loc("Incomplete Query"), -1 ]
+    push @actions, [ "Incomplete Query", -1 ]
       unless ( $last && ( $last | PAREN ) || ( $last || VALUE ) );
 
     # This will never happen, because the parser will complain
-    push @actions, [ loc("Mismatched parentheses"), -1 ]
+    push @actions, [ "Mismatched parentheses", -1 ]
       unless $depth == 1;
 }
 
@@ -680,32 +667,24 @@ sub _match {
 
 sub debug {
     my $message = shift;
-    $m->print( $message . "<br>" );
+    $m->print($message . "<br>");
 }
 
 # }}}
 
 # }}}
 
-my $queues = $tree->GetReferencedQueues;
-
 # {{{ Deal with format changes
-my ( $AvailableColumns, $CurrentFormat );
-( $Format, $AvailableColumns, $CurrentFormat ) = $m->comp(
-    'Elements/BuildFormatString',
-    cfqueues => $queues,
-    %ARGS, Format => $Format
-);
-
+my ($AvailableColumns, $CurrentFormat);
+($Format, $AvailableColumns, $CurrentFormat) = $m->comp('Elements/BuildFormatString', cfqueues => \%queues, %ARGS, Format => $Format);
 # }}}
 
 # {{{ if we're asked to save the current search, save it
 if ( $ARGS{'Save'} ) {
 
-    if ( $search && $search->id ) {
-
-        # This search is based on a previously loaded search -- so
-        # just update the current search object with new values
+    if ($search && $search->id) {
+	# This search is based on a previously loaded search -- so
+	# just update the current search object with new values
         $search->SetSubValues(
             Format      => $Format,
             Query       => $Query,
@@ -713,102 +692,83 @@ if ( $ARGS{'Save'} ) {
             OrderBy     => $OrderBy,
             RowsPerPage => $RowsPerPage,
         );
-        $search->SetDescription($Description);
+        $search->SetDescription( $Description );
 
     }
     elsif ( $SearchId eq 'new' && $ARGS{'Owner'} =~ /^(.*?)-(\d+)$/ ) {
+	# We're saving a new search
+	my $obj_type  = $1;
+	my $obj_id    = $2;
+ 
 
-        # We're saving a new search
-        my $obj_type = $1;
-        my $obj_id   = $2;
-
-        # Find out if we're saving on the user, or a group
+	# Find out if we're saving on the user, or a group
         my $container_object;
-        if ( $obj_type eq 'RT::User' && $obj_id == $session{'CurrentUser'}->Id )
-        {
+        if ( $obj_type eq 'RT::User' && $obj_id == $session{'CurrentUser'}->Id)  {
             $container_object = $session{'CurrentUser'}->UserObj;
         }
-        elsif ( $obj_type eq 'RT::Group' ) {
-            $container_object = RT::Group->new( $session{'CurrentUser'} );
+        elsif ($obj_type eq 'RT::Group') {
+            $container_object = RT::Group->new($session{'CurrentUser'});
             $container_object->Load($obj_id);
         }
 
-        if ( $container_object->id ) {
-
-            # If we got one or the other, add the saerch
-            my ( $search_id, $search_msg ) = $container_object->AddAttribute(
-                Name        => 'SavedSearch',
-                Description => $Description,
-                Content     => {
-                    Format      => $Format,
-                    Query       => $Query,
-                    Order       => $Order,
-                    OrderBy     => $OrderBy,
-                    RowsPerPage => $RowsPerPage,
-                }
-            );
-            $search =
-              $session{'CurrentUser'}->UserObj->Attributes->WithId($search_id);
-
-            # Build new SearchId
-            $SearchId =
-                ref( $session{'CurrentUser'}->UserObj ) . '-'
-              . $session{'CurrentUser'}->UserObj->Id
-              . '-SavedSearch-'
-              . $search->Id;
-        }
-        unless ( $search->id ) {
-            push @actions, [ loc("Can't find a saved search to work with"), 0 ];
+        if ($container_object->id ) { 
+	    # If we got one or the other, add the saerch        
+	    my ( $search_id, $search_msg ) = $container_object->AddAttribute(
+									     Name        => 'SavedSearch',
+									     Description => $Description,
+									     Content     => {
+											     Format      => $Format,
+											     Query       => $Query,
+											     Order       => $Order,
+											     OrderBy     => $OrderBy,
+											     RowsPerPage => $RowsPerPage,
+											    }
+									    );
+	    $search = $session{'CurrentUser'}->UserObj->Attributes->WithId($search_id);
+	    # Build new SearchId
+	    $SearchId = ref( $session{'CurrentUser'}->UserObj ) . '-'
+	      . $session{'CurrentUser'}->UserObj->Id . '-SavedSearch-' . $search->Id;
+	}
+        unless ($search->id) {
+            push @actions, [loc("Can't find a saved search to work with"), 0];
         }
 
     }
     else {
-        push @actions, [ loc("Can't save this search"), 0 ];
+	push @actions, [loc("Can't save this search"), 0];
     }
 
 }
-
 # }}}
 
 # {{{ If we're modifying an old query, check if it has changed
 my $dirty = 0;
-$dirty = 1
-  if defined $search
-  and ($search->SubValue('Format') ne $Format
-    or $search->SubValue('Query')       ne $Query
-    or $search->SubValue('Order')       ne $Order
-    or $search->SubValue('OrderBy')     ne $OrderBy
-    or $search->SubValue('RowsPerPage') ne $RowsPerPage );
-
+$dirty = 1 if defined $search and 
+  ($search->SubValue('Format')      ne $Format      or
+   $search->SubValue('Query')       ne $Query       or 
+   $search->SubValue('Order')       ne $Order       or
+   $search->SubValue('OrderBy')     ne $OrderBy     or
+   $search->SubValue('RowsPerPage') ne $RowsPerPage);
 # }}}
 
 # {{{ Push the updates into the session so we don't loose 'em
-$search_hash->{'SearchId'}    = $SearchId;
-$search_hash->{'Format'}      = $Format;
-$search_hash->{'Query'}       = $Query;
+$search_hash->{'SearchId'} = $SearchId;
+$search_hash->{'Format'} = $Format;
+$search_hash->{'Query'} = $Query;
 $search_hash->{'Description'} = $Description;
-$search_hash->{'Object'}      = $search;
-$search_hash->{'Order'}       = $Order;
-$search_hash->{'OrderBy'}     = $OrderBy;
+$search_hash->{'Object'} = $search;
+$search_hash->{'Order'} = $Order;
+$search_hash->{'OrderBy'} = $OrderBy;
 $search_hash->{'RowsPerPage'} = $RowsPerPage;
 
 $session{'CurrentSearchHash'} = $search_hash;
-
 # }}}
 
 # {{{ Show the results, if we were asked.
 if ( $ARGS{"DoSearch"} ) {
-    $m->comp(
-        "Results.html",
-        Query   => $Query,
-        Format  => $Format,
-        Order   => $Order,
-        OrderBy => $OrderBy,
-        Rows    => $RowsPerPage
-    );
+    $m->comp("Results.html" , Query => $Query, Format => $Format, Order => $Order, OrderBy => $OrderBy, Rows => $RowsPerPage);
     $m->abort();
 }
-
 # }}}
 
 # {{{ Build a querystring for the tabs
@@ -816,20 +776,14 @@ if ( $ARGS{"DoSearch"} ) {
 my $QueryString;
 if ($NewQuery) {
     $QueryString = '?NewQuery=1';
+} else {
+    $QueryString = '?' . $m->comp('/Elements/QueryString', 
+            Query => $Query,
+            Format => $Format,
+            Order => $Order,
+            OrderBy => $OrderBy,
+            Rows => $RowsPerPage) if ($Query);
 }
-else {
-    $QueryString = '?'
-      . $m->comp(
-        '/Elements/QueryString',
-        Query   => $Query,
-        Format  => $Format,
-        Order   => $Order,
-        OrderBy => $OrderBy,
-        Rows    => $RowsPerPage
-      )
-      if ($Query);
-}
-
 # }}}
 
 </%INIT>
@@ -844,6 +798,4 @@ $Order => undef
 $OrderBy => undef
 $RowsPerPage => undef
 $HideResults => 0
-@clauses => ()
 </%ARGS>
-
diff --git a/rt/html/Search/Bulk.html b/rt/html/Search/Bulk.html
index f9eef26..f75934b 100644
--- a/rt/html/Search/Bulk.html
+++ b/rt/html/Search/Bulk.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,13 +42,13 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Bulk ticket update") &>
 <& /Elements/Tabs, Title => loc("Bulk ticket update") &>
 
 <& /Elements/ListActions, actions => \@results &>
-<FORM METHOD="POST" ACTION="<%$RT::WebPath%>/Search/Bulk.html" >
-<input type="hidden" name="Query" value="<%$ARGS{'Query'}%>">
+
+<FORM METHOD=POST>
 <TABLE WIDTH=100% border=0 cellpadding=3 CELLSPACING=0>
 <TR>
 <TH><&|/l&>Update</&></TH>
@@ -75,7 +75,8 @@ while (my $Ticket = $Tickets->Next) {
  }
       </%PERL>
 <TR bgcolor="<%$bgcolor%>">
-<TD><input type=checkbox name="UpdateTicket<%$Ticket->Id%>" value="1" CHECKED></TD>
+<TD><input type=checkbox name="UpdateTicket<%$Ticket->Id%>" CHECKED></TD>
+%# The ticket view is controlled by config.pm, WebOptions
 %foreach my $col (@cols) {
 <TD>
 % if ($col eq 'id') {
@@ -152,26 +153,44 @@ while (my $Ticket = $Tickets->Next) {
 </select> 
 </td></tr>
 <tr><td align=right><&|/l&>Subject</&>:</td><td> <input name="UpdateSubject" size=60 value=""></td></tr>
-% while (my $CF = $TxnCFs->Next()) {
-<TR>
-<TD ALIGN=RIGHT><% $CF->Name %>:</TD>
-<TD><& /Elements/EditCustomField, 
-    CustomField => $CF, 
-    NamePrefix => "Object-RT::Transaction--CustomField-"
-    &><em><% $CF->FriendlyType %></em></TD>
-</TD></TR>
-% } # end if while
  <tr><td align=right><&|/l&>Attach</&>:</td><td><input name="UpdateAttachment" type="file"></td></tr>
  <tr><td class=labeltop><&|/l&>Message</&>:</td><td>
  <& /Elements/MessageBox, Name=>"UpdateContent"&>
  </td></tr>
  </table>
 
-<& /Elements/TitleBoxEnd &>
+<table>
+% foreach (keys %allcfs) {
+<tr><td class=label>
+%     my $cf = $allcfs{$_};
+%     my $pref;
+%     if ($cf->Queue == 0) {
+%         $pref = "[Global]";
+%     } else {
+%         $pref = "[Queue: " . $cfqnames{$_} . "]";
+%     }
+<%$pref%> <b><% $cf->Name %></b><br>
+<% $cf->FriendlyType %>
+</td>
+<td>
+% if ($cf->Type ne "FreeformMultiple") {
+<& /Ticket/Elements/EditCustomField, CustomField => $cf &>
+% } else {
+Add Values<br>
+<textarea cols=15 rows=3 name="<%$cf->Id%>-Values"></textarea>
+</td><td>
+Delete Values<br>
+<textarea cols=15 rows=3 name="<%$cf->Id%>-DeleteValues"></textarea>
+% }    
+</td>
+</tr>
+% }
+</table>
 
+<& /Elements/TitleBoxEnd &>
 
 <& /Elements/TitleBoxStart, title => loc('Edit Links'), color => "#336633"&>
-<i><&|/l&>Enter tickets or URIs to link tickets to. Separate multiple entries with spaces.</&></i><br>
+<i><&|/l&>Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces.</&></i><br>
 <& /Ticket/Elements/BulkLinks &>
 <& /Elements/TitleBoxEnd &>
 
@@ -204,7 +223,7 @@ while (my $Ticket = $Tickets->Next) {
     unless ( exists $cfqs{$cfqid} ) {
 	$cfqs{$cfqid} = 1;
 	$count++;
-	my $cfs = $cfq->TicketCustomFields;
+	my $cfs = $cfq->CustomFields;
 	while (my $cf = $cfs->Next) {
 	    $allcfs{$cf->Id} = $cf;
 	    $cfqnames{$cf->Id} = $cfqn;
@@ -226,11 +245,9 @@ if ($ARGS{'UpdateContent'} &&
 
 #Iterate through each ticket we've been handed
 my @linkresults;
-my %queues;
 
 $Tickets->RedoSearch();
 while (my $Ticket = $Tickets->Next) {
-    $queues{$Ticket->QueueObj->Id}++;
     $RT::Logger->debug( "Checking Ticket ".$Ticket->Id ."\n");
     next unless ($ARGS{"UpdateTicket".$Ticket->Id});
     $RT::Logger->debug ("Matched\n");
@@ -245,6 +262,16 @@ while (my $Ticket = $Tickets->Next) {
     #Update the watchers
     my @watchresults = ProcessTicketWatchers(TicketObj => $Ticket, ARGSRef => \%ARGS);    
 
+    #Update custom fields
+    my $pat = "^(\\d+)-(.*)\$";
+    foreach (keys %ARGS) {
+	$ARGS{"Ticket-" . $Ticket->Id . "-CustomField-" . $1 . "-" . $2} = $ARGS{$_} if (/$pat/o);
+    }
+    my @cfresults = ProcessTicketCustomFieldUpdates(ARGSRef => \%ARGS);
+    foreach (keys %ARGS) {
+	delete $ARGS{"Ticket-" . $Ticket->Id . "-CustomField-" . $1 . "-" . $2} if (/$pat/o);
+    }
+
 
     #Update the links
     $ARGS{'id'} = $Ticket;
@@ -264,15 +291,11 @@ while (my $Ticket = $Tickets->Next) {
     delete $ARGS{'MemberOf-'.$Ticket->Id};
     delete $ARGS{$Ticket->Id.'-RefersTo'};
     delete $ARGS{'RefersTo-'.$Ticket->Id};
-    my @tempresults = (@watchresults, @basicresults, @dateresults,
-    @updateresults, @linkresults);
+    
+    my @tempresults = (@watchresults, @basicresults, @dateresults, @updateresults, @linkresults, @cfresults);
     @tempresults = map { loc("Ticket [_1]: [_2]",$Ticket->Id,$_) } @tempresults;
 
     @results = (@results, @tempresults);
 }
 
-my $TxnCFs = RT::CustomFields->new($session{CurrentUser});
-$TxnCFs->LimitToLookupType("RT::Queue-RT::Ticket-RT::Transaction");
-$TxnCFs->LimitToGlobalOrObjectId(sort keys %queues);
-
 </%INIT>
diff --git a/rt/html/Search/Edit.html b/rt/html/Search/Edit.html
index 16e8a0e..769d38d 100755
--- a/rt/html/Search/Edit.html
+++ b/rt/html/Search/Edit.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title&>
 <& /Ticket/Elements/Tabs, 
     current_tab => "Search/Edit.html?".$QueryString, 
diff --git a/rt/html/Search/Elements/BuildFormatString b/rt/html/Search/Elements/BuildFormatString
index 639e62c..e5e131b 100644
--- a/rt/html/Search/Elements/BuildFormatString
+++ b/rt/html/Search/Elements/BuildFormatString
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,76 +42,45 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%args>
 $Format => undef
 %cfqueues => undef
-$Face => undef
-$Size => undef
-$Link => undef
-$Title => undef
-$AddCol => undef
-$RemoveCol => undef
-$ColUp => undef
-$ColDown => undef
-$SelectDisplayColumns => undef
-$CurrentDisplayColumns => undef
 </%args>
 <%init>
 
 unless ($Format) {         
     $Format = $RT::DefaultSearchResultFormat;
 }   
-   
-
-# All the things we can display in the format string by default
-my @fields = qw(
-  id
-  Status
-  ExtendedStatus
-  Subject
-  QueueName
-  OwnerName
-  Priority
-  InitialPriority
-  FinalPriority
-  Type
-  TimeWorked
-  TimeLeft
-  TimeEstimated
-  CreatedBy
-  LastUpdatedBy
-  Requestors
-  Cc
-  AdminCc
-  Starts
-  StartsRelative
-  Started
-  StartedRelative
-  Created
-  CreatedRelative
-  LastUpdated
-  LastUpdatedRelative
-  Told
-  ToldRelative
-  Due
-  DueRelative
-  Resolved
-  ResolvedRelative
-  RefersTo
-  ReferredToBy
-  DependsOn
-  DependedOnBy
-  MemberOf
-  Members
-  Parents
-  Children
-  NEWLINE
+    
+my @fields = (
+    "QueueName",           "OwnerName",
+    "id",                  "Status",
+    "Subject",             "ExtendedStatus",
+    "Priority",            "InitialPriority",
+    "FinalPriority",       "EffectiveId",
+    "Type",                "TimeWorked",
+    "TimeLeft",            "TimeEstimated",
+    "Requestors",          "Cc",
+    "AdminCc",             "StartsRelative",
+    "StartedRelative",     "CreatedRelative",
+    "LastUpdatedRelative", "ToldRelative",
+    "DueRelative",         "ResolvedRelative",
+    "Starts",              "Started",
+    "Created",             "CreatedBy",
+    "LastUpdated",         "LastUpdatedBy",
+    "Told",                "Due",
+    "Resolved",            "NEWLINE",
+    "RefersTo",	           "ReferredToBy",
+    "DependsOn",           "DependedOnBy",
+    "MemberOf",            "Members",
+    "Parents",             "Children",
+    "-",
 );
 
 my $CustomFields = RT::CustomFields->new( $session{'CurrentUser'});
-foreach my $id (keys %cfqueues) {
-    # What does this _do_? What are the keys to cfqueues
+foreach (keys %cfqueues) {
+    my $id = $_;
     $id =~ s/^.'*(.*).'*$/$1/;
     # Gotta load up the $queue object, since queues get stored by name now.
     my $queue = RT::Queue->new($session{'CurrentUser'});
@@ -148,8 +117,8 @@ foreach my $field (@format) {
     push @seen, \%column;
 }
 
-if ( $RemoveCol ) {
-    my $index  = $CurrentDisplayColumns;
+if ( $ARGS{"RemoveCol"} ) {
+    my $index  = $ARGS{'CurrentDisplayColumns'};
     my $column = $seen[$index];
     if ($index) {
         delete $seen[$index];
@@ -161,9 +130,9 @@ if ( $RemoveCol ) {
         }
     }
 }
-elsif ( $AddCol ) {
-    if ( defined $SelectDisplayColumns ) {
-	my $selected = $SelectDisplayColumns;
+elsif ( $ARGS{"AddCol"} ) {
+    if ( defined $ARGS{'SelectDisplayColumns'} ) {
+	my $selected = $ARGS{'SelectDisplayColumns'};
 	my @columns;
 	if (ref($selected) eq 'ARRAY') {
 	    @columns = @$selected;
@@ -172,71 +141,74 @@ elsif ( $AddCol ) {
 	}
 	foreach my $col (@columns) {
 	    my %column = ();
-	    $column{Column} = $col;
-
-    if ( $Face eq "Bold" ) {
-        $column{Prefix} .= "<B>";
-        $column{Suffix} .= "</B>";
-    }
-    if ( $Face eq "Italic" ) {
-        $column{Prefix} .= "<I>";
-        $column{Suffix} .= "</I>";
-    }
-    if ($Size) {
-        $column{Prefix} .= "<" . $m->interp->apply_escapes( $Size,  'h' ) . ">";
-        $column{Suffix} .= "</" . $m->interp->apply_escapes( $Size, 'h' ) . ">";
-    }
-    if ( $Link eq "Display" ) {
-        $column{Prefix} .=
-          "<A HREF=\"" . $RT::WebPath . "/Ticket/Display.html?id=__id__\">";
-        $column{Suffix} .= "</a>";
-    }
-    elsif ( $Link eq "Take" ) {
-        $column{Prefix} .= "<A HREF=\"" . $RT::WebPath
-          . "/Ticket/Display.html?Action=Take&id=__id__\">";
-        $column{Suffix} .= "</a>";
-    }
-
-    if ($Title) {
-        $column{Suffix} .= "/TITLE:" . $m->interp->apply_escapes( $Title, 'h' );
+	    $column{Column} = $fields[ $col ];
+	    
+	    if ( $ARGS{Face} eq "Bold" ) {
+		$column{Prefix} .= "<B>";
+	    }
+	    if ( $ARGS{Face} eq "Italic" ) {
+		$column{Prefix} .= "<I>";
+	    }
+	    if ( $ARGS{Size} ) {
+		$column{Prefix} .= "<" . $ARGS{Size} . ">";
+	    }
+	    if ( $ARGS{Link} eq "Display" ) {
+		$column{Prefix} .= "<A HREF=\"".$RT::WebPath."/Ticket/Display.html?id=__id__\">";
+	    }
+	    elsif ( $ARGS{Link} eq "Take" ) {
+		$column{Prefix} .=
+		    "<A HREF=\"".$RT::WebPath."/Ticket/Display.html?Action=Take&id=__id__\">";
+	    }
+    
+	    my $suffix;
+	    if ( $ARGS{'Link'} eq "Display" || $ARGS{'Link'} eq "Take" ) {
+		$column{Suffix} .= "</a>";
+	    }
+	    if ( $ARGS{Size} ) {
+		$column{Suffix} .= "</" . $ARGS{Size} . ">";
+	    }
+	    if ( $ARGS{Face} eq "Italic" ) {
+		$column{Suffix} .= "</I>";
+	    }
+	    if ( $ARGS{Face} eq "Bold" ) {
+		$column{Suffix} .= "</B>";
+	    }
+	    if ( $ARGS{Title} ) {
+		$column{Suffix} .= "/TITLE:" . $ARGS{Title};
+	    }
+	    push @seen, \%column;
+	}
     }
-    push @seen, \%column;
-}
-}
 }
-elsif ( $ColUp ) {
-    my $index = $CurrentDisplayColumns;
+elsif ( $ARGS{"ColUp"} ) {
+    my $index = $ARGS{'CurrentDisplayColumns'};
     if ( defined $index && ( $index - 1 ) >= 0 ) {
         my $column = $seen[$index];
         $seen[$index]       = $seen[ $index - 1 ];
         $seen[ $index - 1 ] = $column;
-        $CurrentDisplayColumns     = $index - 1;
+        $ARGS{CurrentDisplayColumns}     = $index - 1;
     }
 }
-elsif ( $ColDown ) {
-    my $index = $CurrentDisplayColumns;
+elsif ( $ARGS{"ColDown"} ) {
+    my $index = $ARGS{'CurrentDisplayColumns'};
     if ( defined $index && ( $index + 1 ) < scalar @seen ) {
         my $column = $seen[$index];
         $seen[$index]       = $seen[ $index + 1 ];
         $seen[ $index + 1 ] = $column;
-        $CurrentDisplayColumns     = $index + 1;
+        $ARGS{CurrentDisplayColumns}     = $index + 1;
     }
 }
 
-
-my @format_string;
+$Format = "";
 foreach my $field (@seen) {
     next unless $field;
-    my $row = "'" . $field->{Prefix};
-    $row .= "__" . $m->interp->apply_escapes( $field->{Column}, 'h' ) . "__"
-      unless ( $field->{Column} eq "<blank>" );
-    $row .= $field->{Suffix} . "'";
-    push( @format_string, $row );
+    $Format .= ", \n" if $Format;
+    $Format .= "'";
+    $Format .= $field->{Prefix};
+    $Format .= "__" . $field->{Column} . "__" if ( $field->{Column} ne "<blank>" ) ;
+    $Format .= $field->{Suffix};
+    $Format .= "'";
 }
-
-$Format = join(",\n", @format_string);
-
-
 return($Format, \@fields, \@seen);
 
 </%init>
diff --git a/rt/html/Search/Elements/DisplayOptions b/rt/html/Search/Elements/DisplayOptions
index 43a9d99..330948d 100644
--- a/rt/html/Search/Elements/DisplayOptions
+++ b/rt/html/Search/Elements/DisplayOptions
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title => loc("Display Columns") &>
 <table>
 <tr>
@@ -54,15 +54,15 @@
 <tr>
 <td class=label>
 <&|/l&>Order by</&>:
-</td><td class=value>
+</td><td class=label>
 <select name="OrderBy">
 % foreach my $field (keys %fields) {
 %    next unless $field;
 <option value=<%$field%>
-% if ($field =~ /^$OrderBy$/i) {
+% if ($field eq $OrderBy) {
 SELECTED
 % }
-><&|/l&><%$field%></&></option>
+><%$field%></option>
 % }
 </select>
 <select name="Order">
@@ -81,7 +81,7 @@ SELECTED
 </tr>
 <td class=label>
 <&|/l&>Rows per page</&>:
-</td><td class="value">
+</td><td>
 <& /Elements/SelectResultsPerPage, 
     Name => "RowsPerPage", 
     Default => $RowsPerPage &>
@@ -91,14 +91,13 @@ SELECTED
 </td>
 </tr>
 </table>
+<& /Elements/Submit, Caption => "Do the Search", Label => loc('Search'), Name => 'DoSearch'&>
 <& /Elements/TitleBoxEnd &>
 
 <%INIT>
 my $tickets = new RT::Tickets($session{'CurrentUser'});
 my %fields = %{$tickets->FIELDS};
 map { $fields{$_}->[0] =~ /^(?:ENUM|INT|DATE|STRING)$/ || delete $fields{$_} } keys %fields;
-delete $fields{'EffectiveId'};
-
 
 </%INIT>
 
diff --git a/rt/html/Search/Elements/EditFormat b/rt/html/Search/Elements/EditFormat
index dc8720f..7d314ae 100644
--- a/rt/html/Search/Elements/EditFormat
+++ b/rt/html/Search/Elements/EditFormat
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,14 +42,14 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <table>
 <tr>
 <td>
-<&|/l&>Add Columns</&>:
+<&|/l&>Available Columns</&>:
 </td>
 <td>
-<&|/l&>Format</&>:
+Format:
 </td>
 <td></td>
 <td>
@@ -58,42 +58,50 @@
 <tr>
 <td valign=top>
 <select size="6" name="SelectDisplayColumns" multiple>
-% foreach my $field ( @$AvailableColumns) {
-<option value="<%$field%>"><% loc( $field) %></option>
-%# $m->comp( '/Elements/RT__Ticket/ColumnMap', Name => $field, Attr => 'title') || 
+% my $i = 0;
+% while ($i < scalar @$AvailableColumns) {
+% my $field = $AvailableColumns->[$i];
+% if ($field) {
+<option value=<%$i%>
+><%$field%></option>
+% }
+% $i++;
 % }
 </select>
 </td>
 <td>
-<&|/l&>Link</&>:
-<select name="Link">
+Link:
+<select name=Link>
 <option value="None">-</option>
-<option value="Display"><&|/l&>Display</&></option>
-<option value="Take"><&|/l&>Take</&></option>
+<option value="Display">Display</option>
+<option value="Take">Take</option>
 </select>
-<br><&|/l&>Title</&>: <input name="Title" size=10>
-<br><&|/l&>Size</&>:
-<select name="Size">
+<br>Title: <input name="Title" size=10>
+<br>Size:
+<select name=Size>
 <option value="">-</option>
-<option value="Small"><&|/l&>Small</&></option>
-<option value="Large"><&|/l&>Large</&></option>
+<option value="Small">Small</option>
+<option value="Large">Large</option>
 </select>
-<br><&|/l&>Style</&>:
-<select name="Face">
+<br>Face:
+<select name=Face>
 <option value="">-</option>
-<option value="Bold"><&|/l&>Bold</&></option>
-<option value="Italic"><&|/l&>Italic</&></option>
+<option value="Bold">Bold</option>
+<option value="Italic">Italic</option>
 </select>
 </td>
 <td>
 <input type=submit name="AddCol" value="->">
 </td>
 <td valign=top>
-<select size=4 name="CurrentDisplayColumns">
-% my $i=0;
-% foreach my $field (@$CurrentFormat) {
-<option value="<%$i++%>><%$field->{Column}%>">
-<%loc( $field->{Column}) %></option>
+<select size=4 name="CurrentDisplayColumns" style="width : 100%">
+% $i = 0;
+% while ($i < scalar @$CurrentFormat) {
+% my $field = $CurrentFormat->[$i];
+% if ($field) {
+<option value=<%$i%>><%$field->{Column}%></option>
+% }
+% $i++;
 % }
 </select>
 <br>
diff --git a/rt/html/Search/Elements/EditQuery b/rt/html/Search/Elements/EditQuery
deleted file mode 100644
index 783541a..0000000
--- a/rt/html/Search/Elements/EditQuery
+++ /dev/null
@@ -1,65 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& NewListActions, actions => $actions &>
-<& /Elements/TitleBoxStart, title => join(': ', grep defined, loc("Query"), $Description) &>
-<select size="10" name="clauses" style="width: 100%" multiple>
-% $m->out($optionlist);
-</select>
-<p align="center">
-<input type=submit name="Up" value="^">
-<input type=submit name="Down" value="v">
-<input type=submit name="Left" value="<">
-<input type=submit name="Right" value=">">
-<input type=submit name="Toggle" value="<&|/l&>And/Or</&>">
-<input type=submit name="DeleteClause" value="<&|/l&>Delete</&>">
-%#<input type=submit name="EditQuery" value="Advanced">
-</p>
-<& /Elements/TitleBoxEnd &>
-<%ARGS>
-$Description
-$optionlist
-$actions
-</%ARGS>
diff --git a/rt/html/Search/Elements/EditSearches b/rt/html/Search/Elements/EditSearches
index bc6b80e..cd9f1ef 100644
--- a/rt/html/Search/Elements/EditSearches
+++ b/rt/html/Search/Elements/EditSearches
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,11 +42,8 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title => loc('Saved searches') &>
-%# Hide all the save functionality if the user shouldn't see it.
-% if ($session{'CurrentUser'}->HasRight( Right => 'CreateSavedSearch',
-%                                       Object=> $RT::System )) {
 <&|/l&>Privacy:</&>
 % if ($CurrentSearch->{'Object'} && $CurrentSearch->{'Object'}->id) {
 <& SearchPrivacy, Object => $CurrentSearch->{'Object'}->Object &><br>
@@ -55,14 +52,13 @@
 % }
 <&|/l&>Description</&>:<br>
 <font size="-1"><input size="25" name="Description" value="<%$CurrentSearch->{'Description'}%>"></font>
-<nobr>
+<br>
 % if ($SearchId ne 'new') {
 % if ($Dirty) {
 <input type="submit" name="Revert" value="<%loc('Revert')%>">
 % }
 <input type="submit" name="Delete" value="<%loc('Delete')%>">
 <input type="submit" name="CopySearch" value="<%loc('Copy')%>">
-</nobr>
 
 % }
 
@@ -70,18 +66,12 @@
 <input type="submit" name="Save" value="<%loc('Save')%>">
 % }
 <hr>
-% }
 <&|/l&>Load saved search:</&><br>
 <& SelectSearchesForObjects, Name => 'LoadSavedSearch', Objects => \@Objects&>
 <input value="<%loc('Load')%>" type="submit">
 <& /Elements/TitleBoxEnd &>
 
 <%init>
-
-unless ($session{'CurrentUser'}->HasRight( Right => 'LoadSavedSearch',
-                                          Object=> $RT::System )) {
-    return;
-}
 my @Objects;
 
 push @Objects,  $session{CurrentUser}->UserObj;
diff --git a/rt/html/Search/Elements/NewListActions b/rt/html/Search/Elements/NewListActions
index eb82544..7b81d80 100644
--- a/rt/html/Search/Elements/NewListActions
+++ b/rt/html/Search/Elements/NewListActions
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % if ($actions[0] ) {
 <b><%loc('Results')%></b><br>
 % foreach my $action (@actions) {
diff --git a/rt/html/Search/Elements/PickBasics b/rt/html/Search/Elements/PickBasics
index 8a48f6b..d7e1978 100644
--- a/rt/html/Search/Elements/PickBasics
+++ b/rt/html/Search/Elements/PickBasics
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,18 +42,11 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<tr>
-<td class="label">
-<&|/l&>id</&>
-</td><td>
-<& /Elements/SelectEqualityOperator, Name => "idOp" &>
-</td><td>
-<INPUT Name="ValueOfid" SIZE=5>
-</td>
-</tr>
-
+%# }}} END BPS TAGGED BLOCK
+<tr><td>
+% foreach my $field (@fields) {
 <tr><td align=right>
+% if ($field eq "Attachment") {
 <& /Elements/SelectAttachmentField, Name => 'AttachmentField' &>
 </td><td>
 <& /Elements/SelectBoolean, Name => "AttachmentOp", 
@@ -64,26 +57,44 @@
 &> 
 </td><td>
 <Input Name="ValueOfAttachment" Size=20>
-</td>
-</tr>
-<tr>
-<td class="label">
-<&|/l&>Queue</&>
+% } elsif ($field eq "Dates") {
+<& /Elements/SelectDateType, Name=>"DateField" &>
 </td><td>
-<& /Elements/SelectBoolean,  Name => "QueueOp" , 
-					True => loc("is"), 
-					False => loc("isn't"), 
-					TrueVal=> '=', 
-					FalseVal => '!=' &>
+<& /Elements/SelectDateRelation, Name=>"DateOp" &>
+</td><td>
+<& /Elements/SelectDate, Name => "ValueOfDate", ShowTime => 0, Default => '' &>
+% } elsif ($field eq "Links") {
+<& SelectLinks, Name=>"LinksField" &>
+</td><td>
+<& /Elements/SelectBoolean, Name => "LinksOp", 
+			    True => loc("is"), 
+  			    False => loc("isn't"), 
+			    TrueVal=> '=', 
+			    FalseVal => '!=' 
+&>  
+</td><td>
+<INPUT Name="ValueOfLinks" value="" SIZE=5>
+%} elsif ($field eq "Priority") {
+<SELECT NAME="PriorityField">
+<OPTION VALUE="Priority"><&|/l&>Priority</&></OPTION>
+<OPTION VALUE="InitialPriority"><&|/l&>Initial Priority</&></OPTION>
+<OPTION VALUE="FinalPriority"><&|/l&>Final Priority</&></OPTION>
+</SELECT>
+</td><td>
+<& /Elements/SelectEqualityOperator, Name => "PriorityOp" &>
+</td><td>
+<INPUT Name="ValueOfPriority" SIZE=5>
+%} elsif ($field =~ m/Time.*/) {
+<SELECT NAME="TimeField">
+<OPTION VALUE="TimeWorked"><&|/l&>Time Worked</&></OPTION>
+<OPTION VALUE="TimeEstimated"><&|/l&>Time Estimated</&></OPTION>
+<OPTION VALUE="TimeLeft"><&|/l&>Time Left</&></OPTION>
+</SELECT>
 </td><td>
-<& /Elements/SelectQueue, 
-    Name => "ValueOfQueue", 
-    NamedValues => 1, 
-    CheckQueueRight => 'ShowTicket' &>
-</td>
-</tr>
-<tr>
-<td class="label">
+<& /Elements/SelectEqualityOperator, Name => "TimeOp" &>
+</td><td>
+<INPUT Name="ValueOfTime" SIZE=5>
+% } elsif ($field eq "Status") {
 <&|/l&>Status</&>
 </td><td>
 <& /Elements/SelectBoolean, Name => "StatusOp", 
@@ -94,9 +105,32 @@
 &>  
 </td><td>
 <& /Elements/SelectStatus, Name => "ValueOfStatus", SkipDeleted => 1 &>
-</td>
-</tr>
+%} elsif ($field =~ m/.*Priority/ || $field =~ m/Time.*/) {
+<&|/l&><%$field%></&>
+</td><td>
+<& /Elements/SelectEqualityOperator, Name => $field . "Op" &>
+</td><td>
+<INPUT Name="<%"ValueOf" . $field%>" SIZE=5>
+% } elsif ($field eq "Queue") {
+<&|/l&>Queue</&>
+</td><td>
+<& /Elements/SelectBoolean,  Name => "QueueOp" , 
+					True => loc("is"), 
+					False => loc("isn't"), 
+					TrueVal=> '=', 
+					FalseVal => '!=' &>
+</td><td>
+<& /Elements/SelectQueue, Name => "ValueOfQueue", NamedValues => 1 &>
+% } elsif ($field eq "id") {
+<&|/l&>Id</&>
+</td><td>
+<& /Elements/SelectEqualityOperator, Name => "idOp" &>
+</td><td>
+<INPUT Name="ValueOfid" SIZE=5>
+% } elsif ($field eq "People") {
+% foreach my $field (@people) {
 <tr><td class="label">
+% if ($field eq "Actor") {
 <SELECT NAME="ActorField">
 <OPTION VALUE="Owner"><&|/l&>Owner</&></OPTION>
 <OPTION VALUE="Creator"><&|/l&>Creator</&></OPTION>
@@ -108,80 +142,43 @@
 					  FalseVal => '!=' 
 &> 
 </td><td>
-<& /Elements/SelectOwner, Name => "ValueOfActor", ValueAttribute => 'Name' &>
-</td>
-</tr>
-<tr>
-<td class="label">
+<& /Elements/SelectOwner, Name => "ValueOfActor" &>
+% } elsif ($field eq 'Watcher') {
 <& SelectPersonType, Name => 'WatcherField', Default => 'Requestor' &>
 </td><td>
 <& /Elements/SelectMatch, Name => "WatcherOp" &>
 </td><td>
 <Input Name="ValueOfWatcher" Size=20>
-</tr>
-<tr>
-<td class="label">
-<& SelectPersonType, Name => 'WatcherGroupField', Default => 'RequestorGroup', Suffix => 'Group' &>
-</td><td>
-<& /Elements/SelectBoolean, Name => "WatcherGroupOp", 
-					  True=> loc('belongs to'), 
-					  False=> loc('does not belong to'), 
-					  TrueVal=> '=', 
-					  FalseVal => '!='
-&>
-</td><td>
-<& SelectGroup, Name => 'ValueOfWatcherGroup' &>
-</td> 
-</tr>
-<tr>
-<td class="label">
-<& /Elements/SelectDateType, Name=>"DateField" &>
-</td><td>
-<& /Elements/SelectDateRelation, Name=>"DateOp" &>
-</td><td>
-<& /Elements/SelectDate, Name => "ValueOfDate", ShowTime => 0, Default => '' &>
+% } else {
+<&|/l&><%$field%></&>
+<& /Elements/SelectMatch, Name => "$field" . "Op" &>
+<INPUT Name="<%"ValueOf" . $field%>" value=""SIZE=20>
+% }
 </td></tr>
-<tr>
-<td class="label">
-<SELECT NAME="TimeField">
-<OPTION VALUE="TimeWorked"><&|/l&>Time Worked</&></OPTION>
-<OPTION VALUE="TimeEstimated"><&|/l&>Time Estimated</&></OPTION>
-<OPTION VALUE="TimeLeft"><&|/l&>Time Left</&></OPTION>
-</SELECT>
-</td><td>
-<& /Elements/SelectEqualityOperator, Name => "TimeOp" &>
+% }
+% } else {
+<&|/l&><%$field%></&>
 </td><td>
-<INPUT Name="ValueOfTime" SIZE=5>
-</td>
-</tr>
-<tr>
-<td class="label">
-<SELECT NAME="PriorityField">
-<OPTION VALUE="Priority"><&|/l&>Priority</&></OPTION>
-<OPTION VALUE="InitialPriority"><&|/l&>Initial Priority</&></OPTION>
-<OPTION VALUE="FinalPriority"><&|/l&>Final Priority</&></OPTION>
-</SELECT>
-</td><td>
-<& /Elements/SelectEqualityOperator, Name => "PriorityOp" &>
+<& /Elements/SelectMatch, Name => "$field" . "Op" &>
 </td><td>
-<INPUT Name="ValueOfPriority" SIZE=5>
-</td>
-</tr>
-<tr>
-<td class="label">
-<& SelectLinks, Name=>"LinksField" &>
-</td><td>
-<& /Elements/SelectBoolean, Name => "LinksOp", 
-			    True => loc("is"), 
-  			    False => loc("isn't"), 
-			    TrueVal=> '=', 
-			    FalseVal => '!=' &>  
-</td><td>
-<INPUT Name="ValueOfLinks" value="" SIZE=5>
+<INPUT Name="<%"ValueOf" . $field%>" value="" SIZE=20>
+% }
 </td></tr>
+% }
+<& '/Elements/Callback', _CallbackName => 'EndOfList' &>
 <%INIT>
+my @fields = ('Attachment',
+    'Queue',
+    'Status',
+    'People',
+    'Dates',
+    'Time',
+    'Priority',
+    'Links',
+    'id',
+    );
+
 my @people = ('Actor',
 	      'Watcher',
-	      'WatcherGroup',
 	      );
 </%INIT>
diff --git a/rt/html/Search/Elements/PickCFs b/rt/html/Search/Elements/PickCFs
index 435a07a..fb143ba 100644
--- a/rt/html/Search/Elements/PickCFs
+++ b/rt/html/Search/Elements/PickCFs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,17 +42,24 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % while ( my $CustomField = $CustomFields->Next ) {
-% my $name = "'CF.{" . $CustomField->Name . "}'";
-<tr><td class="label">
+<tr><td class=label>
+
+% my $name;
+% if ($CustomField->QueueObj->id) {
+%   $name = "'CF." . $CustomField->QueueObj->Name . 
+%	".{" . $CustomField->Name . "}'";
+% } else {
+%   $name = "'CF." . $CustomField->Name . "'";
+% }
 <% $CustomField->Name %> 
 </td>
 <td>
-        <& /Elements/SelectCustomFieldOperator, Name => $name . "Op", 
-                                    True => loc("is"), 
-                                    False => loc("isn't"), 
-                                    TrueVal=> '=', FalseVal => '!=' &>
+<& /Elements/SelectCustomFieldOperator, Name => $name . "Op", 
+                            True => loc("is"), 
+                            False => loc("isn't"), 
+                            TrueVal=> '=', FalseVal => '!=' &>
 </td>
 <td>
 <& /Elements/SelectCustomFieldValue, Name => "ValueOf" . $name,
@@ -60,11 +67,13 @@
                             &>
 </td></tr>
 % }
+
 <%INIT>
 my $CustomFields = RT::CustomFields->new( $session{'CurrentUser'});
-foreach my $id (keys %cfqueues) {
+foreach (keys %cfqueues) {
+    my $id = $_;
     $id =~ s/^.'*(.*).'*$/$1/;
-    # Gotta load up the $queue object, since queues get stored by name now. my $id
+    # Gotta load up the $queue object, since queues get stored by name now.
     my $queue = RT::Queue->new($session{'CurrentUser'});
     $queue->Load($id);
     $CustomFields->LimitToQueue($queue->Id);
diff --git a/rt/html/Search/Elements/PickCriteria b/rt/html/Search/Elements/PickCriteria
index 1293444..344830e 100644
--- a/rt/html/Search/Elements/PickCriteria
+++ b/rt/html/Search/Elements/PickCriteria
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,32 +42,26 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title => loc('Add Criteria')&>
 <table width=100% cellspacing=0 cellpadding=0 border=0>
   <tr>
     <td>
       <table cellspacing=0 border=0>
         <tr><td class=label>
-        <&|/l&>Aggregator</&>:
+        Aggregator:
         </td>
         <td><& SelectAndOr, Name => "AndOr" &>
         </td></tr>
       </table>
     </td></tr>
   <tr>
-    <td>
+    <td colspan=3>
       <hr>
     </td>
   </tr>
-  <tr>
-    <td valign=top>
-      <table cellspacing=0 border=0>
-      <& PickBasics &>
-    <& PickCFs, cfqueues => \%cfqueues &>
-    </table>
-    </td>
-  </tr>
+  <& PickBasics &>
+  <& PickCFs, cfqueues => \%cfqueues &>
   <tr><td>&nbsp;</td></tr>
 </table>
 
diff --git a/rt/html/Search/Elements/SearchPrivacy b/rt/html/Search/Elements/SearchPrivacy
index 270e1ba..5f6f207 100644
--- a/rt/html/Search/Elements/SearchPrivacy
+++ b/rt/html/Search/Elements/SearchPrivacy
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%args>
 $Object => undef
 </%args>
diff --git a/rt/html/Search/Elements/SelectAndOr b/rt/html/Search/Elements/SelectAndOr
index 2f3c704..11df03f 100644
--- a/rt/html/Search/Elements/SelectAndOr
+++ b/rt/html/Search/Elements/SelectAndOr
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,10 +42,10 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<input type=radio NAME="<%$Name%>" CHECKED VALUE="AND"><&|/l&>AND</&></input>
-<input type=radio NAME="<%$Name%>" VALUE="OR"><&|/l&>OR</&></input>
+%# }}} END BPS TAGGED BLOCK
+<input type=radio NAME="<%$Name%>" CHECKED VALUE="AND">AND</input>
+<input type=radio NAME="<%$Name%>" VALUE="OR">OR</input>
 
 <%ARGS>
 $Name => "Operator"
-</%ARGS>
+</%ARGS>
\ No newline at end of file
diff --git a/rt/html/Search/Elements/SelectGroup b/rt/html/Search/Elements/SelectGroup
deleted file mode 100644
index edd5371..0000000
--- a/rt/html/Search/Elements/SelectGroup
+++ /dev/null
@@ -1,65 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<SELECT NAME="<%$Name%>">
-% if ($AllowNull) {
-<OPTION VALUE="">-</OPTION>
-% }
-%while (my $group = $groups->Next) {
-<OPTION VALUE="<%$group->id%>" <%$group->id eq $Default && "SELECTED"%>><%$group->Name%></OPTION>
-%}
-</SELECT>
-
-<%INIT>
-my $groups = new RT::Groups($session{'CurrentUser'});
-$groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => $Domain);
-
-</%INIT>
-<%ARGS>
-$AllowNull => 1
-$Default=> ''
-$Name => 'Group'
-$Domain => 'UserDefined';
-</%ARGS>
diff --git a/rt/html/Search/Elements/SelectLinks b/rt/html/Search/Elements/SelectLinks
index 00ec80b..b814e30 100644
--- a/rt/html/Search/Elements/SelectLinks
+++ b/rt/html/Search/Elements/SelectLinks
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME="<%$Name%>">
 % foreach (@fields) {
 <OPTION VALUE="<%$_%>"><&|/l&><%$_%></&></OPTION>
@@ -56,7 +56,7 @@ $Name => 'LinksField'
 my @fields = ('HasMember',
 	      'MemberOf',
 	      'DependsOn',
-	      'DependedOnBy',
+	      'DependentOn',
 	      'RefersTo',
 	      'ReferredToBy',
 	      'LinkedTo',
diff --git a/rt/html/Search/Elements/SelectPersonType b/rt/html/Search/Elements/SelectPersonType
index d4127c9..01f3893 100644
--- a/rt/html/Search/Elements/SelectPersonType
+++ b/rt/html/Search/Elements/SelectPersonType
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,20 +42,16 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <SELECT NAME ="<%$Name%>">
 % if ($AllowNull) {
 <OPTION VALUE="">-</OPTION>
 % }
-% for my $option (@types) {
-%  if ($Suffix) {
-<OPTION VALUE="<% $option %><% $Suffix %>" <%$option eq $Default && "SELECTED"%> ><%loc($option)%></OPTION>
-%   next;
-%  }
-%  foreach my $subtype (@subtypes) {
-<OPTION VALUE="<%"$option.$subtype"%>" <%$option eq $Default && $subtype eq 'EmailAddress' && "SELECTED"%> ><% loc($option) %> <% loc($subtype) %></OPTION>
-%  }
+%for my $option (@types) {
+%foreach my $subtype (@subtypes) {
+<OPTION VALUE="<%"$option.$subtype"%>" <%$option eq $Default && $subtype eq 'EmailAddress' && "SELECTED"%> ><%loc("[_1] [_2]",$option, $subtype)%></OPTION>
 % }
+%}
 </SELECT>
 
 <%INIT>
@@ -63,9 +59,6 @@ my @types;
 if ($Scope =~ 'queue') {
    @types = qw(Cc AdminCc);
 }
-elsif ($Suffix eq 'Group') {
-   @types = qw(Requestor Cc AdminCc Watcher);
-}
 else { 
    @types = qw(Requestor Cc AdminCc Watcher Owner);
 }
@@ -75,7 +68,6 @@ my @subtypes = qw(EmailAddress Name RealName Nickname Organization Address1 Addr
 </%INIT>
 <%ARGS>
 $AllowNull => 1
-$Suffix => ''
 $Default=>undef
 $Scope => 'ticket'
 $Name => 'WatcherType'
diff --git a/rt/html/Search/Elements/SelectSearchObject b/rt/html/Search/Elements/SelectSearchObject
index e9df517..6eaa680 100644
--- a/rt/html/Search/Elements/SelectSearchObject
+++ b/rt/html/Search/Elements/SelectSearchObject
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%args>
 @Objects => undef
 $Name => undef
diff --git a/rt/html/Search/Elements/SelectSearchesForObjects b/rt/html/Search/Elements/SelectSearchesForObjects
index e6be66a..3f0c458 100644
--- a/rt/html/Search/Elements/SelectSearchesForObjects
+++ b/rt/html/Search/Elements/SelectSearchesForObjects
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%args>
 @Objects => undef
 $Name => undef
@@ -57,9 +57,6 @@ $Name => undef
 % }
 % my @searches = $object->Attributes->Named('SavedSearch');
 % foreach my $search (@searches) { 
-%     # Skip it if it is not a ticket search.
-%     next if ($search->SubValue('SearchType')
-%              && $search->SubValue('SearchType') ne 'Ticket');
 <option value="<%ref($object)%>-<%$object->id%>-SavedSearch-<%$search->Id%>"> -<%$search->Description||loc('Unnamed search')%></option>
 % }
 % }
diff --git a/rt/html/Search/Results.html b/rt/html/Search/Results.html
index 5849378..dfcc788 100755
--- a/rt/html/Search/Results.html
+++ b/rt/html/Search/Results.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'} &>
 <& /Ticket/Elements/Tabs, 
     current_tab => "Search/Results.html".$QueryString, 
@@ -52,6 +52,7 @@
     Rows => $Rows,
     OrderBy => $OrderBy,
     Order => $Order &>
+<hr>
 <& /Elements/TicketList, 
     Query => $Query,
     AllowSorting => 1,
@@ -80,26 +81,24 @@
 <a href="<%$RT::WebPath%>/Search/Bulk.html<%$QueryString%>"><&|/l&>Update multiple tickets</&></a><br>
 <a href="<%$RT::WebPath%>/Search/Results.html<%$QueryString%>"><&|/l&>Bookmarkable link</&></a><br>
 <a href="<%$RT::WebPath%>/Search/Results.tsv<%$QueryString%>"><&|/l&>spreadsheet</&></a> |
-<a href="<%$RT::WebPath%>/Search/Results.rdf<%$ShortQueryString%>"><&|/l&>RSS</&></a> |
-<a href="<%$RT::WebPath%>/Tools/Offline.html<%$ShortQueryString%>"><&|/l&>Work offline</&></a><br>
+<a href="<%$RT::WebPath%>/Search/Results.rdf<%$QueryString%>"><&|/l&>RSS</&></a> |
+<a href="<%$RT::WebPath%>/Tools/Offline.html<%$QueryString%>"><&|/l&>Work offline</&></a><br>
 <& /Elements/Callback, _CallbackName => 'SearchActions', QueryString => $QueryString&>
 </div>
 <%INIT>
 my ($title, $ticketcount);
 $session{'i'}++;
-$session{'tickets'} = RT::Tickets->new($session{'CurrentUser'}) ;
+$session{'tickets'} = RT::Tickets->new($session{'CurrentUser'})  unless ($session{'tickets'});
 $session{'tickets'}->FromSQL($Query) if ($Query);
 $session{'tickets'}->OrderBy(FIELD => $OrderBy, ORDER => $Order); 
 
-
-$session{'CurrentSearchHash'} = {
-    Format      => $Format,
-    Query       => $Query,
-    Order       => $Order,
-    OrderBy     => $OrderBy,
-    RowsPerPage => $Rows
-    };
-
+if ($OrderBy ne $session{'CurrentSearchHash'}->{'OrderBy'}
+    or $Order ne $session{'CurrentSearchHash'}->{'Order'}) {
+    $session{'CurrentSearchHash'}->{'OrderBy'} = $OrderBy;
+    $session{'CurrentSearchHash'}->{'Order'}   = $Order;
+    # Invalidate the ordering cache
+    undef $session{'tickets'}->{'items_array'};
+}
 
 
 if ( $session{'tickets'}->Query()) {
@@ -117,7 +116,6 @@ my $QueryString = "?".$m->comp('/Elements/QueryString',
                                Order => $Order,
                                Page => $Page);
 
-my $ShortQueryString = "?".$m->comp('/Elements/QueryString', Query => $Query);
 
 if ($ARGS{'TicketsRefreshInterval'}) {
 	$session{'tickets_refresh_interval'} = $ARGS{'TicketsRefreshInterval'};
diff --git a/rt/html/Search/Results.rdf b/rt/html/Search/Results.rdf
index ee71fea..8054c86 100644
--- a/rt/html/Search/Results.rdf
+++ b/rt/html/Search/Results.rdf
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 
 my $Tickets = RT::Tickets->new($session{'CurrentUser'});
diff --git a/rt/html/Search/Results.tsv b/rt/html/Search/Results.tsv
index 17aa88a..631e299 100644
--- a/rt/html/Search/Results.tsv
+++ b/rt/html/Search/Results.tsv
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 
 my $Tickets = RT::Tickets->new($session{'CurrentUser'});
@@ -84,8 +84,7 @@ my @attrs = qw( id QueueObj->Name Subject Status TimeEstimated TimeWorked TimeLe
 my @header;
     foreach my $attr (@attrs) {
         my $label = $attr;
-        $label =~ s'Obj-.(?:AsString|Name|ISO)''g;
-        $label =~ s'-\>MemberEmailAddressesAsString''g;
+        $label =~ s'Obj-.(AsString|Name|ISO)''g;
 	push @header, $label;
     }
     foreach my $id (sort keys %known_cfs) {
diff --git a/rt/html/SelfService/Attachment/dhandler b/rt/html/SelfService/Attachment/dhandler
index f953c24..698e345 100644
--- a/rt/html/SelfService/Attachment/dhandler
+++ b/rt/html/SelfService/Attachment/dhandler
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%init>
 $m->comp('/Ticket/Attachment/dhandler', %ARGS);
 $m->abort;
diff --git a/rt/html/SelfService/Closed.html b/rt/html/SelfService/Closed.html
index 2d49a68..515879e 100644
--- a/rt/html/SelfService/Closed.html
+++ b/rt/html/SelfService/Closed.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,8 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<& /SelfService/Elements/Header, Title => loc('Closed tickets') &>
+%# }}} END BPS TAGGED BLOCK
+<& /SelfService/Elements/Header, Title => loc('Closed Tickets') &>
 
 <& /SelfService/Elements/MyRequests, status => ['rejected', 'resolved'], friendly_status =>
 loc('closed') &>
diff --git a/rt/html/SelfService/Create.html b/rt/html/SelfService/Create.html
index d60ae26..a2cfd9f 100644
--- a/rt/html/SelfService/Create.html
+++ b/rt/html/SelfService/Create.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& Elements/Header, Title => loc("Create a ticket") &>
 
 <FORM ACTION="Display.html" METHOD="POST" ENCTYPE="multipart/form-data">
@@ -50,49 +50,43 @@
 
 <TABLE>
 <TR>
-<TD class="label">
+<TD>
 <&|/l&>Queue</&>:
-</td>
-<td class="value">
-    <input type="hidden" name="Queue" value="<%$queue_obj->id%>">
-    <b><%$queue_obj->Name%></b> (<%$queue_obj->Description%>)
+</TD>
+<TD>
+<& /Elements/SelectNewTicketQueue, Verbose => 'True' &>
 </TD>
 </TR>
 <TR>
-<TD class="label">
+<TD>
 <&|/l&>Requestors</&>:
 </TD>
-<TD class="value">
+<TD>
 <INPUT Name="Requestors" Value="<%$session{CurrentUser}->EmailAddress%>" SIZE=20>
 </TD>
 </TR>
 <TR>
-<TD class="label">
+<TD>
 <&|/l&>Cc</&>:
 </TD>
-<TD class="value">
+<TD>
  <INPUT NAME="Cc" SIZE=20>
 </TD>
 </TR>
 <TR>
-<TD class="label">
+<TD>
 <&|/l&>Subject</&>:
 </TD>
-<TD class="value">
+<TD>
 <INPUT Name="Subject" SIZE=60 MAXSIZE=100 value="">
 </TD>
 </TR>
-<tr>
-    <td colspan="2">
-        <& /Ticket/Elements/EditCustomFields, QueueObj => $queue_obj &>
-    </td>
-</tr>
-<tr>
-<TD class="label">
+<TR>
+<TD>
 <&|/l&>Attach file</&>:
 </TD>
-<TD class="value">
-<INPUT Name="Attach" type="file">
+<TD>
+<INPUT Name="Attach" type=file>
 </TD>
 </TR>
 <TR>
@@ -106,10 +100,3 @@
 
 
 </FORM>
-<%args>
-$Queue => undef
-</%args>
-<%init>
-my $queue_obj = RT::Queue->new($session{'CurrentUser'});
-$queue_obj->Load($Queue);
-</%init>
diff --git a/rt/html/SelfService/CreateTicketInQueue.html b/rt/html/SelfService/CreateTicketInQueue.html
deleted file mode 100755
index 5e89736..0000000
--- a/rt/html/SelfService/CreateTicketInQueue.html
+++ /dev/null
@@ -1,61 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-%#                                          <jesse@bestpractical.com>
-%# 
-%# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
-%# LICENSE:
-%# 
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%# 
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%# General Public License for more details.
-%# 
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# CONTRIBUTION SUBMISSION POLICY:
-%# 
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%# 
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%# 
-%# END BPS TAGGED BLOCK }}}
-<& Elements/Header, Title => loc("Create a ticket") &>
-
-<h1><&|/l&>Select a queue for your new ticket</&></h1>
-
-<dl>
-% while (my $queue = $queues->Next) {    
-% next unless $queue->CurrentUserHasRight('CreateTicket');
-
-<dt><a href="<%$RT::WebPath%>/SelfService/Create.html?Queue=<%$queue->id%>"><%$queue->Name%></a></dt>
-<dd><%$queue->Description%></dd>
-% }
-</dl>
-<%init>
-my $queues = RT::Queues->new($session{'CurrentUser'});
-$queues->UnLimit;
-</%init>
diff --git a/rt/html/SelfService/Display.html b/rt/html/SelfService/Display.html
index f7140df..a94593e 100644
--- a/rt/html/SelfService/Display.html
+++ b/rt/html/SelfService/Display.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /SelfService/Elements/Header, Title => loc('#[_1]: [_2]', $Ticket->id, $Ticket->Subject) &>
 
 <& /Elements/ListActions, actions => \@results &>
@@ -54,7 +54,6 @@
                 title_class=> 'inverse',  
                 color => "#993333" &>
                 <& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
-                <& /Ticket/Elements/ShowCustomFields, Ticket => $Ticket &>
           <& /Elements/TitleBoxEnd &>
 </TD>
         <TD VALIGN=TOP WIDTH="50%" class="boxcontainer">
@@ -70,14 +69,7 @@
 
 
 %#!!pape: selfservice_find_attachments.patch {{
-<& /Ticket/Elements/ShowHistory, 
-      Ticket => $Ticket, 
-      URIFile => "Display.html", 
-      ShowHeaders => $ARGS{'ShowHeaders'},
-      AttachPath => "Attachment", 
-      Attachments => $attachments, 
-      UpdatePath => "Update.html" 
-&>
+<& /Ticket/Elements/ShowHistory, Ticket => $Ticket, AttachPath => "Attachment", Attachments => $attachments, UpdatePath => "Update.html" &>
 %#!!pape: selfservice_find_attachments.patch }}
 
 
@@ -93,30 +85,6 @@ my ( $field, @results );
 my @id = ( ref $id eq 'ARRAY' ) ? @{$id} : ($id);
 
 my $Ticket = new RT::Ticket( $session{'CurrentUser'} );
-
-# store the uploaded attachment in session
-if ( $ARGS{'Attach'} ) {    # attachment?
-    $session{'Attachments'} = {} unless defined $session{'Attachments'};
-
-    my $subject = "$ARGS{'Attach'}";
-
-    # since CGI.pm deutf8izes the magic field, we need to add it back.
-    Encode::_utf8_on($subject);
-
-    # strip leading directories
-    $subject =~ s#^.*[\\/]##;
-
-    my $attachment = MakeMIMEEntity(
-        Subject             => $subject,
-        Body                => "",
-        AttachmentFieldName => 'Attach'
-    );
-
-    $session{'Attachments'} =
-    { %{ $session{'Attachments'} || {} },
-        $ARGS{'Attach'} => $attachment };
-}
-
 if ( $id[0] eq 'new' ) {
 
     # {{{ Create a new ticket
@@ -129,87 +97,108 @@ if ( $id[0] eq 'new' ) {
 
     unless ( $Queue->CurrentUserHasRight('CreateTicket') ) {
         $m->comp( 'Error.html',
-            Why =>
-              loc('You have no permission to create tickets in that queue.') );
+             Why =>
+               loc('You have no permission to create tickets in that queue.') );
         $m->abort;
     }
 
-
-    ( $Ticket, @results ) =
-    CreateTicket( Attachments => $session{'Attachments'}, %ARGS, Status => 'new' );
-
-    unless ( $Ticket->id ) {
-        $m->comp( 'Error.html', Why => join( "\n", @results ));
-              $m->abort();
-        }
-
-        # }}}
-
-        # delete temporary storage entry to make WebUI clean
-        unless ( keys %{ $session{'Attachments'} } and $ARGS{'UpdateAttach'} ) {
-            delete $session{'Attachments'};
-        }
-
-        # }}}
-    }
-    else {
-        unless ( $Ticket->Load( $id[0] ) ) {
-            $m->comp( 'Error.html',
-                Why => loc( "Couldn't load ticket '[_1]'", $id ) );
-            $m->abort();
-        }
+    my @Requestors = split ( /\s*,\s*/, $ARGS{'Requestors'} );
+    my @Cc         = split ( /\s*,\s*/, $ARGS{'Cc'} );
+
+    my $MIMEObj = MakeMIMEEntity( Subject             => $ARGS{'Subject'},
+                                  From                => $ARGS{'From'},
+                                  Cc                  => $ARGS{'Cc'},
+                                  Body                => $ARGS{'Content'},
+                                  AttachmentFieldName => 'Attach' );
+
+    #TODO in Create_Details.html: priorities and due-date
+    my ( $id, $Trans, $ErrMsg ) = $Ticket->Create( Queue     => $ARGS{Queue},
+                                                   Requestor => \@Requestors,
+                                                   Cc        => \@Cc,
+                                                   Subject   => $ARGS{Subject},
+                                                   MIMEObj   => $MIMEObj );
+    unless ( $id && $Trans ) {
+        $m->comp( 'Error.html', Why => $ErrMsg );
+        $m->abort();
     }
 
+    push ( @results, $ErrMsg );
+
     # }}}
 
-    unless ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
+# delete temporary storage entry to make WebUI clean
+unless (keys %{$session{'Attachments'}} and $ARGS{'UpdateAttach'}) {
+    delete $session{'Attachments'};
+}
+# }}}
+}
+else {
+    unless ( $Ticket->Load( $id[0] ) ) {
         $m->comp( 'Error.html',
-            Why => loc("No permission to display that ticket") );
+                  Why => loc( "Couldn't load ticket '[_1]'", $id ) );
         $m->abort();
     }
+}
 
-    my ( $code, $msg );
+# }}}
 
-    #Update the status
-    if (    ( defined $ARGS{'Status'} )
-        and $ARGS{'Status'}
-        and ( $ARGS{'Status'} ne $Ticket->Status ) )
-    {
-        ( $code, $msg ) = $Ticket->SetStatus( $ARGS{'Status'} );
-        push @results, "$msg";
-    }
+unless ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
+    $m->comp( 'Error.html',
+              Why => loc("No permission to display that ticket") );
+    $m->abort();
+}
 
-    # }}}
+my ( $code, $msg );
 
-    if (
-        $session{'Attachments'}
-        || (   $ARGS{'UpdateContent'} ne ''
-            && $ARGS{'UpdateContent'} ne "-- \n"
-            . $session{'CurrentUser'}->UserObj->Signature )
-      )
-    {
-        $ARGS{UpdateAttachments} = $session{'Attachments'};
-    }
-    ProcessUpdateMessage(
-        ARGSRef   => \%ARGS,
-        Actions   => \@results,
-        TicketObj => $Ticket
+#Update the status
+if (     ( defined $ARGS{'Status'} ) and $ARGS{'Status'}
+     and ( $ARGS{'Status'} ne $Ticket->Status ) ) {
+    ( $code, $msg ) = $Ticket->SetStatus( $ARGS{'Status'} );
+    push @results, "$msg";
+}
+
+# {{{ store the uploaded attachment in session
+if ($ARGS{'Attach'}) {			# attachment?
+    $session{'Attachments'} = {} unless defined $session{'Attachments'};
+
+    my $subject = "$ARGS{'Attach'}";
+    # since CGI.pm deutf8izes the magic field, we need to add it back.
+    Encode::_utf8_on($subject);
+    # strip leading directories
+    $subject =~ s#^.*[\\/]##;
+
+    my $attachment = MakeMIMEEntity(
+        Subject             => $subject,
+        Body                => "",
+        AttachmentFieldName => 'Attach'
     );
 
-    # delete temporary storage entry to make WebUI clean
-    unless ( keys %{ $session{'Attachments'} } and $ARGS{'UpdateAttach'} ) {
-        delete $session{'Attachments'};
-    }
+    $session{'Attachments'} = { %{$session{'Attachments'} || {}},
+				$ARGS{'Attach'} => $attachment };
+}
+# }}}
 
-    my @cfupdates = ProcessObjectCustomFieldUpdates(Object => $Ticket, ARGSRef => \%ARGS);
-    push (@results, @cfupdates);
+if ( $session{'Attachments'} || 
+     (   $ARGS{'UpdateContent'} ne ''
+	 && $ARGS{'UpdateContent'} ne "-- \n"
+	 . $session{'CurrentUser'}->UserObj->Signature )) {
+    $ARGS{UpdateAttachments} = $session{'Attachments'};
+}
+ProcessUpdateMessage( ARGSRef   => \%ARGS,
+                      Actions   => \@results,
+                      TicketObj => $Ticket );
 
-    # }}}
+# delete temporary storage entry to make WebUI clean
+unless (keys %{$session{'Attachments'}} and $ARGS{'UpdateAttach'}) {
+    delete $session{'Attachments'};
+}
+# }}}
 
-    my $Transactions = $Ticket->Transactions;
+my $Transactions = $Ticket->Transactions;
 
-    my $attachments =
-      $m->comp( '/Ticket/Elements/FindAttachments', Ticket => $Ticket );
+#!!pape: selfservice_find_attachments.patch {{
+my $attachments = $m->comp('/Ticket/Elements/FindAttachments', Ticket => $Ticket);
+#!!pape: selfservice_find_attachments.patch }}
 
 </%INIT>
 
diff --git a/rt/html/SelfService/Elements/GotoTicket b/rt/html/SelfService/Elements/GotoTicket
index 50efaa2..265d698 100644
--- a/rt/html/SelfService/Elements/GotoTicket
+++ b/rt/html/SelfService/Elements/GotoTicket
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,5 +42,5 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <FORM ACTION="<%$RT::WebPath%>/SelfService/Display.html"><input type=submit value="<&|/l&>Goto ticket</&>">&nbsp;<input size=4 name=id></FORM>
diff --git a/rt/html/SelfService/Elements/Header b/rt/html/SelfService/Elements/Header
index c7e6a91..6fe2133 100644
--- a/rt/html/SelfService/Elements/Header
+++ b/rt/html/SelfService/Elements/Header
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,6 +42,6 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, %ARGS, Prefs => '/SelfService/Prefs.html' &>
 <& /SelfService/Elements/Tabs, %ARGS &>
diff --git a/rt/html/SelfService/Elements/MyRequests b/rt/html/SelfService/Elements/MyRequests
index 2df8ce8..026722a 100644
--- a/rt/html/SelfService/Elements/MyRequests
+++ b/rt/html/SelfService/Elements/MyRequests
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/TitleBoxStart, title =>  $title &>
 <TABLE BORDER=0 cellspacing=1 cellpadding=1 BGCOLOR="#eeeeee" WIDTH=100%>
 <TR>
@@ -57,7 +57,7 @@
 <a href="<%$RT::WebPath%>/SelfService/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%>: <%$Ticket->Subject%></a>
 </TD>
 <TD>
-<%loc($Ticket->Status)%>
+<%$Ticket->Status%>
 </TD><TD>
 <%$Ticket->OwnerObj->Name%>
 </TR>
diff --git a/rt/html/SelfService/Elements/Tabs b/rt/html/SelfService/Elements/Tabs
index 802fd65..dbe2109 100644
--- a/rt/html/SelfService/Elements/Tabs
+++ b/rt/html/SelfService/Elements/Tabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/PageLayout,
     current_toptab => $current_toptab,
     current_tab => $current_tab,
@@ -67,16 +67,12 @@ my $tabs = { A  => { title => loc('Open tickets'),
                          path => 'SelfService/Closed.html',
                        },
              C => { title => loc('New ticket'),
-                    path => 'SelfService/CreateTicketInQueue.html'
+                    path => 'SelfService/Create.html'
+                    },
+             Z => { title => loc('Preferences'),
+                    path => 'SelfService/Prefs.html'
                     }
            };
-if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf',
-				       Object => $RT::System )) {
-	$tabs->{Z} = { title => loc('Preferences'),
-		       path => 'SelfService/Prefs.html'
-		       };
-}
-
 my $actions = {
 	B => { html => $m->scomp('GotoTicket') 
 		}
diff --git a/rt/html/SelfService/Error.html b/rt/html/SelfService/Error.html
index 8ac9f81..b4cddee 100644
--- a/rt/html/SelfService/Error.html
+++ b/rt/html/SelfService/Error.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /SelfService/Elements/Header, Title => loc('Error') &>
 <h2 class="title"><%loc('Error')%></h2>
 <& /Elements/TitleBoxStart, title => $Title &>
diff --git a/rt/html/SelfService/Prefs.html b/rt/html/SelfService/Prefs.html
index 3913203..ce2165e 100644
--- a/rt/html/SelfService/Prefs.html
+++ b/rt/html/SelfService/Prefs.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /SelfService/Elements/Header, Title => loc('Preferences') &>
 
 <& /Elements/ListActions, actions => \@results &>
diff --git a/rt/html/SelfService/Update.html b/rt/html/SelfService/Update.html
index 816a610..ef37684 100644
--- a/rt/html/SelfService/Update.html
+++ b/rt/html/SelfService/Update.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,62 +42,35 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<& /SelfService/Elements/Header, 
-    Title =>loc('Update ticket #[_1]', $Ticket->id) 
-&>
+%# }}} END BPS TAGGED BLOCK
+<& /SelfService/Elements/Header, Title =>loc('Update ticket #[_1]', $Ticket->id) &>
 
 
 <FORM ACTION="Display.html" METHOD=POST ENCTYPE="multipart/form-data">
 <input type=hidden name="UpdateType" value="response">
-<input TYPE="hidden" NAME="id" VALUE="<%$Ticket->Id%>">
-<table>
-    <tr>
-        <td class="label">
-            <&|/l&>Status</&>
-        </td>
-        <td class="value">
-            <& /Elements/SelectStatus, Name=>"Status", DefaultLabel => loc("[_1] (Unchanged)",loc($DefaultStatus)) &>
-        </td>
-    </tr>
-    <tr>
-        <td class="label">
-            <&|/l&>Subject</&>
-        </td>
-        <td class="value">
-            <input name="UpdateSubject" size=60 value="<% $Ticket->Subject %>">
-        </td>
 
-    </tr>
-% if (exists $session{'Attachments'}) {
+<&|/l&>Status</&>: <& /Elements/SelectStatus, Name=>"Status", DefaultLabel => loc("[_1] (Unchanged)",$DefaultStatus) &><br>
+<&|/l&>Subject</&>: <input name="UpdateSubject" size=60 value="Re: <% $Ticket->Subject %>"> <br>
+<table>
 <tr>
-    <TD class="label">
-    <&|/l&>Attached file</&>
-    </TD>
-    <TD COLSPAN=5 class="value">
-    <&|/l&>Check box to delete</&><BR>
+% if (exists $session{'Attachments'}) {
+<TD>
+<&|/l&>Attached file</&>:
+</TD>
+<TD COLSPAN=5>
+<&|/l&>Check box to delete</&><BR>
 % foreach my $attach_name (keys %{$session{'Attachments'}}) {
-    <input type="checkbox" name="DeleteAttach-<%$attach_name%>" value="1"><%$attach_name%><BR>
+<input type="checkbox" name="DeleteAttach-<%$attach_name%>"><%$attach_name%><BR>
 % } # end of foreach
-    </TD>
+</TD>
 </TR>
+<TR>
 % } # end of if
-<tr>
-    <td class"label">
-        <&|/l&>Attach</&>
-    </td>
-    <td class="value">
-            <input name="Attach" type="file">
-            <input type="hidden" name="UpdateAttach" value="1">
-    </td>
-  </tr>
+<tr><td align=right><&|/l&>Attach</&>:</td><td><input name="Attach" type="file"><input type="hidden" name="UpdateAttach" value="1">
+</td></tr>
 </table>
-<& /Ticket/Elements/EditCustomFields,  TicketObj => $Ticket &>
-<& /Elements/MessageBox, 
-    Name => "UpdateContent", 
-    QuoteTransaction => $ARGS{QuoteTransaction} 
-    &>
-    <br>
+<& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>
+		<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Ticket->Id%>"><br>
 
 
 <& /Elements/Submit &>
@@ -109,14 +82,14 @@
 
 my $Ticket = LoadTicket($id);
 
-my $title = loc( "Update ticket #[_1]", $Ticket->id );
+my $title = loc("Update ticket #[_1]", $Ticket->id);
 
 $DefaultStatus = $Ticket->Status() unless ($DefaultStatus);
 
 
-Abort( loc("No permission to view update ticket") )
-  unless ( $Ticket->CurrentUserHasRight('ReplyToTicket')
-    or $Ticket->CurrentUserHasRight('ModifyTicket') );
+Abort(loc("No permission to view update ticket")) 
+	unless ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
+                     $Ticket->CurrentUserHasRight('ModifyTicket') ); 
 
 </%INIT>
 
diff --git a/rt/html/SelfService/index.html b/rt/html/SelfService/index.html
index f3ccb85..234568c 100644
--- a/rt/html/SelfService/index.html
+++ b/rt/html/SelfService/index.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /SelfService/Elements/Header, Title => undef &>
 
 <& /SelfService/Elements/MyRequests &>
diff --git a/rt/html/Ticket/Attachment/dhandler b/rt/html/Ticket/Attachment/dhandler
index 584fd72..27b88bd 100644
--- a/rt/html/Ticket/Attachment/dhandler
+++ b/rt/html/Ticket/Attachment/dhandler
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%perl>
      my ($ticket, $trans,$attach, $filename);
      my $arg = $m->dhandler_arg;                # get rest of path
diff --git a/rt/html/Ticket/Create.html b/rt/html/Ticket/Create.html
index b547242..fd2af45 100644
--- a/rt/html/Ticket/Create.html
+++ b/rt/html/Ticket/Create.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,12 +42,12 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Create a new ticket") &>
 <& /Elements/Tabs, 
     current_toptab => "Ticket/Create.html", 
     Title => loc("Create a new ticket") &>
-<FORM ACTION="<%$RT::WebPath%>/Ticket/Create.html" METHOD="POST" ENCTYPE="multipart/form-data" NAME="TicketCreate">
+<FORM ACTION="<%$RT::WebPath%>/Ticket/Create.html" METHOD="POST" ENCTYPE="multipart/form-data">
 <INPUT TYPE=HIDDEN Name="id" VALUE="new">
 <A NAME="top">
 	
@@ -113,15 +113,6 @@
 <& /Ticket/Elements/EditCustomFields, QueueObj => $QueueObj &>
 </TD>
 </TR>
-% if ($TxnCFs->Count) {
-% while (my $CF = $TxnCFs->Next()) {
-<TR>
-<TD ALIGN=RIGHT><% $CF->Name %>:</TD>
-<TD><& /Elements/EditCustomField, CustomField => $CF, NamePrefix =>
-    "Object-RT::Transaction--CustomField-" &><em><% $CF->FriendlyType %></em></TD>
-</TD></TR>
-% }
-% }
 <TR>
 % if (exists $session{'Attachments'}) {
 <TD class=label>
@@ -130,7 +121,7 @@
 <TD COLSPAN=5>
 <&|/l&>Check box to delete</&><BR>
 % foreach my $attach_name (keys %{$session{'Attachments'}}) {
-<input type="checkbox" name="DeleteAttach-<%$attach_name%>" value="1"><%$attach_name%><BR>
+<input type="checkbox" name="DeleteAttach-<%$attach_name%>"><%$attach_name%><BR>
 % } # end of foreach
 </TD>
 </TR>
@@ -237,8 +228,7 @@ $ARGS{Due}%>"></TD></TR>
 
 my $QueueObj = new RT::Queue($session{'CurrentUser'});
 $QueueObj->Load($Queue) || Abort(loc("Queue could not be loaded."));
-my $CFs = $QueueObj->TicketCustomFields();
-my $TxnCFs = $QueueObj->TicketTransactionCustomFields();
+my $CFs = $QueueObj->CustomFields();
 
 # if no due date has been set explicitly, then use the
 # queue's default if it exists
diff --git a/rt/html/Ticket/Display.html b/rt/html/Ticket/Display.html
index dd4c093..745ed42 100644
--- a/rt/html/Ticket/Display.html
+++ b/rt/html/Ticket/Display.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, 
     Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
 <& /Ticket/Elements/Tabs, 
@@ -58,9 +58,6 @@
 <& /Elements/TitleBoxEnd &>
 
 <BR>
-
-<& /Elements/Callback, _CallbackName => 'BeforeShowHistory', Ticket => $TicketObj, %ARGS &>
-
 <& /Ticket/Elements/ShowHistory , 
       Ticket => $TicketObj, 
       Tickets => $Tickets, 
@@ -127,11 +124,10 @@ if ($ARGS{'id'} eq 'new') {
 	}
     }
 
-    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g if defined $ARGS{'UpdateContent'};
+    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
     if ( $ARGS{'UpdateTimeWorked'} ||
 	 $session{'Attachments'} || 
-	 (   defined $ARGS{'UpdateContent'}
-             && $ARGS{'UpdateContent'} ne ''
+	 (   $ARGS{'UpdateContent'} ne ''
 	     && $ARGS{'UpdateContent'} ne "-- \n"
 	     . $session{'CurrentUser'}->UserObj->Signature )) {
 	$ARGS{UpdateAttachments} = $session{'Attachments'};
diff --git a/rt/html/Ticket/Elements/AddCustomers b/rt/html/Ticket/Elements/AddCustomers
index 01c7367..66480e2 100644
--- a/rt/html/Ticket/Elements/AddCustomers
+++ b/rt/html/Ticket/Elements/AddCustomers
@@ -19,8 +19,9 @@
 % foreach my $customer (@Customers) {
 <tr>
   <td>
-    <input type="checkbox" name="Ticket-AddCustomer-<% $customer->{'custnum'} %>" VALUE="1" <% scalar(@Customers) == 1 ? 'CHECKED' : '' %>>
-    <A HREF="<%$freeside_url%>/view/cust_main.cgi?<% $customer->{'custnum'} %>"><% &RT::URI::freeside::small_custview($customer->{'custnum'}, &RT::URI::freeside::FreesideGetConfig('countrydefault'), 1) |n %>
+    <input type="checkbox" name="Ticket-AddCustomer-<% $customer->custnum %>" VALUE="1" <% scalar(@Customers) == 1 ? 'CHECKED' : '' %>>
+%#    <% $customer->name %>
+    <A HREF="<% $p %>view/cust_main.cgi?<% $customer->custnum %>"><% small_custview( $customer, scalar(FS::Conf->new->config('countrydefault')), 1 ) |n %>
   </td>
 </tr>
 % }
@@ -30,11 +31,10 @@
 <%INIT>
 my ($msg);
 
-my $freeside_url = &RT::URI::freeside::FreesideURL();
-
 my @Customers = ();
 if ( $CustomerString ) {
-    @Customers = &RT::URI::freeside::smart_search( 'search' => $CustomerString );
+    @Customers = smart_search( 'search' => $CustomerString );
+    warn scalar(@Customers);
 }
 
 my @Services = ();
@@ -42,6 +42,9 @@ if ($ServiceString) {
     @Services = (); #service_search();
 }
 
+eval { use FS::CGI qw( popurl small_custview ); };
+my $p = eval { popurl(3); };
+
 </%INIT>
 
 <%ARGS>
diff --git a/rt/html/Ticket/Elements/AddWatchers b/rt/html/Ticket/Elements/AddWatchers
index 98314b9..f70e86a 100644
--- a/rt/html/Ticket/Elements/AddWatchers
+++ b/rt/html/Ticket/Elements/AddWatchers
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <BR>
 <%$msg%><br>
 
diff --git a/rt/html/Ticket/Elements/BulkLinks b/rt/html/Ticket/Elements/BulkLinks
index 6a3859a..c071bd1 100644
--- a/rt/html/Ticket/Elements/BulkLinks
+++ b/rt/html/Ticket/Elements/BulkLinks
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
   <TR>
     <TD class="label"><&|/l&>Merge into</&>:</TD>
diff --git a/rt/html/Ticket/Elements/EditBasics b/rt/html/Ticket/Elements/EditBasics
index 7156851..7ad4a63 100644
--- a/rt/html/Ticket/Elements/EditBasics
+++ b/rt/html/Ticket/Elements/EditBasics
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
   <TR>
       <td class="label"><&|/l&>Subject</&>:</td>
@@ -84,7 +84,7 @@
 
 <%INIT>
 #It's hard to do this inline, so we'll preload the html of the selectstatus in here.
-my $SelectStatus = $m->scomp("/Elements/SelectStatus", Name => 'Status', DefaultLabel => loc("[_1] (Unchanged)",loc($TicketObj->Status)));
+my $SelectStatus = $m->scomp("/Elements/SelectStatus", Name => 'Status', DefaultLabel => loc("[_1] (Unchanged)",$TicketObj->Status));
 my $SelectQueue = $m->scomp("/Elements/SelectQueue", Name => 'Queue', Default =>$TicketObj->QueueObj->Id);
 
 </%INIT>
diff --git a/rt/html/Ticket/Elements/EditCustomField b/rt/html/Ticket/Elements/EditCustomField
index 63687ac..74e57dd 100644
--- a/rt/html/Ticket/Elements/EditCustomField
+++ b/rt/html/Ticket/Elements/EditCustomField
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,14 +42,55 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<%init>
-
-# RT 3.2 API compatibility glue
-
-$RT::Logger->debug("Ticket/Elements/EditCustomField is deprecated in RT 3.4 and will be removed in 3.6.");
-
-$ARGS{'NamePrefix'} =~ s/^Ticket-/Object-RT::Ticket-/;
-$ARGS{'NamePrefix'} =~ s/^CustomField-/Object-RT::Ticket--CustomField-/;
-$m->comp('/Elements/EditCustomField', %ARGS, Object=> $ARGS{'TicketObj'});
-</%init>
+%# }}} END BPS TAGGED BLOCK
+% my $Values;
+% if ($TicketObj) {
+%          $Values  = $TicketObj->CustomFieldValues($CustomField->id);
+% }
+% if ($CustomField->Type eq 'FreeformSingle') {
+      <input name="<%$NamePrefix%><%$CustomField->Id%>-Value"
+        size="<%$Cols%>"
+% if ($TicketObj) {
+          value="<%$Values->Count ? $Values->First->Content : ''%>"
+% } elsif ($Default) {
+          value="<%$Default ? $Default : ''%>"
+% }
+>
+% } elsif ($CustomField->Type eq 'FreeformMultiple') {
+% my $content;
+% if ($TicketObj) {
+%          while (my $value = $Values->Next ) {
+%                 $content .= $value->Content;
+%           }
+% } elsif ($Default) {
+          value="<%$Default ? $Default : ''%>"
+%  }
+<input type="hidden" name="<%$NamePrefix%><%$CustomField->Id%>-Values-Magic" value="1">
+<textarea cols=<%$Cols%> rows=<%$Rows%> name="<%$NamePrefix%><%$CustomField->Id%>-Values"><%$content%></textarea>
+% } elsif ($CustomField->Type =~ /^Select/) {
+      <input type="hidden" name="<%$NamePrefix%><%$CustomField->Id%>-Values-Magic" value="1">
+      <select name="<%$NamePrefix%><%$CustomField->Id%>-Values"
+        size="<%$Rows%>"
+        <%$CustomField->Type eq 'SelectMultiple' && 'MULTIPLE'%>>
+% my $CustomFieldValues = $CustomField->Values();
+% my $selected;
+% while (my $value = $CustomFieldValues->Next) {
+        <option value="<%$value->Name%>" 
+% if ($TicketObj) {
+            <% $Values->HasEntry($value->Name) && ($selected = 1) && 'SELECTED' %>
+% } elsif ($Default) {
+            <% ($Default eq $value->Name) && ($selected = 1) && 'SELECTED' %>
+% }
+            ><% $value->Name%></option>
+% }
+        <option value="" <% !$selected && 'SELECTED' %>><&|/l&>(no value)</&></option>
+      </select>
+% }
+<%ARGS>
+$TicketObj => undef
+$CustomField => undef
+$NamePrefix => undef
+$Rows => 5
+$Cols=> 15
+$Default => undef
+</%ARGS>
diff --git a/rt/html/Ticket/Elements/EditCustomFields b/rt/html/Ticket/Elements/EditCustomFields
index d566f4e..b049751 100644
--- a/rt/html/Ticket/Elements/EditCustomFields
+++ b/rt/html/Ticket/Elements/EditCustomFields
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <table>
 <tr>
 <td valign="top" width="50%">
@@ -66,11 +66,7 @@
       <b><%$CustomField->Name%></b><br>
       <i><%$CustomField->FriendlyType%></i>
     </td>
-    <td class="entry"><& /Elements/EditCustomField, 
-        Object => $TicketObj, 
-        CustomField => $CustomField, 
-        NamePrefix => $NamePrefix 
-        &></td>
+    <td class="entry"><& EditCustomField, TicketObj => $TicketObj, CustomField => $CustomField, NamePrefix => $NamePrefix &></td>
   </tr>
 % }
 </table>
@@ -83,12 +79,12 @@ my $CustomFields;
 my $NamePrefix;
 
 if ($TicketObj) {
- $CustomFields = $TicketObj->CustomFields();
-  $NamePrefix = "Object-RT::Ticket-".$TicketObj->Id."-CustomField-";
+ $CustomFields = $TicketObj->QueueObj->CustomFields();
+  $NamePrefix = "Ticket-".$TicketObj->Id."-CustomField-";
 
 } else {
- $CustomFields = $QueueObj->TicketCustomFields();
-  $NamePrefix = "Object-RT::Ticket--CustomField-";
+ $CustomFields = $QueueObj->CustomFields();
+  $NamePrefix = "CustomField-";
 }
 
 
diff --git a/rt/html/Ticket/Elements/EditCustomers b/rt/html/Ticket/Elements/EditCustomers
index 47d1aa2..10b9c5b 100644
--- a/rt/html/Ticket/Elements/EditCustomers
+++ b/rt/html/Ticket/Elements/EditCustomers
@@ -29,7 +29,7 @@
 
       <INPUT TYPE=CHECKBOX NAME="DeleteLink--<%$link->Type%>-<%$link->Target%>">
 %#        <& ShowLink, URI => $link->TargetURI &><br>
-        <A HREF="<% $link->TargetURI->Resolver->HREF %>"><% $link->TargetURI->Resolver->AsStringLong |n %></A>
+        <A HREF="<% $link->TargetURI->Resolver->HREF %>"><% $link->TargetURI->Resolver->AsStringLong |n %>
       <BR>
 % }
     </td>
diff --git a/rt/html/Ticket/Elements/EditDates b/rt/html/Ticket/Elements/EditDates
index a197741..8e12f25 100644
--- a/rt/html/Ticket/Elements/EditDates
+++ b/rt/html/Ticket/Elements/EditDates
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
   <TR>
     <TD class="label"><&|/l&>Starts</&>:</TD>
diff --git a/rt/html/Ticket/Elements/EditPeople b/rt/html/Ticket/Elements/EditPeople
index 055d7ba..4b2a1ac 100644
--- a/rt/html/Ticket/Elements/EditPeople
+++ b/rt/html/Ticket/Elements/EditPeople
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
 <TR>
 <TD VALIGN=TOP>
@@ -52,7 +52,7 @@
 <& /Elements/SelectUsers &>
 <input type=submit name="OnlySearchForPeople" value="<&|/l&>Go!</&>">
 <BR>
-<&|/l&>Find groups whose</&><BR>
+<&|/l&>Find group whose</&><BR>
 <& /Elements/SelectGroups &>
 <input type=submit name="OnlySearchForGroup" value="<&|/l&>Go!</&>">
 
diff --git a/rt/html/Ticket/Elements/EditWatchers b/rt/html/Ticket/Elements/EditWatchers
index 0089932..19c884b 100644
--- a/rt/html/Ticket/Elements/EditWatchers
+++ b/rt/html/Ticket/Elements/EditWatchers
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <ul>
 %# Print out a placeholder if there are none.
 %if ($Members->Count == 0 ) {
@@ -52,7 +52,7 @@
 
 %while (my $watcher=$Members->Next) {
 <li>
-<INPUT TYPE=CHECKBOX NAME="Ticket-DeleteWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" value="1" UNCHECKED>
+<INPUT TYPE=CHECKBOX NAME="Ticket-DeleteWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" UNCHECKED>
 %if ($watcher->MemberObj->IsUser) { 
 <a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->MemberObj->Object->id%>">
 <%$watcher->MemberObj->Object->Name%></a>
diff --git a/rt/html/Ticket/Elements/FindAttachments b/rt/html/Ticket/Elements/FindAttachments
index 017c772..a1e973f 100755
--- a/rt/html/Ticket/Elements/FindAttachments
+++ b/rt/html/Ticket/Elements/FindAttachments
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 my %documents;
 
@@ -63,14 +63,11 @@ $attachments->Join( ALIAS1 => 'main',
     
 my $tickets = $attachments->NewAlias('Tickets');
 
-  $attachments->Join( ALIAS1 => $transactions,                         
-                        FIELD1 => 'ObjectId',
-                        ALIAS2 => $tickets,
-                        FIELD2 => 'id' );
-    
-    $attachments->Limit( ALIAS => $transactions,
-                         FIELD => 'ObjectType',
-                        VALUE => 'RT::Ticket');
+$attachments->Join( ALIAS1 => $transactions,
+		    FIELD1 => 'Ticket',
+		    ALIAS2 => $tickets,
+		    FIELD2 => 'id' );
+
 if ($Tickets) {
     while ($Ticket = $Tickets->Next) {
 	$attachments->Limit( ALIAS => $tickets,
diff --git a/rt/html/Ticket/Elements/LoadTextAttachments b/rt/html/Ticket/Elements/LoadTextAttachments
index 943568f..370371b 100755
--- a/rt/html/Ticket/Elements/LoadTextAttachments
+++ b/rt/html/Ticket/Elements/LoadTextAttachments
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 
 my $attachments = RT::Attachments->new( $session{'CurrentUser'} );
@@ -58,17 +58,11 @@ if ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
     
     my $tickets = $attachments->NewAlias('Tickets');
 
-
     $attachments->Join( ALIAS1 => $transactions,
-                        FIELD1 => 'ObjectId',
+                        FIELD1 => 'Ticket',
                         ALIAS2 => $tickets,
                         FIELD2 => 'id' );
 
-    $attachments->Limit( ALIAS => $transactions,
-                         FIELD => 'ObjectType',
-                        VALUE => 'RT::Ticket');
-
-
     $attachments->Limit( ALIAS => $tickets,
                          FIELD => 'EffectiveId',
                          VALUE => $Ticket->id() );
diff --git a/rt/html/Ticket/Elements/PreviewScrips b/rt/html/Ticket/Elements/PreviewScrips
index a3492b7..846c62c 100755
--- a/rt/html/Ticket/Elements/PreviewScrips
+++ b/rt/html/Ticket/Elements/PreviewScrips
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%args>
 $TicketObj => undef
 
@@ -95,7 +95,7 @@ my @non_recipients = $TicketObj->SquelchMailTo;
 % foreach my $scrip (@{$Object->Scrips->Prepared}) {
 % next unless $scrip->ActionObj->Action->isa('RT::Action::SendEmail');
 <b><%$scrip->Description%></b><br>
-<&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name)&>[_1] [_2] with template [_3]</&>
+<&|/l, $scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name&>[_1] [_2] with template [_3]</&>
 <br>
 %foreach my $type qw(To Cc Bcc) {
 %my @addresses =  $scrip->ActionObj->Action->$type();
diff --git a/rt/html/Ticket/Elements/ShowAttachments b/rt/html/Ticket/Elements/ShowAttachments
index 82028dd..8a2a5cb 100644
--- a/rt/html/Ticket/Elements/ShowAttachments
+++ b/rt/html/Ticket/Elements/ShowAttachments
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % if (keys %documents) {
 <& /Elements/TitleBoxStart, title => loc('Attachments'), 
         title_class=> 'inverse',  
@@ -82,12 +82,8 @@ if ($size) {
 % }
 
 <%INIT>
-
-# If we haven't been passed in an Attachments object (through the precaching mechanism)
-# then we need to find one
-$Attachments ||= $m->comp('FindAttachments', Ticket => $Ticket);
-
 my %documents;
+
 while ( my $attach = $Attachments->Next() ) {
     next unless ($attach->Filename());
    unshift( @{ $documents{ $attach->Filename } }, $attach );
diff --git a/rt/html/Ticket/Elements/ShowBasics b/rt/html/Ticket/Elements/ShowBasics
index 00ed3cc..55e923f 100644
--- a/rt/html/Ticket/Elements/ShowBasics
+++ b/rt/html/Ticket/Elements/ShowBasics
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <table>
   <tr>
     <td class="label"><&|/l&>Id</&>:</td>
diff --git a/rt/html/Ticket/Elements/ShowCustomFields b/rt/html/Ticket/Elements/ShowCustomFields
index eb49212..895439e 100644
--- a/rt/html/Ticket/Elements/ShowCustomFields
+++ b/rt/html/Ticket/Elements/ShowCustomFields
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,27 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
-<& /Elements/ShowCustomFields, Object => $Ticket &>
+%# }}} END BPS TAGGED BLOCK
+<table>
+% my @entry_fields;
+% while (my $CustomField = $CustomFields->Next()) {
+% my $Values = $Ticket->CustomFieldValues($CustomField->Id);
+  <tr>
+    <td class="label"><%$CustomField->Name%>:</td>
+    <td class="value">
+% while (my $Value = $Values->Next()) {
+<%$Value->Content%><br>        
+% }
+% unless ($Values->Count()) {
+<i><&|/l&>(no value)</&></i>
+% }
+    </td>
+  </tr>
+% }
+</table>
+<%INIT>
+my $CustomFields = $Ticket->QueueObj->CustomFields();
+</%INIT>
 <%ARGS>
 $Ticket => undef
 </%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowCustomers b/rt/html/Ticket/Elements/ShowCustomers
index 612727e..5519d24 100644
--- a/rt/html/Ticket/Elements/ShowCustomers
+++ b/rt/html/Ticket/Elements/ShowCustomers
@@ -21,7 +21,7 @@
 %   my $cust_main = '';
   <tr>
     <td class="value">
-      <A HREF="<% $customerURI->Resolver->HREF %>"><% $customerURI->Resolver->AsStringLong |n %></A>
+      <A HREF="<% $customerURI->Resolver->HREF %>"><% $customerURI->Resolver->AsStringLong |n %>
     </td>
   </tr>
 % }
diff --git a/rt/html/Ticket/Elements/ShowDates b/rt/html/Ticket/Elements/ShowDates
index 2ccbb3f..a22a02d 100644
--- a/rt/html/Ticket/Elements/ShowDates
+++ b/rt/html/Ticket/Elements/ShowDates
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <TABLE>
   <TR>
     <TD class="label"><&|/l&>Created</&>:</TD>
diff --git a/rt/html/Ticket/Elements/ShowDependencies b/rt/html/Ticket/Elements/ShowDependencies
index f276bc9..d3bdd59 100644
--- a/rt/html/Ticket/Elements/ShowDependencies
+++ b/rt/html/Ticket/Elements/ShowDependencies
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <&|/l&>Depends on</&>:<BR>
 % while (my $Link = $Ticket->DependsOn->Next) {
 % my $member = $Link->TargetObj;
diff --git a/rt/html/Ticket/Elements/ShowGroupMembers b/rt/html/Ticket/Elements/ShowGroupMembers
index 1fdb79a..1d6e711 100644
--- a/rt/html/Ticket/Elements/ShowGroupMembers
+++ b/rt/html/Ticket/Elements/ShowGroupMembers
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# Released under the terms of version 2 of the GNU Public License
 
 % my $UserMembers = $Group->UserMembersObj;
diff --git a/rt/html/Ticket/Elements/ShowHistory b/rt/html/Ticket/Elements/ShowHistory
index 75e3477..37b670d 100644
--- a/rt/html/Ticket/Elements/ShowHistory
+++ b/rt/html/Ticket/Elements/ShowHistory
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%perl>
  if ($ShowDisplayModes or $ShowTitle) {
 my $title;
@@ -104,8 +104,8 @@ while ( my $Transaction = $Transactions->Next ) {
     $m->comp( 'ShowTransaction',
             %ARGS,
 
-              AttachPath           => $AttachPath,
-              UpdatePath           => $UpdatePath,
+	      AttachPath	  => $AttachPath,
+	      UpdatePath	   => $UpdatePath,
               Ticket               => $Ticket,
               Transaction          => $Transaction,
               ShowHeaders          => $ShowHeaders,
@@ -116,10 +116,6 @@ while ( my $Transaction = $Transactions->Next ) {
               AttachmentContent    => $trans_content,
               LastTransaction      => $Transactions->IsLast
  );
-
-# manually flush the content buffer after each txn, so the user sees
-# some update
-$m->flush_buffer(); 
 }
 
 </%perl>
@@ -131,7 +127,9 @@ $m->flush_buffer();
 my $Transactions = new RT::Transactions($session{'CurrentUser'});
 if ($Tickets) {
     while (my $t = $Tickets->Next) {
-        $Transactions->LimitToTicket($t->id);
+	$Transactions->Limit(FIELD => 'Ticket',
+			     OPERATOR => '=',
+			     VALUE => $t->Id);
     }
 } else {
     $Transactions = $Ticket->Transactions;
@@ -155,4 +153,5 @@ $ShowDisplayModes => 1
 $ShowTitleBarCommands => 1
 $AttachPath => $RT::WebPath."/Ticket/Attachment"
 $UpdatePath => $RT::WebPath."/Ticket/Update.html"
+
 </%ARGS>
diff --git a/rt/html/Ticket/Elements/ShowMemberOf b/rt/html/Ticket/Elements/ShowMemberOf
index e443132..eb285d3 100644
--- a/rt/html/Ticket/Elements/ShowMemberOf
+++ b/rt/html/Ticket/Elements/ShowMemberOf
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,11 +42,11 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <UL>
 % my $memberof = $Ticket->MemberOf;
 % while (my $member_of = $memberof->Next) {
-<LI><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member_of->Id%>"><%$member_of->Id%></a>: <%$member_of->Subject%> [<%$member_of->Status%>]
+<LI><a href="/Ticket/Display.html?id=<%$member_of->Id%>"><%$member_of->Id%></a>: <%$member_of->Subject%> [<%$member_of->Status%>]
 % }
 </UL>
 
diff --git a/rt/html/Ticket/Elements/ShowMembers b/rt/html/Ticket/Elements/ShowMembers
index f4fec1c..9802e89 100644
--- a/rt/html/Ticket/Elements/ShowMembers
+++ b/rt/html/Ticket/Elements/ShowMembers
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % if ($members->Count) {
 <UL>
 % while (my $link = $members->Next) {
diff --git a/rt/html/Ticket/Elements/ShowMessageHeaders b/rt/html/Ticket/Elements/ShowMessageHeaders
index 8dc76ba..408b2c8 100644
--- a/rt/html/Ticket/Elements/ShowMessageHeaders
+++ b/rt/html/Ticket/Elements/ShowMessageHeaders
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % use Data::Dumper;
 <table>
 % foreach my $header (@headers) {
diff --git a/rt/html/Ticket/Elements/ShowMessageStanza b/rt/html/Ticket/Elements/ShowMessageStanza
index eaf551d..8b91261 100644
--- a/rt/html/Ticket/Elements/ShowMessageStanza
+++ b/rt/html/Ticket/Elements/ShowMessageStanza
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 % if (ref($Message)) {
 <font color="<%$colors[$Depth]%>">
 <%perl>
@@ -57,7 +57,7 @@ foreach my $stanza (@$Message) {
         my $content = $stanza->{raw};
         RT::Interface::Web::EscapeUTF8(\$content);
         $m->comp('/Elements/Callback', content => \$content, %ARGS);
-                $content =~ s/\n/<br>/gi if defined $content;
+                $content =~ s/\n/<br>/gi;
 
 </%perl>
 <%$content |n%><br>
diff --git a/rt/html/Ticket/Elements/ShowPeople b/rt/html/Ticket/Elements/ShowPeople
index dbec939..597a991 100644
--- a/rt/html/Ticket/Elements/ShowPeople
+++ b/rt/html/Ticket/Elements/ShowPeople
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,11 +42,11 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <table>
   <tr>
     <td class="label"><&|/l&>Owner</&>:</td>
-    <td class="value"><& ShowUserEntry, User => $Ticket->OwnerObj &></td>
+    <td class="value"><%$Ticket->OwnerObj->Name%></td>
   </tr>
   <tr>
     <td class="labeltop"><&|/l&>Requestors</&>:</td>
diff --git a/rt/html/Ticket/Elements/ShowReferences b/rt/html/Ticket/Elements/ShowReferences
index bb323f6..e3639d0 100644
--- a/rt/html/Ticket/Elements/ShowReferences
+++ b/rt/html/Ticket/Elements/ShowReferences
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,14 +42,14 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <UL>
 % while (my $Link = $Ticket->RefersTo->Next) {
 <LI>
 % if ($Link->TargetURI->IsLocal) {
 % my $member = $Link->TargetObj;
 
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+<a href="/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
 % } else {
 <A HREF="<%$Link->TargetURI->HREF%>"><%$Link->Target%></A>
 % }
@@ -61,7 +61,7 @@
 <LI>
 % if ($Link->BaseURI->IsLocal) {
 % my $member = $Link->BaseObj;
-<a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
+<a href="/Ticket/Display.html?id=<%$member->Id%>"><%$member->Id%></a>: (<%$member->OwnerObj->Name%>) <%$member->Subject%> [<%$member->Status%>]<br>
 % } else {
 <A HREF="<%$Link->BaseURI->HREF%>"><%$Link->Base%></A>
 %}
diff --git a/rt/html/Ticket/Elements/ShowRequestor b/rt/html/Ticket/Elements/ShowRequestor
index 421d38e..cb9d7a6 100644
--- a/rt/html/Ticket/Elements/ShowRequestor
+++ b/rt/html/Ticket/Elements/ShowRequestor
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%PERL>
 my $rows = 10;
 my $people = $Ticket->Requestors->UserMembersObj;
@@ -73,11 +73,6 @@ $tickets->OrderBy(FIELD => 'Priority',
 <LI><a href="<%$RT::WebPath%><%$DisplayPath%>?id=<%$w->id%>"><%$w->Id%>: <%$w->Subject%></a> (<%$w->Status%>)
 %}
 </UL>
-
-<&|/l&>Groups this user belongs to</&>:<BR>
-
-<& /Elements/ShowMemberships, UserObj => $requestor &>
-
 <& /Elements/TitleBoxEnd &>
 
 % }
diff --git a/rt/html/Ticket/Elements/ShowSummary b/rt/html/Ticket/Elements/ShowSummary
index 5a6e7e0..f3775ea 100644
--- a/rt/html/Ticket/Elements/ShowSummary
+++ b/rt/html/Ticket/Elements/ShowSummary
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
       <TABLE WIDTH="100%" class="ticketsummary" >
       <TR>
 	<TD VALIGN=TOP WIDTH="50%" class="boxcontainer">
@@ -53,7 +53,7 @@
 	        <& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
 	  <& /Elements/TitleBoxEnd &>
           <br>
-% if ($Ticket->QueueObj->TicketCustomFields->First) {
+% if ($Ticket->QueueObj->CustomFields()->First) {
 	  <& /Elements/TitleBoxStart, title => loc('Custom Fields'), 
 		title_href =>"$RT::WebPath/Ticket/Modify.html?id=".$Ticket->Id, 
 		title_class=> 'inverse',  
diff --git a/rt/html/Ticket/Elements/ShowTransaction b/rt/html/Ticket/Elements/ShowTransaction
index 8bf589d..f0b8326 100644
--- a/rt/html/Ticket/Elements/ShowTransaction
+++ b/rt/html/Ticket/Elements/ShowTransaction
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,9 +42,9 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <TR class="<% $RowNum%2 ? 'oddline' : 'evenline'%>" >
-<TD rowspan="2" valign="top" bgcolor="<%$bgcolor%>"><A NAME="txn-<%$Transaction->Id%>" href="<% $DisplayPath %>#txn-<%$Transaction->Id%>">#</A><% $LastTransaction ? '<a name="lasttrans">&nbsp;</a>' : '&nbsp;' |n %></TD>
+<TD rowspan="2" valign="top" bgcolor="<%$bgcolor%>"><A NAME="txn-<%$Transaction->Id%>" href="#txn-<%$Transaction->Id%>">#</A><% $LastTransaction ? '<a name="lasttrans">&nbsp;</a>' : '&nbsp;' |n %></TD>
 <TD>&nbsp&nbsp;</TD>
 <TD><font size=-2><% $transdate|n %></font>&nbsp;</TD>
 % my $desc = $Transaction->BriefDescription;
@@ -56,9 +56,6 @@
 <TD ALIGN="RIGHT"><font size=-1><%$titlebar_commands|n%></font></TD>
 </TR>
 <TR class="<% $RowNum%2 ? 'oddline' : 'evenline'%>"><TD colspan=5>
-% if ($Transaction->CustomFieldValues->Count) {
-<& /Elements/ShowCustomFields, Object => $Transaction &>
-% }
 % $m->comp('ShowTransactionAttachments', %ARGS, Parent => 0) unless ($Collapsed ||!$ShowBody);
 </TD>
 </TR>
@@ -70,7 +67,6 @@ $ShowHeaders => 0
 $Collapsed => undef
 $ShowTitleBarCommands => 1
 $RowNum => 1
-$DisplayPath => $RT::WebPath."/Ticket/Display.html?id=".$Ticket->id
 $AttachPath => $RT::WebPath."/Ticket/Attachment"
 $UpdatePath => $RT::WebPath."/Ticket/Update.html"
 $EmailRecordPath => $RT::WebPath."/Ticket/ShowEmailRecord.html"
@@ -118,7 +114,6 @@ else {
 if ( $Ticket->Id != $Transaction->Ticket ) {
     $TicketString = "Ticket " . $Transaction->Ticket . ": ";
 }
-$TicketString ||= '';
 
 if ( $Transaction->TimeTaken != 0 ) {
     $TimeTaken = $Transaction->TimeTaken . " min";
diff --git a/rt/html/Ticket/Elements/ShowTransactionAttachments b/rt/html/Ticket/Elements/ShowTransactionAttachments
index 8dabff4..b01586d 100644
--- a/rt/html/Ticket/Elements/ShowTransactionAttachments
+++ b/rt/html/Ticket/Elements/ShowTransactionAttachments
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%perl>
 # Find all the attachments which have parent $Parent
 # For each of these attachments
@@ -79,24 +79,21 @@ foreach my $message ( grep { $_->Parent == $Parent } @$Attachments ) {
      }
         
 </%PERL> 
-<A HREF="<%$AttachPath%>/<%$Transaction->Id%>/<%$message->Id%>/<%$message->Filename | u%>"><&|/l&>Download</&> <%$message->Filename || loc('(untitled)') %></a> 
+<A HREF="<%$AttachPath%>/<%$Transaction->Id%>/<%$message->Id%>/<%$message->Filename | u%>"><&|/l&>Download</&><%$message->Filename || loc('(untitled)') %></a> 
 <div class="downloadcontenttype">
 <%$message->ContentType%> <% $size %> 
 </div> 
 </div>
-% }
+%}
+
 % # }}}
 <div class="messagebody">
 <%perl>
-# {{{   if it has a content-disposition: attachment, don't show inline
-unless ( $message->GetHeader('Content-Disposition') =~ /attachment/i ) {
-
+# {{{   if it's got content-disposition inline, show it inline
     my $content;
 
     # If it's text
-    if (   $message->ContentType =~ m{^(text|message)}i
-        && $size <= $RT::MaxInlineBody )
-    {
+    if ( $message->ContentType =~ m{^(text|message)}i ) {
 
         if (
 
@@ -130,7 +127,7 @@ unless ( $message->GetHeader('Content-Disposition') =~ /attachment/i ) {
             if ( $message->ContentType =~ m{^text/(?:html|enriched)$}i ) {
                 $content =
                   $m->comp( '/Elements/ScrubHTML', Content => $content );
-                $m->out($content);
+                $m->out( $content );
             }
 
             # if it's a text/plain show the body
@@ -149,24 +146,22 @@ unless ( $message->GetHeader('Content-Disposition') =~ /attachment/i ) {
         }
 
     }
+        # if it's an image, show it as an image
+        elsif ( $message->ContentType =~ /^image\//i ) {
+            $m->out('<img src="'
+                  . $AttachPath . '/'
+                  . $Transaction->Id . '/'
+                  . $message->Id
+                  . '/">' );
+        }
 
-    # if it's an image, show it as an image
-    elsif ( $message->ContentType =~ /^image\//i ) {
-        $m->out('<img src="'
-              . $AttachPath . '/'
-              . $Transaction->Id . '/'
-              . $message->Id
-              . '/">' );
-    }
-}
 
-# }}}
+    # }}}
+
+    $m->comp( 'ShowTransactionAttachments', %ARGS,
+          Parent    => $message->id,
+          ParentObj => $message );
 
-$m->comp(
-    'ShowTransactionAttachments', %ARGS,
-    Parent    => $message->id,
-    ParentObj => $message
-);
 
 }
 </%PERL>
diff --git a/rt/html/Ticket/Elements/ShowUserEntry b/rt/html/Ticket/Elements/ShowUserEntry
index 163bcbd..38473ff 100644
--- a/rt/html/Ticket/Elements/ShowUserEntry
+++ b/rt/html/Ticket/Elements/ShowUserEntry
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 %# Released under the terms of version 2 of the GNU Public License
 
 <%$User->Name%>
diff --git a/rt/html/Ticket/Elements/Tabs b/rt/html/Ticket/Elements/Tabs
index 46e1d4a..64fa131 100644
--- a/rt/html/Ticket/Elements/Tabs
+++ b/rt/html/Ticket/Elements/Tabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Callback, Ticket => $Ticket, actions=> $actions, tabs => $tabs, %ARGS &>
 <& /Elements/Tabs, 
     tabs => $tabs, 
@@ -123,7 +123,7 @@ my $ticket_page_tabs = {
             path  => "Ticket/ModifyCustomers.html?id=" . $id, },
     _F => { title => loc('Jumbo'),
             path  => "Ticket/ModifyAll.html?id=" . $id,
-            separator => 1
+            seperator => 1
  },
 
 };
@@ -189,7 +189,6 @@ my $args = "?" . $m->comp(
     Order   => $ARGS{'Order'}   || $session{'CurrentSearchHash'}->{'Order'},
     Rows    => $ARGS{'Rows'},
   ) if ($ARGS{'Query'} or $session{'CurrentSearchHash'}->{'Query'});
-$args ||= '';
 
 $tabs->{"f"} = { path      => "Search/Build.html?NewQuery=1",
                  title     => loc('New Query')};
@@ -214,7 +213,7 @@ if (defined $session{'tickets'} and $session{'tickets'}->Count) {
 <%ARGS>
 $Ticket => undef
 $subtabs => undef
-$current_tab => ''
-$current_subtab => ''
+$current_tab => undef
+$current_subtab => undef
 $Title => undef
 </%ARGS>
diff --git a/rt/html/Ticket/History.html b/rt/html/Ticket/History.html
index a80cd00..faa6a29 100644
--- a/rt/html/Ticket/History.html
+++ b/rt/html/Ticket/History.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Ticket History # [_1] [_2]", $Ticket->Id, $Ticket->Subject) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $Ticket, current_tab => 'Ticket/History.html?id='.$Ticket->id, 
diff --git a/rt/html/Ticket/Modify.html b/rt/html/Ticket/Modify.html
index a6c3161..f567ff2 100644
--- a/rt/html/Ticket/Modify.html
+++ b/rt/html/Ticket/Modify.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,14 +42,14 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc('Modify ticket #[_1]', $TicketObj->Id) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $TicketObj, current_subtab => "Ticket/Modify.html?id=".$TicketObj->Id, 
     Title => loc('Modify ticket #[_1]', $TicketObj->Id) &>
 
 <& /Elements/ListActions, actions => \@results &>
-<FORM METHOD=POST ACTION="Modify.html" ENCTYPE="multipart/form-data">
+<FORM METHOD=POST ACTION="Modify.html">
 <INPUT TYPE=HIDDEN NAME=id VALUE="<%$TicketObj->Id%>">
 
 <& /Elements/TitleBoxStart, title => loc('Modify ticket #[_1]',$TicketObj->Id),   color=> "#993333", width => "100%" &>
@@ -62,13 +62,13 @@
 <%INIT>
   
 my $TicketObj = LoadTicket($id);
-my $CustomFields = $TicketObj->QueueObj->TicketCustomFields();
+my $CustomFields = $TicketObj->QueueObj->CustomFields();
 
 # Now let callbacks have a chance at editing %ARGS
 $m->comp('/Elements/Callback', TicketObj => $TicketObj, CustomFields => $CustomFields, %ARGS);
 
 my @results = ProcessTicketBasics(TicketObj => $TicketObj, ARGSRef => \%ARGS);
-my @cf_results = ProcessObjectCustomFieldUpdates(Object => $TicketObj, ARGSRef => \%ARGS);
+my @cf_results = ProcessTicketCustomFieldUpdates(TicketObj => $TicketObj, ARGSRef => \%ARGS);
 push (@results, @cf_results);
 
 # TODO: display the results, even if we can't display the ticket
diff --git a/rt/html/Ticket/ModifyAll.html b/rt/html/Ticket/ModifyAll.html
index 23cd935..f78cddc 100644
--- a/rt/html/Ticket/ModifyAll.html
+++ b/rt/html/Ticket/ModifyAll.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Ticket #[_1] Jumbo update: [_2]", $Ticket->Id, $Ticket->Subject) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $Ticket, 
@@ -100,17 +100,6 @@
     <td class="label"><&|/l&>Subject</&>:</td>
     <td class="entry"><input name="UpdateSubject" size=60 value="<%$Ticket->Subject%>"></td>
   </tr>
-% if (my $TxnCFs = $Ticket->TransactionCustomFields) {
-%    while (my $CF = $TxnCFs->Next()) {
-<TR>
-<TD class="label"><% $CF->Name %>:</TD>
-<TD class="entry"><& /Elements/EditCustomField, 
-    CustomField => $CF, 
-    NamePrefix => "Object-RT::Transaction--CustomField-"
-    &><em><% $CF->FriendlyType %></em></TD>
-</TD></TR>
-%    } # end if while
-% } # end of if
   <tr>
     <td class="label"><&|/l&>Attach</&>:</td>
     <td class="entry"><input name="UpdateAttachment" type=file></td>
@@ -123,9 +112,7 @@
 <& /Elements/TitleBoxEnd &>
   
 
-<& /Elements/Submit, 
-    Label => loc('Save Changes'), 
-    Caption => loc("If you've updated anything above, be sure to"), color => "#333399" &>
+<& /Elements/Submit, Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), color => "#333399" &>
 </form>
 
 <%INIT>
@@ -149,7 +136,8 @@ my (@wresults, @results,  @dresults, @lresults, @cf_results);
 
 unless ($OnlySearchForPeople) {
     @wresults = ProcessTicketWatchers( TicketObj => $Ticket, ARGSRef => \%ARGS);
- @cf_results = ProcessObjectCustomFieldUpdates( Object => $Ticket, ARGSRef => \%ARGS);
+    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
+ @cf_results = ProcessTicketCustomFieldUpdates( TicketObj => $Ticket, ARGSRef => \%ARGS);
     @dresults = ProcessTicketDates( TicketObj => $Ticket, ARGSRef => \%ARGS);
     @lresults = ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
 
@@ -171,11 +159,15 @@ unless ($OnlySearchForPeople) {
 
     $ARGS{'UpdateContent'} =~ s/\r+\n/\n/g;
 
-    if ($ARGS{'UpdateAttachments'} || ( $ARGS{'UpdateContent'} && $ARGS{'UpdateContent'} ne  "-- \n" . 
-				$session{'CurrentUser'}->UserObj->Signature)) {
-   	 ProcessUpdateMessage(TicketObj => $Ticket, ARGSRef=>\%ARGS, Actions=>\@results);
+    if ($ARGS{'UpdateAttachments'} || (
+        $ARGS{'UpdateContent'} &&
+	$ARGS{'UpdateContent'} ne  "-- \n" . 
+				$session{'CurrentUser'}->UserObj->Signature
+       )) {
+   	 ProcessUpdateMessage(TicketObj => $Ticket, 
+			      ARGSRef=>\%ARGS, 
+                              Actions=>\@results);
 	}
-    @results = ProcessTicketBasics( TicketObj => $Ticket, ARGSRef => \%ARGS);
 }
 push @results, @wresults;
 push @results, @dresults;
diff --git a/rt/html/Ticket/ModifyDates.html b/rt/html/Ticket/ModifyDates.html
index a4f68f2..bf4bc79 100644
--- a/rt/html/Ticket/ModifyDates.html
+++ b/rt/html/Ticket/ModifyDates.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc('Modify dates for #[_1]', $TicketObj->Id) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $TicketObj, 
diff --git a/rt/html/Ticket/ModifyLinks.html b/rt/html/Ticket/ModifyLinks.html
index 150597d..05d369d 100644
--- a/rt/html/Ticket/ModifyLinks.html
+++ b/rt/html/Ticket/ModifyLinks.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Link ticket #[_1]", $Ticket->Id) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $Ticket, 
diff --git a/rt/html/Ticket/ModifyPeople.html b/rt/html/Ticket/ModifyPeople.html
index 61cbe6c..dde2d29 100644
--- a/rt/html/Ticket/ModifyPeople.html
+++ b/rt/html/Ticket/ModifyPeople.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc('Modify people related to ticket #[_1]', $Ticket->id) &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $Ticket, 
diff --git a/rt/html/Ticket/ShowEmailRecord.html b/rt/html/Ticket/ShowEmailRecord.html
index 38eddd3..23eb6d5 100644
--- a/rt/html/Ticket/ShowEmailRecord.html
+++ b/rt/html/Ticket/ShowEmailRecord.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%args>
 $Attachment => undef
 $Transaction => undef
diff --git a/rt/html/Ticket/Update.html b/rt/html/Ticket/Update.html
index df739c9..e26d988 100644
--- a/rt/html/Ticket/Update.html
+++ b/rt/html/Ticket/Update.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title &>
 <& /Ticket/Elements/Tabs, 
     Ticket => $TicketObj, 
@@ -58,7 +58,7 @@
 
 <tr><td align=right><&|/l&>Status</&>:</td>
 <td>
-<& /Elements/SelectStatus, Name=>"Status", DefaultLabel => loc("[_1] (Unchanged)", loc($TicketObj->Status)), Default => $ARGS{'Status'} || ($TicketObj->Status eq $DefaultStatus ? undef : $DefaultStatus)&>
+<& /Elements/SelectStatus, Name=>"Status", DefaultLabel => loc("[_1] (Unchanged)", $TicketObj->Status), Default => $ARGS{'Status'} || ($TicketObj->Status eq $DefaultStatus ? undef : $DefaultStatus)&>
 <&|/l&>Owner</&>:  
 <& /Elements/SelectOwner, Name=>"Owner", DefaultLabel => loc("[_1] (Unchanged)", $TicketObj->OwnerObj->Name()), QueueObj => $TicketObj->QueueObj, TicketObj => $TicketObj, Default => $ARGS{'Owner'} &>
 <&|/l&>Worked</&>: <input size=4 name="UpdateTimeWorked" value="<% $ARGS{UpdateTimeWorked}%>"> <&|/l&>minutes</&></td></tr>
@@ -94,33 +94,19 @@ value="<% $ARGS{UpdateCc} %>"><BR>
 <TD COLSPAN=5>
 <&|/l&>Check box to delete</&><BR>
 % foreach my $attach_name (keys %{$session{'Attachments'}}) {
-<input type="checkbox" name="DeleteAttach-<%$attach_name%>" value="1"><%$attach_name%><BR>
+<input type="checkbox" name="DeleteAttach-<%$attach_name%>"><%$attach_name%><BR>
 % } # end of foreach
 </TD>
 </TR>
 <TR>
 % } # end of if
-
-% if (my $TxnCFs = $TicketObj->TransactionCustomFields) {
-%    while (my $CF = $TxnCFs->Next()) {
-<TR>
-<TD ALIGN=RIGHT><% $CF->Name %>:</TD>
-<TD><& /Elements/EditCustomField, CustomField => $CF, NamePrefix =>
-    "Object-RT::Transaction--CustomField-" &><em><% $CF->FriendlyType %></em></TD>
-</TR>
-%    } # end if while
-% } # end of if
-
 <tr><td align=right><&|/l&>Attach</&>:</td><td><input name="Attach" type="file"><INPUT TYPE=SUBMIT NAME="AddMoreAttach" VALUE="<&|/l&>Add More Files</&>"><input type="hidden" name="UpdateAttach" value="1">
 </td></tr>
 <tr><td align="right" valign="top"><&|/l&>Message</&>:</td><td>
 <& /Elements/Callback, _CallbackName => 'BeforeMessageBox', %ARGS &>
 % if (exists $ARGS{UpdateContent}) {
-% # preserve QuoteTransaction so we can use it to set up sane references/in/reply to
-% my $temp = $ARGS{'QuoteTransaction'};
 % delete $ARGS{'QuoteTransaction'};
 <& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, IncludeSignature => 0, %ARGS&>
-% $ARGS{'QuoteTransaction'} = $temp;
 % } else {
 <& /Elements/MessageBox, Name=>"UpdateContent", %ARGS &>
 % }
@@ -136,6 +122,7 @@ value="<% $ARGS{UpdateCc} %>"><BR>
 % }
 </FORM>
 <%INIT>
+
 my $CanRespond = 0;
 my $CanComment = 0;
 my $title;
@@ -181,7 +168,6 @@ foreach my $key (keys %ARGS) {
     }
     $session{'Attachments'} = { %{$session{'Attachments'} || {}} };
 }
-# }}}
 
 # {{{ store the uploaded attachment in session
 if ($ARGS{'Attach'}) {			# attachment?
@@ -194,7 +180,7 @@ if ($ARGS{'Attach'}) {			# attachment?
     $subject =~ s#^.*[\\/]##;
 
     my $attachment = MakeMIMEEntity(
-        Filename             => $subject,
+        Subject             => $subject,
         Body                => "",
         AttachmentFieldName => 'Attach'
     );
@@ -214,7 +200,6 @@ if ( exists $ARGS{SubmitTicket} ) {
     $m->comp('Display.html', TicketObj => $TicketObj, %ARGS);
     return;
 }
-
 </%INIT>
 
 <%ARGS>
diff --git a/rt/html/Tools/Elements/Tabs b/rt/html/Tools/Elements/Tabs
index fc4153b..39321f1 100644
--- a/rt/html/Tools/Elements/Tabs
+++ b/rt/html/Tools/Elements/Tabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Tabs, 
     tabs => $tabs, 
     current_toptab => 'Tools/Offline.html', 
diff --git a/rt/html/Tools/MyDay.html b/rt/html/Tools/MyDay.html
index a20209c..3fe2eda 100644
--- a/rt/html/Tools/MyDay.html
+++ b/rt/html/Tools/MyDay.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, title => "What I did today" &>
 (displaying new and open tickets for <%$session{'CurrentUser'}->Name%>)
 <FORM METHOD=POST ACTION="MyDay.html">
@@ -62,7 +62,7 @@ HREF="<%$RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%>:
 cols=60></textarea></TD></TR>
 <TR <%$class|n%>>
 <TD><SPAN CLASS="label">Status:</SPAN> <& /Elements/SelectStatus, Name=> 'UpdateStatus-'.$Ticket->Id, 
-				  DefaultLabel => loc("[_1] (Unchanged)",loc($Ticket->Status())) &></TD>
+				  DefaultLabel => loc("[_1] (Unchanged)",$Ticket->Status()) &></TD>
                   </TR>
 
 % }
diff --git a/rt/html/Tools/Offline.html b/rt/html/Tools/Offline.html
index 8b12784..0879c94 100644
--- a/rt/html/Tools/Offline.html
+++ b/rt/html/Tools/Offline.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Offline upload") &>
 <& Elements/Tabs, 
     current_tab => "Tools/Offline.html", 
diff --git a/rt/html/User/Delegation.html b/rt/html/User/Delegation.html
index 3347fda..47a5d13 100644
--- a/rt/html/User/Delegation.html
+++ b/rt/html/User/Delegation.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => loc("Delegate rights") &>
 <& /User/Elements/Tabs, 
     current_tab => 'User/Delegation.html', 
diff --git a/rt/html/User/Elements/DelegateRights b/rt/html/User/Elements/DelegateRights
index 79ecb59..112f3f6 100644
--- a/rt/html/User/Elements/DelegateRights
+++ b/rt/html/User/Elements/DelegateRights
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <h2><%$sectionheading%></h2>
 <%perl>
 
@@ -81,7 +81,7 @@ while ( my $delegation = $delegations->Next) {
        </td>
 % while (my $pg = $personalgroups->Next) {
 <td align=center>
-        <input name="Delegate-ACE-<% $right->Id %>-to-<% $pg->PrincipalId%>" type=checkbox value="1" <%$ del_hash->{$pg->PrincipalId} && 'CHECKED' %>>
+        <input name="Delegate-ACE-<% $right->Id %>-to-<% $pg->PrincipalId%>" type=checkbox <%$ del_hash->{$pg->PrincipalId} && 'CHECKED' %>>
 % if ( $del_hash->{$pg->PrincipalId}) {
 <input type=hidden name="Delegate-Existing-ACE-<% $right->Id %>-to-<% $pg->PrincipalId%>-as-<%$del_hash->{$pg->PrincipalId}->Id%>">
 % }
diff --git a/rt/html/User/Elements/GroupTabs b/rt/html/User/Elements/GroupTabs
index 2e79df2..26d8e85 100644
--- a/rt/html/User/Elements/GroupTabs
+++ b/rt/html/User/Elements/GroupTabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /User/Elements/Tabs, 
     subtabs => $tabs, 
     current_tab => 'User/Groups/', 
diff --git a/rt/html/User/Elements/Tabs b/rt/html/User/Elements/Tabs
index 1d25fb9..6411be6 100644
--- a/rt/html/User/Elements/Tabs
+++ b/rt/html/User/Elements/Tabs
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Tabs, 
     tabs => $tabs, 
     current_toptab => 'User/Prefs.html', 
diff --git a/rt/html/User/Groups/Members.html b/rt/html/User/Groups/Members.html
index 2068e5a..0b133b3 100644
--- a/rt/html/User/Groups/Members.html
+++ b/rt/html/User/Groups/Members.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title &>
 <& /User/Elements/GroupTabs, 
     GroupObj => $Group, 
@@ -81,7 +81,7 @@
 % $UserMembers->LimitToUsers();
 <UL>
 % while (my $member = $UserMembers->Next()) {
-<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>" value="1">
+<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>">
 <%$member->MemberObj->Object->Name%> (<%$member->MemberObj->Object->RealName%>)
 % }
 </ul>
@@ -90,7 +90,7 @@
 % my $GroupMembers = $Group->MembersObj;
 % $GroupMembers->LimitToGroups();
 % while (my $member = $GroupMembers->Next()) {
-<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>" value="1">
+<LI><INPUT TYPE=CHECKBOX Name="DeleteMember-<%$member->MemberId%>">
 <%$member->MemberObj->Object->Name%>
 % }
 % }
diff --git a/rt/html/User/Groups/Modify.html b/rt/html/User/Groups/Modify.html
index c0e9ce5..e744e10 100644
--- a/rt/html/User/Groups/Modify.html
+++ b/rt/html/User/Groups/Modify.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title &>
 
 <& /User/Elements/GroupTabs, 
@@ -74,7 +74,7 @@
 <INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this group)</&><BR>
 </TR>
 </TABLE>
-<& /Elements/Submit, Label => loc('Save Changes'), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
 </form>
 <%INIT>
 
diff --git a/rt/html/User/Groups/index.html b/rt/html/User/Groups/index.html
index 6d2e15d..d4fa7df 100644
--- a/rt/html/User/Groups/index.html
+++ b/rt/html/User/Groups/index.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title => $title &>
 <& /User/Elements/GroupTabs, 
     current_subtab => 'User/Groups/index.html', 
diff --git a/rt/html/User/Prefs.html b/rt/html/User/Prefs.html
index f1c7558..b5aa13d 100644
--- a/rt/html/User/Prefs.html
+++ b/rt/html/User/Prefs.html
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title=>loc("Preferences") &>
 <& /User/Elements/Tabs, 
     current_tab => 'User/Prefs.html', 
@@ -165,7 +165,7 @@
 %if ($UserObj->Privileged) {
 <BR>
 <& /Elements/TitleBoxStart, title => loc('Signature') &>
-<TEXTAREA COLS=80 ROWS=5 name="Signature" class="signature" WRAP=HARD>
+<TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
 <%$UserObj->Signature%></TEXTAREA>
 <& /Elements/TitleBoxEnd &>
 % }
@@ -210,10 +210,9 @@ if ($UserObj->Id) {
 					    Object => $UserObj,
 					    ARGSRef => \%ARGS );
     if ($Lang) {
-	$session{'CurrentUser'}->LanguageHandle($Lang);
-	$session{'CurrentUser'} = $session{'CurrentUser'}; # force writeback
+        $session{'CurrentUser'}->LanguageHandle($Lang);
+        $session{'CurrentUser'}= $session{'CurrentUser'}; # Force writeback
     }
-
     push (@results,@fieldresults);
 
 
diff --git a/rt/html/autohandler b/rt/html/autohandler
index c854c2b..b21d261 100644
--- a/rt/html/autohandler
+++ b/rt/html/autohandler
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 
 # Roll back any dangling transactions from a previous failed connection
@@ -61,15 +61,21 @@ if ($m->request_comp->attr_exists('AutoFlush')) {
     # passed just one, a scalar whatever they are, mark them as utf8
     my $type = ref($_);
     (!$type)
-	? Encode::is_utf8($_) ? $_ : Encode::decode(utf8 => $_, Encode::FB_PERLQQ) :
+	? Encode::decode(utf8 => $_, Encode::FB_PERLQQ) :
 	($type eq 'ARRAY')
-	? [ map { (ref($_) or Encode::is_utf8($_)) ? $_ : Encode::decode(utf8 => $_, Encode::FB_PERLQQ) } @$_ ] :
+	? [ map { ref($_) ? $_ : Encode::decode(utf8 => $_, Encode::FB_PERLQQ) } @$_ ] :
 	($type eq 'HASH')
-	? { map { (ref($_) or Encode::is_utf8($_)) ? $_ : Encode::decode(utf8 => $_, Encode::FB_PERLQQ) } %$_ } : $_
+	? { map { ref($_) ? $_ : Encode::decode(utf8 => $_, Encode::FB_PERLQQ) } %$_ } : $_
     } %ARGS;
 
-$m->{'rt_base_time'} = [Time::HiRes::gettimeofday()];
+if ($ARGS{'Debug'}) {
+        require Time::HiRes;
+        $m->{'rt_base_time'} = [Time::HiRes::gettimeofday()];
         
+}
+else {
+        $m->{'rt_base_time'} = time;
+}
 $m->comp('/Elements/SetupSessionCookie', %ARGS);
 
 unless ($session{'CurrentUser'} && $session{'CurrentUser'}->Id) {
@@ -163,7 +169,7 @@ elsif ( $RT::WebExternalAuth ) {
     elsif ($RT::WebFallbackToInternalAuth) {
   	unless (defined($session{'CurrentUser'})) {
 	        $m->comp('/Elements/Login', %ARGS,
-                         Error=> loc('You are not an authorized user'));
+                         Error=> loc('XXX CHANGEME You are not an authorized user'));
                 $m->abort();
 	}
     } else {
@@ -187,8 +193,8 @@ if (!$session{'CurrentUser'} && defined ($user) && defined ($pass) ){
     if (!$session{'CurrentUser'}->id() ||
         !$session{'CurrentUser'}->IsPassword($pass))
     {
-        delete $session{'CurrentUser'};
 	$RT::Logger->error("FAILED LOGIN for $user from $ENV{'REMOTE_ADDR'}");
+        delete $session{'CurrentUser'};
         $m->comp('/Elements/Login', %ARGS,
                  Error => loc('Your username or password is incorrect'));
         $m->abort();
diff --git a/rt/html/index.html b/rt/html/index.html
index 04d48ec..8c64b5a 100644
--- a/rt/html/index.html
+++ b/rt/html/index.html
@@ -24,11 +24,11 @@ If you need commercial support, please contact us at sales@bestpractical.com.
 <!--
 % }
 
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -68,7 +68,7 @@ If you need commercial support, please contact us at sales@bestpractical.com.
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <& /Elements/Header, Title=>loc("RT at a glance"), Refresh => $session{'home_refresh_interval'} &>
 <& /Elements/Tabs, 
     current_toptab => '', 
diff --git a/rt/html/l b/rt/html/l
index dbd146e..d19fbec 100644
--- a/rt/html/l
+++ b/rt/html/l
@@ -1,8 +1,8 @@
-%# BEGIN BPS TAGGED BLOCK {{{
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# END BPS TAGGED BLOCK }}}
+%# }}} END BPS TAGGED BLOCK
 <%init>
  my $hand = ($session{'CurrentUser'} ||= RT::CurrentUser->new)->LanguageHandle;
  $m->print($hand->maketext($m->content,@_));
diff --git a/rt/lib/RT.pm.in b/rt/lib/RT.pm.in
index f7c882b..db37250 100644
--- a/rt/lib/RT.pm.in
+++ b/rt/lib/RT.pm.in
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT;
 use strict;
 use RT::I18N;
@@ -59,7 +59,6 @@ use vars qw($VERSION $System $SystemUser $Nobody $Handle $Logger
         $LocalEtcPath
         $LocalLexiconPath
         $LogDir
-        $BinPath
         $MasonComponentRoot
         $MasonLocalComponentRoot
         $MasonDataDir
@@ -75,7 +74,6 @@ $SITE_CONFIG_FILE = "@CONFIG_FILE_PATH@/RT_SiteConfig.pm";
 $BasePath = '@RT_PATH@';
 
 $EtcPath = '@RT_ETC_PATH@';
-$BinPath = '@RT_BIN_PATH@';
 $VarPath = '@RT_VAR_PATH@';
 $LocalPath = '@RT_LOCAL_PATH@';
 $LocalEtcPath = '@LOCAL_ETC_PATH@';
@@ -102,26 +100,21 @@ $MasonSessionDir = '@MASON_SESSION_PATH@';
 
 =head1 NAME
 
-RT - Request Tracker
+	RT - Request Tracker
 
 =head1 SYNOPSIS
 
-A fully featured request tracker package
+	A fully featured request tracker package
 
 =head1 DESCRIPTION
 
-=head2 LoadConfig
 
-Load RT's config file.  First, the site configuration file
-(C<RT_SiteConfig.pm>) is loaded, in order to establish overall site
-settings like hostname and name of RT instance.  Then, the core
-configuration file (C<RT_Config.pm>) is loaded to set fallback values
-for all settings; it bases some values on settings from the site
-configuration file.
+=cut
+
+=item LoadConfig
 
-In order for the core configuration to not override the site's
-settings, the function C<Set> is used; it only sets values if they
-have not been set already.
+Load RT's config file. First, go after the core config file. 
+After that, go after the site config.
 
 =cut
 
@@ -136,10 +129,10 @@ sub LoadConfig {
     RT::I18N->Init;
 }
 
-=head2 Init
-
-Conenct to the database, set up logging.
+=item Init
 
+    Conenct to the database, set up logging.
+    
 =cut
 
 sub Init {
@@ -157,8 +150,7 @@ sub Init {
   
     $System = RT::System->new();
 
-    InitClasses();
-    InitLogging(); 
+   InitLogging(); 
 }
 
   
@@ -167,7 +159,7 @@ sub Init {
 Get a database connection
 
 =cut
-
+ 
 sub ConnectToDatabase {
     require RT::Handle;
     unless ($Handle && $Handle->dbh && $Handle->dbh->ping) {
@@ -181,10 +173,9 @@ sub ConnectToDatabase {
 Create the RT::Logger object. 
 
 =cut
-
 sub InitLogging {
 
-    # We have to set the record separator ($, man perlvar)
+    # We have to set the record seperator ($, man perlvar)
     # or Log::Dispatch starts getting
     # really pissy, as some other module we use unsets it.
 
@@ -213,7 +204,6 @@ sub InitLogging {
         die ("Log file $filename couldn't be written or created.\n RT can't run.");
     }
 
-    package Log::Dispatch::File;
     require Log::Dispatch::File;
 
 
@@ -231,7 +221,6 @@ sub InitLogging {
 		       ));
     }
     if ($RT::LogToScreen) {
-	package Log::Dispatch::Screen;
 	require Log::Dispatch::Screen;
 	$RT::Logger->add(Log::Dispatch::Screen->new
 		     ( name => 'screen',
@@ -245,7 +234,6 @@ sub InitLogging {
 		     ));
     }
     if ($RT::LogToSyslog) {
-	package Log::Dispatch::Syslog;
 	require Log::Dispatch::Syslog;
 	$RT::Logger->add(Log::Dispatch::Syslog->new
 		     ( name => 'syslog',
@@ -278,14 +266,7 @@ sub InitLogging {
 ## Mason).  It will log all problems through the standard logging
 ## mechanism (see above).
 
-$SIG{__WARN__} = sub {
-    my $w = shift;
-    $w =~ s/(?:\r*\n)+$//;
-    # The 'wide character' warnings has to be silenced for now, at least
-    # until HTML::Mason offers a sane way to process both raw output and
-    # unicode strings.
-    $RT::Logger->warning($w) if index($w, 'Wide character in ') != 0;
-};
+$SIG{__WARN__} = sub {$RT::Logger->warning($_[0])};
 
 #When we call die, trap it and log->crit with the value of the die.
 
@@ -305,30 +286,6 @@ $SIG{__DIE__}  = sub {
 
 }
 
-=head2 InitClasses
-
-Load all modules that define base classes
-
-=cut
-
-sub InitClasses {
-    require RT::Tickets;
-    require RT::Transactions;
-    require RT::Users;
-    require RT::CurrentUser;
-    require RT::Templates;
-    require RT::Queues;
-    require RT::ScripActions;
-    require RT::ScripConditions;
-    require RT::Scrips;
-    require RT::Groups;
-    require RT::GroupMembers;
-    require RT::CustomFields;
-    require RT::CustomFieldValues;
-    require RT::ObjectCustomFields;
-    require RT::ObjectCustomFieldValues;
-}
-
 # }}}
 
 
@@ -340,6 +297,9 @@ sub Nobody {
     return ($Nobody);
 }
 
+
+=head1 SYNOPSIS
+
 =head1 BUGS
 
 Please report them to rt-bugs@fsck.com, if you know what's broken and have at least 
@@ -352,13 +312,17 @@ If you're not sure what's going on, report them rt-devel@lists.bestpractical.com
 L<RT::StyleGuide>
 L<DBIx::SearchBuilder>
 
+
+
 =begin testing
 
+
 ok ($RT::Nobody->Name() eq 'Nobody', "Nobody is nobody");
 ok ($RT::Nobody->Name() ne 'root', "Nobody isn't named root");
 ok ($RT::SystemUser->Name() eq 'RT_System', "The system user is RT_System");
 ok ($RT::SystemUser->Name() ne 'noname', "The system user isn't noname");
 
+
 =end testing
 
 =cut
diff --git a/rt/lib/RT/ACE.pm b/rt/lib/RT/ACE.pm
index 9073b02..cbcd99f 100755
--- a/rt/lib/RT/ACE.pm
+++ b/rt/lib/RT/ACE.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -266,21 +266,21 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         PrincipalType => 
-		{read => 1, write => 1, sql_type => 12, length => 25,  is_blob => 0,  is_numeric => 0,  type => 'varchar(25)', default => ''},
+		{read => 1, write => 1, type => 'varchar(25)', default => ''},
         PrincipalId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         RightName => 
-		{read => 1, write => 1, sql_type => 12, length => 25,  is_blob => 0,  is_numeric => 0,  type => 'varchar(25)', default => ''},
+		{read => 1, write => 1, type => 'varchar(25)', default => ''},
         ObjectType => 
-		{read => 1, write => 1, sql_type => 12, length => 25,  is_blob => 0,  is_numeric => 0,  type => 'varchar(25)', default => ''},
+		{read => 1, write => 1, type => 'varchar(25)', default => ''},
         ObjectId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         DelegatedBy => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         DelegatedFrom => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
 
  }
 };
@@ -312,7 +312,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/ACE_Overlay.pm b/rt/lib/RT/ACE_Overlay.pm
index 75e39d0..00a7157 100644
--- a/rt/lib/RT/ACE_Overlay.pm
+++ b/rt/lib/RT/ACE_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 SYNOPSIS
 
   use RT::ACE;
@@ -64,9 +63,6 @@ ok(require RT::ACE);
 
 =cut
 
-
-package RT::ACE;
-
 use strict;
 no warnings qw(redefine);
 use RT::Principals;
@@ -133,8 +129,8 @@ Load an ACE by specifying a paramhash with the following fields:
 
             OR
 
-	      ObjectType => undef,
-	      ObjectId => undef
+        ObjectType => undef,
+        ObjectId => undef
 
 =cut
 
@@ -159,9 +155,16 @@ sub LoadByValues {
         );
     }
 
-    my ($object, $object_type, $object_id) = $self->_ParseObjectArg( %args );
-    unless( $object ) {
-	return ( 0, $self->loc("System error. Right not granted.") );
+    my ($object_type, $object_id);
+    
+    if ($args{'Object'} && UNIVERSAL::can($args{'Object'},'id')) {
+        $object_type = ref($args{'Object'});
+        $object_id = $args{'Object'}->id;
+    } elsif ($args{'ObjectId'} || $args{'ObjectType'}) {
+        $object_type = $args{'ObjectType'};
+        $object_id = $args{'ObjectId'};
+    } else {
+            return ( 0, $self->loc("System error. Right not granted.") );
     }
 
     $self->LoadByCols( PrincipalId   => $princ_obj->Id,
@@ -205,12 +208,6 @@ PARAMS is a parameter hash with the following elements:
    ObjectType => the type of the object in question (ref ($object))
    ObjectId => the id of the object in question $object->Id
 
-
-
-   Returns a tuple of (STATUS, MESSAGE);  If the call succeeded, STATUS is true. Otherwise it's false.
-
-
-
 =cut
 
 sub Create {
@@ -218,16 +215,8 @@ sub Create {
     my %args = ( PrincipalId   => undef,
                  PrincipalType => undef,
                  RightName     => undef,
-                 Object        => undef,
+                 Object    => $RT::System,
                  @_ );
-    #if we haven't specified any sort of right, we're talking about a global right
-    if (!defined $args{'Object'} && !defined $args{'ObjectId'} && !defined $args{'ObjectType'}) {
-        $args{'Object'} = $RT::System;
-    }
-    ($args{'Object'}, $args{'ObjectType'}, $args{'ObjectId'}) = $self->_ParseObjectArg( %args );
-    unless( $args{'Object'} ) {
-	return ( 0, $self->loc("System error. Right not granted.") );
-    }
 
     # {{{ Validate the principal
     my $princ_obj;
@@ -243,6 +232,17 @@ sub Create {
 
     # }}}
 
+
+    if ($args{'Object'} && ($args{'ObjectId'} || $args{'ObjectType'})) {
+        use Carp;
+        $RT::Logger->crit(Carp::cluck("ACE::Create called with an ObjectType or an ObjectId"));
+    }
+
+
+    
+    unless ($args{'Object'} && UNIVERSAL::can($args{'Object'},'id')) {
+            return ( 0, $self->loc("System error. Right not granted.") );
+    }
     # {{{ Check the ACL
 
     if (ref( $args{'Object'}) eq 'RT::Group' ) {
@@ -292,14 +292,17 @@ sub Create {
         }
     }
 
+    unless ( $args{'RightName'} ) {
+        return ( 0, $self->loc('Invalid right') );
+    }
     # }}}
 
     # Make sure the right doesn't already exist.
     $self->LoadByCols( PrincipalId   => $princ_obj->id,
                        PrincipalType => $args{'PrincipalType'},
                        RightName     => $args{'RightName'},
-                       ObjectType    => $args{'ObjectType'},
-                       ObjectId      => $args{'ObjectId'},
+                       ObjectType    => ref($args{'Object'}),
+                       ObjectId      => $args{'Object'}->id,
                        DelegatedBy   => 0,
                        DelegatedFrom => 0 );
     if ( $self->Id ) {
@@ -315,7 +318,7 @@ sub Create {
                                    DelegatedFrom => 0 );
 
     #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
-    RT::Principal->InvalidateACLCache();
+    RT::Principal->_InvalidateACLCache();
 
     if ( $id > 0 ) {
         return ( $id, $self->loc('Right Granted') );
@@ -625,7 +628,7 @@ sub Delegate {
 
     #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
     # TODO what about the groups key cache?
-    RT::Principal->InvalidateACLCache();
+    RT::Principal->_InvalidateACLCache();
 
     if ( $id > 0 ) {
         return ( $id, $self->loc('Right Delegated') );
@@ -688,7 +691,7 @@ sub _Delete {
     while ( my $delegated_ace = $delegated_from_this->Next ) {
         ( $delete_succeeded, $submsg ) =
           $delegated_ace->_Delete( InsideTransaction => 1 );
-        last unless ($delete_succeeded);
+        last if ($delete_succeeded);
     }
 
     unless ($delete_succeeded) {
@@ -698,23 +701,18 @@ sub _Delete {
 
     my ( $val, $msg ) = $self->SUPER::Delete(@_);
 
-    # If we're revoking delegation rights (see above), we may need to
-    # revoke all rights delegated by the recipient.
-    if ($val and ($self->RightName() eq 'DelegateRights' or
-		  $self->RightName() eq 'SuperUser')) {
-	$val = $self->PrincipalObj->_CleanupInvalidDelegations( InsideTransaction => 1 );
-    }
+    #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
+    # TODO what about the groups key cache?
+    RT::Principal->_InvalidateACLCache();
 
     if ($val) {
-	#Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
-	# TODO what about the groups key cache?
-	RT::Principal->InvalidateACLCache();
         $RT::Handle->Commit() unless $InsideTransaction;
         return ( $val, $self->loc('Right revoked') );
     }
-
-    $RT::Handle->Rollback() unless $InsideTransaction;
-    return ( 0, $self->loc('Right could not be revoked') );
+    else {
+        $RT::Handle->Rollback() unless $InsideTransaction;
+        return ( 0, $self->loc('Right could not be revoked') );
+    }
 }
 
 # }}}
@@ -927,32 +925,5 @@ sub _CanonicalizePrincipal {
     return ( $princ_obj, $princ_type );
 }
 
-sub _ParseObjectArg {
-    my $self = shift;
-    my %args = ( Object    => undef,
-                 ObjectId    => undef,
-                 ObjectType    => undef,
-                 @_ );
-
-    if( $args{'Object'} && ($args{'ObjectId'} || $args{'ObjectType'}) ) {
-	$RT::Logger->crit( "Method called with an ObjectType or an ObjectId and Object args" );
-	return ();
-    } elsif( $args{'Object'} && !UNIVERSAL::can($args{'Object'},'id') ) {
-	$RT::Logger->crit( "Method called called Object that has no id method" );
-	return ();
-    } elsif( $args{'Object'} ) {
-	my $obj = $args{'Object'};
-	return ($obj, ref $obj, $obj->id);
-    } elsif ( $args{'ObjectType'} ) {
-	my $obj =  $args{'ObjectType'}->new( $self->CurrentUser );
-	$obj->Load( $args{'ObjectId'} );
-	return ($obj, ref $obj, $obj->id);
-    } else {
-	$RT::Logger->crit( "Method called with wrong args" );
-	return ();
-    }
-}
-
-
 # }}}
 1;
diff --git a/rt/lib/RT/ACL.pm b/rt/lib/RT/ACL.pm
index aafc1d2..8fd548e 100755
--- a/rt/lib/RT/ACL.pm
+++ b/rt/lib/RT/ACL.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/ACL_Overlay.pm b/rt/lib/RT/ACL_Overlay.pm
index c20bfd3..827d34c 100644
--- a/rt/lib/RT/ACL_Overlay.pm
+++ b/rt/lib/RT/ACL_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::ACL - collection of RT ACE objects
@@ -66,9 +65,6 @@ ok(require RT::ACL);
 
 =cut
 
-
-package RT::ACL;
-
 use strict;
 no warnings qw(redefine);
 
@@ -90,68 +86,17 @@ Limit the ACL to rights for the object $object. It needs to be an RT::Record cla
 
 sub LimitToObject {
     my $self = shift;
-    my $obj  = shift;
-    unless ( defined($obj)
-        && ref($obj)
-        && UNIVERSAL::can( $obj, 'id' )
-        && $obj->id )
-    {
-        return undef;
+    my $obj = shift;
+    unless (defined($obj) && ref($obj) && UNIVERSAL::can($obj, 'id')) {
+    return undef;
     }
-    $self->Limit(
-        FIELD           => 'ObjectType',
-        OPERATOR        => '=',
-        VALUE           => ref($obj),
-        ENTRYAGGREGATOR => 'OR'
-    );
-    $self->Limit(
-        FIELD           => 'ObjectId',
-        OPERATOR        => '=',
-        VALUE           => $obj->id,
-        ENTRYAGGREGATOR => 'OR',
-        QUOTEVALUE      => 0
-    );
+    $self->Limit(FIELD => 'ObjectType', OPERATOR=> '=', VALUE => ref($obj), ENTRYAGGREGATOR => 'OR');
+    $self->Limit(FIELD => 'ObjectId', OPERATOR=> '=', VALUE => $obj->id, ENTRYAGGREGATOR => 'OR', QUOTEVALUE => 0);
 
 }
 
 # }}}
 
-# {{{ LimitNotObject
-
-=head2 LimitNotObject $object
-
-Limit the ACL to rights NOT on the object $object.  $object needs to be
-an RT::Record class.
-
-=cut
-
-sub LimitNotObject {
-    my $self = shift;
-    my $obj  = shift;
-    unless ( defined($obj)
-        && ref($obj)
-        && UNIVERSAL::can( $obj, 'id' )
-        && $obj->id )
-    {
-        return undef;
-    }
-    $self->Limit( FIELD => 'ObjectType',
-		  OPERATOR => '!=',
-		  VALUE => ref($obj),
-		  ENTRYAGGREGATOR => 'OR',
-		  SUBCLAUSE => $obj->id
-		);
-    $self->Limit( FIELD => 'ObjectId',
-		  OPERATOR => '!=',
-		  VALUE => $obj->id,
-		  ENTRYAGGREGATOR => 'OR',
-		  QUOTEVALUE => 0,
-		  SUBCLAUSE => $obj->id
-		);
-}
-
-# }}}
-
 # {{{ LimitToPrincipal 
 
 =head2 LimitToPrincipal { Type => undef, Id => undef, IncludeGroupMembership => undef }
diff --git a/rt/lib/RT/Action/AutoOpen.pm b/rt/lib/RT/Action/AutoOpen.pm
index 3423db9..b28c50d 100644
--- a/rt/lib/RT/Action/AutoOpen.pm
+++ b/rt/lib/RT/Action/AutoOpen.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # This Action will open the BASE if a dependent is resolved.
 
 package RT::Action::AutoOpen;
@@ -74,8 +74,6 @@ sub Prepare {
     if ( ( $self->TicketObj->Status eq 'open' )
          || ( ( $self->TicketObj->Status eq 'new' )
               && $self->TransactionObj->IsInbound )
-         || ( defined $self->TransactionObj->Message->First
-              && $self->TransactionObj->Message->First->GetHeader('RT-Control') =~ /\bno-autoopen\b/i )
       ) {
 
         return undef;
diff --git a/rt/lib/RT/Action/Autoreply.pm b/rt/lib/RT/Action/Autoreply.pm
index c1ac5f8..6d2894f 100755
--- a/rt/lib/RT/Action/Autoreply.pm
+++ b/rt/lib/RT/Action/Autoreply.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Action::Autoreply;
 require RT::Action::SendEmail;
 
diff --git a/rt/lib/RT/Action/CreateTickets.pm b/rt/lib/RT/Action/CreateTickets.pm
index b708f2e..68f402e 100644
--- a/rt/lib/RT/Action/CreateTickets.pm
+++ b/rt/lib/RT/Action/CreateTickets.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Action::CreateTickets;
 require RT::Action::Generic;
 
@@ -148,8 +148,8 @@ A convoluted example
          push (@admins, $admin->EmailAddress); 
      }
  }
- Queue: ___Approvals
- Type: approval
+ Queue: Approvals
+ Type: Approval
  AdminCc: {join ("\nAdminCc: ",@admins) }
  Depended-On-By: TOP
  Refers-To: TOP
@@ -164,7 +164,7 @@ A convoluted example
  Subject: Manager approval
  Depended-On-By: TOP
  Refers-On: {$Tickets{"approval"}->Id}
- Queue: ___Approvals
+ Queue: Approvals
  Content-Type: text/plain
  Content: 
  Your approval is requred for this ticket, too.
@@ -213,7 +213,7 @@ A complete list of acceptable fields for this beastie:
 
 Fields marked with an * are required.
 
-Fields marked with a + may have multiple values, simply
+Fields marked with a + man have multiple values, simply
 by repeating the fieldname on a new line with an additional value.
 
 Fields marked with a ! are postponed to be processed after all
@@ -243,8 +243,8 @@ ok ($approvalsq->Id, "Created Approvals test queue");
 
 my $approvals = 
 '===Create-Ticket: approval
-Queue: ___Approvals
-Type: approval
+Queue: Approvals
+Type: Approval
 AdminCc: {join ("\nAdminCc: ",@admins) }
 Depended-On-By: {$Tickets{"TOP"}->Id}
 Refers-To: TOP 
@@ -258,7 +258,7 @@ ENDOFCONTENT
 ===Create-Ticket: two
 Subject: Manager approval.
 Depended-On-By: approval
-Queue: ___Approvals
+Queue: Approvals
 Content-Type: text/plain
 Content: 
 Your minion approved ticket {$Tickets{"TOP"}->Id}. you ok with that?
@@ -565,14 +565,12 @@ sub CreateByTemplate {
     # XXX: cargo cult programming that works. i'll be back.
     use bytes;
 
-    local %T::Tickets = %T::Tickets;
-    local $T::TOP = $T::TOP;
-    local $T::ID = $T::ID;
-    $T::Tickets{'TOP'} = $T::TOP = $top if $top;
+    %T::Tickets = ();
 
     my $ticketargs;
     my ( @links, @postponed );
     foreach my $template_id ( @{ $self->{'create_tickets'} } ) {
+        $T::Tickets{'TOP'} = $T::TOP = $top if $top;
         $RT::Logger->debug("Workflow: processing $template_id of $T::TOP")
           if $T::TOP;
 
@@ -630,8 +628,7 @@ sub UpdateByTemplate {
     use bytes;
 
     my @results;
-    local %T::Tickets = %T::Tickets;
-    local $T::ID = $T::ID;
+    %T::Tickets = ();
 
     my $ticketargs;
     my ( @links, @postponed );
diff --git a/rt/lib/RT/Action/EscalatePriority.pm b/rt/lib/RT/Action/EscalatePriority.pm
index c549921..ace72dd 100644
--- a/rt/lib/RT/Action/EscalatePriority.pm
+++ b/rt/lib/RT/Action/EscalatePriority.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Action::EscalatePriority
diff --git a/rt/lib/RT/Action/Generic.pm b/rt/lib/RT/Action/Generic.pm
index cf7600a..5e80f40 100755
--- a/rt/lib/RT/Action/Generic.pm
+++ b/rt/lib/RT/Action/Generic.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Action::Generic - a generic baseclass for RT Actions
@@ -85,31 +84,31 @@ sub new  {
 # {{{ sub _Init 
 sub _Init  {
   my $self = shift;
-  my %args = ( Argument => undef,
-               CurrentUser => undef,
-               ScripActionObj => undef,
-               ScripObj => undef,
-               TemplateObj => undef,
-               TicketObj => undef,
-               TransactionObj => undef,
-               Type => undef,
-
-               @_ );
-
+  my %args = ( TransactionObj => undef,
+	       TicketObj => undef,
+	       ScripObj => undef,
+	       TemplateObj => undef,
+	       Argument => undef,
+	       Type => undef,
+            CurrentUser => undef,
+	       @_ );
+  
+  
   $self->{'Argument'} = $args{'Argument'};
-  $self->CurrentUser( $args{'CurrentUser'});
-  $self->{'ScripActionObj'} = $args{'ScripActionObj'};
   $self->{'ScripObj'} = $args{'ScripObj'};
-  $self->{'TemplateObj'} = $args{'TemplateObj'};
   $self->{'TicketObj'} = $args{'TicketObj'};
   $self->{'TransactionObj'} = $args{'TransactionObj'};
+  $self->{'TemplateObj'} = $args{'TemplateObj'};
   $self->{'Type'} = $args{'Type'};
+  $self->CurrentUser( $args{'CurrentUser'});
+    Scalar::Util::weaken($self->{'ScripObj'});
+    Scalar::Util::weaken($self->{'TicketObj'});
+    Scalar::Util::weaken($self->{'TemplateObj'});
+    Scalar::Util::weaken($self->{'TransactionObj'});
+
+
+
 
-  Scalar::Util::weaken($self->{'ScripActionObj'});
-  Scalar::Util::weaken($self->{'ScripObj'});
-  Scalar::Util::weaken($self->{'TemplateObj'});
-  Scalar::Util::weaken($self->{'TicketObj'});
-  Scalar::Util::weaken($self->{'TransactionObj'});
 
 }
 # }}}
@@ -151,13 +150,6 @@ sub ScripObj  {
 }
 # }}}
 
-# {{{ sub ScripActionObj
-sub ScripActionObj  {
-  my $self = shift;
-  return($self->{'ScripActionObj'});
-}
-# }}}
-
 # {{{ sub Type
 sub Type  {
   my $self = shift;
@@ -213,11 +205,13 @@ sub DESTROY {
 
     # We need to clean up all the references that might maybe get
     # oddly circular
-    $self->{'ScripActionObj'} = undef;
-    $self->{'ScripObj'} = undef;
     $self->{'TemplateObj'} =undef
     $self->{'TicketObj'} = undef;
     $self->{'TransactionObj'} = undef;
+    $self->{'ScripObj'} = undef;
+
+
+     
 }
 
 # }}}
diff --git a/rt/lib/RT/Action/Notify.pm b/rt/lib/RT/Action/Notify.pm
index 0daaa55..4131a8c 100755
--- a/rt/lib/RT/Action/Notify.pm
+++ b/rt/lib/RT/Action/Notify.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 #
 package RT::Action::Notify;
 require RT::Action::SendEmail;
@@ -158,9 +158,9 @@ sub SetRecipients {
         @{ $self->{'Bcc'} } = @Bcc;
     }
     else {
-        @{ $self->{'To'} }  = grep ( lc $_ ne lc $creator, @To );
-        @{ $self->{'Cc'} }  = grep ( lc $_ ne lc $creator, @Cc );
-        @{ $self->{'Bcc'} } = grep ( lc $_ ne lc $creator, @Bcc );
+        @{ $self->{'To'} }  = grep ( !/^$creator$/, @To );
+        @{ $self->{'Cc'} }  = grep ( !/^$creator$/, @Cc );
+        @{ $self->{'Bcc'} } = grep ( !/^$creator$/, @Bcc );
     }
     @{ $self->{'PseudoTo'} } = @PseudoTo;
 
diff --git a/rt/lib/RT/Action/NotifyAsComment.pm b/rt/lib/RT/Action/NotifyAsComment.pm
index f7cc875..475e355 100755
--- a/rt/lib/RT/Action/NotifyAsComment.pm
+++ b/rt/lib/RT/Action/NotifyAsComment.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Action::NotifyAsComment;
 require RT::Action::Notify;
 
diff --git a/rt/lib/RT/Action/RecordComment.pm b/rt/lib/RT/Action/RecordComment.pm
index d9740dc..b548a26 100644
--- a/rt/lib/RT/Action/RecordComment.pm
+++ b/rt/lib/RT/Action/RecordComment.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,31 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+#
 package RT::Action::RecordComment;
 require RT::Action::Generic;
 use strict;
diff --git a/rt/lib/RT/Action/RecordCorrespondence.pm b/rt/lib/RT/Action/RecordCorrespondence.pm
index 62255ec..c6770c5 100644
--- a/rt/lib/RT/Action/RecordCorrespondence.pm
+++ b/rt/lib/RT/Action/RecordCorrespondence.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,31 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
+#
 package RT::Action::RecordCorrespondence;
 require RT::Action::Generic;
 use strict;
diff --git a/rt/lib/RT/Action/ResolveMembers.pm b/rt/lib/RT/Action/ResolveMembers.pm
index 0081318..4d751eb 100644
--- a/rt/lib/RT/Action/ResolveMembers.pm
+++ b/rt/lib/RT/Action/ResolveMembers.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # This Action will resolve all members of a resolved group ticket
 
 package RT::Action::ResolveMembers;
diff --git a/rt/lib/RT/Action/SendEmail.pm b/rt/lib/RT/Action/SendEmail.pm
index 3c70dc4..a85c169 100755
--- a/rt/lib/RT/Action/SendEmail.pm
+++ b/rt/lib/RT/Action/SendEmail.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Portions Copyright 2000 Tobias Brox <tobix@cpan.org>
 
 package RT::Action::SendEmail;
@@ -150,10 +150,6 @@ sub Prepare {
     # try to convert message body from utf-8 to $RT::EmailOutputEncoding
     $self->SetHeader( 'Content-Type', 'text/plain; charset="utf-8"' );
 
-    # fsck.com #5959: Since RT sends 8bit mail, we should say so.
-    $self->SetHeader( 'Content-Transfer-Encoding','8bit');
-
-
     RT::I18N::SetMIMEEntityToEncoding( $MIMEObj, $RT::EmailOutputEncoding,
         'mime_words_ok' );
     $self->SetHeader( 'Content-Type', 'text/plain; charset="' . $RT::EmailOutputEncoding . '"' );
@@ -229,11 +225,9 @@ sub SendMessage {
     my $self    = shift;
     my $MIMEObj = shift;
 
-    my $msgid = $MIMEObj->head->get('Message-ID');
+    my $msgid = $MIMEObj->head->get('Message-Id');
     chomp $msgid;
 
-    $self->ScripActionObj->{_Message_ID}++;
-    
     $RT::Logger->info( $msgid . " #"
         . $self->TicketObj->id . "/"
         . $self->TransactionObj->id
@@ -400,13 +394,12 @@ sub RecordOutgoingMailTransaction {
         $type = 'EmailRecord';
     }
 
-    my $msgid = $MIMEObj->head->get('Message-ID');
-    chomp $msgid;
 
+      
     my ( $id, $msg ) = $transaction->Create(
         Ticket         => $self->TicketObj->Id,
         Type           => $type,
-        Data           => $msgid,
+        Data           => $MIMEObj->head->get('Message-Id'),
         MIMEObj        => $MIMEObj,
         ActivateScrips => 0
     );
@@ -434,38 +427,28 @@ sub SetRTSpecialHeaders {
     $self->SetHeaderAsEncoding( 'Subject', $RT::EmailOutputEncoding )
       if ($RT::EmailOutputEncoding);
     $self->SetReturnAddress();
-    $self->SetReferencesHeaders();
-
-    unless ($self->TemplateObj->MIMEObj->head->get('Message-ID')) {
-      # Get Message-ID for this txn
-      my $msgid = "";
-      $msgid = $self->TransactionObj->Message->First->GetHeader("RT-Message-ID")
-        || $self->TransactionObj->Message->First->GetHeader("Message-ID")
-        if $self->TransactionObj->Message && $self->TransactionObj->Message->First;
-
-      # If there is one, and we can parse it, then base our Message-ID on it
-      if ($msgid 
-          and $msgid =~ s/<(rt-.*?-\d+-\d+)\.(\d+-0-0)\@$RT::Organization>$/
-                         "<$1." . $self->TicketObj->id
-                          . "-" . $self->ScripObj->id
-                          . "-" . $self->ScripActionObj->{_Message_ID}
-                          . "@" . $RT::Organization . ">"/eg
-          and $2 == $self->TicketObj->id) {
-        $self->SetHeader( "Message-ID" => $msgid );
-      } else {
-        $self->SetHeader( 'Message-ID',
-            "<rt-"
-            . $RT::VERSION . "-"
-            . $$ . "-"
-            . CORE::time() . "-"
-            . int(rand(2000)) . '.'
-            . $self->TicketObj->id . "-"
-            . $self->ScripObj->id . "-"  # Scrip
-            . $self->ScripActionObj->{_Message_ID} . "@"  # Email sent
-            . $RT::Organization
-            . ">" );
-      }
-    }
+
+    # TODO: this one is broken.  What is this email really a reply to?
+    # If it's a reply to an incoming message, we'll need to use the
+    # actual message-id from the appropriate Attachment object.  For
+    # incoming mails, we would like to preserve the In-Reply-To and/or
+    # References.
+
+    $self->SetHeader( 'In-Reply-To',
+        "<rt-" . $self->TicketObj->id() . "\@" . $RT::rtname . ">" );
+
+    # TODO We should always add References headers for all message-ids
+    # of previous messages related to this ticket.
+
+    $self->SetHeader( 'Message-ID',
+        "<rt-"
+        . $RT::VERSION . "-"
+        . $self->TicketObj->id() . "-"
+        . $self->TransactionObj->id() . "-"
+        . $self->ScripObj->Id . "."
+        . rand(20) . "\@"
+        . $RT::Organization . ">" )
+      unless $self->TemplateObj->MIMEObj->head->get('Message-ID');
 
     $self->SetHeader( 'Precedence', "bulk" )
       unless ( $self->TemplateObj->MIMEObj->head->get("Precedence") );
@@ -499,67 +482,28 @@ sub RemoveInappropriateRecipients {
 
     my @blacklist;
 
-    my @types = qw/To Cc Bcc/;
-
     # Weed out any RT addresses. We really don't want to talk to ourselves!
-    foreach my $type (@types) {
-        @{ $self->{$type} } =
-          RT::EmailParser::CullRTAddresses( "", @{ $self->{$type} } );
-    }
+    @{ $self->{'To'} } =
+      RT::EmailParser::CullRTAddresses( "", @{ $self->{'To'} } );
+    @{ $self->{'Cc'} } =
+      RT::EmailParser::CullRTAddresses( "", @{ $self->{'Cc'} } );
+    @{ $self->{'Bcc'} } =
+      RT::EmailParser::CullRTAddresses( "", @{ $self->{'Bcc'} } );
 
     # If there are no recipients, don't try to send the message.
     # If the transaction has content and has the header RT-Squelch-Replies-To
 
-    if ( $self->TransactionObj->Attachments->First() ) {
-        if (
-            $self->TransactionObj->Attachments->First->GetHeader(
-                'RT-DetectedAutoGenerated')
-          )
-        {
-
-            # What do we want to do with this? It's probably (?) a bounce
-            # caused by one of the watcher addresses being broken.
-            # Default ("true") is to redistribute, for historical reasons.
-
-            if ( !$RT::RedistributeAutoGeneratedMessages ) {
-
-                # Don't send to any watchers.
-                @{ $self->{'To'} }  = ();
-                @{ $self->{'Cc'} }  = ();
-                @{ $self->{'Bcc'} } = ();
-
-            }
-            elsif ( $RT::RedistributeAutoGeneratedMessages eq 'privileged' ) {
-
-                # Only send to "privileged" watchers.
-                #
-
-                foreach my $type (@types) {
-
-                    foreach my $addr ( @{ $self->{$type} } ) {
-                        my $user = RT::User->new($RT::SystemUser);
-                        $user->LoadByEmail($addr);
-                        @{ $self->{$type} } =
-                          grep ( !/^\Q$addr\E$/, @{ $self->{$type} } )
-                          if ( !$user->Privileged );
-
-                    }
-                }
-
-            }
-
-        }
-
+    if ( defined $self->TransactionObj->Attachments->First() ) {
         my $squelch =
           $self->TransactionObj->Attachments->First->GetHeader(
             'RT-Squelch-Replies-To');
 
         if ($squelch) {
-            @blacklist = split( /,/, $squelch );
+            @blacklist = split ( /,/, $squelch );
         }
     }
 
-    # Let's grab the SquelchMailTo attribue and push those entries into the @blacklist
+# Let's grab the SquelchMailTo attribue and push those entries into the @blacklist
     my @non_recipients = $self->TicketObj->SquelchMailTo;
     foreach my $attribute (@non_recipients) {
         push @blacklist, $attribute->Content;
@@ -570,10 +514,10 @@ sub RemoveInappropriateRecipients {
 
     foreach my $person_to_yank (@blacklist) {
         $person_to_yank =~ s/\s//g;
-        foreach my $type (@types) {
-            @{ $self->{$type} } =
-              grep ( !/^\Q$person_to_yank\E$/, @{ $self->{$type} } );
-        }
+        @{ $self->{'To'} } = grep ( !/^$person_to_yank$/, @{ $self->{'To'} } );
+        @{ $self->{'Cc'} } = grep ( !/^$person_to_yank$/, @{ $self->{'Cc'} } );
+        @{ $self->{'Bcc'} } =
+          grep ( !/^$person_to_yank$/, @{ $self->{'Bcc'} } );
     }
 }
 
@@ -727,93 +671,8 @@ sub SetSubjectToken {
 
 # }}}
 
-=head2 SetReferencesHeaders
-
-Set References and In-Reply-To headers for this message.
-
-=cut
-
-sub SetReferencesHeaders {
-
-    my $self = shift;
-    my ( @in_reply_to, @references, @msgid );
-
-    my $attachments = $self->TransactionObj->Message;
-
-    if ( my $top = $attachments->First() ) {
-        @in_reply_to = split(/\s+/m, $top->GetHeader('In-Reply-To') || '');  
-        @references = split(/\s+/m, $top->GetHeader('References') || '' );  
-        @msgid = split(/\s+/m, $top->GetHeader('Message-ID') || ''); 
-    }
-    else {
-        return (undef);
-    }
-
-    # There are two main cases -- this transaction was created with
-    # the RT Web UI, and hence we want to *not* append its Message-ID
-    # to the References and In-Reply-To.  OR it came from an outside
-    # source, and we should treat it as per the RFC
-    if ( "@msgid" =~ /<(rt-.*?-\d+-\d+)\.(\d+-0-0)\@$RT::Organization>/) {
-
-      # Make all references which are internal be to version which we
-      # have sent out
-      for (@references, @in_reply_to) {
-        s/<(rt-.*?-\d+-\d+)\.(\d+-0-0)\@$RT::Organization>$/
-          "<$1." . $self->TicketObj->id .
-             "-" . $self->ScripObj->id .
-             "-" . $self->ScripActionObj->{_Message_ID} .
-             "@" . $RT::Organization . ">"/eg
-      }
-
-      # In reply to whatever the internal message was in reply to
-      $self->SetHeader( 'In-Reply-To', join( " ",  ( @in_reply_to )));
-
-      # Default the references to whatever we're in reply to
-      @references = @in_reply_to unless @references;
-
-      # References are unchanged from internal
-    } else {
-      # In reply to that message
-      $self->SetHeader( 'In-Reply-To', join( " ",  ( @msgid )));
-
-      # Default the references to whatever we're in reply to
-      @references = @in_reply_to unless @references;
-
-      # Push that message onto the end of the references
-      push @references, @msgid;
-    }
-
-    # Push pseudo-ref to the front
-    my $pseudo_ref = $self->PseudoReference;
-    @references = ($pseudo_ref, grep { $_ ne $pseudo_ref } @references);
-
-    # If there are more than 10 references headers, remove all but the
-    # first four and the last six (Gotta keep this from growing
-    # forever)
-    splice(@references, 4, -6) if ($#references >= 10);
-
-    # Add on the references
-    $self->SetHeader( 'References', join( " ",   @references) );
-    $self->TemplateObj->MIMEObj->head->fold_length( 'References', 80 );
-
-}
-
 # }}}
 
-=head2 PseudoReference
-
-Returns a fake Message-ID: header for the ticket to allow a base level of threading
-
-=cut
-
-sub PseudoReference {
-
-    my $self = shift;
-    my $pseudo_ref =  '<RT-Ticket-'.$self->TicketObj->id .'@'.$RT::Organization .'>';
-    return $pseudo_ref;
-}
-
-
 # {{{ SetHeadingAsEncoding
 
 =head2 SetHeaderAsEncoding($field_name, $charset_encoding)
diff --git a/rt/lib/RT/Action/SetPriority.pm b/rt/lib/RT/Action/SetPriority.pm
index c129bf0..d3272a0 100644
--- a/rt/lib/RT/Action/SetPriority.pm
+++ b/rt/lib/RT/Action/SetPriority.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Action::SetPriority;
 require RT::Action::Generic;
 
diff --git a/rt/lib/RT/Action/UserDefined.pm b/rt/lib/RT/Action/UserDefined.pm
index 90653f6..c298a7c 100644
--- a/rt/lib/RT/Action/UserDefined.pm
+++ b/rt/lib/RT/Action/UserDefined.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
  
 
 package RT::Action::UserDefined;
diff --git a/rt/lib/RT/Attachment.pm b/rt/lib/RT/Attachment.pm
index 2a09b12..71aa4d5 100755
--- a/rt/lib/RT/Attachment.pm
+++ b/rt/lib/RT/Attachment.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -326,29 +326,29 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         TransactionId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Parent => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         MessageId => 
-		{read => 1, write => 1, sql_type => 12, length => 160,  is_blob => 0,  is_numeric => 0,  type => 'varchar(160)', default => ''},
+		{read => 1, write => 1, type => 'varchar(160)', default => ''},
         Subject => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         Filename => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         ContentType => 
-		{read => 1, write => 1, sql_type => 12, length => 80,  is_blob => 0,  is_numeric => 0,  type => 'varchar(80)', default => ''},
+		{read => 1, write => 1, type => 'varchar(80)', default => ''},
         ContentEncoding => 
-		{read => 1, write => 1, sql_type => 12, length => 80,  is_blob => 0,  is_numeric => 0,  type => 'varchar(80)', default => ''},
+		{read => 1, write => 1, type => 'varchar(80)', default => ''},
         Content => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'longtext', default => ''},
+		{read => 1, write => 1, type => 'longtext', default => ''},
         Headers => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'longtext', default => ''},
+		{read => 1, write => 1, type => 'longtext', default => ''},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
@@ -380,7 +380,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Attachment_Overlay.pm b/rt/lib/RT/Attachment_Overlay.pm
index fe189e3..8dcf56e 100644
--- a/rt/lib/RT/Attachment_Overlay.pm
+++ b/rt/lib/RT/Attachment_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 SYNOPSIS
 
   use RT::Attachment;
@@ -67,9 +66,6 @@ ok (require RT::Attachment);
 
 =cut
 
-
-package RT::Attachment;
-
 use strict;
 no warnings qw(redefine);
 
@@ -157,13 +153,6 @@ sub Create {
     defined($Subject) or $Subject = '';
     chomp($Subject);
 
-    #Get the Message-ID
-    my $MessageId = $Attachment->head->get( 'Message-ID', 0 );
-    defined($MessageId) or $MessageId = '';
-    chomp ($MessageId);
-    $MessageId =~ s/^<(.*)>$/$1/go;
-
-
     #Get the filename
     my $Filename = $Attachment->head->recommended_filename || eval {
 	${ $Attachment->head->{mail_hdr_hash}{'Content-Disposition'}[0] }
@@ -173,19 +162,12 @@ sub Create {
     # If a message has no bodyhandle, that means that it has subparts (or appears to)
     # and we should act accordingly.  
     unless ( defined $Attachment->bodyhandle ) {
-
         $id = $self->SUPER::Create(
             TransactionId => $args{'TransactionId'},
             Parent        => 0,
             ContentType   => $Attachment->mime_type,
             Headers => $Attachment->head->as_string,
-            MessageId => $MessageId,
             Subject => $Subject);
-        
-        unless ($id) {
-            $RT::Logger->crit("Attachment insert failed - ".$RT::Handle->dbh->errstr);
-
-        }
 
         foreach my $part ( $Attachment->parts ) {
             my $SubAttachment = new RT::Attachment( $self->CurrentUser );
@@ -194,6 +176,7 @@ sub Create {
                 Parent        => $id,
                 Attachment    => $part,
                 ContentType   => $Attachment->mime_type,
+                Headers       => $Attachment->head->as_string(),
 
             );
         }
@@ -203,21 +186,21 @@ sub Create {
     #If it's not multipart
     else {
 
+
+        my $Body = $Attachment->bodyhandle->as_string;
+
+
 	my ($ContentEncoding, $Body) = $self->_EncodeLOB($Attachment->bodyhandle->as_string, $Attachment->mime_type);
+
+
         my $id = $self->SUPER::Create( TransactionId => $args{'TransactionId'},
                                        ContentType   => $Attachment->mime_type,
                                        ContentEncoding => $ContentEncoding,
                                        Parent          => $args{'Parent'},
-                                                  Headers       =>  $Attachment->head->as_string,
+                                       Headers       =>  $Attachment->head->as_string, 
                                        Subject       =>  $Subject,
                                        Content         => $Body,
-                                       Filename => $Filename, 
-                                        MessageId => $MessageId
-                                    );
-        unless ($id) {
-            $RT::Logger->crit("Attachment insert failed - ".$RT::Handle->dbh->errstr);
-        }
-
+                                       Filename => $Filename, );
         return ($id);
     }
 }
@@ -237,11 +220,7 @@ sub Import {
     my %args = ( ContentEncoding => 'none',
 
 		 @_ );
-
-
- ($args{'ContentEncoding'}, $args{'Content'}) = $self->_EncodeLOB($args{'Content'}, $args{'MimeType'});
-
-    return($self->SUPER::Create(%args));
+    return($self->SUPER::Create(@_));
 }
 
 # {{{ sub Content
@@ -255,7 +234,26 @@ before returning it.
 
 sub Content {
   my $self = shift;
-   $self->_DecodeLOB($self->ContentType, $self->ContentEncoding, $self->_Value('Content', decode_utf8 => 0));
+  my $decode_utf8 = (($self->ContentType =~ qr{^text/plain}i) ? 1 : 0);
+
+  if ( $self->ContentEncoding eq 'none' || ! $self->ContentEncoding ) {
+      return $self->_Value(
+	  'Content',
+	  decode_utf8 => $decode_utf8,
+      );
+  } elsif ( $self->ContentEncoding eq 'base64' ) {
+      return ( $decode_utf8
+        ? Encode::decode_utf8(MIME::Base64::decode_base64($self->_Value('Content')))
+        : MIME::Base64::decode_base64($self->_Value('Content'))
+      );
+  } elsif ( $self->ContentEncoding eq 'quoted-printable' ) {
+      return ( $decode_utf8
+        ? Encode::decode_utf8(MIME::QuotedPrint::decode($self->_Value('Content')))
+        : MIME::QuotedPrint::decode($self->_Value('Content'))
+      );
+  } else {
+      return( $self->loc("Unknown ContentEncoding [_1]", $self->ContentEncoding));
+  }
 }
 
 
@@ -267,7 +265,7 @@ sub Content {
 =head2 OriginalContent
 
 Returns the attachment's content as octets before RT's mangling.
-Currently, this just means restoring text content back to its
+Currently, this just means restoring text/plain content back to its
 original encoding.
 
 =cut
@@ -275,8 +273,7 @@ original encoding.
 sub OriginalContent {
   my $self = shift;
 
-  return $self->Content unless (
-     $self->ContentType =~ qr{^(text/plain|message/rfc822)$}i) ;
+  return $self->Content unless $self->ContentType eq 'text/plain';
   my $enc = $self->OriginalEncoding;
 
   my $content;
@@ -401,16 +398,19 @@ sub Quote {
 
 =head2 NiceHeaders
 
-Returns a multi-line string of the To, From, Cc, Date and Subject headers.
+Returns the To, From, Cc, Date and Subject headers.
+
+It is a known issue that this breaks if any of these headers are not
+properly unfolded.
 
 =cut
 
 sub NiceHeaders {
     my $self = shift;
     my $hdrs = "";
-    my @hdrs = $self->_SplitHeaders;
+    my @hdrs = split(/\n/,$self->Headers);
     while (my $str = shift @hdrs) {
-	    next unless $str =~ /^(To|From|RT-Send-Cc|Cc|Bcc|Date|Subject):/i;
+	    next unless $str =~ /^(To|From|RT-Send-Cc|Cc|Bcc:Date|Subject): /i;
 	    $hdrs .= $str . "\n";
 	    $hdrs .= shift( @hdrs ) . "\n" while ($hdrs[0] =~ /^[ \t]+/);
     }
@@ -433,9 +433,10 @@ an abstraction barrier that makes it impossible to pass this data directly
 sub Headers {
     my $self = shift;
     my $hdrs="";
-    my @headers =  grep { !/^RT-Send-Bcc/i } $self->_SplitHeaders;
-    return join("\n",@headers);
-
+    for ($self->_SplitHeaders) {
+	    $hdrs.="$_\n" unless /^(RT-Send-Bcc):/i
+    }
+    return $hdrs;
 }
 
 
@@ -534,7 +535,7 @@ sub _Value {
 =head2 _SplitHeaders
 
 Returns an array of this attachment object's headers, with one header 
-per array entry. multiple lines are folded.
+per array entry. multiple lines are folded
 
 =begin testing
 
diff --git a/rt/lib/RT/Attachments.pm b/rt/lib/RT/Attachments.pm
index aedd7ad..9ab11f3 100755
--- a/rt/lib/RT/Attachments.pm
+++ b/rt/lib/RT/Attachments.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Attachments_Overlay.pm b/rt/lib/RT/Attachments_Overlay.pm
index 1ea56e4..084d02d 100644
--- a/rt/lib/RT/Attachments_Overlay.pm
+++ b/rt/lib/RT/Attachments_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Attachments - a collection of RT::Attachment objects
@@ -69,9 +68,6 @@ ok (require RT::Attachments);
 
 =cut
 
-
-package RT::Attachments;
-
 use strict;
 no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Attribute.pm b/rt/lib/RT/Attribute.pm
index a46f4d8..62555d2 100644
--- a/rt/lib/RT/Attribute.pm
+++ b/rt/lib/RT/Attribute.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -281,27 +281,27 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         Name => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         Description => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         Content => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'text', default => ''},
+		{read => 1, write => 1, type => 'text', default => ''},
         ContentType => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         ObjectType => 
-		{read => 1, write => 1, sql_type => 12, length => 64,  is_blob => 0,  is_numeric => 0,  type => 'varchar(64)', default => ''},
+		{read => 1, write => 1, type => 'varchar(64)', default => ''},
         ObjectId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, write => 1, type => 'int(11)', default => ''},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
@@ -333,7 +333,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Attribute_Overlay.pm b/rt/lib/RT/Attribute_Overlay.pm
index ead842e..b95b8f6 100644
--- a/rt/lib/RT/Attribute_Overlay.pm
+++ b/rt/lib/RT/Attribute_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,9 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-package RT::Attribute;
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 use Storable qw/nfreeze thaw/;
diff --git a/rt/lib/RT/Attributes.pm b/rt/lib/RT/Attributes.pm
index bb63b81..bb71333 100644
--- a/rt/lib/RT/Attributes.pm
+++ b/rt/lib/RT/Attributes.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Attributes_Overlay.pm b/rt/lib/RT/Attributes_Overlay.pm
index 0e79df1..63c9ba0 100644
--- a/rt/lib/RT/Attributes_Overlay.pm
+++ b/rt/lib/RT/Attributes_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Attributes - collection of RT::Attribute objects
@@ -58,10 +57,29 @@ my $Attributes = new RT::Attributes($CurrentUser);
 
 =head1 METHODS
 
-=cut
+=begin testing
+
+ok(require RT::Attributes);
+
+my $root = RT::User->new($RT::SystemUser);
+ok (UNIVERSAL::isa($root, 'RT::User'));
+$root->Load('root');
+ok($root->id, "Found a user for root");
+
+my $attr = $root->Attributes;
+
+ok (UNIVERSAL::isa($attr,'RT::Attributes'), 'got the attributes object');
 
+my ($id, $msg) =  $root->AddAttribute(Name => 'TestAttr', Content => 'The attribute has content'); 
+ok ($id, $msg);
+my @names = $attr->Names;
 
-package RT::Attributes;
+is ($names[0] , 'TestAttr');
+
+
+=end testing
+
+=cut
 
 use strict;
 no warnings qw(redefine);
@@ -157,17 +175,13 @@ sub DeleteEntry {
                  Content => undef,
                  id => undef,
                  @_);
-    my $found = 0;
+
     foreach my $attr ($self->Named($args{'Name'})){ 
-      if ((!defined $args{'id'} and !defined $args{'Content'})
-          or (defined $args{'id'} and $attr->id eq $args{'id'})
-          or (defined $args{'Content'} and $attr->Content eq $args{'Content'})) {
-        my ($id, $msg) = $attr->Delete;
-        return ($id, $msg) unless $id;
-        $found = 1;
-      }
+        $attr->Delete
+            if (!defined $args{'id'} and !defined $args{'Content'})
+            or (defined $args{'id'} and $attr->id eq $args{'id'})
+            or (defined $args{'Content'} and $attr->Content eq $args{'Content'});
     }
-    return (0, "No entry found") unless $found;
     $self->_DoSearch();
     return (1, $self->loc('Attribute Deleted'));
 }
diff --git a/rt/lib/RT/Base.pm b/rt/lib/RT/Base.pm
index f329221..03b50e6 100644
--- a/rt/lib/RT/Base.pm
+++ b/rt/lib/RT/Base.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Base;
 use Carp;
 use Scalar::Util;
@@ -52,18 +52,9 @@ use vars qw(@EXPORT);
 
 @EXPORT=qw(loc CurrentUser);
 
-=head1 NAME
-
-RT::Base
-
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
 =head1 FUNCTIONS
 
-=cut
+
 
 # {{{ sub CurrentUser 
 
@@ -81,9 +72,6 @@ sub CurrentUser {
     if (@_) {
         $self->{'original_user'} = $self->{'user'};
         $self->{'user'} = shift;
-        # We need to weaken the CurrentUser ($self->{'user'}) reference
-        # if the object in question is the currentuser object.
-        # This avoids memory leaks.
         Scalar::Util::weaken($self->{'user'}) if (ref($self->{'user'}) &&
                                                     $self->{'user'} == $self );
     }
@@ -91,6 +79,7 @@ sub CurrentUser {
     unless ( ref( $self->{'user'}) ) {
         $RT::Logger->err( "$self was created without a CurrentUser\n" . Carp::cluck() );
         return (0);
+        die;
     }
     return ( $self->{'user'} );
 }
@@ -109,7 +98,7 @@ sub OriginalUser {
 }
 
 
-=head2 loc LOC_STRING
+=item loc LOC_STRING
 
 l is a method which takes a loc string
 to this object's CurrentUser->LanguageHandle for localization. 
@@ -136,18 +125,6 @@ sub loc {
     }
 }
 
-sub loc_fuzzy {
-    my $self = shift;
-    if (my $user = $self->OriginalUser) {
-        return $user->loc_fuzzy(@_);
-    }
-    else {
-        use Carp;
-        Carp::confess("No currentuser");
-        return ("Critical error:$self has no CurrentUser", $self);
-    }
-}
-
 eval "require RT::Base_Vendor";
 die $@ if ($@ && $@ !~ qr{^Can't locate RT/Base_Vendor.pm});
 eval "require RT::Base_Local";
diff --git a/rt/lib/RT/CachedGroupMember.pm b/rt/lib/RT/CachedGroupMember.pm
index bc7f62e..96b1d00 100644
--- a/rt/lib/RT/CachedGroupMember.pm
+++ b/rt/lib/RT/CachedGroupMember.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -224,17 +224,17 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         GroupId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, write => 1, type => 'int(11)', default => ''},
         MemberId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, write => 1, type => 'int(11)', default => ''},
         Via => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, write => 1, type => 'int(11)', default => ''},
         ImmediateParentId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, write => 1, type => 'int(11)', default => ''},
         Disabled => 
-		{read => 1, write => 1, sql_type => 5, length => 6,  is_blob => 0,  is_numeric => 1,  type => 'smallint(6)', default => '0'},
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
 
  }
 };
@@ -266,7 +266,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/CachedGroupMember_Overlay.pm b/rt/lib/RT/CachedGroupMember_Overlay.pm
index 15f6bd7..1294af4 100644
--- a/rt/lib/RT/CachedGroupMember_Overlay.pm
+++ b/rt/lib/RT/CachedGroupMember_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,45 +42,29 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-package RT::CachedGroupMember;
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 
-=head1 NAME
-
-  RT::CachedGroupMember
-
-=head1 SYNOPSIS
-
-  use RT::CachedGroupMember;
+# {{{ Create
 
-=head1 DESCRIPTION
-
-=head1 METHODS
-
-=cut
-
-# {{ Create
-
-=head2 Create PARAMHASH
+=item Create PARAMHASH
 
 Create takes a hash of values and creates a row in the database:
 
-  'Group' is the "top level" group we're building the cache for. This 
-  is an RT::Principal object
+  'Group' is the "top level" group we're building the cache for. This is an 
+  RT::Principal object
 
-  'Member' is the RT::Principal  of the user or group we're adding to 
-  the cache.
+  'Member' is the RT::Principal  of the user or group we're adding
+  to the cache.
 
-  'ImmediateParent' is the RT::Principal of the group that this 
-  principal belongs to to get here
+  'ImmediateParent' is the RT::Principal of the group that this principal
+  belongs to to get here
 
   int(11) 'Via' is an internal reference to CachedGroupMembers->Id of
-  the "parent" record of this cached group member. It should be empty if 
-  this member is a "direct" member of this group. (In that case, it will 
-  be set to this cached group member's id after creation)
+  the "parent" record of this cached group member. It should be empty if this
+  member is a "direct" member of this group. (In that case, it will be set to this 
+  cached group member's id after creation)
 
   This routine should _only_ be called by GroupMember->Create
 
@@ -256,14 +240,11 @@ mysql supported foreign keys with cascading SetDisableds.
 sub SetDisabled {
     my $self = shift;
     my $val = shift;
- 
-    # if it's already disabled, we're good.
-    return {1} if ($self->__Value('Disabled') == $val);
+    
     my $err = $self->SUPER::SetDisabled($val);
-    my ($retval, $msg) = $err->as_array();
-    unless ($retval) {
-        $RT::Logger->error( "Couldn't SetDisabled CachedGroupMember " . $self->Id .": $msg");
-        return ($err);
+    unless ($err) {
+        $RT::Logger->error( "Couldn't SetDisabled CachedGroupMember " . $self->Id );
+        return (undef);
     }
     
     my $member = $self->MemberObj();
@@ -277,7 +258,7 @@ sub SetDisabled {
             my $kid_err = $kid->SetDisabled($val );
             unless ($kid_err) {
                 $RT::Logger->error( "Couldn't SetDisabled CachedGroupMember " . $kid->Id );
-                return ($kid_err);
+                return (undef);
             }
         }
     }
diff --git a/rt/lib/RT/CachedGroupMembers.pm b/rt/lib/RT/CachedGroupMembers.pm
index 5ed35e6..909089d 100644
--- a/rt/lib/RT/CachedGroupMembers.pm
+++ b/rt/lib/RT/CachedGroupMembers.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/CachedGroupMembers_Overlay.pm b/rt/lib/RT/CachedGroupMembers_Overlay.pm
index e83dab4..0dbcffc 100644
--- a/rt/lib/RT/CachedGroupMembers_Overlay.pm
+++ b/rt/lib/RT/CachedGroupMembers_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::CachedGroupMembers - a collection of RT::GroupMember objects
@@ -66,9 +65,6 @@ ok (require RT::CachedGroupMembers);
 
 =cut
 
-
-package RT::CachedGroupMembers;
-
 use strict;
 no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Condition/AnyTransaction.pm b/rt/lib/RT/Condition/AnyTransaction.pm
index 6685e27..a338523 100644
--- a/rt/lib/RT/Condition/AnyTransaction.pm
+++ b/rt/lib/RT/Condition/AnyTransaction.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
  
 
 package RT::Condition::AnyTransaction;
diff --git a/rt/lib/RT/Condition/BeforeDue.pm b/rt/lib/RT/Condition/BeforeDue.pm
index d5e371e..4be0afc 100644
--- a/rt/lib/RT/Condition/BeforeDue.pm
+++ b/rt/lib/RT/Condition/BeforeDue.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Condition::BeforeDue;
 require RT::Condition::Generic;
 
diff --git a/rt/lib/RT/Condition/Generic.pm b/rt/lib/RT/Condition/Generic.pm
index cdde9ee..1f291fc 100755
--- a/rt/lib/RT/Condition/Generic.pm
+++ b/rt/lib/RT/Condition/Generic.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Condition::Generic - ;
diff --git a/rt/lib/RT/Condition/Overdue.pm b/rt/lib/RT/Condition/Overdue.pm
index 877db40..df4476c 100644
--- a/rt/lib/RT/Condition/Overdue.pm
+++ b/rt/lib/RT/Condition/Overdue.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
  
 
 
diff --git a/rt/lib/RT/Condition/OwnerChange.pm b/rt/lib/RT/Condition/OwnerChange.pm
index 5fbc6b2..5ec3a43 100644
--- a/rt/lib/RT/Condition/OwnerChange.pm
+++ b/rt/lib/RT/Condition/OwnerChange.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
  
 
 
diff --git a/rt/lib/RT/Condition/PriorityChange.pm b/rt/lib/RT/Condition/PriorityChange.pm
index 101c388..b3dbde8 100644
--- a/rt/lib/RT/Condition/PriorityChange.pm
+++ b/rt/lib/RT/Condition/PriorityChange.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
  
 
 
diff --git a/rt/lib/RT/Condition/PriorityExceeds.pm b/rt/lib/RT/Condition/PriorityExceeds.pm
index b811c72..68db1e5 100644
--- a/rt/lib/RT/Condition/PriorityExceeds.pm
+++ b/rt/lib/RT/Condition/PriorityExceeds.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
  
 
 
diff --git a/rt/lib/RT/Condition/QueueChange.pm b/rt/lib/RT/Condition/QueueChange.pm
index 7a3ede9..4227fe6 100644
--- a/rt/lib/RT/Condition/QueueChange.pm
+++ b/rt/lib/RT/Condition/QueueChange.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
  
 
 
diff --git a/rt/lib/RT/Condition/StatusChange.pm b/rt/lib/RT/Condition/StatusChange.pm
index 902bf2a..1182fcd 100644
--- a/rt/lib/RT/Condition/StatusChange.pm
+++ b/rt/lib/RT/Condition/StatusChange.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
  
 
 
diff --git a/rt/lib/RT/Condition/UserDefined.pm b/rt/lib/RT/Condition/UserDefined.pm
index f6d077d..0cb8bdb 100644
--- a/rt/lib/RT/Condition/UserDefined.pm
+++ b/rt/lib/RT/Condition/UserDefined.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
  
 
 package RT::Condition::UserDefined;
diff --git a/rt/lib/RT/CurrentUser.pm b/rt/lib/RT/CurrentUser.pm
index 8e28801..d147fe6 100755
--- a/rt/lib/RT/CurrentUser.pm
+++ b/rt/lib/RT/CurrentUser.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::CurrentUser - an RT object representing the current user
@@ -245,7 +244,6 @@ sub LoadByGecos  {
 
 Loads a User into this CurrentUser object.
 Takes a Name.
-
 =cut
 
 sub LoadByName {
@@ -352,12 +350,12 @@ specification. but currently doesn't
 =begin testing
 
 ok (my $cu = RT::CurrentUser->new('root'));
-ok (my $lh = $cu->LanguageHandle('en-us'));
+ok (my $lh = $cu->LanguageHandle);
 ok ($lh != undef);
 ok ($lh->isa('Locale::Maketext'));
-is ($cu->loc('TEST_STRING'), "Concrete Mixer", "Localized TEST_STRING into English");
+ok ($cu->loc('TEST_STRING') eq "Concrete Mixer", "Localized TEST_STRING into English");
 ok ($lh = $cu->LanguageHandle('fr'));
-is ($cu->loc('Before'), "Avant", "Localized TEST_STRING into Frenc");
+ok ($cu->loc('Before') eq "Avant", "Localized TEST_STRING into Frenc");
 
 =end testing
 
@@ -368,7 +366,7 @@ sub LanguageHandle {
     if (   ( !defined $self->{'LangHandle'} )
         || ( !UNIVERSAL::can( $self->{'LangHandle'}, 'maketext' ) )
         || (@_) ) {
-        if ( !$RT::SystemUser or ($self->id || 0) == $RT::SystemUser->id() ) {
+        if ( (!$RT::SystemUser || $self->id == $RT::SystemUser->id() )) {
             @_ = qw(en-US);
         }
 
@@ -402,7 +400,7 @@ sub loc {
 
 sub loc_fuzzy {
     my $self = shift;
-    return '' if (!$_[0] ||  $_[0] eq '');
+    return '' if $_[0] eq '';
 
     # XXX: work around perl's deficiency when matching utf8 data
     return $_[0] if Encode::is_utf8($_[0]);
@@ -425,48 +423,6 @@ sub CurrentUser {
 
 }
 
-=head2 Authenticate
-
-Takes $password, $created and $nonce, and returns a boolean value
-representing whether the authentication succeeded.
-
-If both $nonce and $created are specified, validate $password against:
-
-    encode_base64(sha1(
-	$nonce .
-	$created .
-	sha1_hex( "$username:$realm:$server_pass" )
-    ))
-
-where $server_pass is the md5_hex(password) digest stored in the
-database, $created is in ISO time format, and $nonce is a random
-string no longer than 32 bytes.
-
-=cut
-
-sub Authenticate { 
-    my ($self, $password, $created, $nonce, $realm) = @_;
-
-    require Digest::MD5;
-    require Digest::SHA1;
-    require MIME::Base64;
-
-    my $username = $self->UserObj->Name or return;
-    my $server_pass = $self->UserObj->__Value('Password') or return;
-    my $auth_digest = MIME::Base64::encode_base64(Digest::SHA1::sha1(
-	$nonce .
-	$created .
-	Digest::MD5::md5_hex("$username:$realm:$server_pass")
-    ));
-
-    chomp($password);
-    chomp($auth_digest);
-
-    return ($password eq $auth_digest);
-}
-
-# }}}
-
 
 eval "require RT::CurrentUser_Vendor";
 die $@ if ($@ && $@ !~ qr{^Can't locate RT/CurrentUser_Vendor.pm});
diff --git a/rt/lib/RT/CustomField.pm b/rt/lib/RT/CustomField.pm
index 212e594..be05c30 100644
--- a/rt/lib/RT/CustomField.pm
+++ b/rt/lib/RT/CustomField.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -67,6 +67,7 @@ RT::CustomField
 
 package RT::CustomField;
 use RT::Record; 
+use RT::Queue;
 
 
 use vars qw( @ISA );
@@ -89,17 +90,11 @@ Create takes a hash of values and creates a row in the database:
 
   varchar(200) 'Name'.
   varchar(200) 'Type'.
-  int(11) 'MaxValues'.
-  varchar(255) 'Pattern'.
-  smallint(6) 'Repeated'.
+  int(11) 'Queue'.
   varchar(255) 'Description'.
   int(11) 'SortOrder'.
-  varchar(255) 'LookupType'.
   smallint(6) 'Disabled'.
 
-  'LookupType' is generally the result of either 
-  RT::Ticket->CustomFieldLookupType or RT::Transaction->CustomFieldLookupType
-
 =cut
 
 
@@ -110,24 +105,18 @@ sub Create {
     my %args = ( 
                 Name => '',
                 Type => '',
-                MaxValues => '',
-                Pattern => '',
-                Repeated => '0',
+                Queue => '0',
                 Description => '',
                 SortOrder => '0',
-                LookupType => '',
                 Disabled => '0',
 
 		  @_);
     $self->SUPER::Create(
                          Name => $args{'Name'},
                          Type => $args{'Type'},
-                         MaxValues => $args{'MaxValues'},
-                         Pattern => $args{'Pattern'},
-                         Repeated => $args{'Repeated'},
+                         Queue => $args{'Queue'},
                          Description => $args{'Description'},
                          SortOrder => $args{'SortOrder'},
-                         LookupType => $args{'LookupType'},
                          Disabled => $args{'Disabled'},
 );
 
@@ -180,59 +169,37 @@ Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
 =cut
 
 
-=head2 MaxValues
-
-Returns the current value of MaxValues. 
-(In the database, MaxValues is stored as int(11).)
-
-
-
-=head2 SetMaxValues VALUE
-
-
-Set MaxValues to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, MaxValues will be stored as a int(11).)
-
-
-=cut
-
-
-=head2 Pattern
+=head2 Queue
 
-Returns the current value of Pattern. 
-(In the database, Pattern is stored as varchar(255).)
+Returns the current value of Queue. 
+(In the database, Queue is stored as int(11).)
 
 
 
-=head2 SetPattern VALUE
+=head2 SetQueue VALUE
 
 
-Set Pattern to VALUE. 
+Set Queue to VALUE. 
 Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, Pattern will be stored as a varchar(255).)
+(In the database, Queue will be stored as a int(11).)
 
 
 =cut
 
 
-=head2 Repeated
-
-Returns the current value of Repeated. 
-(In the database, Repeated is stored as smallint(6).)
-
-
+=head2 QueueObj
 
-=head2 SetRepeated VALUE
-
-
-Set Repeated to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, Repeated will be stored as a smallint(6).)
+Returns the Queue Object which has the id returned by Queue
 
 
 =cut
 
+sub QueueObj {
+	my $self = shift;
+	my $Queue =  RT::Queue->new($self->CurrentUser);
+	$Queue->Load($self->__Value('Queue'));
+	return($Queue);
+}
 
 =head2 Description
 
@@ -270,24 +237,6 @@ Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
 =cut
 
 
-=head2 LookupType
-
-Returns the current value of LookupType. 
-(In the database, LookupType is stored as varchar(255).)
-
-
-
-=head2 SetLookupType VALUE
-
-
-Set LookupType to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, LookupType will be stored as a varchar(255).)
-
-
-=cut
-
-
 =head2 Creator
 
 Returns the current value of Creator. 
@@ -347,33 +296,27 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         Name => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         Type => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
-        MaxValues => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
-        Pattern => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
-        Repeated => 
-		{read => 1, write => 1, sql_type => 5, length => 6,  is_blob => 0,  is_numeric => 1,  type => 'smallint(6)', default => '0'},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
+        Queue => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Description => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         SortOrder => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
-        LookupType => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         Disabled => 
-		{read => 1, write => 1, sql_type => 5, length => 6,  is_blob => 0,  is_numeric => 1,  type => 'smallint(6)', default => '0'},
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
 
  }
 };
@@ -405,7 +348,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/CustomFieldValue.pm b/rt/lib/RT/CustomFieldValue.pm
index 105ac40..e1d4e03 100644
--- a/rt/lib/RT/CustomFieldValue.pm
+++ b/rt/lib/RT/CustomFieldValue.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -254,23 +254,23 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         CustomField => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Name => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         Description => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         SortOrder => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
@@ -302,7 +302,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/CustomFieldValue_Overlay.pm b/rt/lib/RT/CustomFieldValue_Overlay.pm
deleted file mode 100644
index 322e58b..0000000
--- a/rt/lib/RT/CustomFieldValue_Overlay.pm
+++ /dev/null
@@ -1,19 +0,0 @@
-use warnings;
-use strict;
-
-package RT::CustomFieldValue;
-
-no warnings qw/redefine/;
-
-
-=head2 ValidateName
-
-Override the default ValidateName method that stops custom field values
-from being integers.
-
-=cut
-
-
-sub ValidateName { 1 };
-
-1;
diff --git a/rt/lib/RT/CustomFieldValues.pm b/rt/lib/RT/CustomFieldValues.pm
index 9a55af8..70deda1 100644
--- a/rt/lib/RT/CustomFieldValues.pm
+++ b/rt/lib/RT/CustomFieldValues.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -83,15 +83,10 @@ sub _Init {
 
 
 
-  # By default, order by SortOrder
-  $self->OrderByCols(
-	 { ALIAS => 'main',
-	   FIELD => 'SortOrder',
-	   ORDER => 'ASC' },
-	 { ALIAS => 'main',
-	   FIELD => 'id',
-	   ORDER => 'ASC' },
-     );
+  # By default, order by name
+  $self->OrderBy( ALIAS => 'main',
+                  FIELD => 'SortOrder',
+                  ORDER => 'ASC');
 
     return ( $self->SUPER::_Init(@_) );
 }
@@ -134,7 +129,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/CustomFieldValues_Overlay.pm b/rt/lib/RT/CustomFieldValues_Overlay.pm
index 3a9f5d5..0744980 100644
--- a/rt/lib/RT/CustomFieldValues_Overlay.pm
+++ b/rt/lib/RT/CustomFieldValues_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,9 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-package RT::CustomFieldValues;
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 
diff --git a/rt/lib/RT/CustomField_Overlay.pm b/rt/lib/RT/CustomField_Overlay.pm
index 9e0ce24..4c4bd8b 100644
--- a/rt/lib/RT/CustomField_Overlay.pm
+++ b/rt/lib/RT/CustomField_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,78 +42,28 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-package RT::CustomField;
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 
-use vars qw(%FieldTypes $RIGHTS %FRIENDLY_OBJECT_TYPES);
+use vars qw(@TYPES %TYPES);
 
 use RT::CustomFieldValues;
-use RT::ObjectCustomFieldValues;
-
-
-%FieldTypes = (
-    Select => [
-        'Select multiple values',	# loc
-        'Select one value',		# loc
-        'Select up to [_1] values',	# loc
-    ],
-    Freeform => [
-        'Enter multiple values',	# loc
-        'Enter one value',		# loc
-        'Enter up to [_1] values',	# loc
-    ],
-    Text => [
-        'Fill in multiple text areas',	# loc
-        'Fill in one text area',	# loc
-        'Fill in up to [_1] text areas',# loc
-    ],
-    Wikitext => [
-        'Fill in multiple wikitext areas',	# loc
-        'Fill in one wikitext area',	# loc
-        'Fill in up to [_1] wikitext areas',# loc
-    ],
-    Image => [
-        'Upload multiple images',	# loc
-        'Upload one image',		# loc
-        'Upload up to [_1] images',	# loc
-    ],
-    Binary => [
-        'Upload multiple files',	# loc
-        'Upload one file',		# loc
-        'Upload up to [_1] files',	# loc
-    ],
+use RT::TicketCustomFieldValues;
+
+# Enumerate all valid types for this custom field
+@TYPES = (
+    'SelectSingle',	# loc
+    'SelectMultiple',	# loc
+    'FreeformSingle',	# loc
+    'FreeformMultiple', # loc
 );
 
+# Populate a hash of types of easier validation
+for (@TYPES) { $TYPES{$_} = 1};
 
-%FRIENDLY_OBJECT_TYPES =  ();
-
-RT::CustomField->_ForObjectType( 'RT::Queue-RT::Ticket' => "Tickets", );    #loc
-RT::CustomField->_ForObjectType(
-    'RT::Queue-RT::Ticket-RT::Transaction' => "Ticket Transactions", );    #loc
-RT::CustomField->_ForObjectType( 'RT::User'  => "Users", );                           #loc
-RT::CustomField->_ForObjectType( 'RT::Group' => "Groups", );                          #loc
-
-$RIGHTS = {
-    SeeCustomField            => 'See custom fields',       # loc_pair
-    AdminCustomField          => 'Create, delete and modify custom fields',        # loc_pair
-    ModifyCustomField         => 'Add, delete and modify custom field values for objects' #loc_pair
 
-};
 
-# Tell RT::ACE that this sort of object can get acls granted
-$RT::ACE::OBJECT_TYPES{'RT::CustomField'} = 1;
-
-foreach my $right ( keys %{$RIGHTS} ) {
-    $RT::ACE::LOWERCASERIGHTNAMES{ lc $right } = $right;
-}
-
-sub AvailableRights {
-    my $self = shift;
-    return($RIGHTS);
-}
 
 =head1 NAME
 
@@ -133,17 +83,11 @@ Create takes a hash of values and creates a row in the database:
 
   varchar(200) 'Name'.
   varchar(200) 'Type'.
-  int(11) 'MaxValues'.
-  varchar(255) 'Pattern'.
-  smallint(6) 'Repeated'.
+  int(11) 'Queue'.
   varchar(255) 'Description'.
   int(11) 'SortOrder'.
-  varchar(255) 'LookupType'.
   smallint(6) 'Disabled'.
 
-  'LookupType' is generally the result of either 
-  RT::Ticket->CustomFieldLookupType or RT::Transaction->CustomFieldLookupType
-
 =cut
 
 
@@ -154,36 +98,19 @@ sub Create {
     my %args = ( 
                 Name => '',
                 Type => '',
-		MaxValues => '0',
-		Pattern  => '',
+                Queue => '0',
                 Description => '',
+                SortOrder => '0',
                 Disabled => '0',
-		LookupType  => '',
-		Repeated  => '0',
 
 		  @_);
 
-    unless ($self->CurrentUser->HasRight(Object => $RT::System, Right => 'AdminCustomField')) {
-        return (0, $self->loc('Permission Denied'));
-    }
-
-
-    if ($args{TypeComposite}) {
-	@args{'Type', 'MaxValues'} = split(/-/, $args{TypeComposite}, 2);
-    }
-    elsif ($args{Type} =~ s/(?:(Single)|Multiple)$//) {
-	# old style Type string
-	$args{'MaxValues'} = $1 ? 1 : 0;
-    }
     
-    if ( !exists $args{'Queue'}) {
-	# do nothing -- things below are strictly backward compat
-    }
-    elsif (  ! $args{'Queue'} ) {
-        unless ( $self->CurrentUser->HasRight( Object => $RT::System, Right => 'AssignCustomFields') ) {
+
+    if (  ! $args{'Queue'} ) {
+        unless ( $self->CurrentUser->HasRight( Object => $RT::System, Right => 'AdminCustomFields') ) {
             return ( 0, $self->loc('Permission Denied') );
         }
-	$args{'LookupType'} = 'RT::Queue-RT::Ticket';
     }
     else {
         my $queue = RT::Queue->new($self->CurrentUser);
@@ -191,75 +118,35 @@ sub Create {
         unless ($queue->Id) {
             return (0, $self->loc("Queue not found"));
         }
-        unless ( $queue->CurrentUserHasRight('AssignCustomFields') ) {
+        unless ( $queue->CurrentUserHasRight('AdminCustomFields') ) {
             return ( 0, $self->loc('Permission Denied') );
         }
-	$args{'LookupType'} = 'RT::Queue-RT::Ticket';
     }
-    my $rv = $self->SUPER::Create(
+    $self->SUPER::Create(
                          Name => $args{'Name'},
                          Type => $args{'Type'},
-                         MaxValues => $args{'MaxValues'},
-                         Pattern  => $args{'Pattern'},
+                         Queue => $args{'Queue'},
                          Description => $args{'Description'},
+                         SortOrder => $args{'SortOrder'},
                          Disabled => $args{'Disabled'},
-			 LookupType => $args{'LookupType'},
-			 Repeated => $args{'Repeated'},
 );
 
-    return $rv unless exists $args{'Queue'};
-
-    # Compat code -- create a new ObjectCustomField mapping
-    my $OCF = RT::ObjectCustomField->new($self->CurrentUser);
-    $OCF->Create(
-	CustomField => $self->Id,
-	ObjectId => $args{'Queue'},
-    );
-
-    return $rv;
-}
-
-=head2 Load ID/NAME
-
-Load a custom field.  If the value handed in is an integer, load by custom field ID. Otherwise, Load by name.
-
-=cut
-
-
-sub Load {
-    my $self = shift;
-    my $id = shift;
-
-    if ($id =~ /^\d+$/) {
-        return ($self->SUPER::Load($id));
-    } else {
-        return($self->LoadByName(Name => $id));
-    }
 }
 
 
-# {{{ sub LoadByName
-
-=head2  LoadByName (Queue => QUEUEID, Name => NAME)
-
-Loads the Custom field named NAME.
-
-If a Queue parameter is specified, only look for ticket custom fields tied to that Queue.
-
-If the Queue parameter is '0', look for global ticket custom fields.
+# {{{ sub LoadByNameAndQueue
 
-If no queue parameter is specified, look for any and all custom fields with this name.
+=head2  LoadByNameAndQueue (Queue => QUEUEID, Name => NAME)
 
-BUG/TODO, this won't let you specify that you only want user or group CFs.
+Loads the Custom field named NAME for Queue QUEUE. If QUEUE is 0,
+loads a global custom field
 
 =cut
 
 # Compatibility for API change after 3.0 beta 1
-*LoadNameAndQueue = \&LoadByName;
-# Change after 3.4 beta.
-*LoadByNameAndQueue = \&LoadByName;
+*LoadNameAndQueue = \&LoadByNameAndQueue;
 
-sub LoadByName {
+sub LoadByNameAndQueue {
     my $self = shift;
     my %args = (
         Queue => undef,
@@ -267,33 +154,13 @@ sub LoadByName {
         @_,
     );
 
-    # if we're looking for a queue by name, make it a number
-    if  (defined $args{'Queue'}  &&  $args{'Queue'} !~ /^\d+$/) {
+    if ($args{'Queue'} =~ /\D/) {
 	my $QueueObj = RT::Queue->new($self->CurrentUser);
 	$QueueObj->Load($args{'Queue'});
 	$args{'Queue'} = $QueueObj->Id;
     }
 
-    # XXX - really naive implementation.  Slow. - not really. still just one query
-
-    my $CFs = RT::CustomFields->new($self->CurrentUser);
-
-    $CFs->Limit( FIELD => 'Name', VALUE => $args{'Name'} );
-    # Don't limit to queue if queue is 0.  Trying to do so breaks
-    # RT::Group type CFs.
-    if (defined $args{'Queue'}) {
-	$CFs->LimitToQueue( $args{'Queue'} );
-    }
-
-    # When loading by name, it's ok if they're disabled. That's not a big deal.
-    $CFs->{'find_disabled_rows'}=1;
-
-    # We only want one entry.
-    $CFs->RowsPerPage(1);
-    unless ($CFs->First) {
-        return(0);
-    }
-    return($self->Load($CFs->First->id));
+    return ( $self->LoadByCols( Name => $args{'Name'}, Queue => $args{'Queue'} ) );
 
 }
 
@@ -302,7 +169,6 @@ sub LoadByName {
 # {{{ Dealing with custom field values 
 
 =begin testing
-
 use_ok(RT::CustomField);
 ok(my $cf = RT::CustomField->new($RT::SystemUser));
 ok(my ($id, $msg)=  $cf->Create( Name => 'TestingCF',
@@ -312,13 +178,10 @@ ok(my ($id, $msg)=  $cf->Create( Name => 'TestingCF',
                                  Type=> 'SelectSingle'), 'Created a global CustomField');
 ok($id != 0, 'Global custom field correctly created');
 ok ($cf->SingleValue);
-is($cf->Type, 'Select');
-is($cf->MaxValues, 1);
+ok($cf->Type eq 'SelectSingle');
 
-my ($val, $msg) = $cf->SetMaxValues('0');
-ok($val, $msg);
-is($cf->Type, 'Select');
-is($cf->MaxValues, 0);
+ok($cf->SetType('SelectMultiple'));
+ok($cf->Type eq 'SelectMultiple');
 ok(!$cf->SingleValue );
 ok(my ($bogus_val, $bogus_msg) = $cf->SetType('BogusType') , "Trying to set a custom field's type to a bogus type");
 ok($bogus_val == 0, "Unable to set a custom field's type to a bogus type");
@@ -349,7 +212,7 @@ ok($cf->Id == 1);
 ok(my ($val,$msg)  = $cf->AddValue(Name => 'foo' , Description => 'TestCFValue', SortOrder => '6'));
 ok($val != 0);
 ok (my ($delval, $delmsg) = $cf->DeleteValue($val));
-ok ($delval,"Deleting a cf value: $delmsg");
+ok ($delval != 0);
 
 =end testing
 
@@ -362,7 +225,7 @@ sub AddValue {
 		     SortOrder => undef,
 		     @_ );
 
-    unless ($self->CurrentUserHasRight('AdminCustomField')) {
+    unless ($self->CurrentUserHasRight('AdminCustomFields')) {
         return (0, $self->loc('Permission Denied'));
     }
 
@@ -394,7 +257,7 @@ Does not remove this value for any article which has had it selected
 sub DeleteValue {
 	my $self = shift;
     my $id = shift;
-    unless ($self->CurrentUserHasRight('AdminCustomField')) {
+    unless ($self->CurrentUserHasRight('AdminCustomFields')) {
         return (0, $self->loc('Permission Denied'));
     }
 
@@ -426,14 +289,11 @@ Return a CustomFieldeValues object of all acceptable values for this Custom Fiel
 
 =cut
 
-*ValuesObj = \&Values;
-
 sub Values {
     my $self = shift;
 
     my $cf_values = RT::CustomFieldValues->new($self->CurrentUser);
-    # if the user has no rights, return an empty object
-    if ($self->id && $self->CurrentUserHasRight( 'SeeCustomField') ) {
+    if ( $self->__Value('Queue') == 0 || $self->CurrentUserHasRight( 'SeeQueue') ) {
         $cf_values->LimitToCustomField($self->Id);
     }
     return ($cf_values);
@@ -449,23 +309,21 @@ sub Values {
 
 =head2 ValuesForTicket TICKET
 
-Returns a RT::ObjectCustomFieldValues object of this Field's values for TICKET.
+Returns a RT::TicketCustomFieldValues object of this Field's values for TICKET.
 TICKET is a ticket id.
 
-This is deprecated -- use ValuesForObject instead.
-
 
 =cut
 
 sub ValuesForTicket {
 	my $self = shift;
     my $ticket_id = shift;
-    
-    $RT::Logger->debug( ref($self) . " -> ValuesForTicket deprecated in favor of ValuesForObject"); 
-    my $ticket = RT::Ticket->new($self->CurrentUser);
-    $ticket->Load($ticket_id);
 
-    return $self->ValuesForObject($ticket);
+	my $values = new RT::TicketCustomFieldValues($self->CurrentUser);
+	$values->LimitToCustomField($self->Id);
+    $values->LimitToTicket($ticket_id);
+
+	return ($values);
 }
 
 # }}}
@@ -476,8 +334,6 @@ sub ValuesForTicket {
 
 Adds a custom field value for a ticket. Takes a param hash of Ticket and Content
 
-This is deprecated -- use AddValueForObject instead.
-
 =cut
 
 sub AddValueForTicket {
@@ -485,12 +341,13 @@ sub AddValueForTicket {
 	my %args = ( Ticket => undef,
                  Content => undef,
 		     @_ );
-    $RT::Logger->debug( ref($self) . " -> AddValueForTicket deprecated in favor of AddValueForObject"); 
 
+	my $newval = RT::TicketCustomFieldValue->new($self->CurrentUser);
+	my $val = $newval->Create(Ticket => $args{'Ticket'},
+                            Content => $args{'Content'},
+                            CustomField => $self->Id);
 
-    my $ticket = RT::Ticket->new($self->CurrentUser);
-    $ticket->Load($args{'Ticket'});
-    return($self->AddValueForObject(Content => $args{'Content'}, Object => $ticket,@_));
+    return($val);
 
 }
 
@@ -503,8 +360,6 @@ sub AddValueForTicket {
 
 Adds a custom field value for a ticket. Takes a param hash of Ticket and Content
 
-This is deprecated -- use DeleteValueForObject instead.
-
 =cut
 
 sub DeleteValueForTicket {
@@ -513,15 +368,24 @@ sub DeleteValueForTicket {
                  Content => undef,
 		     @_ );
 
-    $RT::Logger->debug( ref($self) . " -> DeleteValueForTicket deprecated in favor of DeleteValueForObject"); 
-
-
-    my $ticket = RT::Ticket->new($self->CurrentUser);
-    $ticket->load($args{'Ticket'});
-    return ($self->DeleteValueForObject(Object => $ticket, Content => $args{'Content'}, @_));
+	my $oldval = RT::TicketCustomFieldValue->new($self->CurrentUser);
+    $oldval->LoadByTicketContentAndCustomField (Ticket => $args{'Ticket'}, 
+                                                Content =>  $args{'Content'}, 
+                                                CustomField => $self->Id );
+    # check ot make sure we found it
+    unless ($oldval->Id) {
+        return(0, $self->loc("Custom field value [_1] could not be found for custom field [_2]", $args{'Content'}, $self->Name));
+    }
+    # delete it
 
+    my $ret = $oldval->Delete();
+    unless ($ret) {
+        return(0, $self->loc("Custom field value could not be found"));
+    }
+    return(1, $self->loc("Custom field value deleted"));
 }
 
+
 # }}}
 # }}}
 
@@ -560,13 +424,13 @@ Retuns an array of the types of CustomField that are supported
 =cut
 
 sub Types {
-	return (keys %FieldTypes);
+	return (@TYPES);
 }
 
 # }}}
 
 
-=head2 FriendlyType [TYPE, MAX_VALUES]
+=head2 FriendlyType [TYPE]
 
 Returns a localized human-readable version of the custom field type.
 If a custom field type is specified as the parameter, the friendly type for that type will be returned
@@ -576,23 +440,25 @@ If a custom field type is specified as the parameter, the friendly type for that
 sub FriendlyType {
     my $self = shift;
 
-    my $type = @_ ? shift : $self->Type;
-    my $max  = @_ ? shift : $self->MaxValues;
+    my $type = shift || $self->Type;
 
-    if (my $friendly_type = $FieldTypes{$type}[$max>2 ? 2 : $max]) {
-	return ( $self->loc( $friendly_type, $max ) );
+    if ( $type eq 'SelectSingle' ) {
+        return ( $self->loc('Select one value') );
+    }
+    elsif ( $type eq 'SelectMultiple' ) {
+        return ( $self->loc('Select multiple values') );
+    }
+    elsif ( $type eq 'FreeformSingle' ) {
+        return ( $self->loc('Enter one value') );
+    }
+    elsif ( $type eq 'FreeformMultiple' ) {
+        return ( $self->loc('Enter multiple values') );
     }
     else {
-        return ( $self->loc( $type ) );
+        return ( $self->loc( $self->Type ) );
     }
 }
 
-sub FriendlyTypeComposite {
-    my $self = shift;
-    my $composite = shift || $self->TypeComposite;
-    return $self->FriendlyType(split(/-/, $composite, 2));
-}
-
 
 =head2 ValidateType TYPE
 
@@ -614,11 +480,7 @@ sub ValidateType {
     my $self = shift;
     my $type = shift;
 
-    if ($type =~ s/(?:Single|Multiple)$//) {
-	$RT::Logger->warning( "Prefix 'Single' and 'Multiple' to Type deprecated, use MaxValues instead");
-    }
-
-    if( $FieldTypes{$type}) {
+    if( $TYPES{$type}) {
         return(1);
     }
     else {
@@ -626,17 +488,6 @@ sub ValidateType {
     }
 }
 
-
-sub SetType {
-    my $self = shift;
-    my $type = shift;
-    if ($type =~ s/(?:(Single)|Multiple)$//) {
-	warn "'Single' and 'Multiple' on SetType deprecated, use SetMaxValues instead";
-	$self->SetMaxValues($1 ? 1 : 0);
-    }
-    $self->SUPER::SetType($type);
-}
-
 # {{{ SingleValue
 
 =head2 SingleValue
@@ -648,17 +499,7 @@ Returns false if it accepts multiple values
 
 sub SingleValue {
     my $self = shift;
-    if ($self->MaxValues == 1) {
-        return 1;
-    } 
-    else {
-        return undef;
-    }
-}
-
-sub UnlimitedValues {
-    my $self = shift;
-    if ($self->MaxValues == 0) {
+    if ($self->Type =~  /Single$/) {
         return 1;
     } 
     else {
@@ -677,13 +518,14 @@ Helper function to call the custom field's queue's CurrentUserHasRight with the
 =cut
 
 sub CurrentUserHasRight {
-    my $self  = shift;
+    my $self = shift;
     my $right = shift;
-
-    return $self->CurrentUser->HasRight(
-	Object => $self,
-	Right  => $right,
-    );
+    # if there's no queue, we want to know about a global right
+    if ( ( !defined $self->__Value('Queue') ) || ( $self->__Value('Queue') == 0 ) ) {
+         return $self->CurrentUser->HasRight( Object => $RT::System, Right => $right); 
+    } else {
+        return ( $self->QueueObj->CurrentUserHasRight($right) );
+    }
 }
 
 # }}}
@@ -693,7 +535,7 @@ sub CurrentUserHasRight {
 sub _Set {
     my $self = shift;
 
-    unless ( $self->CurrentUserHasRight('AdminCustomField') ) {
+    unless ( $self->CurrentUserHasRight('AdminCustomFields') ) {
         return ( 0, $self->loc('Permission Denied') );
     }
     return ( $self->SUPER::_Set(@_) );
@@ -716,10 +558,16 @@ sub _Value {
     my $self  = shift;
     my $field = shift;
 
-    # we need to do the rights check
-    unless ( $self->id && $self->CurrentUserHasRight( 'SeeCustomField') ) {
-	    return (undef);
-    }
+    # We need to expose the queue so that we can do things like ACL checks
+    if ( $field eq 'Queue') {
+          return ( $self->SUPER::_Value($field) );
+     }
+
+
+    #Anybody can see global custom fields, otherwise we need to do the rights check
+        unless ( $self->__Value('Queue') == 0 || $self->CurrentUserHasRight( 'SeeQueue') ) {
+            return (undef);
+        }
     return ( $self->__Value($field) );
 
 }
@@ -737,368 +585,4 @@ Takes a boolean.
 
 # }}}
 
-sub Queue {
-    $RT::Logger->debug( ref($_[0]) . " -> Queue deprecated");
-    
-    return 0;
-}
-
-sub SetQueue {
-    $RT::Logger->debug( ref($_[0]) . " -> SetQueue deprecated");
-
-    return 0;
-}
-
-sub QueueObj {
-    $RT::Logger->debug( ref($_[0]) . " -> QueueObj deprecated");
-
-    return undef;
-}
-
-=head2 SetTypeComposite
-
-Set this custom field's type and maximum values as a composite value
-
-
-=cut
-
-sub SetTypeComposite {
-    my $self = shift;
-    my $composite = shift;
-    my ($type, $max_values) = split(/-/, $composite, 2);
-    $self->SetType($type);
-    $self->SetMaxValues($max_values);
-}
-
-=head2 SetLookupType
-
-Autrijus: care to doc how LookupTypes work?
-
-=cut
-
-sub SetLookupType {
-    my $self = shift;
-    my $lookup = shift;
-    if ($lookup ne $self->LookupType) {
-	# Okay... We need to invalidate our existing relationships
-	my $ObjectCustomFields = RT::ObjectCustomFields->new($self->CurrentUser);
-	$ObjectCustomFields->LimitToCustomField($self->Id);
-	$_->Delete foreach @{$ObjectCustomFields->ItemsArrayRef};
-    }
-    $self->SUPER::SetLookupType($lookup);
-}
-
-=head2 TypeComposite
-
-Returns a composite value composed of this object's type and maximum values
-
-=cut
-
-
-sub TypeComposite {
-    my $self = shift;
-    join('-', $self->Type, $self->MaxValues);
-}
-
-=head2 TypeComposites
-
-Returns an array of all possible composite values for custom fields.
-
-=cut
-
-sub TypeComposites {
-    my $self = shift;
-    return grep !/Text-0/, map { ("$_-1", "$_-0") } $self->Types;
-}
-
-=head2 LookupTypes
-
-Returns an array of LookupTypes available
-
-=cut
-
-
-sub LookupTypes {
-    my $self = shift;
-    return keys %FRIENDLY_OBJECT_TYPES;
-}
-
-my @FriendlyObjectTypes = (
-    "[_1] objects",		    # loc
-    "[_1]'s [_2] objects",	    # loc
-    "[_1]'s [_2]'s [_3] objects",   # loc
-);
-
-=head2 FriendlyTypeLookup
-
-=cut
-
-sub FriendlyLookupType {
-    my $self = shift;
-    my $lookup = shift || $self->LookupType;
-   
-    return ($self->loc( $FRIENDLY_OBJECT_TYPES{$lookup} ))
-      	           if (defined  $FRIENDLY_OBJECT_TYPES{$lookup} );
-
-    my @types = map { s/^RT::// ? $self->loc($_) : $_ }
-      grep { defined and length }
-      split( /-/, $lookup )
-      or return;
-    return ( $self->loc( $FriendlyObjectTypes[$#types], @types ) );
-}
-
-
-=head2 AddToObject OBJECT
-
-Add this custom field as a custom field for a single object, such as a queue or group.
-
-Takes an object 
-
-=cut
-
-
-sub AddToObject {
-    my $self  = shift;
-    my $object = shift;
-    my $id = $object->Id || 0;
-
-    unless (index($self->LookupType, ref($object)) == 0) {
-    	return ( 0, $self->loc('Lookup type mismatch') );
-    }
-
-    unless ( $object->CurrentUserHasRight('AssignCustomFields') ) {
-        return ( 0, $self->loc('Permission Denied') );
-    }
-
-    my $ObjectCF = RT::ObjectCustomField->new( $self->CurrentUser );
-
-    $ObjectCF->LoadByCols( ObjectId => $id, CustomField => $self->Id );
-    if ( $ObjectCF->Id ) {
-        return ( 0, $self->loc("That is already the current value") );
-    }
-    my ( $id, $msg ) =
-      $ObjectCF->Create( ObjectId => $id, CustomField => $self->Id );
-
-    return ( $id, $msg );
-}
-
-
-=head2 RemoveFromObject OBJECT
-
-Remove this custom field  for a single object, such as a queue or group.
-
-Takes an object 
-
-=cut
-
-
-sub RemoveFromObject {
-    my $self = shift;
-    my $object = shift;
-    my $id = $object->Id || 0;
-
-    unless (index($self->LookupType, ref($object)) == 0) {
-	return ( 0, $self->loc('Object type mismatch') );
-    }
-
-    unless ( $object->CurrentUserHasRight('AssignCustomFields') ) {
-        return ( 0, $self->loc('Permission Denied') );
-    }
-
-    my $ObjectCF = RT::ObjectCustomField->new( $self->CurrentUser );
-
-    $ObjectCF->LoadByCols( ObjectId => $id, CustomField => $self->Id );
-    unless ( $ObjectCF->Id ) {
-        return ( 0, $self->loc("This custom field does not apply to that object") );
-    }
-    my ( $id, $msg ) = $ObjectCF->Delete;
-
-    return ( $id, $msg );
-}
-
-# {{{ AddValueForObject
-
-=head2 AddValueForObject HASH
-
-Adds a custom field value for a record object of some kind. 
-Takes a param hash of 
-
-Required:
-
-    Object
-    Content
-
-Optional:
-
-    LargeContent
-    ContentType
-
-=cut
-
-sub AddValueForObject {
-    my $self = shift;
-    my %args = (
-        Object       => undef,
-        Content      => undef,
-        LargeContent => undef,
-        ContentType  => undef,
-        @_
-    );
-    my $obj = $args{'Object'} or return;
-
-    unless ( $self->CurrentUserHasRight('ModifyCustomField') ) {
-        return ( 0, $self->loc('Permission Denied') );
-    }
-
-    $RT::Handle->BeginTransaction;
-
-    my $current_values = $self->ValuesForObject($obj);
-
-    if ( $self->MaxValues ) {
-        my $extra_values = ( $current_values->Count + 1 ) - $self->MaxValues;
-
-        # (The +1 is for the new value we're adding)
-
-        # If we have a set of current values and we've gone over the maximum
-        # allowed number of values, we'll need to delete some to make room.
-        # which former values are blown away is not guaranteed
-
-        while ($extra_values) {
-            my $extra_item = $current_values->Next;
-
-            unless ( $extra_item->id ) {
-                $RT::Logger->crit(
-"We were just asked to delete a custom fieldvalue that doesn't exist!"
-                );
-                $RT::Handle->Rollback();
-                return (undef);
-            }
-            $extra_item->Delete;
-            $extra_values--;
-
-        }
-    }
-    my $newval = RT::ObjectCustomFieldValue->new( $self->CurrentUser );
-    my $val    = $newval->Create(
-        ObjectType   => ref($obj),
-        ObjectId     => $obj->Id,
-        Content      => $args{'Content'},
-        LargeContent => $args{'LargeContent'},
-        ContentType  => $args{'ContentType'},
-        CustomField  => $self->Id
-    );
-
-    unless ($val) {
-        $RT::Handle->Rollback();
-        return ($val);
-    }
-
-    $RT::Handle->Commit();
-    return ($val);
-
-}
-
-# }}}
-
-# {{{ DeleteValueForObject
-
-=head2 DeleteValueForObject HASH
-
-Deletes a custom field value for a ticket. Takes a param hash of Object and Content
-
-Returns a tuple of (STATUS, MESSAGE). If the call succeeded, the STATUS is true. otherwise it's false
-
-=cut
-
-sub DeleteValueForObject {
-    my $self = shift;
-    my %args = ( Object => undef,
-                 Content => undef,
-                 Id => undef,
-		     @_ );
-
-
-    unless ($self->CurrentUserHasRight('ModifyCustomField')) {
-        return (0, $self->loc('Permission Denied'));
-    }
-
-    my $oldval = RT::ObjectCustomFieldValue->new($self->CurrentUser);
-
-    if (my $id = $args{'Id'}) {
-	$oldval->Load($id);
-    }
-    unless ($oldval->id) { 
-	$oldval->LoadByObjectContentAndCustomField(
-	    Object => $args{'Object'}, 
-	    Content =>  $args{'Content'}, 
-	    CustomField => $self->Id,
-	);
-    }
-
-
-    # check ot make sure we found it
-    unless ($oldval->Id) {
-        return(0, $self->loc("Custom field value [_1] could not be found for custom field [_2]", $args{'Content'}, $self->Name));
-    }
-    # delete it
-
-    my $ret = $oldval->Delete();
-    unless ($ret) {
-        return(0, $self->loc("Custom field value could not be found"));
-    }
-    return($oldval->Id, $self->loc("Custom field value deleted"));
-}
-
-
-=head2 ValuesForObject OBJECT
-
-Return an RT::ObjectCustomFieldValues object containing all of this custom field's values for OBJECT 
-
-=cut
-
-sub ValuesForObject {
-	my $self = shift;
-    my $object = shift;
-
-	my $values = new RT::ObjectCustomFieldValues($self->CurrentUser);
-	unless ($self->CurrentUserHasRight('SeeCustomField')) {
-        # Return an empty object if they have no rights to see
-        return ($values);
-    }
-	
-	
-	$values->LimitToCustomField($self->Id);
-	$values->LimitToEnabled();
-    $values->LimitToObject($object);
-
-	return ($values);
-}
-
-
-=head2 _ForObjectType PATH FRIENDLYNAME
-
-Tell RT that a certain object accepts custom fields
-
-Examples:
-
-    'RT::Queue-RT::Ticket'                 => "Tickets",		# loc
-    'RT::Queue-RT::Ticket-RT::Transaction' => "Ticket Transactions",	# loc
-    'RT::User'                             => "Users",			# loc
-    'RT::Group'                            => "Groups",			# loc
-
-This is a class method. 
-
-=cut
-
-sub _ForObjectType {
-    my $self = shift;
-    my $path = shift;
-    my $friendly_name = shift;
-
-    $FRIENDLY_OBJECT_TYPES{$path} = $friendly_name;
-
-}
-
-# }}}
-
 1;
diff --git a/rt/lib/RT/CustomFields.pm b/rt/lib/RT/CustomFields.pm
index aac2d4b..b1e48df 100644
--- a/rt/lib/RT/CustomFields.pm
+++ b/rt/lib/RT/CustomFields.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -83,15 +83,10 @@ sub _Init {
 
 
 
-  # By default, order by SortOrder
-  $self->OrderByCols(
-	 { ALIAS => 'main',
-	   FIELD => 'SortOrder',
-	   ORDER => 'ASC' },
-	 { ALIAS => 'main',
-	   FIELD => 'id',
-	   ORDER => 'ASC' },
-     );
+  # By default, order by name
+  $self->OrderBy( ALIAS => 'main',
+                  FIELD => 'SortOrder',
+                  ORDER => 'ASC');
 
     return ( $self->SUPER::_Init(@_) );
 }
@@ -134,7 +129,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/CustomFields_Overlay.pm b/rt/lib/RT/CustomFields_Overlay.pm
index ca80fa2..b22e8b4 100644
--- a/rt/lib/RT/CustomFields_Overlay.pm
+++ b/rt/lib/RT/CustomFields_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::CustomFields - a collection of RT CustomField objects
@@ -65,31 +64,13 @@ ok (require RT::CustomFields);
 
 =cut
 
-
-package RT::CustomFields;
-
 use strict;
 no warnings qw(redefine);
-use DBIx::SearchBuilder::Unique;
-
-
-sub _OCFAlias {
-    my $self = shift;
-    unless ($self->{_sql_ocfalias}) {
-
-        $self->{'_sql_ocfalias'} = $self->NewAlias('ObjectCustomFields');
-    $self->Join( ALIAS1 => 'main',
-                FIELD1 => 'id',
-                ALIAS2 => $self->_OCFAlias,
-                FIELD2 => 'CustomField' );
-    }
-    return($self->{_sql_ocfalias});
-}
 
 
 # {{{ sub LimitToGlobalOrQueue 
 
-=head2 LimitToGlobalOrQueue QUEUEID
+=item LimitToGlobalOrQueue QUEUEID
 
 Limits the set of custom fields found to global custom fields or those tied to the queue with ID QUEUEID 
 
@@ -98,8 +79,8 @@ Limits the set of custom fields found to global custom fields or those tied to t
 sub LimitToGlobalOrQueue {
     my $self = shift;
     my $queue = shift;
-    $self->LimitToGlobalOrObjectId( $queue );
-    $self->LimitToLookupType( 'RT::Queue-RT::Ticket' );
+    $self->LimitToQueue($queue);
+    $self->LimitToGlobal();
 }
 
 # }}}
@@ -118,12 +99,11 @@ sub LimitToQueue  {
    my $self = shift;
   my $queue = shift;
  
-  $self->Limit (ALIAS => $self->_OCFAlias,
-                ENTRYAGGREGATOR => 'OR',
-		FIELD => 'ObjectId',
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Queue',
 		VALUE => "$queue")
       if defined $queue;
-  $self->LimitToLookupType( 'RT::Queue-RT::Ticket' );
+  
 }
 # }}}
 
@@ -141,11 +121,10 @@ another call to this method or LimitToQueue
 sub LimitToGlobal  {
    my $self = shift;
  
-  $self->Limit (ALIAS => $self->_OCFAlias,
-                ENTRYAGGREGATOR => 'OR',
-		FIELD => 'ObjectId',
+  $self->Limit (ENTRYAGGREGATOR => 'OR',
+		FIELD => 'Queue',
 		VALUE => 0);
-  $self->LimitToLookupType( 'RT::Queue-RT::Ticket' );
+  
 }
 # }}}
 
@@ -154,9 +133,9 @@ sub LimitToGlobal  {
 
 =head2 _DoSearch
 
-A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that 
- _Disabled rows never get seen unless we're explicitly trying to see 
-them.
+  A subclass of DBIx::SearchBuilder::_DoSearch that makes sure that _Disabled ro
+ws never get seen unless
+we're explicitly trying to see them.
 
 =cut
 
@@ -173,91 +152,6 @@ sub _DoSearch {
 }
 
 # }}}
-
-# {{{ sub Next 
-
-=head2 Next
-
-Returns the next custom field that this user can see.
-
-=cut
-  
-sub Next {
-    my $self = shift;
-    
-    
-    my $CF = $self->SUPER::Next();
-    if ((defined($CF)) and (ref($CF))) {
-
-	if ($CF->CurrentUserHasRight('SeeCustomField')) {
-	    return($CF);
-	}
-	
-	#If the user doesn't have the right to show this queue
-	else {	
-	    return($self->Next());
-	}
-    }
-    #if there never was any queue
-    else {
-	return(undef);
-    }	
-    
-}
-# }}}
-
-sub LimitToLookupType  {
-    my $self = shift;
-    my $lookup = shift;
- 
-    $self->Limit( FIELD => 'LookupType', VALUE => "$lookup" );
-}
-
-sub LimitToChildType  {
-    my $self = shift;
-    my $lookup = shift;
- 
-    $self->Limit( FIELD => 'LookupType', VALUE => "$lookup" );
-    $self->Limit( FIELD => 'LookupType', ENDSWITH => "$lookup" );
-}
-
-sub LimitToParentType  {
-    my $self = shift;
-    my $lookup = shift;
- 
-    $self->Limit( FIELD => 'LookupType', VALUE => "$lookup" );
-    $self->Limit( FIELD => 'LookupType', STARTSWITH => "$lookup" );
-}
-
-sub LimitToGlobalOrObjectId {
-    my $self = shift;
-    my $global_only = 1;
-
-
-    foreach my $id (@_) {
-	$self->Limit( ALIAS           => $self->_OCFAlias,
-		    FIELD           => 'ObjectId',
-		    OPERATOR        => '=',
-		    VALUE           => $id || 0,
-		    ENTRYAGGREGATOR => 'OR' );
-	$global_only = 0 if $id;
-    }
-
-    $self->Limit( ALIAS           => $self->_OCFAlias,
-                 FIELD           => 'ObjectId',
-                 OPERATOR        => '=',
-                 VALUE           => 0,
-                 ENTRYAGGREGATOR => 'OR' ) unless $global_only;
-
-    $self->OrderByCols(
-	{ ALIAS => $self->_OCFAlias, FIELD => 'ObjectId' },
-	{ ALIAS => $self->_OCFAlias, FIELD => 'SortOrder' },
-    );
-    
-    # This doesn't work on postgres. 
-    #$self->OrderBy( ALIAS => $class_cfs , FIELD => "SortOrder", ORDER => 'ASC');
-
-}
   
 1;
 
diff --git a/rt/lib/RT/Date.pm b/rt/lib/RT/Date.pm
index 620acc7..a000b8d 100644
--- a/rt/lib/RT/Date.pm
+++ b/rt/lib/RT/Date.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Date - a simple Object Oriented date.
@@ -399,7 +398,6 @@ sub AsString {
 # }}}
 
 # {{{ GetWeekday
-
 =head2 GetWeekday DAY
 
 Takes an integer day of week and returns a localized string for that day of week
@@ -422,7 +420,6 @@ sub GetWeekday {
 # }}}
 
 # {{{ GetMonth
-
 =head2 GetMonth DAY
 
 Takes an integer month and returns a localized string for that month 
@@ -575,7 +572,6 @@ sub W3CDTF {
 # }}}
 
 # {{{ sub LocalTimezone 
-
 =head2 LocalTimezone
 
   Returns the current timezone. For now, draws off a system timezone, RT::Timezone. Eventually, this may
diff --git a/rt/lib/RT/EmailParser.pm b/rt/lib/RT/EmailParser.pm
index 3a99e5a..8ed810c 100644
--- a/rt/lib/RT/EmailParser.pm
+++ b/rt/lib/RT/EmailParser.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::EmailParser;
 
 
@@ -77,7 +77,6 @@ ok(require RT::EmailParser);
 
 =head2 new
 
-Returns a new RT::EmailParser object
 
 =cut
 
@@ -90,12 +89,96 @@ sub new  {
 }
 
 
-# {{{ sub SmartParseMIMEEntityFromScalar
+
+# {{{ sub debug
+
+sub debug {
+    my $val = shift;
+    my ($debug);
+    if ($val) {
+        $RT::Logger->debug( $val . "\n" );
+        if ($debug) {
+            print STDERR "$val\n";
+        }
+    }
+    if ($debug) {
+        return (1);
+    }
+}
+
+# }}}
+
+# {{{ sub CheckForLoops 
+
+sub CheckForLoops {
+    my $self = shift;
+
+    my $head = $self->Head;
+
+    #If this instance of RT sent it our, we don't want to take it in
+    my $RTLoop = $head->get("X-RT-Loop-Prevention") || "";
+    chomp($RTLoop);    #remove that newline
+    if ( $RTLoop =~ /^\Q$RT::rtname\E/o ) {
+        return (1);
+    }
+
+    # TODO: We might not trap the case where RT instance A sends a mail
+    # to RT instance B which sends a mail to ...
+    return (undef);
+}
+
+# }}}
+
+# {{{ sub CheckForSuspiciousSender
+
+sub CheckForSuspiciousSender {
+    my $self = shift;
+
+    #if it's from a postmaster or mailer daemon, it's likely a bounce.
+
+    #TODO: better algorithms needed here - there is no standards for
+    #bounces, so it's very difficult to separate them from anything
+    #else.  At the other hand, the Return-To address is only ment to be
+    #used as an error channel, we might want to put up a separate
+    #Return-To address which is treated differently.
+
+    #TODO: search through the whole email and find the right Ticket ID.
+
+    my ( $From, $junk ) = $self->ParseSenderAddressFromHead();
+
+    if ( ( $From =~ /^mailer-daemon/i ) or ( $From =~ /^postmaster/i ) ) {
+        return (1);
+
+    }
+
+    return (undef);
+
+}
+
+# }}}
+
+# {{{ sub CheckForAutoGenerated
+sub CheckForAutoGenerated {
+    my $self = shift;
+    my $head = $self->Head;
+
+    my $Precedence = $head->get("Precedence") || "";
+    if ( $Precedence =~ /^(bulk|junk)/i ) {
+        return (1);
+    }
+    else {
+        return (undef);
+    }
+}
+
+# }}}
+
 
 =head2 SmartParseMIMEEntityFromScalar { Message => SCALAR_REF, Decode => BOOL }
 
 Parse a message stored in a scalar from scalar_ref
 
+
 =cut
 
 sub SmartParseMIMEEntityFromScalar {
@@ -140,16 +223,8 @@ sub SmartParseMIMEEntityFromScalar {
 
 }
 
-# }}}
-
 # {{{ sub ParseMIMEEntityFromSTDIN
 
-=head2 ParseMIMEEntityFromSTDIN
-
-Parse a message from standard input
-
-=cut
-
 sub ParseMIMEEntityFromSTDIN {
     my $self = shift;
     my $postprocess = (@_ ? shift : 1);
@@ -158,8 +233,6 @@ sub ParseMIMEEntityFromSTDIN {
 
 # }}}
 
-# {{{ ParseMIMEEntityFromScalar
-
 =head2 ParseMIMEEntityFromScalar  $message
 
 Takes either a scalar or a reference to a scalr which contains a stringified MIME message.
@@ -168,6 +241,7 @@ Parses it.
 Returns true if it wins.
 Returns false if it loses.
 
+
 =cut
 
 sub ParseMIMEEntityFromScalar {
@@ -177,7 +251,6 @@ sub ParseMIMEEntityFromScalar {
     $self->_ParseMIMEEntity($message,'parse_data', $postprocess);
 }
 
-# }}}
 
 # {{{ ParseMIMEEntityFromFilehandle *FH
 
@@ -212,8 +285,8 @@ sub ParseMIMEEntityFromFile {
 }
 
 # }}}
-
-# {{{ _ParseMIMEEntity
+#
+#  {{{ _ParseMIMEEntity {
 sub _ParseMIMEEntity {
     my $self = shift;
     my $message = shift;
@@ -241,6 +314,7 @@ sub _ParseMIMEEntity {
 
 }
 
+
 # }}}
 
 # {{{ _PostProcessNewEntity 
@@ -256,17 +330,12 @@ sub _PostProcessNewEntity {
 
     #Now we've got a parsed mime object. 
 
-    # Unfold headers that are have embedded newlines
-    #  Better do this before conversion or it will break
-    #  with multiline encoded Subject (RFC2047) (fsck.com #5594)
-    
-    $self->Head->unfold;
-
-
     # try to convert text parts into utf-8 charset
     RT::I18N::SetMIMEEntityToEncoding($self->{'entity'}, 'utf-8');
 
 
+    # Unfold headers that are have embedded newlines
+    $self->Head->unfold;
 
 
 }
@@ -277,10 +346,17 @@ sub _PostProcessNewEntity {
 
 sub ParseTicketId {
     my $self = shift;
-    $RT::Logger->warnings("RT::EmailParser->ParseTicketId deprecated. You should be using RT::Interface::Email");
 
-    require RT::Interface::Email;
-    RT::Interface::Email::ParseTicketId(@_);
+    my $Subject = shift;
+
+    if ( $Subject =~ s/\[\Q$RT::rtname\E\s+\#(\d+)\s*\]//i ) {
+        my $id = $1;
+        $RT::Logger->debug("Found a ticket ID. It's $id");
+        return ($id);
+    }
+    else {
+        return (undef);
+    }
 }
 
 # }}}
@@ -317,10 +393,10 @@ sub ParseCcAddressesFromHead {
         my $Address = $AddrObj->address;
         my $user = RT::User->new($RT::SystemUser);
         $Address = $user->CanonicalizeEmailAddress($Address);
-        next if ( lc $args{'CurrentUser'}->EmailAddress   eq lc $Address );
-        next if ( lc $args{'QueueObj'}->CorrespondAddress eq lc $Address );
-        next if ( lc $args{'QueueObj'}->CommentAddress    eq lc $Address );
-        next if ( $self->IsRTAddress($Address) );
+        next if ( $args{'CurrentUser'}->EmailAddress   =~ /^$Address$/i );
+        next if ( $args{'QueueObj'}->CorrespondAddress =~ /^$Address$/i );
+        next if ( $args{'QueueObj'}->CommentAddress    =~ /^$Address$/i );
+        next if ( IsRTAddress($Address) );
 
         push ( @Addresses, $Address );
     }
@@ -413,7 +489,7 @@ sub ParseAddressFromHeader {
 
 # {{{ IsRTAddress
 
-=head2 IsRTaddress ADDRESS
+=item IsRTaddress ADDRESS
 
 Takes a single parameter, an email address. 
 Returns true if that address matches the $RTAddressRegexp.  
@@ -447,7 +523,7 @@ sub IsRTAddress {
 
 # {{{ CullRTAddresses
 
-=head2 CullRTAddresses ARRAY
+=item CullRTAddresses ARRAY
 
 Takes a single argument, an array of email addresses.
 Returns the same array with any IsRTAddress()es weeded out.
@@ -468,10 +544,7 @@ sub CullRTAddresses {
     my @addrlist;
 
     foreach my $addr( @addresses ) {
-                                 # We use the class instead of the instance
-                                 # because sloppy code calls this method
-                                 # without a $self
-      push (@addrlist, $addr)    unless RT::EmailParser->IsRTAddress($addr);
+      push (@addrlist, $addr)    unless IsRTAddress("", $addr);
     }
     return (@addrlist);
 }
@@ -495,7 +568,7 @@ sub CullRTAddresses {
 # template for the rejection message.
 
 
-=head2 LookupExternalUserInfo
+=item LookupExternalUserInfo
 
  LookupExternalUserInfo is a site-definable method for synchronizing
  incoming users with an external data source. 
@@ -508,12 +581,12 @@ sub CullRTAddresses {
 
  It returns (FoundInExternalDatabase, ParamHash);
 
-   FoundInExternalDatabase must  be set to 1 before return if the user 
-   was found in the external database.
+   FoundInExternalDatabase must  be set to 1 before return if the user was
+   found in the external database.
 
-   ParamHash is a Perl parameter hash which can contain at least the 
-   following fields. These fields are used to populate RT's users 
-   database when the user is created.
+   ParamHash is a Perl parameter hash which can contain at least the following
+   fields. These fields are used to populate RT's users database when the user 
+   is created
 
     EmailAddress is the email address that RT should use for this user.  
     Name is the 'Name' attribute RT should use for this user. 
@@ -568,7 +641,6 @@ sub Entity {
 }
 
 # }}}
-
 # {{{ _SetupMIMEParser 
 
 =head2 _SetupMIMEParser $parser
@@ -614,6 +686,7 @@ sub _SetupMIMEParser {
     # Temp files should never be recycled, especially when running under perl taint checking
     
     $parser->tmp_recycling(0);
+    
 
 }
 
diff --git a/rt/lib/RT/Group.pm b/rt/lib/RT/Group.pm
index 04c3076..60f7fb7 100755
--- a/rt/lib/RT/Group.pm
+++ b/rt/lib/RT/Group.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -224,17 +224,17 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         Name => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         Description => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         Domain => 
-		{read => 1, write => 1, sql_type => 12, length => 64,  is_blob => 0,  is_numeric => 0,  type => 'varchar(64)', default => ''},
+		{read => 1, write => 1, type => 'varchar(64)', default => ''},
         Type => 
-		{read => 1, write => 1, sql_type => 12, length => 64,  is_blob => 0,  is_numeric => 0,  type => 'varchar(64)', default => ''},
+		{read => 1, write => 1, type => 'varchar(64)', default => ''},
         Instance => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, write => 1, type => 'int(11)', default => ''},
 
  }
 };
@@ -266,7 +266,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/GroupMember.pm b/rt/lib/RT/GroupMember.pm
index 692303a..e116519 100755
--- a/rt/lib/RT/GroupMember.pm
+++ b/rt/lib/RT/GroupMember.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -161,11 +161,11 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         GroupId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         MemberId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
 
  }
 };
@@ -197,7 +197,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/GroupMember_Overlay.pm b/rt/lib/RT/GroupMember_Overlay.pm
index d824dc4..5ff7b3e 100644
--- a/rt/lib/RT/GroupMember_Overlay.pm
+++ b/rt/lib/RT/GroupMember_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::GroupMember - a member of an RT Group
@@ -73,9 +72,6 @@ ok (require RT::GroupMember);
 
 =cut
 
-
-package RT::GroupMember;
-
 use strict;
 no warnings qw(redefine);
 use RT::CachedGroupMembers;
@@ -124,7 +120,7 @@ sub Create {
 
     #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
     # TODO what about the groups key cache?
-    RT::Principal->InvalidateACLCache();
+    RT::Principal->_InvalidateACLCache();
 
     $RT::Handle->BeginTransaction() unless ($args{'InsideTransaction'});
 
@@ -233,7 +229,7 @@ sub _StashUser {
 
     #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
     # TODO what about the groups key cache?
-    RT::Principal->InvalidateACLCache();
+    RT::Principal->_InvalidateACLCache();
 
 
     # We really need to make sure we don't add any members to this group
@@ -307,6 +303,9 @@ sub Delete {
         VALUE    => $self->GroupObj->Id
     );
 
+    #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
+    # TODO what about the groups key cache?
+    RT::Principal->_InvalidateACLCache();
 
 
 
@@ -320,27 +319,12 @@ sub Delete {
         }
     }
 
-    my ($err, $msg) = $self->SUPER::Delete();
+    my $err = $self->SUPER::Delete();
     unless ($err) {
             $RT::Logger->warning("Couldn't delete cached group submember ".$self->Id);
         $RT::Handle->Rollback();
         return (undef);
     }
-
-    # Since this deletion may have changed the former member's
-    # delegation rights, we need to ensure that no invalid delegations
-    # remain.
-    $err = $self->MemberObj->_CleanupInvalidDelegations(InsideTransaction => 1);
-    unless ($err) {
-	$RT::Logger->warning("Unable to revoke delegated rights for principal ".$self->Id);
-	$RT::Handle->Rollback();
-	return (undef);
-    }
-
-    #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
-    # TODO what about the groups key cache?
-    RT::Principal->InvalidateACLCache();
-
     $RT::Handle->Commit();
     return ($err);
 
diff --git a/rt/lib/RT/GroupMembers.pm b/rt/lib/RT/GroupMembers.pm
index 2cf2cd3..bd74c51 100755
--- a/rt/lib/RT/GroupMembers.pm
+++ b/rt/lib/RT/GroupMembers.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/GroupMembers_Overlay.pm b/rt/lib/RT/GroupMembers_Overlay.pm
index 1b6f931..6814c53 100644
--- a/rt/lib/RT/GroupMembers_Overlay.pm
+++ b/rt/lib/RT/GroupMembers_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::GroupMembers - a collection of RT::GroupMember objects
@@ -66,9 +65,6 @@ ok (require RT::GroupMembers);
 
 =cut
 
-
-package RT::GroupMembers;
-
 use strict;
 no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Group_Overlay.pm b/rt/lib/RT/Group_Overlay.pm
index 41cf497..69ada31 100644
--- a/rt/lib/RT/Group_Overlay.pm
+++ b/rt/lib/RT/Group_Overlay.pm
@@ -1,9 +1,9 @@
 
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Released under the terms of version 2 of the GNU Public License
 
 =head1 NAME
@@ -52,13 +52,21 @@
 
 =head1 SYNOPSIS
 
-use RT::Group;
+  use RT::Group;
 my $group = new RT::Group($CurrentUser);
 
 =head1 DESCRIPTION
 
 An RT group object.
 
+=head1 AUTHOR
+
+Jesse Vincent, jesse@bestpractical.com
+
+=head1 SEE ALSO
+
+RT
+
 =head1 METHODS
 
 
@@ -146,9 +154,6 @@ ok($group_3->HasMemberRecursively($principal_2) == undef, "group 3 has member 2
 
 =cut
 
-
-package RT::Group;
-
 use strict;
 no warnings qw(redefine);
 
@@ -166,7 +171,6 @@ $RIGHTS = {
     ModifyOwnMembership => 'Join or leave this group',                 # loc_pair
     EditSavedSearches => 'Edit saved searches for this group',        # loc_pair
     ShowSavedSearches => 'Display saved searches for this group',        # loc_pair
-    SeeGroup => 'Make this group visible to user',                    # loc_pair
 };
 
 # Tell RT::ACE that this sort of object can get acls granted
@@ -431,7 +435,6 @@ sub LoadSystemRoleGroup {
 # }}}
 
 # {{{ sub Create
-
 =head2 Create
 
 You need to specify what sort of group you're creating by calling one of the other
@@ -466,7 +469,6 @@ sub _Create {
         Type        => undef,
         Instance    => '0',
         InsideTransaction => undef,
-        _RecordTransaction => 1,
         @_
     );
 
@@ -512,12 +514,8 @@ sub _Create {
     $cgm->Create(Group =>$self->PrincipalObj, Member => $self->PrincipalObj, ImmediateParent => $self->PrincipalObj);
 
 
-    if ( $args{'_RecordTransaction'} ) {
-	$self->_NewTransaction( Type => "Create" );
-    }
 
     $RT::Handle->Commit() unless ($args{'InsideTransaction'});
-
     return ( $id, $self->loc("Group created") );
 }
 
@@ -712,7 +710,6 @@ If passed a positive value, this group will be disabled. No rights it commutes o
 It will not appear in most group listings.
 
 This routine finds all the cached group members that are members of this group  (recursively) and disables them.
-
 =cut 
 
  # }}}
@@ -757,7 +754,7 @@ This routine finds all the cached group members that are members of this group
 
     #Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space. 
     # TODO what about the groups key cache?
-    RT::Principal->InvalidateACLCache();
+    RT::Principal->_InvalidateACLCache();
 
 
 
@@ -789,8 +786,7 @@ sub Disabled {
 
 =head2 DeepMembersObj
 
-Returns an RT::CachedGroupMembers object of this group's members,
-including all members of subgroups.
+Returns an RT::CachedGroupMembers object of this group's members.
 
 =cut
 
@@ -843,7 +839,7 @@ sub UserMembersObj {
 
 =head2 MembersObj
 
-Returns an RT::GroupMembers object of this group's direct members.
+Returns an RT::CachedGroupMembers object of this group's members.
 
 =cut
 
@@ -1169,70 +1165,11 @@ sub _DeleteMember {
 
 # }}}
 
-# {{{ sub _CleanupInvalidDelegations
-
-=head2 _CleanupInvalidDelegations { InsideTransaction => undef }
-
-Revokes all ACE entries delegated by members of this group which are
-inconsistent with their current delegation rights.  Does not perform
-permission checks.  Should only ever be called from inside the RT
-library.
-
-If called from inside a transaction, specify a true value for the
-InsideTransaction parameter.
-
-Returns a true value if the deletion succeeded; returns a false value
-and logs an internal error if the deletion fails (should not happen).
-
-=cut
-
-# XXX Currently there is a _CleanupInvalidDelegations method in both
-# RT::User and RT::Group.  If the recursive cleanup call for groups is
-# ever unrolled and merged, this code will probably want to be
-# factored out into RT::Principal.
-
-sub _CleanupInvalidDelegations {
-    my $self = shift;
-    my %args = ( InsideTransaction => undef,
-		  @_ );
-
-    unless ( $self->Id ) {
-	$RT::Logger->warning("Group not loaded.");
-	return (undef);
-    }
-
-    my $in_trans = $args{InsideTransaction};
-
-    # TODO: Can this be unrolled such that the number of DB queries is constant rather than linear in exploded group size?
-    my $members = $self->DeepMembersObj();
-    $members->LimitToUsers();
-    $RT::Handle->BeginTransaction() unless $in_trans;
-    while ( my $member = $members->Next()) {
-	my $ret = $member->MemberObj->_CleanupInvalidDelegations(InsideTransaction => 1,
-								 Object => $args{Object});
-	unless ($ret) {
-	    $RT::Handle->Rollback() unless $in_trans;
-	    return (undef);
-	}
-    }
-    $RT::Handle->Commit() unless $in_trans;
-    return(1);
-}
-
-# }}}
-
 # {{{ ACL Related routines
 
 # {{{ sub _Set
 sub _Set {
     my $self = shift;
-    my %args = (
-        Field => undef,
-        Value => undef,
-	TransactionType   => 'Set',
-	RecordTransaction => 1,
-        @_
-    );
 
 	if ($self->Domain eq 'Personal') {
    		if ($self->CurrentUser->PrincipalId == $self->Instance) {
@@ -1250,30 +1187,7 @@ sub _Set {
         	return ( 0, $self->loc('Permission Denied') );
     	}
 	}
-
-    my $Old = $self->SUPER::_Value("$args{'Field'}");
-    
-    my ($ret, $msg) = $self->SUPER::_Set( Field => $args{'Field'},
-					  Value => $args{'Value'} );
-    
-    #If we can't actually set the field to the value, don't record
-    # a transaction. instead, get out of here.
-    if ( $ret == 0 ) { return ( 0, $msg ); }
-
-    if ( $args{'RecordTransaction'} == 1 ) {
-
-        my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
-                                               Type => $args{'TransactionType'},
-                                               Field     => $args{'Field'},
-                                               NewValue  => $args{'Value'},
-                                               OldValue  => $Old,
-                                               TimeTaken => $args{'TimeTaken'},
-        );
-        return ( $Trans, scalar $TransObj->Description );
-    }
-    else {
-        return ( $ret, $msg );
-    }
+    return ( $self->SUPER::_Set(@_) );
 }
 
 # }}}
@@ -1281,7 +1195,7 @@ sub _Set {
 
 
 
-=head2 CurrentUserHasRight RIGHTNAME
+=item CurrentUserHasRight RIGHTNAME
 
 Returns true if the current user has the specified right for this group.
 
@@ -1361,21 +1275,5 @@ sub PrincipalId {
 }
 
 # }}}
-
-sub BasicColumns {
-    (
-	[ Name => 'Name' ],
-	[ Description => 'Description' ],
-    );
-}
-
 1;
 
-=head1 AUTHOR
-
-Jesse Vincent, jesse@bestpractical.com
-
-=head1 SEE ALSO
-
-RT
-
diff --git a/rt/lib/RT/Groups.pm b/rt/lib/RT/Groups.pm
index 46337f7..1c4278c 100755
--- a/rt/lib/RT/Groups.pm
+++ b/rt/lib/RT/Groups.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Groups_Overlay.pm b/rt/lib/RT/Groups_Overlay.pm
index cf29114..732236c 100644
--- a/rt/lib/RT/Groups_Overlay.pm
+++ b/rt/lib/RT/Groups_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Groups - a collection of RT::Group objects
@@ -52,7 +51,7 @@
 
   use RT::Groups;
   my $groups = $RT::Groups->new($CurrentUser);
-  $groups->UnLimit();
+  $groups->LimitToReal();
   while (my $group = $groups->Next()) {
      print $group->Id ." is a group id\n";
   }
@@ -71,9 +70,6 @@ ok (require RT::Groups);
 
 =cut
 
-
-package RT::Groups;
-
 use strict;
 no warnings qw(redefine);
 
@@ -149,7 +145,8 @@ sub LimitToPersonalGroupsFor {
     $self->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'Personal');
     $self->Limit(   FIELD => 'Instance',   
                     OPERATOR => '=', 
-                    VALUE => $princ);
+                    VALUE => $princ,
+                    ENTRY_AGGREGATOR => 'OR');
 }
 
 
@@ -157,7 +154,7 @@ sub LimitToPersonalGroupsFor {
 
 # {{{ LimitToRolesForQueue
 
-=head2 LimitToRolesForQueue QUEUE_ID
+=item LimitToRolesForQueue QUEUE_ID
 
 Limits the set of groups found to role groups for queue QUEUE_ID
 
@@ -174,7 +171,7 @@ sub LimitToRolesForQueue {
 
 # {{{ LimitToRolesForTicket
 
-=head2 LimitToRolesForTicket Ticket_ID
+=item LimitToRolesForTicket Ticket_ID
 
 Limits the set of groups found to role groups for Ticket Ticket_ID
 
@@ -191,7 +188,7 @@ sub LimitToRolesForTicket {
 
 # {{{ LimitToRolesForSystem
 
-=head2 LimitToRolesForSystem System_ID
+=item LimitToRolesForSystem System_ID
 
 Limits the set of groups found to role groups for System System_ID
 
@@ -254,7 +251,7 @@ sub WithMember {
 }
 
 
-=head2 WithRight { Right => RIGHTNAME, Object => RT::Record, IncludeSystemRights => 1, IncludeSuperusers => 0, EquivObjects => [ ] }
+=head2 WithRight { Right => RIGHTNAME, Object => RT::Record, IncludeSystemRights => 1, IncludeSuperusers => 0 }
 
 
 Find all groups which have RIGHTNAME for RT::Record. Optionally include global rights and superusers. By default, include the global rights, but not the superusers.
@@ -287,57 +284,6 @@ $groups->WithRight(Right => 'OwnTicket', Object => $q);
 ok ($id,$msg);
 is($groups->Count, 2);
 
-my $RTxGroup = RT::Group->new($RT::SystemUser);
-($id, $msg) = $RTxGroup->CreateUserDefinedGroup( Name => 'RTxGroup', Description => "RTx extension group");
-ok ($id,$msg);
-
-my $RTxSysObj = {};
-bless $RTxSysObj, 'RTx::System';
-*RTx::System::Id = sub { 1; };
-*RTx::System::id = *RTx::System::Id;
-my $ace = RT::Record->new($RT::SystemUser);
-$ace->Table('ACL');
-$ace->_BuildTableAttributes unless ($_TABLE_ATTR->{ref($self)});
-($id, $msg) = $ace->Create( PrincipalId => $RTxGroup->id, PrincipalType => 'Group', RightName => 'RTxGroupRight', ObjectType => 'RTx::System', ObjectId  => 1);
-ok ($id, "ACL for RTxSysObj created");
-
-my $RTxObj = {};
-bless $RTxObj, 'RTx::System::Record';
-*RTx::System::Record::Id = sub { 4; };
-*RTx::System::Record::id = *RTx::System::Record::Id;
-
-$groups = RT::Groups->new($RT::SystemUser);
-$groups->WithRight(Right => 'RTxGroupRight', Object => $RTxSysObj);
-is($groups->Count, 1, "RTxGroupRight found for RTxSysObj");
-
-$groups = RT::Groups->new($RT::SystemUser);
-$groups->WithRight(Right => 'RTxGroupRight', Object => $RTxObj);
-is($groups->Count, 0, "RTxGroupRight not found for RTxObj");
-
-$groups = RT::Groups->new($RT::SystemUser);
-$groups->WithRight(Right => 'RTxGroupRight', Object => $RTxObj, EquivObjects => [ $RTxSysObj ]);
-is($groups->Count, 1, "RTxGroupRight found for RTxObj using EquivObjects");
-
-$ace = RT::Record->new($RT::SystemUser);
-$ace->Table('ACL');
-$ace->_BuildTableAttributes unless ($_TABLE_ATTR->{ref($self)});
-($id, $msg) = $ace->Create( PrincipalId => $RTxGroup->id, PrincipalType => 'Group', RightName => 'RTxGroupRight', ObjectType => 'RTx::System::Record', ObjectId  => 5 );
-ok ($id, "ACL for RTxObj created");
-
-my $RTxObj2 = {};
-bless $RTxObj2, 'RTx::System::Record';
-*RTx::System::Record::Id = sub { 5; };
-
-$groups = RT::Groups->new($RT::SystemUser);
-$groups->WithRight(Right => 'RTxGroupRight', Object => $RTxObj2);
-is($groups->Count, 1, "RTxGroupRight found for RTxObj2");
-
-$groups = RT::Groups->new($RT::SystemUser);
-$groups->WithRight(Right => 'RTxGroupRight', Object => $RTxObj2, EquivObjects => [ $RTxSysObj ]);
-is($groups->Count, 1, "RTxGroupRight found for RTxObj2");
-
-
-
 =end testing
 
 
@@ -350,7 +296,6 @@ sub WithRight {
                  Object =>              => undef,
                  IncludeSystemRights    => 1,
                  IncludeSuperusers      => undef,
-                 EquivObjects           => [ ],
                  @_ );
 
     my $acl        = $self->NewAlias('ACL');
@@ -398,10 +343,6 @@ sub WithRight {
 	else {
 	    $which_object = '';
 	}
-        foreach my $obj ( @{ $args{'EquivObjects'} } ) {
-             next unless ( UNIVERSAL::can( $obj, 'id' ) );
-             $which_object .= "($acl.ObjectType = '" . ref( $obj ) . "' AND $acl.ObjectId = " . $obj->id . ") OR ";
-         }
         $which_object .=
             " ($acl.ObjectType = '" . ref($args{'Object'}) . "'" .
             " AND $acl.ObjectId = " . $args{'Object'}->Id . ") ";
@@ -475,28 +416,6 @@ sub LimitToDeleted {
 }
 # }}}
 
-# {{{ sub Next
-
-sub Next {
-    my $self = shift;
-
-    # Don't show groups which the user isn't allowed to see.
-
-    my $Group = $self->SUPER::Next();
-    if ((defined($Group)) and (ref($Group))) {
-	unless ($Group->CurrentUserHasRight('SeeGroup')) {
-	    return $self->Next();
-	}
-	
-	return $Group;
-    }
-    else {
-	return undef;
-    }
-}
-
-
-
 sub _DoSearch {
     my $self = shift;
     
diff --git a/rt/lib/RT/Handle.pm b/rt/lib/RT/Handle.pm
index 21ca1ac..8d4563b 100644
--- a/rt/lib/RT/Handle.pm
+++ b/rt/lib/RT/Handle.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Handle - RT's database handle
@@ -90,9 +89,7 @@ sub Connect {
     my $self = shift;
 
     if ($RT::DatabaseType eq 'Oracle') {
-        $ENV{'NLS_LANG'} = "AMERICAN_AMERICA.AL32UTF8";
-        $ENV{'NLS_NCHAR'} = "AL32UTF8";
-        
+        $ENV{'NLS_LANG'} = ".UTF8";
     }
 
     $self->SUPER::Connect(
@@ -104,23 +101,19 @@ sub Connect {
    
 }
 
-=head2 BuildDSN
+=item BuildDSN
 
 Build the DSN for the RT database. doesn't take any parameters, draws all that
 from the config file.
 
 =cut
 
-use File::Spec;
 
 sub BuildDSN {
     my $self = shift;
 # Unless the database port is a positive integer, we really don't want to pass it.
 $RT::DatabasePort = undef unless (defined $RT::DatabasePort && $RT::DatabasePort =~ /^(\d+)$/);
 $RT::DatabaseHost = undef unless (defined $RT::DatabaseHost && $RT::DatabaseHost ne '');
-$RT::DatabaseName = File::Spec->catfile($RT::VarPath, $RT::DatabaseName)
-    if ($RT::DatabaseType eq 'SQLite') and
-	not File::Spec->file_name_is_absolute($RT::DatabaseName);
 
 
     $self->SUPER::BuildDSN(Host => $RT::DatabaseHost, 
diff --git a/rt/lib/RT/I18N.pm b/rt/lib/RT/I18N.pm
index affff98..af5ece0 100644
--- a/rt/lib/RT/I18N.pm
+++ b/rt/lib/RT/I18N.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
 RT::I18N - a base class for localization of RT
@@ -99,11 +98,9 @@ ok(RT::I18N->Init);
 =cut
 
 sub Init {
-    require File::Glob;
-
     # Load language-specific functions
-    foreach my $language ( File::Glob::bsd_glob(substr(__FILE__, 0, -3) . "/*.pm")) {
-        if ($language =~ /^([-\w\s.\/\\~:]+)$/) {
+    foreach my $language ( glob(substr(__FILE__, 0, -3) . "/*.pm")) {
+        if ($language =~ /^([-\w.\/\\~:]+)$/) {
             require $1;
         }
         else {
@@ -120,7 +117,6 @@ sub Init {
 	    $_	=> [
 		Gettext => (substr(__FILE__, 0, -3) . "/$_.po"),
 		Gettext => "$RT::LocalLexiconPath/*/$_.po",
-		Gettext => "$RT::LocalLexiconPath/$_.po",
 	    ],
 	} @lang
     });
@@ -322,20 +318,6 @@ sub DecodeMIMEWordsToEncoding {
 	    }
 	}
 
-        # XXX TODO: RT doesn't currently do the right thing with mime-encoded headers
-        # We _should_ be preserving them encoded until after parsing is completed and
-        # THEN undo the mime-encoding.
-        #
-        # This routine should be translating the existing mimeencoding to utf8 but leaving
-        # things encoded.
-        #
-        # It's legal for headers to contain mime-encoded commas and semicolons which
-        # should not be treated as address separators. (Encoding == quoting here)
-        #
-        # until this is fixed, we must escape any string containing a comma or semicolon
-        # this is only a bandaid
-
-        $enc_str = qq{"$enc_str"} if ($enc_str =~ /[,;]/);                                     
 	$str .= $prefix . $enc_str . $trailing;
     }
 
@@ -375,6 +357,7 @@ sub _FindOrGuessCharset {
 
 # }}}
 
+
 # {{{ _GuessCharset
 
 =head2 _GuessCharset STRING
@@ -440,7 +423,6 @@ sub SetMIMEHeadToEncoding {
     return if $charset eq $enc and $preserve_words;
 
     foreach my $tag ( $head->tags ) {
-        next unless $tag; # seen in wild: headers with no name
         my @values = $head->get_all($tag);
         $head->delete($tag);
         foreach my $value (@values) {
diff --git a/rt/lib/RT/I18N/cs.pm b/rt/lib/RT/I18N/cs.pm
index 10ece32..bb97867 100644
--- a/rt/lib/RT/I18N/cs.pm
+++ b/rt/lib/RT/I18N/cs.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::I18N::cs;
 
 # # CZECH TRANSLATORS COMMENTS see Locale::Maketext::TPJ13
diff --git a/rt/lib/RT/I18N/cs.po b/rt/lib/RT/I18N/cs.po
index 224a316..7b0ef23 100644
--- a/rt/lib/RT/I18N/cs.po
+++ b/rt/lib/RT/I18N/cs.po
@@ -1,9 +1,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: RT 3.2.2\n"
+"Project-Id-Version: RT 3.0.0\n"
 "POT-Creation-Date: 2002-05-02 11:36+0800\n"
-"PO-Revision-Date: 2005-01-21 00:00+0100\n"
+"PO-Revision-Date: 2003-03-24 03:00+0800\n"
 "Last-Translator: Jan Okrouhly <okrouhly@civ.zcu.cz>\n"
 "Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
 "MIME-Version: 1.0\n"
@@ -18,64 +18,67 @@ msgstr "#"
 msgid "#%1"
 msgstr "#%1"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr "#%1: %2"
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%1 %3.%2.%7 %4:%5:%6"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "%1 %2 přidáno"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "- %1 %2"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 %2 změněno na %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
 msgstr "%1 %2 smazáno"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "%1 %2 se vzorem %3"
@@ -84,46 +87,46 @@ msgstr "%1 %2 se vzorem %3"
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 tento požadavek\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
-msgstr ""%1 (%2) vytvořil %3"
+msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
-msgstr "%1 (Nezměněn)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 - %2 shown"
 msgstr "%1. až %2. zobrazený"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr "%1 - argument k předání %2"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr "%1 - Výstupní stav jde do STDOUT"
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr "%1 - Jaký ak�ní modul chcete použít"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr "%1 - Jaký podmínkový modul chcete použít"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - Jaký vyhledávací modul chcete použít"
@@ -134,29 +137,20 @@ msgstr "%1 - Jaký vyhledávací modul chcete použít"
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "ScripAction %1 nahrána"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "%1 přidáno jako hodnota pro %2"
@@ -169,31 +163,32 @@ msgstr "%1 aliasy vyžadují k �innosti TicketId"
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
 msgstr "%1 aliasy vyžadují k �innosti TicketId (odesílatel %2) %3"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 vypadá jako lokální objekt, ale není v databázi"
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 uživatelem %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 změněno z %2 na %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
-msgstr "kopie %1"
+msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "%1 nemůže být nastaveno na %2."
 
@@ -201,36 +196,31 @@ msgstr "%1 nemůže být nastaveno na %2."
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 nemůže za�ít transakci (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 nemůže nastavit stav na vyřešen. RT databáze může být nekonzistentní."
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
-msgid "%1 created"
-msgstr ""
-
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
-msgid "%1 deleted"
-msgstr ""
-
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
-msgstr "%1 nejdůležitějších požadavků, které vlastním"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "%1 highest priority tickets I own..."
+msgstr "%1 nejdůležitějších požadavků, které vlastním..."
+
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "%1 nejdůležitějších požadavků, které žádám..."
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr "%1 je nástroj zpracující požadavky z vnějšího plánovacího nástroje jako je cron"
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 již není %2 této fronty."
@@ -239,7 +229,8 @@ msgstr "%1 již není %2 této fronty."
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 již není %2 tohoto požadavku."
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 již není hodnotou uživatelské položky %2"
 
@@ -247,7 +238,7 @@ msgstr "%1 již není hodnotou uživatelské položky %2"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 není platným identifikátorem fronty."
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -256,20 +247,16 @@ msgstr "%1 není platným identifikátorem fronty."
 msgid "%1 min"
 msgstr "%1 %quant(%1,minuta,minuty,minut,minut)"
 
-#: html/Elements/MyRequests:47
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
-msgstr "%1 nejnovějších nevlastněných požadavků"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 not shown"
 msgstr "%1 nezobrazeno"
 
-#: lib/RT/CustomField_Overlay.pm:827
-msgid "%1 objects"
-msgstr ""
-
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "práva %1"
@@ -286,7 +273,7 @@ msgstr "typ %1 neznámý pro $MessageId"
 msgid "%1 type unknown for %2"
 msgstr "typ %1 neznámý pro %2"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 vyřeší všechny �leny skupiny vyřešeného požadavku."
@@ -295,36 +282,28 @@ msgstr "%1 vyřeší všechny �leny skupiny vyřešeného požadavku."
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "%1 odloží [místní] B�ZI, je-li závislá [�i �lenem] na spjatém požadavku."
 
-#: lib/RT/CustomField_Overlay.pm:828
-msgid "%1's %2 objects"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:829
-msgid "%1's %2's %3 objects"
-msgstr ""
-
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
-msgstr "uložené dotazy %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: neudána příloha"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1 B"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1 kB"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "%1 je neplatnou hodnotou pro stav"
@@ -337,81 +316,77 @@ msgstr "%1 je neznámá akce."
 msgid "(Check box to delete scrip)"
 msgstr "(Zatrhněte pro smazání scripu)"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(Zatrhněte pro smazání)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
-msgstr "(Zatrhněte pro zakázání upozorňování uvedených příjemců)"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
-msgstr "(Zatrhněte pro povolení upozorňování uvedených příjemců)"
+msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
 msgstr "(Zadejte identifikátory �i URL požadavku, oddělené mezerami)"
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
+msgid "(If left blank, will default to %1"
 msgstr "(Pro prázdné pole se použije %1)"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(Žádné uživatelské položky)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(Žádní �lenové)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "Žádné scripy"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr "(Žádné vzory)"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
-msgid "(None)"
-msgstr ""
-
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(Zašle skrytou kopii této aktualizace �árkami oddělenému seznamu e-mail adres. <b>Neovlivňuje</b> příjemce budoucích aktualizací.)"
+msgstr "(Zašle skrytou kopii této aktualizace mezerami oddělenému seznamu e-mail adres. <b>Neovlivňuje</b> příjemce budoucích aktualizací.)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
-msgstr "(Zašle skrytou kopii této aktualizace �árkami oddělenému seznamu e-mail adres. <b>Neovlivňuje</b> příjemce budoucích aktualizací.)"
+msgstr "(Zašle skrytou kopii této aktualizace mezerami oddělenému seznamu e-mail adres. <b>Neovlivňuje</b> příjemce budoucích aktualizací.)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Zašle kopii této aktualizace �árkami oddělenému seznamu e-mail adres. Tito lidé <b>budou</b> dostávat budoucí aktualizace.)"
+msgstr "(Zašle kopii této aktualizace mezerami oddělenému seznamu e-mail adres. Tito lidé <b>budou</b> dostávat budoucí aktualizace.)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(Zašle kopii této aktualizace �árkami oddělenému seznamu e-mail adres. <b>Nemění</b> příjemce budoucích aktualizací"
+msgstr "(Zašle kopii této aktualizace mezerami oddělenému seznamu e-mail adres. <b>Nemění</b> příjemce budoucích aktualizací"
 
 #: NOT FOUND IN SOURCE
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
-msgstr "(Zašle kopii této aktualizace �árkami oddělenému seznamu e-mail adres. <b>Neovlivňuje</b> příjemce budoucích aktualizací.)"
+msgstr "(Zašle kopii této aktualizace mezerami oddělenému seznamu e-mail adres. <b>Neovlivňuje</b> příjemce budoucích aktualizací.)"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Zašle kopii této aktualizace �árkami oddělenému seznamu e-mail adres. Tito lidé <b>budou</b> dostávat budoucí aktualizace.)"
+msgstr "(Zašle kopii této aktualizace mezerami oddělenému seznamu e-mail adres. Tito lidé <b>budou</b> dostávat budoucí aktualizace.)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
-msgstr "(Použijte tyto formuláře v případě výběru Uživatelen definované podmínky �i akce)"
+msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(prázdná)"
 
-#: html/Admin/Users/index.html:60
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr "žádné jméno nebylo vypsáno"
 
@@ -419,55 +394,59 @@ msgstr "žádné jméno nebylo vypsáno"
 msgid "(no subject)"
 msgstr "(bez předmětu)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(bez hodnoty)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
-msgid "(no values)"
-msgstr ""
-
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(jen jeden požadavek)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(o�ekávájící schválení)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
-msgstr "(probíhá jiná Sbírka)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "(pending other tickets)"
 msgstr "(jiné o�ekávající požadavky)"
 
-#: html/Admin/Users/Modify.html:71
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(povinné)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(nepojmenováno)"
 
-#: html/Ticket/Elements/ShowBasics:53
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "25 mnou vlastněných nejdůležitějších požadavků..."
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "25 mnou žádaných nejdůležitějších požadavků..."
+
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr "<% $Ticket->Status%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
-msgstr ""
+msgstr "<% $_ %>"
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Nový požadavek v\">&nbsp;%1"
@@ -476,86 +455,70 @@ msgstr "<input type=\"submit\" value=\"Nový požadavek v\">&nbsp;%1"
 msgid "A blank template"
 msgstr "Prázdný vzor"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE nenalezeno"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "ACE mohou být jen vytvářeny nebo rušeny."
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "Přerušeno k zamezení nežádoucích změn požadavku.\\n"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "O mnÄ›"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "Řízení přístupu"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Akce"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "Akce %1 nenalezena"
 
-#: NOT FOUND IN SOURCE
+#: bin/rt-crontool:119
 msgid "Action committed."
 msgstr "Akce provedena."
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr ""
-
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "Akce připravena..."
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
-msgstr "Přidat"
+msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "Přidat AdminCc"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "Přidat Cc"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
-msgstr "Přidat podmínku"
+msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "Přidat další soubory"
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "Přidat Žadatele"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
-msgstr "Přidat hodnotu"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Add a new a global scrip"
@@ -565,53 +528,49 @@ msgstr "Přidat nový globální scrip"
 msgid "Add a scrip to this queue"
 msgstr "Přidat scrip k této frontě"
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr "Přidat scrip do všech front"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
-msgstr "Přidat dodate�nou podmínku"
+msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "Přidat komentáře �i odpovědi k vybraným požadavkům"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "Přidat �leny"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Přidat nové pozorovatele"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "AddNextState"
 msgstr "PřidatDalšíStav"
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "Uživatel přidán do této fronty jako %1"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "Uživatel přidán k tomuto požadavku jako %1"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "Adresa1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "Adresa2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "Admin Cc"
 
@@ -623,7 +582,7 @@ msgstr "Administrativní komentář"
 msgid "Admin Correspondence"
 msgstr "Administrativní korespondence"
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "Správa/Front"
 
@@ -631,7 +590,7 @@ msgstr "Správa/Front"
 msgid "Admin users"
 msgstr "Správa/Uživatelů"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "Správa/Globální konfigurace"
 
@@ -647,7 +606,7 @@ msgstr "Správa/Front/Základních údajů"
 msgid "AdminAllPersonalGroups"
 msgstr "Spravovat všechny osobní skupiny"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "AdminCc"
 
@@ -659,47 +618,43 @@ msgstr "AdminComment"
 msgid "AdminCorrespondence"
 msgstr "AdminCorrespondence"
 
-#: lib/RT/CustomField_Overlay.pm:101
-msgid "AdminCustomField"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Queue_Overlay.pm:73
 msgid "AdminCustomFields"
 msgstr "Spravovat uživatelem definované položky"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "Spravovat skupinu"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "Spravovat �lenství ve skupinách"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr "Spravovat vlastní osobní skupiny"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr "Spravovat frontu"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr "Spravovat uživatele"
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "Administrativní Cc"
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
-msgstr "Pokro�ilé"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Advanced Search"
 msgstr "Pokro�ilé Vyhledávání"
 
-#: html/Elements/SelectDateRelation:57
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "Po"
 
@@ -707,19 +662,15 @@ msgstr "Po"
 msgid "Age"
 msgstr "Stáří"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr ""
-
 #: etc/initialdata:363
 msgid "All Approvals Passed"
-msgstr "Všechna schvalování prošla"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "Všechny uživatelské položky"
 
-#: html/Admin/Queues/index.html:75
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "VÅ¡echny Fronty"
 
@@ -727,39 +678,31 @@ msgstr "VÅ¡echny Fronty"
 msgid "Always sends a message to the requestors independent of message sender"
 msgstr "Vždy posílá zprávu žadatelům nezávisle na odesílateli"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr ""
-
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
-msgid "Applies to"
-msgstr ""
-
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
-msgstr "Provést"
+msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
-msgstr "Provést změny"
+msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "Schvalování"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "Schválení #%1: $2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr "Schválení #$1: Poznámky neuloženy kvůli systémové chybě"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr "Schválení #%1: Poznámky uloženy"
@@ -770,17 +713,17 @@ msgstr "Detaily schválení"
 
 #: etc/initialdata:351
 msgid "Approval Passed"
-msgstr "Schvalování prošlo"
+msgstr ""
 
 #: etc/initialdata:374
 msgid "Approval Rejected"
-msgstr "Schvalování odmítnuto"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Approval diagram"
 msgstr "Schvalovací diagram"
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "Schválit"
 
@@ -788,56 +731,48 @@ msgstr "Schválit"
 msgid "Approver's notes: %1"
 msgstr "Poznámky schvalovatele: %1"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "dub"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "VzestupnÄ›"
 
-#: lib/RT/Queue_Overlay.pm:97
-msgid "Assign and remove custom fields"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:97
-msgid "AssignCustomFields"
-msgstr ""
-
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "Přiložit"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "Připojit soubor"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "Připojený soubor"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "Příloha '%1' nemůže být nahrána"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "Příloha vytvořena"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "Jméno souboru přílohy"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Přílohy"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
-msgstr "Atribut smazán"
+msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "srp"
 
@@ -857,9 +792,9 @@ msgstr "Automaticky odpověz žadatelům"
 msgid "AutoreplyToRequestors"
 msgstr "Automatická odpově� žadatelům"
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Elements/EditFormat:4
 msgid "Available Columns"
-msgstr "Dostupné položky"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
@@ -877,19 +812,19 @@ msgstr "Chybná data v %1"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "Chybné �íslo transakce u přílohy. %1 má být %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "Základní údaje"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "Neopomeňte uložit vaše změny"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "Před"
 
@@ -897,125 +832,112 @@ msgstr "Před"
 msgid "Begin Approval"
 msgstr "Za�átek schvalování"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
-msgstr ""
-
 #: etc/initialdata:217
 msgid "Blank"
 msgstr "Prázdný"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr ""
+#: NOT FOUND IN SOURCE
+msgid "Bookmarkable URL for this search"
+msgstr "Uložitelné URL pro toto hledání"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
-msgstr "Uložitelný odkaz"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "Zkrácené hlavi�ky"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "Hromadná úprava požadavků"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "Nelze měnit systémové uživatele"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr "Může tento uživatel vidět tuto frontu"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "Uživatelské položce nelze přidat hodnotu beze jména"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
-msgstr "Nelze nalézt uložený dotaz ke zpracování"
+msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "Požadavek nelze svázat se sebou samým"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "Nelze slou�it do slou�eného požadavku. To by se vám nemělo nikdy stát."
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
-msgstr "Tento dotaz nelze uložit"
+msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "Nelze zadat zároveň zdroj i cíl"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "Nelze vytvořit uživatele: %1"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Cc"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "Změna hesla"
 
-#: html/Elements/Submit:100
-msgid "Check All"
-msgstr ""
-
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "Zašrtnutím odstraníte"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "Zatrhněte k odebrání práva"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "Potomci"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "Město"
 
-#: html/Elements/Submit:102
-msgid "Clear All"
-msgstr ""
-
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "Vyřešeno"
 
-#: NOT FOUND IN SOURCE
+#: html/SelfService/Closed.html:24
 msgid "Closed Tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Closed requests"
 msgstr "Uzavřené požadavky"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
-msgstr "Uzavřené požadavky"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Command not understood!\\n"
 msgstr "Neznámý příkaz!\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Komentovat"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "Adresa pro komentáře"
 
@@ -1023,11 +945,11 @@ msgstr "Adresa pro komentáře"
 msgid "Comment not recorded"
 msgstr "Komentář nezaznamenán"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr "Komentovat požadavky"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr "Komentovat požadavky"
 
@@ -1035,11 +957,11 @@ msgstr "Komentovat požadavky"
 msgid "Comments"
 msgstr "Poznámky"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "Komentář (Neposílá se žadatelům)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "Komentář (nepošle se žadatelům)"
 
@@ -1047,15 +969,15 @@ msgstr "Komentář (nepošle se žadatelům)"
 msgid "Comments about %1"
 msgstr "Poznámky o %1"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "Poznámky o tomto uživateli"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "Komentáře přidány"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr "Commit v zárodku"
 
@@ -1063,23 +985,23 @@ msgstr "Commit v zárodku"
 msgid "Compile Restrictions"
 msgstr "Omezení překladu"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "Podmínka"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr "Podmínky splněny..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "Podmínka nenalezena"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "Správa"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "Potvrzení"
 
@@ -1091,17 +1013,17 @@ msgstr "Kontaktní informa�ní systém"
 msgid "Contacted date '%1' could not be parsed"
 msgstr "Datum kontaktu '%1' nemůže být rozpoznáno"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "Obsah"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:64
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
-msgstr "Kopírovat"
+msgstr ""
 
 #: etc/initialdata:286
 msgid "Correspondence"
@@ -1111,7 +1033,7 @@ msgstr "Korespondence"
 msgid "Correspondence Address"
 msgstr "Adresa pro korespondenci"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "Korespondence zaznamenána"
 
@@ -1119,47 +1041,33 @@ msgstr "Korespondence zaznamenána"
 msgid "Correspondence not recorded"
 msgstr "Korespondence nebyla zaznamenána"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
 msgstr "Nelze přidat novou hodnotu uživatelské položky požadavku. "
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr ""
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "Nelze změnit vlastníka. "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "Nelze vytvořit Uživatelskou položku"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "Nelze vytvořit skupinu"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "Nelze vytvořit vzor: %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "Nelze vytvořit požadavek. Nenastavena fronta"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "Nelze vytvořit uživatele"
 
@@ -1171,11 +1079,11 @@ msgstr "Nelze nalézt požadavek s identifikátorem %1"
 msgid "Could not find group %1."
 msgstr "Nelze nalézt skupinu %1."
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "Tohoto uživatele nelze nalézt nebo vytvořit"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "Nelze naléze tohoto uživatele"
 
@@ -1183,34 +1091,21 @@ msgstr "Nelze naléze tohoto uživatele"
 msgid "Could not find user %1."
 msgstr "Nelze nalézt uživatele %1."
 
-#: html/Admin/CustomFields/Objects.html:69
-msgid "Could not load CustomField %1"
-msgstr ""
-
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "Nelze na�íst skupinu"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "Tento uživatel nemůže být %1 této fronty"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "Tento uživatel nemůže být %1 tohoto požadavku"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "Tento uživatel nemůže být odstraněn jako %1 této fronty"
@@ -1219,15 +1114,15 @@ msgstr "Tento uživatel nemůže být odstraněn jako %1 této fronty"
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "Tento uživatel nemůže být odstraněn jako %1 tohoto požadavku"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
-msgstr "Nelze nastavit uživatelské informace"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "Do skupiny nelze přidat �lena"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "Nelze vytvořit transakci: %1"
@@ -1240,15 +1135,15 @@ msgstr "Nelze zjistit co dělat s gpg odpovědí\\n"
 msgid "Couldn't find group\\n"
 msgstr "Skupinu nelze nalézt\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr "Nemohu nalézt sloupec"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "Tohoto uživatele nelze nalézt"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "Tuto hodnotu nelze nalézt"
 
@@ -1256,21 +1151,11 @@ msgstr "Tuto hodnotu nelze nalézt"
 msgid "Couldn't find user\\n"
 msgstr "Uživatele nelze nalézt\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "Z uživatelské databáze nelze na�íst %1.\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
-msgid "Couldn't load Class %1"
-msgstr ""
-
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
-msgid "Couldn't load CustomField %1"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load RT config file '%1' %2"
 msgstr "Konfigura�ní soubor RT '%1'nelze na�íst %2"
@@ -1279,26 +1164,21 @@ msgstr "Konfigura�ní soubor RT '%1'nelze na�íst %2"
 msgid "Couldn't load Scrips."
 msgstr "Scripy nelze na�íst."
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "Skupinu %1 nelze na�íst"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "Vazbu nelze na�íst"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
-msgid "Couldn't load object %1"
-msgstr ""
-
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "Frontu nelze na�íst"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "Frontu %1 nelze na�íst"
@@ -1315,26 +1195,16 @@ msgstr "Vzor nelze na�íst"
 msgid "Couldn't load that user (%1)"
 msgstr "Uživatele (%1) nelze na�íst"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "Požadavek '%1' nelze na�íst"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "ZemÄ›"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -1342,16 +1212,16 @@ msgstr "Vytvořit"
 msgid "Create Tickets"
 msgstr "Vytvořit požadavky"
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "Vytvořit uživatelskou položku"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr "Vytvoření uživatelské položky pro frontu %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:47
 msgid "Create a CustomField which applies to all queues"
 msgstr "Vytvoření uživatelské položky pro všechny front"
 
@@ -1363,11 +1233,11 @@ msgstr "Vytvořit novou uživatelskou položku"
 msgid "Create a new global scrip"
 msgstr "Vytvořit nový globální scrip"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "Vytvořit novou skupinu"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "Vytvořit novou vlastní skupinu"
 
@@ -1383,15 +1253,15 @@ msgstr "Vytvořit nový scrip"
 msgid "Create a new template"
 msgstr "Vytvořit nový vzor"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "Vytvoření nového požadavku"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "Vytvořit nového uživatele"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "Vytvořit frontu"
 
@@ -1403,36 +1273,36 @@ msgstr "Vytvořit frontu nazvanou"
 msgid "Create a request"
 msgstr "Vytvořit požadavek"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr "Vytvořit scrips pro frontu %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "Vytvořit vzor"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
-msgstr "Vytvořit požadavek"
+msgstr ""
 
 #: etc/initialdata:137
 msgid "Create new tickets based on this scrip's template"
 msgstr "Vytvářet požadavky podle toho vzoru scripu"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "Vytvořit požadavek"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr "Vytvářet požadavky v této frontě"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "Vytvářet, mazat a měnit uživatelen definované položky"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr "Vytvářet, mazat a měnit fronty"
 
@@ -1440,27 +1310,23 @@ msgstr "Vytvářet, mazat a měnit fronty"
 msgid "Create, delete and modify the members of any user's personal groups"
 msgstr "Vytvářet, mazat a měnit �leny uživatelských osobních skupin"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "Vytvářet, mazat a měnit �leny osobních skupin"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "Vytvářen, mazat a měnit uživatele"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr "Vytvořit požadavek"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "Vytvořeno"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "Uživatelská položka %1 vytvořena"
@@ -1469,23 +1335,23 @@ msgstr "Uživatelská položka %1 vytvořena"
 msgid "Created template %1"
 msgstr "Vzor %1 vytvořen"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
-msgstr "Tvůrce"
+msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "Aktuální relace"
 
-#: html/Admin/Elements/EditScrips:51
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "Aktuální scripy"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "Aktuální �lenové"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Aktuální práva"
 
@@ -1493,63 +1359,60 @@ msgstr "Aktuální práva"
 msgid "Current search criteria"
 msgstr "Aktuální vyhledávací podmínky"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "Aktuální pozorovatelé"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
 msgid "Custom Field #%1"
 msgstr "Uživatelská položka #%1"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "Uživatelské položky"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
-msgid "Custom Fields for %1"
-msgstr ""
-
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr "Čistící kód uživatelské akce"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "Přípravný kód uživatelské akce"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "Uživatelská podmínka"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "Užitavelská položka %1 %2 %3"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "Uživatelská položka %1 má hodnotu."
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "Uživatelská položka %1 nemá hodnotu."
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "Uživatelská položka %1 nenalezena"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
 msgstr "Uživatelská položka smazána"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "Uživatelská položka nenalezena"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "Hodnota %1 nemůže být nalezena v uživatelské položce %2"
@@ -1558,41 +1421,45 @@ msgstr "Hodnota %1 nemůže být nalezena v uživatelské položce %2"
 msgid "Custom field value changed from %1 to %2"
 msgstr "Hodnota uživatelské položky změněna z %1 na %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "Hodnota uživatelské položky nemůže být smazána"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "Hodnota uživatelské položky nemůže být nalezena"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "Hodnota uživatelské položky smazána"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr "Uživatelská položka"
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Datumy"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "pro"
 
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr "Implicitní vzor automatické odpovědi"
+
 #: etc/initialdata:222
 msgid "Default Autoresponse template"
 msgstr "Implicitní vzor automatické odpovědi"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
-msgstr "Implicitní fronta"
+msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
-msgstr "Implicitní žadatel"
+msgstr ""
 
 #: etc/initialdata:296
 msgid "Default admin comment template"
@@ -1610,72 +1477,64 @@ msgstr "Implicitní koresponden�ní vzor"
 msgid "Default transaction template"
 msgstr "Implicitní transak�ní vzor"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "Defaulní: %1/%2 změněno z %3 na %4"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "Delegovat práva"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr "Delegovat specifická práva, která vám byla poskytnuta."
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr "Delegovat práva"
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "Pověření"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "Smazat"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
-msgstr "Smazat vzor"
-
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
-msgstr "Smazat vybrané scripy"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr "Mazat požadavky"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr "Smazat požadavek"
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "Smazání tohoto objektu mohlo porušit referen�ní integritu"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "Smazání tohoto objektu by mohlo porušit referen�ní integritu"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "Smazání tohoto objektu by mohlo narušit referen�ní integritu"
 
-#: html/Approvals/Elements/Approve:66
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "Zamítnout"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "Je rekvizitou pro"
 
@@ -1683,39 +1542,39 @@ msgstr "Je rekvizitou pro"
 msgid "Dependencies: \\n"
 msgstr "Závistlosti: \\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
-msgstr "Přidána závislost %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
-msgstr "Závislost %1 smazána"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
-msgstr "Přidána závislost na %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
-msgstr "Závislost na %1 smazána"
+msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "Závisející na"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "SestupnÄ›"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "Popište případ níže"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Popis"
 
@@ -1723,59 +1582,59 @@ msgstr "Popis"
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "Zobrazit"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr "Zobrazit přístupová práva"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
-msgstr "Zobrazované položky"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr "Zobrazovat scrips vzory pro tuto frontu"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr "Zobrazovat scripy pro tuto frontu"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "Režim zobrazení"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
-msgstr "Zobraz uložené dotazy pro tuto skupinu"
+msgstr ""
 
-#: html/Elements/Footer:60
+#: NOT FOUND IN SOURCE
+msgid "Display ticket #%1"
+msgstr "Zobraz požadavek #%1"
+
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
-msgstr "Šířeno pod verzí 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> GNU GPL.</a>"
+msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "Dělat cokoli a všechno"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "Neob�erstvovat tuto stránku."
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: NOT FOUND IN SOURCE
+msgid "Don't show search results"
+msgstr "Nezobrazit výsledky hledání"
+
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "Stáhnout"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
-msgid "Download as a tab-delimited file"
-msgstr ""
-
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "Termín dokon�ení"
 
@@ -1791,41 +1650,33 @@ msgstr "CHYBA: Nelze na�íst požadavek '%1': %2.\\n"
 msgid "Edit"
 msgstr "Upravit"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "Upravit uživatelské položky pro %1"
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
-msgstr ""
-
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "Upravit relace"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
-msgstr "Upravit dotaz"
+msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr "Upravit vzory pro frontu %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "Upravit scprips"
+
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "Úprava systémových vzorů"
 
@@ -1833,11 +1684,11 @@ msgstr "Úprava systémových vzorů"
 msgid "Edit templates for %1"
 msgstr "Upravit vzory pro %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
-msgstr "Upravit Uložené Dotazy"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr "Úprava konfigurace pro frontu %1"
@@ -1846,17 +1697,17 @@ msgstr "Úprava konfigurace pro frontu %1"
 msgid "Editing Configuration for user %1"
 msgstr "Úprava konfigurace pro uživatele %1"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "Úprava uživatelské položky %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "Úprava �lenství ve skupině %1"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "Úprava �lenství ve vlastní skupině %1"
@@ -1865,15 +1716,15 @@ msgstr "Úprava �lenství ve vlastní skupině %1"
 msgid "Editing template %1"
 msgstr "Úprava vzoru %1"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "Zdroj �i cíl musí být zadány"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "Email"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "Email adresa je použita"
 
@@ -1885,97 +1736,96 @@ msgstr "Email adresa"
 msgid "EmailEncoding"
 msgstr "Kódování emailu"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr "Povolena (zrušením zatrhnutí zablokujete tuto uživatelskou položky)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "Povolena (zrušením zatrhnutí zablokujete tuto skupinu)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "Povoleno (zrušení zatrhnutí zablokuje tuto frontu)"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
 msgstr "Povolené uživatelské položky"
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr "Povolené fronty"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "Povolen stav %1"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
-msgid "Enabled status: %1"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:64
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "Vyplnit více hodnot"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
-msgstr "Zadejte objekty �i URI k provázání. Více položek oddělujte mezerami."
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "Vyplnit jednu hodnotu"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
-msgstr "Zadejte fronty �i URI k provázání. Více položek oddělujte mezerami."
+msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
-msgstr "Zadejte požadavky �i URI k provázání. Více položek oddělujte mezerami."
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Bulk.html:142
 msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "Zadejte požadavky �i URI se nimiž požadavky svázat. Oddělte více položek mezerami."
 
-#: lib/RT/CustomField_Overlay.pm:66
-msgid "Enter up to %1 values"
-msgstr ""
-
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Chyba"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "Chyba v parametrech do Queue->AddWatcher"
 
-#: lib/RT/Queue_Overlay.pm:830
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Chyba v parametrech do Queue->DelWatcher"
+
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
-msgstr "Chyba v parametrech do Queue->DeleteWatcher"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "Chyba v parametrech do Ticket->AddWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Chyba v parametrech do Ticket->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
-msgstr "Chyba v parametrech do Ticket->DeleteWatcher"
+msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
-msgstr "Eskalovat požadavky"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
-msgstr "Odhadovaný"
+msgstr ""
 
 #: etc/initialdata:20
 msgid "Everyone"
 msgstr "Kdokoli"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "Příklad:"
 
@@ -1987,93 +1837,56 @@ msgstr "Identifikátor externí autentizace"
 msgid "ExternalContactInfoId"
 msgstr "Identifikátor externího kontaktu"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "Doplňkové údaje"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:377
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "Nepovedlo se nalézt uživatele 'Privilegované' pseudoskupiny."
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "Nepovedlo se nalézt uživatele 'Neprivilegované' pseudoskupiny"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr "Nepovedlo se nahrát modul %1. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "úno"
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
-msgstr "Název souboru"
-
-#: lib/RT/CustomField_Overlay.pm:69
-msgid "Fill in multiple text areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
-msgid "Fill in one text area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
-msgid "Fill in up to %1 text areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Fin"
 msgstr "Kon"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "Koncová priorita"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr "Koncová priorita"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
 msgid "Find group whose"
 msgstr "Najít skupiny které"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
-msgid "Find groups whose"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Find new/open tickets"
 msgstr "Najít nové/otevřené požadavky"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "Najít ty, jejichž"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "Nalézt požadavky"
 
@@ -2081,7 +1894,7 @@ msgstr "Nalézt požadavky"
 msgid "Finish Approval"
 msgstr "Závere�né schválení"
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "První"
 
@@ -2089,28 +1902,24 @@ msgstr "První"
 msgid "First page"
 msgstr "První stránka"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "Foo Bar Baz"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "Foo!"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "Vynutit změnu"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "Nalezen%quant(%1,,y,o) %numf(%1) %quant(%1,požadavek,požadavky,požadavků)"
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "Nalezen objekt"
 
@@ -2118,53 +1927,53 @@ msgstr "Nalezen objekt"
 msgid "FreeformContactInfo"
 msgstr "Kontaktní údaje ve volné podobě"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:37
 msgid "FreeformMultiple"
 msgstr "Volná forma vícenásobně"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:36
 msgid "FreeformSingle"
 msgstr "Volná formu jedinkrát"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "pá"
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "Celé hlavi�ky"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
-msgstr "Vzít vzor ze souboru"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "Aktuální uživatel se získává z PGP podpisu\\n"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "Dán %1"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Globální"
 
-#: html/Admin/Elements/EditCustomFields:55
-msgid "Global Custom Fields"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr ""
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "Globální Scrips"
 
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "Globální vzor: %1"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
-msgstr "Provést"
+msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "Spusť!"
 
@@ -2176,11 +1985,11 @@ msgstr "Správný PGP podpis od %1\\n"
 msgid "Goto page"
 msgstr "Přejít na stránku"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "Přejít na požadavek"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Skupina"
 
@@ -2188,28 +1997,28 @@ msgstr "Skupina"
 msgid "Group %1 %2: %3"
 msgstr "Skupina %1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "Práva skupiny"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "Skupina již má �lena"
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "Skupina nemůže být založena: %1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "Skupina vytvořena"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "Skupina nemá takového �lena"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Skupina nenalezena"
 
@@ -2221,54 +2030,36 @@ msgstr "Skupina nenalezena.\\n"
 msgid "Group not specified.\\n"
 msgstr "Skupina neudána.\\n"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Skupiny"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "Skupiny nemohou být svými �leny"
 
-#: html/Admin/Groups/index.html:82
-msgid "Groups matching search criteria"
-msgstr ""
-
-#: html/Ticket/Elements/ShowRequestor:77
-msgid "Groups this user belongs to"
-msgstr ""
-
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "Ahoj!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "Ahoj, %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "Historie"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
-msgid "History of the group %1"
-msgstr ""
-
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
-msgid "History of the user %1"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "HomePhone"
 msgstr "Telefon domů"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Domovská stránka"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "Mám %quant(%1,mícha�ka,mícha�ky,mícha�ek)"
@@ -2277,16 +2068,12 @@ msgstr "Mám %quant(%1,mícha�ka,mícha�ky,mícha�ek)"
 msgid "I have [quant,_1,concrete mixer]."
 msgstr "I have [quant,_1,concrete mixer]."
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr ""
-
 #msgstr "Mám [quant,_1,Mícha�ku na beton,Mícha�ky na beton,Mícha�ek na beton]."
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "Identifikátor"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Identita"
 
@@ -2294,84 +2081,76 @@ msgstr "Identita"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "Odmítni původce a zruš stávající schválení, bylo-li zamítnuto schválení"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "Nebyl-li zadán Žadatel, vytvářej požadavky jako tento žadatel"
+msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
-msgstr "Nebyla-li zadána fronta, vytvářej požadavky v této frontě"
+msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr "Byl-li tento nástroj setgid, místní uživatel jej mohl použit k získaní administrativního přístupu k RT"
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "Pokud jste změnili cokoli nahoře, nezapomeňte"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "Neplatná hodnota pro %1"
 
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "Neměnitelná položka"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "Zahrnout do výpisu blokované uživatelské položky"
 
-#: html/Admin/Groups/index.html:65
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
-msgstr "Zahrnout blokované skupiny ve výpisu."
+msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
 msgstr "Zahrnout blokované fronty do výpisu."
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "Zahrnout blokované uživatele do vyhledávání."
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "Po�áte�ní priorita"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr "Po�áte�ní priorita"
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "Chyba na vstupu"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "Vnitřní chyba"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "Vnitřní chyba: %1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "Neplatný typ skupiny"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "Neplatné právo"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "Neplatná data"
 
@@ -2379,64 +2158,60 @@ msgstr "Neplatná data"
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "Neplatný vlastník. Použije se 'nobody'."
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "Neplatná fronta"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "Neplatné právo"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "Neplatná hodnota pro %1"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "Neplatná hodnota pro uživatelskou položku"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "Neplatná hodnota pro stav"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr "Je velmi důležité, aby neprivilegovaní uživatelé nemohli spustit tento nástroj."
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr "Pro spuštění tohoto nástroje se doporu�uje založení neprivilegovaného UNIX uživatele se správným skupinovým �lenstvím a přístupem do RT."
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr "Používá několik parametrů:"
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Items pending my approval"
 msgstr "Věci o�ekávající mé schválení"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "led"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "Přidat se �i odebrat z této skupiny"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "�ec"
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "Maxi"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "�en"
 
@@ -2448,23 +2223,19 @@ msgstr "Klí�ové slovo"
 msgid "Lang"
 msgstr "Jazyk"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
-msgstr "Jazyk"
-
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "Poslední"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "Poslední kontakt"
 
-#: html/Elements/SelectDateType:50
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "Naposled kontaktován"
 
@@ -2472,23 +2243,23 @@ msgstr "Naposled kontaktován"
 msgid "Last Notified"
 msgstr "Naposled upozorněn"
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "Naposled aktualizován"
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
-msgstr "NaposledAktualizoval(a)"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "Zbývá"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "Umožnit tomuto uživateli přístup k RT"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "Umožnit dávat tomuto uživateli práva"
 
@@ -2500,255 +2271,213 @@ msgstr "Vlastník omezen na %1 %2"
 msgid "Limiting queue to %1 %2"
 msgstr "Fronta omezena na %1 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "Vazba již existuje"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "Vazba nemůže být vytvořena"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "Vazba vytvořena (%1)"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "Vazba zrušena (%1)"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Vazba nenalezena"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "Svázat požadavek #%1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Vazby"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
-msgstr "Na�íst"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
-msgstr "Na�íst uložený dotaz:"
-
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
-msgstr "Na�tené perlovské moduly"
-
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "Umístění"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "Záznamový adresář %1 nenalezen nebo doň nemůže být zapisováno.\\ RT nemůže běžet."
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "Přihlášen jako %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "Přihlásit"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "Odhlásit"
 
-#: lib/RT/CustomField_Overlay.pm:866
-msgid "Lookup type mismatch"
-msgstr ""
-
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "Nastavit vlastníka"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "Nastavit stav"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "Nastavit datum termínu dokon�ení"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "Nastavit datum vyřešení"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "Nastavit datum, kdy za�al"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "Nastavit datum, kdy za�ne"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "Nastavit datum posledního kontaktu"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "Nastavit prioritu"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "Nastavit frontu"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "Nastavit předmět"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
-msgstr ""
-
-#: html/Admin/index.html:78
-msgid "Manage custom fields and custom field values"
-msgstr ""
-
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "Správa skupin a �lenství v nich"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "Správa vlastností a konfigurací platných ve všech frontách"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr "Správa front a jim příslušných vlastností"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "Správa uživatelů a hesel"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "bře"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "kvÄ›"
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
-msgstr "Člen %1 přidán"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
-msgstr "Člen %1 odebrán"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "Člen přidán"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "Člen odebrán"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "Člen neodebrán"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "ÄŒlen"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "Členové"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
-msgstr "Členství v %1 přidáno"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
-msgstr "Členství v %1 zrušeno"
-
-#: html/Admin/Elements/UserTabs:61
-msgid "Memberships"
-msgstr ""
-
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
-msgid "Memberships of the user %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "Slou�ení úspěšné"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "Slou�ení se nepodařilo. Nelze nastavit EffectiveId"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "Slou�it do"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
-msgstr "Slou�en do %1"
+msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "Zpráva"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
-msgstr "Zpráva nemůže být zaznamenána"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
+#: lib/RT/Ticket_Overlay.pm:2517
 msgid "Message recorded"
-msgstr "Zpráva zaznamenána"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
+#: html/Ticket/Elements/PreviewScrips:70
 msgid "Messages about this ticket will not be sent to..."
-msgstr "Zprávy o tomto požadavku NEBUDOU zaslány na..."
-
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
 msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "Chybí primární klí�?: %1"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "Mobilní telefon"
 
@@ -2756,7 +2485,7 @@ msgstr "Mobilní telefon"
 msgid "MobilePhone"
 msgstr "Mobilní telefon"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "Upravovat seznam přístupových práv"
 
@@ -2764,37 +2493,27 @@ msgstr "Upravovat seznam přístupových práv"
 msgid "Modify Custom Field %1"
 msgstr "Upravit uživatelskou položku %1"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr ""
-
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
-msgid "Modify Custom Fields which apply to all %1"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "Úprava uživatelských položek pro všechny fronty"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
-msgstr "Úprava skupinových práv"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
-msgstr "Upravit �leny"
+msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
-msgstr "Upravit práva"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr "Upravovat vzory scripů této fronty"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "Upravovat scripů této fronty"
 
@@ -2802,52 +2521,43 @@ msgstr "Upravovat scripů této fronty"
 msgid "Modify Template %1"
 msgstr "Upravovat vzor %1"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
-msgstr "Upravit práva uživatelů"
+msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
 msgstr "Upravovat uživatelskou položku pro frontu %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:52
 msgid "Modify a CustomField which applies to all queues"
 msgstr "Upravovat uživatelskou položku pro všechny fronty"
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr "Upravovat scrip pro frontu %1"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "Upravovat scrip platný ve všech frontách"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
-msgid "Modify associated objects for %1"
-msgstr ""
-
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "Upravit datumy pro #%1"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "Úprav datumů pro požadavek # %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "Úprava globálních skupinových práv"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "Úprava globálních skupinových práv."
 
@@ -2855,110 +2565,100 @@ msgstr "Úprava globálních skupinových práv."
 msgid "Modify global scrips"
 msgstr "Úprava globálních scrips"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "Úprava globálních uživatelských práv"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "Úprava globálních uživatelských práv."
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "Upravovat metadata skupiny nebo smazat skupinu"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
-msgid "Modify group rights for custom field %1"
-msgstr ""
-
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "Úprava skupinových práv pro %1"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "Úprava skupinových práv pro frontu %1"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "Upravovat seznam �lenů pro tuto skupinu"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr "Upravovat vlastní RT ú�et"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr "Úprava uživatelů fronty %1"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "Úprava uživatelů souvisejících s požadavkem #%1"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "Úprava scrips pro frontu %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr "Upravovat scripy platné ve všech frontách"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "Úprava vzoru %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "Upravit vzory pro všechny fronty"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "Úprava skupiny %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "Upravovat pozorovatele fronty"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "Úprava uživatele %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "Úprava požadavku # %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "Úprava požadavku #%1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "Upravovat požadavky"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
-msgid "Modify user rights for custom field %1"
-msgstr ""
-
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "Úprava uživatelských práv pro skupinu %1"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr "Úprava skupinových práv pro frontu %1"
@@ -2967,85 +2667,81 @@ msgstr "Úprava skupinových práv pro frontu %1"
 msgid "Modify watchers for queue '%1'"
 msgstr "Úprava pozorovatelů fronty '%1'"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr "Upravovat seznam přístupových práv"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "Upravovat �lenství ve skupině"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr "Upravovat pozorovale fronty"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr "Upravovat scripy"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr "Upravovat sebe"
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr "Upravovat vzor"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr "Upravovat požadavek"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "po"
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "Více o %1"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr "Dát níže"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr "Dát výše"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "Vícenásobná"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "Nutno zadat atribut 'Jméno'"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
-msgstr "Mé požadavky ve stavu %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "My Approvals"
 msgstr "Mnou schválené"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "Mnou schválené"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
-msgstr "Mé uložené dotazy"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Jméno"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "Jméno je použito"
 
@@ -3053,19 +2749,19 @@ msgstr "Jméno je použito"
 msgid "Need approval from system administrator"
 msgstr "Je třeba schválení systémového správce"
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "Nikdy"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "Nové"
 
-#: html/Elements/EditLinks:115
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "Nové relace"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "Nové heslo"
 
@@ -3073,31 +2769,31 @@ msgstr "Nové heslo"
 msgid "New Pending Approval"
 msgstr "Nová probíhající schválení"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
-msgstr "Nový dotaz"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "New Search"
 msgstr "Nové vyhledávání"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "Vytvořit uživatelskou položku"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "Založit skupinu"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "Nové heslo"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "Oznámení nového hesla zasláno"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "Vytvoření fronty"
 
@@ -3105,11 +2801,11 @@ msgstr "Vytvoření fronty"
 msgid "New request"
 msgstr "Nový požadavek"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "Nová práva"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "Vytovření scripu"
 
@@ -3117,27 +2813,27 @@ msgstr "Vytovření scripu"
 msgid "New search"
 msgstr "Nové vyhledání"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "Vytvořit vzor"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
-msgstr "Nový požadavek"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "Nový požadavek neexistuje"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "Vytvořit uživatele"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "Nový uživatel jména"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "Nový pozorovatel"
 
@@ -3145,13 +2841,13 @@ msgstr "Nový pozorovatel"
 msgid "New window setting"
 msgstr "Nové nastavení okna"
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "Další"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
-msgstr "Další stránka"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Next page"
@@ -3161,39 +2857,31 @@ msgstr "Další stránka"
 msgid "NickName"
 msgstr "Přezdívka"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: html/Admin/CustomFields/UserRights.html:145
-msgid "No Class defined"
-msgstr ""
-
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "Žádná uživatelská položka"
 
-#: html/Admin/CustomFields/GroupRights.html:103
-msgid "No CustomField defined"
-msgstr ""
-
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "Nedefinována žádná skupina"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
-msgstr "Prázdný dotaz"
+msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "Nedefinována žádná fronta"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr "Žádný uživatel RT nenalezen. Prosím pora�te se se správcem RT.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "Žádný vzor"
 
@@ -3205,11 +2893,11 @@ msgstr "Neudán požadavek. Přerušuje se požadavek "
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
 msgstr "Neudán požadavek. Přerušují se úpravy požadavku\\n\\n"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "bez akce"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr "Neudán sloupec"
 
@@ -3217,7 +2905,7 @@ msgstr "Neudán sloupec"
 msgid "No command found\\n"
 msgstr "Příkaz nenalezen\\n"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "Poznámky k tomuto uživateli neudány"
 
@@ -3225,89 +2913,80 @@ msgstr "Poznámky k tomuto uživateli neudány"
 msgid "No correspondence attached"
 msgstr "Žádná připojená korespondence"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "Pro %1 není popis"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "Neudána skupina"
 
-#: html/Admin/Groups/index.html:52
-msgid "No groups matching search criteria found."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
-msgstr "Zpráva nepřipojena"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "Heslo nenastaveno"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr "Nedostatek práv k vytváření front"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "Nedostatek práv k vytváření požadavků ve frontě '%1'"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "Nedostatek práv k vytváření uživatelů"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "Nedostatek práv k zobrazení tohoto požadavku"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "Nedostatek práv k zobrazení aktualizace požadavku"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "Nezadán uživatel"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "Nevybráni uživatelé."
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr "Nenalezeny žádné fronty odpovídající vyhledávací podmínce."
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "Práva nenalezena"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "Nepřidělena žádná práva."
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "Bez vyhledání nelze pracovat."
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
-msgstr "Žádný předmět"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "No ticket id specified"
 msgstr "Neudán identifikátor požadavku"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "Neudán typ transakce"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "Nenalezeni uživatelé odpovídající vyhledávací podmínce"
 
@@ -3315,15 +2994,15 @@ msgstr "Nenalezeni uživatelé odpovídající vyhledávací podmínce"
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "Nenalezen platný uživatel RT. Ovlada� RT CVS uvolněn. Prosím pora�te se se svým správcem RT.\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr "Žádná z hodnot nanastavena na _Set!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "Nikdo"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr "Neexistující položka"
 
@@ -3331,15 +3010,15 @@ msgstr "Neexistující položka"
 msgid "Not logged in"
 msgstr "Nepřihlášen"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "Nepřihlášen."
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "Nenastaven"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "Zatím neimplementováno."
 
@@ -3347,11 +3026,11 @@ msgstr "Zatím neimplementováno."
 msgid "Not yet implemented...."
 msgstr "Zatím neimplementováno..."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "Poznámky"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "Upozornění nemůže být zasláno"
 
@@ -3365,11 +3044,11 @@ msgstr "Zaslat všem AdminCc jako komentář"
 
 #: etc/initialdata:93 etc/upgrade/3.1.17/content:6
 msgid "Notify Ccs"
-msgstr "Upozornit Ccs"
+msgstr ""
 
 #: etc/initialdata:89 etc/upgrade/3.1.17/content:2
 msgid "Notify Ccs as Comment"
-msgstr "Upozornit Ccs jako komentář"
+msgstr ""
 
 #: etc/initialdata:128
 msgid "Notify Other Recipients"
@@ -3389,7 +3068,7 @@ msgstr "Zaslat vlastníkovi jako komentář"
 
 #: etc/initialdata:376
 msgid "Notify Owner of their rejected ticket"
-msgstr "/"
+msgstr ""
 
 #: etc/initialdata:365
 msgid "Notify Owner of their ticket has been approved by all approvers"
@@ -3423,57 +3102,35 @@ msgstr "Zaslat žadatelům, všem Cc a všem AdminCc"
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "Zaslat žadatelům, v�em Cc a v�em AdminCc jako komentář"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "lis"
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr ""
-
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr "Objekt nemůže být vytvořen"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr "Objekt vytvořen"
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
-msgid "Object of type %1 cannot take custom fields"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:901
-msgid "Object type mismatch"
-msgstr ""
-
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "říj"
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
-msgstr "Off-line"
+msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
-msgstr "Úpravy off-line"
+msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
-msgstr "Off-line na�tení"
+msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "Dne"
 
@@ -3495,7 +3152,7 @@ msgstr "Při změně vlastníka"
 
 #: etc/initialdata:177 etc/upgrade/3.1.17/content:15
 msgid "On Priority Change"
-msgstr "Při změně priority"
+msgstr ""
 
 #: etc/initialdata:192
 msgid "On Queue Change"
@@ -3513,21 +3170,21 @@ msgstr "Při změně stavu"
 msgid "On Transaction"
 msgstr "Při transakci"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "Zobrazit jen schvalování pro požadavky založené po %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "Zobrazit jen schvalování pro požadavky založení před %quant(%1)"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Otevřené"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Otevřít"
 
@@ -3535,9 +3192,9 @@ msgstr "Otevřít"
 msgid "Open requests"
 msgstr "Otevřené požadavky"
 
-#: html/SelfService/Elements/Tabs:63
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
-msgstr "Otevřené požadavky"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Open tickets (from listing) in a new window"
@@ -3551,44 +3208,44 @@ msgstr "Otevřít požadavky (ze seznamu) v jiném okně"
 msgid "Open tickets on correspondence"
 msgstr "Otevřít požadavky při korespondenci"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
-msgstr "Řadit podle"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ordering and sorting"
 msgstr "Řazení a třídění"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Organizace"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "Původní požadavek: #%1"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
-msgstr "Odchozí zpráva o komentáři zaznamenána"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
-msgstr "Odchozí zpráva zaznamenána"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "Časem se priorita posouvá k"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr "Vlastnit požadavky"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr "Vlastnit požadavek"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "Vlastník"
 
@@ -3596,11 +3253,11 @@ msgstr "Vlastník"
 msgid "Owner changed from %1 to %2"
 msgstr "Vlastník změněn z %1 na %2"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
-msgstr "Vlastník nemůže být nastaven."
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "Vlastník nuceně změněn z %1 na %2"
@@ -3609,12 +3266,12 @@ msgstr "Vlastník nuceně změněn z %1 na %2"
 msgid "Owner is"
 msgstr "Vlastník"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
-msgstr "Stránka %1 z %2"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "Pager"
 
@@ -3622,53 +3279,36 @@ msgstr "Pager"
 msgid "PagerPhone"
 msgstr "Číslo pageru"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "Rodi�e"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "Heslo"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "Připomína� hesel"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "Heslo příliš krátké"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "Heslo: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
-msgstr "Hesla nesouhlasí."
+msgstr ""
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
-msgstr "Hesla nesouhlasí. Vaše heslo nebylo změněno"
+msgstr ""
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "Uživatelé"
 
@@ -3676,27 +3316,27 @@ msgstr "Uživatelé"
 msgid "Perform a user-defined action"
 msgstr "Provedení uživatelem definované akce"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
-msgstr "Konfigurace Perlu"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "Přístup nepovolen"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "Osobní skupiny"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Vlastní skupiny"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Vlastní skupiny:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "Čísla telefonů"
 
@@ -3704,7 +3344,7 @@ msgstr "Čísla telefonů"
 msgid "Placeholder"
 msgstr "Zábor místa"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "Nastavení"
 
@@ -3712,17 +3352,17 @@ msgstr "Nastavení"
 msgid "Prefs"
 msgstr "Nastavení"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "Prepare v zárodku"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "Předchozí"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
-msgstr "Předchozí stránka"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Previous page"
@@ -3732,33 +3372,33 @@ msgstr "Předchozí stránka"
 msgid "Pri"
 msgstr "Pri"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "Uživatel %1 nenalezen."
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Priorita"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "Priorita za�íná na"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
-msgstr "Vlastní:"
+msgstr ""
 
 #: etc/initialdata:25
 msgid "Privileged"
 msgstr "Privilegovaný"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "Privilegovaný stav: %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "Privilegovaní uživatelé"
 
@@ -3766,19 +3406,19 @@ msgstr "Privilegovaní uživatelé"
 msgid "Pseudogroup for internal use"
 msgstr "Pseudo skupina pro vnitřní použití"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
-msgstr "Dotaz"
+msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
-msgstr "Tvůrce dotazu"
+msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "Fronta"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
@@ -3788,7 +3428,7 @@ msgstr "Fronta %1 nenalezena"
 msgid "Queue '%1' not found\\n"
 msgstr "Fronta '%1' nenalezena\\n"
 
-#: html/Admin/Queues/Modify.html:64
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "Název fronty"
 
@@ -3796,19 +3436,19 @@ msgstr "Název fronty"
 msgid "Queue Scrips"
 msgstr "Scripy fronty"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "Fronta již existuje"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr "Fronta nemůže být vytvořena"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr "Fronta nemůže být na�tena."
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "Fronta vytvořena"
 
@@ -3816,32 +3456,32 @@ msgstr "Fronta vytvořena"
 msgid "Queue is not specified."
 msgstr "Není zadána fronta."
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "Fronta nenalezena"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "Fronty"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
-msgstr "Rychlé hledání"
+msgstr ""
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
-msgstr "Rychlé založení požadavku"
+msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 pro %2"
@@ -3854,7 +3494,7 @@ msgstr "RT %1 od <a href=\"http://bestpractical.com\">Best Practival Solutions,
 msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "Správa RT"
 
@@ -3874,7 +3514,7 @@ msgstr "Konfigura�ní chyba RT"
 msgid "RT Critical error. Message not recorded!"
 msgstr "Kritická chyba RT. Zpráva nezaznamenána!"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "Chyba RT"
 
@@ -3886,11 +3526,11 @@ msgstr "RT přijal poštu (%1) od sebe samého."
 msgid "RT Self Service / Closed Tickets"
 msgstr "RT Samoobsluha / Uzavřené požadavky"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
-msgstr "Proměnné RT"
+msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "RT v celé své záři"
 
@@ -3906,15 +3546,11 @@ msgstr "RT nemůže nalézt žadatele přes hledání v externí databázi"
 msgid "RT couldn't find the queue: %1"
 msgstr "RT nemůže nalézt frontu: %1"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "RT nemůže ověřit tento PGP podpis. \\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "RT pro %1"
@@ -3943,7 +3579,7 @@ msgstr "RT zpracuje tuto zprávu tak, jako by byla nepodepsaná.\\n"
 msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
 msgstr "Emailový příkazový režim RT vyžaduje PGP autentizaci. Nepodepsal jste vaši zprávu nebo váš podpis nemůže být ověřen."
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "Skute�né jméno"
 
@@ -3951,31 +3587,31 @@ msgstr "Skute�né jméno"
 msgid "RealName"
 msgstr "Skute�né jméno"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
-msgstr "Přidán odkaz z %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
-msgstr "Smazán odkaz z %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
-msgstr "Přidán odkaz na %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
-msgstr "Smazán odkaz na %1"
+msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "Je odkazem z"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "Odkazuje na"
 
@@ -3987,44 +3623,44 @@ msgstr "Zjemnit"
 msgid "Refine search"
 msgstr "Zjemnit vyhledání"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Obnovit tuto stránku %quant(%1,každou,každé,každých) %numf(%1) %quant(%1,minutu,minuty,minut)."
 
-#: html/Search/Bulk.html:116
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "Odstranit AdminCc"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Odstranit Cc"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "Odstranit žadatele"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
-msgstr "Adresa pro odpově�"
+msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
-msgstr "Odpově� žadatelům"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "Odpovědět na požadavky"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "Odpovídat na požadavky"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "Žadatel"
 
@@ -4036,37 +3672,37 @@ msgstr "Emailová adresa žadatele"
 msgid "Requestor(s)"
 msgstr "Žadatel(é)"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "Žadatelé"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "Požadavky mají být vyřešeny do"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
-msgstr "Povinný parametr '%1' neudán"
+msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Vynulovat"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Bydliště"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "Vyřešit"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "Vyřešení požadavku #%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "Vyřešen"
 
@@ -4074,7 +3710,7 @@ msgstr "Vyřešen"
 msgid "Response to requestors"
 msgstr "Odpově� žadatelům"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "Výsledky"
 
@@ -4082,61 +3718,61 @@ msgstr "Výsledky"
 msgid "Results per page"
 msgstr "Výsledků na stránku"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "Zopakujte heslo"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
-msgstr "Vrátit"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "Nenalezeno právo %1 pro %2 %3 v mezích %4 (%5)"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "Právo delegováno"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "Práva přidána"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "Právo na�teno"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "Právo nemůže být odebráno"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "Právo nenalezeno"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "Právo nena�teno."
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "Právo odebráno"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Práva"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "Práva pro %1 nemohou být přidělena"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "Práva nemohou být %1 odebrána"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "Pravidla"
 
@@ -4144,59 +3780,53 @@ msgstr "Pravidla"
 msgid "RootApproval"
 msgstr "Kořenový schvalovatel"
 
-#: html/Search/Elements/DisplayOptions:83
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
-msgstr "Řádek na stránku"
+msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "so"
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
-msgstr "Uložit"
+msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "Uložit změny"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
-msgstr "Uložit nastavení"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "Nezapomeňte uložit změny - "
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
-msgstr "Uložené dotazy"
+msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr "Scrip #%1"
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "Scrip vytvořen"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
-msgstr "Položky scripu"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "Scrip smazán"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "Scripy"
 
@@ -4204,151 +3834,94 @@ msgstr "Scripy"
 msgid "Scrips for %1\\n"
 msgstr "Scripy fro %1\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr "Scripy platné ve všech frontách"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
-msgstr "Vyhledat"
+msgstr "Vyhledávání"
 
 #: NOT FOUND IN SOURCE
 msgid "Search Criteria"
 msgstr "Podmínky vyhledávání"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
-
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr "Vyhledávání schvalování"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
-msgstr ""
-
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr "Zabezpe�ní:"
 
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "See custom fields"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
-msgstr "Vidět přesnou odchozí zprávu a její příjemce"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
-msgstr "Vidět soukromé komentáře požadavku"
-
-#: lib/RT/Queue_Overlay.pm:104
-msgid "See ticket summaries"
-msgstr "Vidět sumárně požadavek"
-
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "SeeCustomField"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
+#: lib/RT/Queue_Overlay.pm:80
+msgid "See ticket summaries"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
 msgstr "Vidět frontu"
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
-msgid "Select a Custom Field"
-msgstr ""
-
-#: html/Admin/Groups/index.html:78
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "Výběr skupiny"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "Výběr fronty"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr ""
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "Výběr uživatele"
 
-#: html/Admin/Elements/CustomFieldTabs:90
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
 msgid "Select custom field"
 msgstr "Vybrat uživatelskou položku"
 
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr ""
-
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "Vybrat skupinu"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr "Vybrat více hodnot"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr "Vybrat jednu hodnotu"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr "Výběr fronty"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr "Výběr scripu"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr "Vybrat vzor"
 
-#: lib/RT/CustomField_Overlay.pm:61
-msgid "Select up to %1 values"
-msgstr ""
-
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr "Výběr uživatele"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectMultiple"
 msgstr "Výběr vícenásobný"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:34
 msgid "SelectSingle"
 msgstr "Výbět jedine�ný"
 
-#: html/Admin/Elements/EditCustomFields:58
-msgid "Selected Custom Fields"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:59
-msgid "Selected objects"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Self Service"
 msgstr "Samoobsluha"
@@ -4379,11 +3952,11 @@ msgstr "Posílá e-mail všem přesně vyjmenovaným Cc a Bcc"
 
 #: etc/initialdata:94 etc/upgrade/3.1.17/content:7
 msgid "Sends mail to the Ccs"
-msgstr "Posílá e-mail Ccs"
+msgstr ""
 
 #: etc/initialdata:90 etc/upgrade/3.1.17/content:3
 msgid "Sends mail to the Ccs as a comment"
-msgstr "Posílá e-mail Ccs jako komentář"
+msgstr ""
 
 #: etc/initialdata:102
 msgid "Sends mail to the administrative Ccs"
@@ -4397,47 +3970,47 @@ msgstr "Posílá e-mail všem administrativním Cc jako komentář"
 msgid "Sends mail to the owner"
 msgstr "Posílá e-mail vlastníkovi"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "zář"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
-msgstr "Zobrazit"
+msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
-msgstr "Zobrazit sloupce"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "Zobrazit výsledky"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "Zobrazit schválené požadavky"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "Zobrazit základní údaje"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "Zobrazit odepřené požadavky"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "Zobrazit podrobnosti"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "Zobrazit trvající požadavky"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "Zobrazit požadavky �ekající na jejich schválení"
 
@@ -4449,47 +4022,43 @@ msgstr "Zobrazovat privátní komentáře požadavku"
 msgid "Show ticket summaries"
 msgstr "Zobrazovat výsledky požadavku"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
 msgstr "Zobrazovat seznam přístupových práv"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
-msgstr "Zobrazit odchotí e-mail"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
-msgstr "Zobrazit uložené dotazy"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr "Zobrazit scripy"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr "Zobrazit vzor"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr "Zobrazit požadavek"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr "Zobrazit komentáře požadavku"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr "Být žadatelem �i Cc požadavku �i fronty"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "Být AdminCc požadavku nebo fronty"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "Podpis"
 
@@ -4497,23 +4066,15 @@ msgstr "Podpis"
 msgid "Signed in as %1"
 msgstr "Příhlášen jako %1"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "Jednoduchá"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr "Přesko�it menu"
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr ""
-
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
 msgstr ""
 
@@ -4529,9 +4090,9 @@ msgstr "Třídit výsledky dle"
 msgid "SortOrder"
 msgstr "Třídící pořadí"
 
-#: html/Admin/Elements/EditScrip:87
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
-msgstr "Fáze"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Stalled"
@@ -4541,7 +4102,7 @@ msgstr "Odložené"
 msgid "Start page"
 msgstr "Úvodní stránka"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "Zapo�ato"
 
@@ -4549,7 +4110,7 @@ msgstr "Zapo�ato"
 msgid "Started date '%1' could not be parsed"
 msgstr "Datum zapo�etí '%1' nemůže být rozpoznáno"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "Za�íná"
 
@@ -4561,11 +4122,11 @@ msgstr "Za�íná"
 msgid "Starts date '%1' could not be parsed"
 msgstr "Datum za�ínání '%1' nemůže být rozpoznáno"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Stát"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Stav"
 
@@ -4573,7 +4134,8 @@ msgstr "Stav"
 msgid "Status Change"
 msgstr "Změna Stavu"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "Stav změněn z %1 na %2"
 
@@ -4581,37 +4143,33 @@ msgstr "Stav změněn z %1 na %2"
 msgid "StatusChange"
 msgstr "Změna stavu"
 
-#: html/Ticket/Elements/Tabs:170
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "Vzít"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
-msgstr "Vzít požadavky"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
-msgstr "Vzít požadavek"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "Vzato %1"
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
+msgid "Stolen from %1 "
+msgstr "Vzato %1 "
 
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Předmět"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "Předmět změněn na %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "Odeslat"
 
@@ -4619,48 +4177,43 @@ msgstr "Odeslat"
 msgid "Submit Workflow"
 msgstr "Potvrdit model zpracování"
 
-#: lib/RT/Group_Overlay.pm:782
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "Úspěšné"
 
-#: lib/RT/Date.pm:419
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "ne"
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "Super uživatel"
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "Systém"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
-msgstr "Systémová konfigurace"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "Systémová chyba"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr ""
-
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
-msgstr "Systémové nástroje"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "Systémová chyba. Právo nedelegováno."
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "Systémová chyba. Právo nepřiděleno."
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "Systémové skupiny"
 
@@ -4668,40 +4221,40 @@ msgstr "Systémové skupiny"
 msgid "SystemRolegroup for internal use"
 msgstr "Skupina systémovýh pravidel pro vnitřní použití"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "Mícha�ka na beton"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "Vzít"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
-msgstr "Vzít požadavky"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
-msgstr "Vzít požadavek"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "Vzatý"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Vzor"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "Vzor #%!"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "Vzor smazán"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Vzor nenalezen"
 
@@ -4709,11 +4262,11 @@ msgstr "Vzor nenalezen"
 msgid "Template not found\\n"
 msgstr "Vzor nenalezen\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Vzor rozpoznán"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Vzory"
 
@@ -4721,33 +4274,33 @@ msgstr "Vzory"
 msgid "Templates for %1\\n"
 msgstr "Vzory pro %1\\n"
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "Toto je již aktuální hodnota"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "Toto není hodnota pro tuto uživatelskou položku"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "Toto je shodná hodnota"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
-msgstr "Tento uživatel již toto práva má"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "Tento uživatel je již v této frontě %1"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "Tento uživatel je již u tohoto požadavku %1"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "Tento uživatel není v této frontě %1"
@@ -4756,11 +4309,11 @@ msgstr "Tento uživatel není v této frontě %1"
 msgid "That principal is not a %1 for this ticket"
 msgstr "Tento uživatel není u tohoto požadavku %1"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr "Tata fronta neexistuje"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "Tento požadavek má nevyřešené závislosti"
 
@@ -4768,47 +4321,47 @@ msgstr "Tento požadavek má nevyřešené závislosti"
 msgid "That user already has that right"
 msgstr "Tento uživatel již má toto právo"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr "Tento uživatel již tento požadavek vlastní"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "Tento uživatel neexistuje"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "Tento uživatel je již privilegován"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr "Tento uživatel je již neprivilegován"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "Uživatel je nyní privilegován"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr "Uživatel je nyní neprivilegován"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr "V této frontě nemůže tento uživatel vlastnit požadavky"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "Toto není �íselný identifikátor"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "Základní údaje"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr "Cc požadavku"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr "Administrativní Cc požadavku"
 
@@ -4816,7 +4369,7 @@ msgstr "Administrativní Cc požadavku"
 msgid "The comment has been recorded"
 msgstr "Komentář byl zaznamenán"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr "Následující příkaz najde všechny aktivní požadavky ve frontě 'general' a nastaví jejich priority na 99, pokud nebyly tknuty poslední 4 hodiny:"
 
@@ -4824,47 +4377,43 @@ msgstr "Následující příkaz najde všechny aktivní požadavky ve frontě 'g
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "Následující příkazy nebyly zpracovány\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "Nová hodnota nastavena."
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr "Vlastník požadavku"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "Žadatel požadavku"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "Tyto komentáře nejsou běžně viditelné uživateli"
 
-#: lib/RT/CustomField_Overlay.pm:912
-msgid "This custom field does not apply to that object"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
-msgstr "Tato funkce je dostupná jen správcům systému"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
-msgstr "Tato zpráva BUDE poslána na..."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "Tento požadavek %1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "Tento nástroj umožňuje uživateli spustit libovolné perl moduly z RT."
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "Tato transakce vypadá, že nemá obsah"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
 msgstr "nejdůležitější%quant(%1, požadavek,požadavky,ch požadavků) tohoto uživatele"
@@ -4873,7 +4422,7 @@ msgstr "nejdůležitější%quant(%1, požadavek,požadavky,ch požadavků) toho
 msgid "This user's 25 highest priority tickets"
 msgstr "25 nejdůležitějších požadavků tohoto uživatele"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "�t"
 
@@ -4881,24 +4430,24 @@ msgstr "�t"
 msgid "Ticket # %1  %2"
 msgstr "Požadavek # %1 %2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "Maxi aktualizace požadavku #%1: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "Požadavek #%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
-msgstr "Požadavek %1"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "Požadavek %1 vytvořen ve frontě '%2'"
@@ -4907,16 +4456,12 @@ msgstr "Požadavek %1 vytvořen ve frontě '%2'"
 msgid "Ticket %1 loaded\\n"
 msgstr "Požadavek %1 na�ten\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "Požadavek %1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
-msgid "Ticket Custom Fields"
-msgstr ""
-
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr "Historie požadavku # %1 %2"
@@ -4929,27 +4474,23 @@ msgstr "Identifikátor požadavku"
 msgid "Ticket Resolved"
 msgstr "Požadavek vyřešen"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
-msgid "Ticket Transactions"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Ticket attachment"
 msgstr "Příloha požadavku"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "Obsah požadavku"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "Typ obsahu požadavku"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "Požadaven nemůže být vytvořen pro vnitřní chybu"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "Požadavek vytvořen"
 
@@ -4957,7 +4498,7 @@ msgstr "Požadavek vytvořen"
 msgid "Ticket creation failed"
 msgstr "Nezdařilo se vytvoření požadavku"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "Požadavek smazán"
 
@@ -4965,9 +4506,9 @@ msgstr "Požadavek smazán"
 msgid "Ticket id not found"
 msgstr "Id požadavku nenalezeno"
 
-#: html/Ticket/Display.html:55
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
-msgstr "Metadata požadavku"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket not found"
@@ -4981,20 +4522,17 @@ msgstr "Stav požadavku změněn"
 msgid "Ticket watchers"
 msgstr "Pozorovatelé požadavku"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "Požadavky"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "Požadavky %1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "Požadavky %1 dle %2"
 
@@ -5002,42 +4540,38 @@ msgstr "Požadavky %1 dle %2"
 msgid "Tickets from %1"
 msgstr "Požadavky z %1"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr "Požadavky, které záleží na tomto schválení:"
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
-msgstr "Předpokládaný �as"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "Zbývající �as"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "Čas práce"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "Zbývající �as"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "Čas k zobrazení"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "Čas práce"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
 msgstr "Čas práce"
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:"
 msgstr "Vytvořit diff tohoto commitu:"
@@ -5046,45 +4580,37 @@ msgstr "Vytvořit diff tohoto commitu:"
 msgid "To generate a diff of this commit:\\n"
 msgstr "Vytvořit diff tohoto commitu:\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
-msgstr "K získání informací o podpoře, tréninku, zákaznických úpravách �i licencování kontaktujte prosím %1."
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "Poslední kontakt"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
-msgstr "Nástroje"
+msgstr ""
 
 #: etc/initialdata:252
 msgid "Transaction"
 msgstr "Transakce"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "Transakce %1 vymazána"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "Transakce vytvořena"
 
-#: html/Admin/Elements/QueueTabs:78
-msgid "Transaction Custom Fields"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:92
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "Bez udání id požadavku nelze volat Transaction->Create"
 
-#: lib/RT/Transaction_Overlay.pm:125
-msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr ""
-
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "Transakce jsou neměnné"
 
@@ -5092,19 +4618,19 @@ msgstr "Transakce jsou neměnné"
 msgid "Trying to delete a right: %1"
 msgstr "Pokus o smazání práva: %1"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "út"
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "typ"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "Neimplementováno"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Unixový login"
 
@@ -5112,57 +4638,44 @@ msgstr "Unixový login"
 msgid "UnixUsername"
 msgstr "Unixové uživatelské jméno"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "Neznámé kódování obsahu %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "NeomezenÄ›"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
-msgstr "Nepojmenovaný dotaz"
+msgstr ""
 
 #: etc/initialdata:32
 msgid "Unprivileged"
 msgstr "Neprivilegovaný"
 
-#: html/Admin/Elements/EditCustomFields:60
-msgid "Unselected Custom Fields"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:61
-msgid "Unselected objects"
-msgstr ""
-
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "Vrácen"
 
-#: html/Search/Bulk.html:54
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Aktualizace"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
-msgstr "Aktualizovat všechny"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update ID"
 msgstr "Identifikátor aktualizace"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
-msgstr "Aktualizovat požadavek"
+msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "Typ aktualizace"
 
@@ -5174,19 +4687,19 @@ msgstr "Aktualizovat spole�ně všechny tyty požadavky"
 msgid "Update email"
 msgstr "Aktualizovat email"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
-msgstr "Aktualizovat hromadně požadavky"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update name"
 msgstr "Aktualizovat jméno"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "Aktualizace nezaznamenána"
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "Aktualizovat vybrané požadavky"
 
@@ -5194,7 +4707,7 @@ msgstr "Aktualizovat vybrané požadavky"
 msgid "Update signature"
 msgstr "Aktualizace podpisu"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "Aktualizace požadavku"
 
@@ -5202,58 +4715,30 @@ msgstr "Aktualizace požadavku"
 msgid "Update ticket # %1"
 msgstr "Aktualizace požadavku # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "Aktualizace požadavku #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "Aktualizace požadavku #%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "Typ aktualizace nebyl ani korespondence ani komentář."
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
-msgstr "Na�íst"
-
-#: lib/RT/CustomField_Overlay.pm:84
-msgid "Upload multiple files"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:79
-msgid "Upload multiple images"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:85
-msgid "Upload one file"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:80
-msgid "Upload one image"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:86
-msgid "Upload up to %1 files"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:81
-msgid "Upload up to %1 images"
 msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
-msgstr "Na�íst vaše změny"
-
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5264,52 +4749,55 @@ msgstr "Uživatel %1 %2: %3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "Heslo uživatele %1: %2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
-msgstr "Uživatel '%1' nemůže být nalezen"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "Uživatel '%1' nenalezen"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "Uživatel '%1' nenalezen\\n"
 
 #: etc/initialdata:132 etc/initialdata:206
 msgid "User Defined"
 msgstr "Uživatelem definované"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
-msgstr "Uživatelem definované podmínky a akce"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User ID"
 msgstr "Identifikátor uživatele"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "Identifikátor uživatele"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "Práva uživatele"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
-msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "Uživatel nemůže být vytvořen: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "Uživatel vytvořen"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Uživatelem definované skupiny"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
-msgstr "Uživatel na�ten"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User notified"
@@ -5319,43 +4807,39 @@ msgstr "Uživatel upozorněn"
 msgid "User view"
 msgstr "Uživatelský pohled"
 
-#: html/Admin/Groups/index.html:99
-msgid "User-defined groups"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Uživatelé"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "Uživatelé odpovídající podmínce vyhledání"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
-msgstr "Platný dotaz"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "ValueOfQueue"
 msgstr "Hodnota fronty"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Hodnoty"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr "Být pozorovatelem"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr "Být AdminCc pozorovatelem"
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "Pozorovatelé"
 
@@ -5363,7 +4847,7 @@ msgstr "Pozorovatelé"
 msgid "WebEncoding"
 msgstr "Kódování WWW"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "st"
 
@@ -5397,7 +4881,7 @@ msgstr "Změní-li se vlastník požadavku"
 
 #: etc/initialdata:178 etc/upgrade/3.1.17/content:16
 msgid "Whenever a ticket's priority changes"
-msgstr "Při změně priority požadavku"
+msgstr ""
 
 #: etc/initialdata:193
 msgid "Whenever a ticket's queue changes"
@@ -5419,35 +4903,35 @@ msgstr "Přijde-li komentář"
 msgid "Whenever correspondence comes in"
 msgstr "Přijde-li korespondence"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Zaměstnání"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
-msgstr "Pracovat off-line"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "WorkPhone"
 msgstr "Telefon do zaměstnání"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "Odpracováno"
 
-#: NOT FOUND IN SOURCE
+#: html/autohandler:150
 msgid "XXX CHANGEME You are not an authorized user"
-msgstr "XXX ZMĚNIT Nejste autorizovaný uživatel"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "Požadavek již vlastníte"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "Nejste autorizovaný uživatel"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "Můžete přidělit pouze požadavky, které jsou vaše nebo nejsou vlastněny"
 
@@ -5455,25 +4939,25 @@ msgstr "Můžete přidělit pouze požadavky, které jsou vaše nebo nejsou vlas
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "Nemáte právo k zobrazení tohoto požadavku.\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "Nalezl jste %1 požadavků ve frontě %2"
 
 #??? quant
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "Byl jste odhlášen od RT."
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "V této frontě nemáte práva vytvářet požadavky."
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "V této frontě nemůžete vytvářet požadavky."
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "Jste vítáni k dalšímu přihlášení"
 
@@ -5501,36 +4985,24 @@ msgstr "Váš požadavek byl odmítnut"
 msgid "Your request was rejected."
 msgstr "Váš požadavek byl odmítnut."
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "Vaše uživatelské jméno �i heslo je nesprávné"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "PSČ"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
-msgstr ""
-
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
-msgstr ""
-
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "jak je dovoleno %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
-msgstr "uzavřen"
+msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "obsahuje"
 
@@ -5550,7 +5022,7 @@ msgstr "korespondence (zřejmě) neposlána"
 msgid "correspondence sent"
 msgstr "korespondence poslána"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "dnů"
 
@@ -5558,92 +5030,64 @@ msgstr "dnů"
 msgid "delete"
 msgstr "smazat"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "smazán"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "neodpovídá"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "equal to"
 msgstr "je rovno"
 
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr ""
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr ""
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "filename"
 msgstr "název souboru"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "větší než"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "skupina '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "hodin"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "Identifikátor"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "je"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "není"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "menší než"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "odpovídá"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "min"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "minut"
 
@@ -5651,88 +5095,84 @@ msgstr "minut"
 msgid "modifications\\n\\n"
 msgstr "úpravy\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "měsíců"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "nový"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
-msgstr "bez jména"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "znehodnotit"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "žádný"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "není rovno"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "otevřený"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "vlastní skupina '%1' pro uživatele '%2'"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "fronta %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "zamítnutý"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "vyřešený"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "sek"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "odložený"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "systém %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "systémová skupina '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "volající komponenta neudala důvod"
 
-#: lib/RT/Group_Overlay.pm:238
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "požadavek #%1 %2"
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "nepopsaná skupina %1"
@@ -5741,12 +5181,12 @@ msgstr "nepopsaná skupina %1"
 msgid "undescripbed group %1"
 msgstr "nepopsaná skupina %1"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "uživatel %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "týdnů"
 
@@ -5754,7 +5194,7 @@ msgstr "týdnů"
 msgid "with template %1"
 msgstr "se vzorem %1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "roků"
 
diff --git a/rt/lib/RT/I18N/da.po b/rt/lib/RT/I18N/da.po
index 76e97f5..e2a2e8c 100644
--- a/rt/lib/RT/I18N/da.po
+++ b/rt/lib/RT/I18N/da.po
@@ -1,8 +1,5 @@
 msgid ""
 msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 
 #: NOT FOUND IN SOURCE
 msgid "#"
@@ -12,64 +9,67 @@ msgstr "#"
 msgid "#%1"
 msgstr "#%1"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr "#%1: %2"
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
-msgstr "$prefix %1"
+msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
-msgstr "%1 #%2"
+msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
-msgstr "%1 %2 %3"
+msgstr ""
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%2 %1 %3 %4:%5:%6 %7"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "%1 %2 tilføjet"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "%1 %2 siden"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 %2 ændret til %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
 msgstr "%1 %2 slettet"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "%1 %2 med skabelon %3"
@@ -78,46 +78,46 @@ msgstr "%1 %2 med skabelon %3"
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 denne ticket\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
-msgstr "%1 (%2) af %3"
+msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
-msgstr "%1 (Uændret)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 - %2 shown"
 msgstr "%1 - %2 vist"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr "%1 - Et argument til afsendelse til %2"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr "%1 - Send status opdateringer til STDOUT"
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr "%1 - Specificér den aktion du ønsker at benytte"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr "%1 - Specificer det betingelses modul du ønsker at benytte"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - Specificer det søge modul du ønsker at benytte"
@@ -128,35 +128,20 @@ msgstr "%1 - Specificer det søge modul du ønsker at benytte"
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
-msgstr "%1 RT %2 Copyright 1996-%3 %4."
+msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "%1 ScripAktion indlæst"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "%1 tilføjet som en værdi for %2"
@@ -169,31 +154,32 @@ msgstr "%1 aliaser kræver en TicketID at arbejde på"
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
 msgstr "%1 aliaser kræver en TicketID at arbejde på (fra %2) %3"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 synes at være et lokalt object, men kan ikke findes i databasen"
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 af %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 ændret fra %2 til %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
-msgstr "%1 kopier"
+msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "%1 kunne ikke sættes til %2"
 
@@ -201,40 +187,31 @@ msgstr "%1 kunne ikke sættes til %2"
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 kun ikke initiere en transaktion (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 kunne ikke sætte status til løst. RT's Database er muligvis inkonsistent"
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
-msgid "%1 created"
-msgstr "%1 oprettet"
-
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
-msgid "%1 deleted"
-msgstr "%1 slettet"
-
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
-msgstr "%1 højest prioriterede tickets jeg ejer"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 highest priority tickets I own..."
-msgstr "%1 højest prioriterede tickets jeg ejer..."
+msgstr "%1 højest prioriteterede tickets jeg ejer..."
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "%1 højest prioriterede tickets jeg har anmodet om"
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr "%1 er et værktøj som reagerer på tickets fra et eksternt skedulerings værktøj såsom cron."
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 er ikke længere en %2 for denne kø"
@@ -243,7 +220,8 @@ msgstr "%1 er ikke længere en %2 for denne kø"
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 er ikke længere en %2 for denne ticket."
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 er ikke længere en værdi for special felt %2"
 
@@ -251,7 +229,7 @@ msgstr "%1 er ikke længere en værdi for special felt %2"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 er ikke en lovlig kø ID"
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -260,20 +238,16 @@ msgstr "%1 er ikke en lovlig kø ID"
 msgid "%1 min"
 msgstr "%1 min."
 
-#: html/Elements/MyRequests:47
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
-msgstr "%1 nyeste ikke ejede tickets"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 not shown"
 msgstr "%1 ikke vist"
 
-#: lib/RT/CustomField_Overlay.pm:827
-msgid "%1 objects"
-msgstr "%1 objekter"
-
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "%1 rettigheder"
@@ -290,7 +264,7 @@ msgstr "%1 type er ukendt for $MessageId"
 msgid "%1 type unknown for %2"
 msgstr "%1 type ukendt for %2"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 vil løse samtlige alle medlemmer af en løst gruppe ticket."
@@ -300,36 +274,28 @@ msgstr "%1 vil løse samtlige alle medlemmer af en løst gruppe ticket."
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "%1 vil "
 
-#: lib/RT/CustomField_Overlay.pm:828
-msgid "%1's %2 objects"
-msgstr "%1's %2 objekter"
-
-#: lib/RT/CustomField_Overlay.pm:829
-msgid "%1's %2's %3 objects"
-msgstr "%1's %2's %3 objekter"
-
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
-msgstr "%1's gemte søgninger"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: ingen vedhæftet fil angivet"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1b"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1k"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' er ikke en valid status værdi"
@@ -342,50 +308,50 @@ msgstr "'%1' er ikke en genkendt aktion. "
 msgid "(Check box to delete scrip)"
 msgstr "(Check box til sletning af scrip)"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(Check box til sletning)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
-msgstr "(Check bokse for fravalg af notificering af de listede modtagere)"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
-msgstr "(Check bokse for tilvalg af notificering af de listede modtagere)"
+msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr "(Indtast ticket ids eller URLSs, separeret af mellemrum)"
 
 #MANGLER
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(Hvis ikke angivet vil defaulte til %1)"
+msgid "(If left blank, will default to %1"
+msgstr "(Hvis ikke angivet vil defaulte til %1"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(Ingen custom felter)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(Ingen medlemmer)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "(Ingen scrips)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr "(Ingen templates)"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Sender en blind karbon-kopi af denne opdatering til en komma separeret liste af e-mail adresser. Ændrer <b>IKKE</b> hvem som vil modtage fremtidige opdateringer.)"
 
@@ -393,11 +359,11 @@ msgstr "(Sender en blind karbon-kopi af denne opdatering til en komma separeret
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Sender en blind karbon-kopi af denne opdatering til en komma separeret liste af e-mail adresser. Ændrer <b>IKKE</b> hvem som vil modtage fremtidige opdateringer.)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Sender en karbon-kopi af denne opdatering til en komma separeret liste af e-mail adresser. Disse <b>vil</b> modtage fremtidige opdateringer.)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Sender en karbon-kopi af denne opdatering til en komma separeret liste af e-mail adresser. Ændrer <b>IKKE</b> hvem som vil modtage fremtidige opdateringer.)"
 
@@ -405,19 +371,19 @@ msgstr "(Sender en karbon-kopi af denne opdatering til en komma separeret liste
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Sender en karbon-kopi af denne opdatering til en komma separeret liste af e-mail adresser. Disse <b>vil</b> modtage fremtidige opdateringer.)"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Sender en karbon-kopi af denne opdatering til en komma separeret liste af e-mail adresser. Disse <b>vil</b> modtage fremtidige opdateringer.)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
-msgstr "(Benyt disse felter når du vælger 'Bruger Defineret' for en betingelse eller aktion"
+msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(tom)"
 
-#: html/Admin/Users/index.html:60
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr "(intet navn listet)"
 
@@ -425,35 +391,31 @@ msgstr "(intet navn listet)"
 msgid "(no subject)"
 msgstr "(intet emne)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(ingen værdi)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
-msgid "(no values)"
-msgstr "(ingen værdier)"
-
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(kun en ticket)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(afventer godkendelse)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
-msgstr "(afventer anden Samling)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "(pending other tickets)"
 msgstr "(afventer andre tickets)"
 
-#: html/Admin/Users/Modify.html:71
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(obligatorisk)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(unavngiven)"
 
@@ -465,24 +427,24 @@ msgstr "25 højest prioriterede tickets jeg ejer..."
 msgid "25 highest priority tickets I requested..."
 msgstr "25 højest prioriterede tickets jeg har anmodet..."
 
-#: html/Ticket/Elements/ShowBasics:53
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr "<% $Ticket->Status%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr "<% $_ %>"
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
-msgstr "<%$_%>"
+msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
 #MANGLER
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Ny ticket i\">&nbsp;%1"
@@ -491,85 +453,69 @@ msgstr "<input type=\"submit\" value=\"Ny ticket i\">&nbsp;%1"
 msgid "A blank template"
 msgstr "En blank template"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE ikke fundet"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "ACEs kan kun blive oprettet og slettet"
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr "OG"
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "Afbryder for a undgå utilsigtede ticket ændringer"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "Om mig"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "Adgangskontrol"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Aktion"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "Aktion %1 ikke fundet"
 
 #MANGLER
-#: NOT FOUND IN SOURCE
+#: bin/rt-crontool:119
 msgid "Action committed."
 msgstr "Aktion "
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr "Aktion committet.\\n"
-
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "Aktion forberedt"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
-msgstr "Tilføj"
+msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "Tilføj AdminCc"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "Tilføj Cc"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr "Tilføj kolonner"
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
-msgstr "Tilføj Kriterie"
+msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "Tilføj flere filer"
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "Tilføj Anmoder"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr "Tilføj værdi"
 
@@ -581,54 +527,50 @@ msgstr "Tilføj en ny global scrip"
 msgid "Add a scrip to this queue"
 msgstr "Tilføj en scrip til denne kø"
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr "Tilføj en scrip som vil virke for alle køer"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
-msgstr "Tilføj yderligere kriterier"
+msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "Tilføj kommentarer eller svar til valgte tickets"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "Tilføj medlemmer"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Tilføj nye watchers"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr "Tilføj, slet og editer custom felt værdier for objekter"
-
 HERTIL
 #: NOT FOUND IN SOURCE
 msgid "AddNextState"
 msgstr "TilføjNæsteStatus"
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "Tilføjede principal som %1 for denne kø"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "Tilføjede principal som %1 for denne ticket"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "Adresse1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "Adresse2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "Admin Cc"
 
@@ -640,7 +582,7 @@ msgstr "Admin Kommentar"
 msgid "Admin Correspondence"
 msgstr "Admin Korrespondance"
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "Admin Køer"
 
@@ -648,7 +590,7 @@ msgstr "Admin Køer"
 msgid "Admin users"
 msgstr "Admin brugere"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "Amin/Global konfiguration"
 
@@ -665,7 +607,7 @@ msgstr "Admin/Køer/Basics"
 msgid "AdminAllPersonalGroups"
 msgstr "AdminAllPersonligeGrupper"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "AdminCc"
 
@@ -677,47 +619,43 @@ msgstr "AdminKommentar"
 msgid "AdminCorrespondence"
 msgstr "AdminKorrespondance"
 
-#: lib/RT/CustomField_Overlay.pm:101
-msgid "AdminCustomField"
-msgstr "AdminCustomerField"
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Queue_Overlay.pm:73
 msgid "AdminCustomFields"
 msgstr "AdminCustomFelter"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "AdminGruppe"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "AdminGruppeMedlemskab"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr "AdminEgnePersonligeGrupper"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr "AdminKø"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr "AdminBrugere"
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "Administrativ Cc"
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
-msgstr "Avanceret"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Advanced Search"
 msgstr "Avanceret Søgning"
 
-#: html/Elements/SelectDateRelation:57
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "Efter"
 
@@ -725,19 +663,15 @@ msgstr "Efter"
 msgid "Age"
 msgstr "Alder"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr "Aggregator"
-
 #: etc/initialdata:363
 msgid "All Approvals Passed"
 msgstr "All godkendelser godtaget"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "Alle custom felter"
 
-#: html/Admin/Queues/index.html:75
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "Alle Køer"
 
@@ -745,39 +679,31 @@ msgstr "Alle Køer"
 msgid "Always sends a message to the requestors independent of message sender"
 msgstr "Sender altid en besked til requestoren uafhængigt af besked afsenderen"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr "Og/Eller"
-
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
-msgid "Applies to"
-msgstr "Gælder for"
-
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
-msgstr "Foretag"
+msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
-msgstr "Foretag dine ændringer"
+msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "Godkendelse"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "Godkendelse #%1: %2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr "Godkendelse #%1: Noter ikke gemt grundet en system fejl"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr "Godkendelse #%1: Noter gemt"
@@ -798,7 +724,7 @@ msgstr "Godkendelse afvist"
 msgid "Approval diagram"
 msgstr "Godkendelses diagram"
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "Godkend"
 
@@ -806,56 +732,48 @@ msgstr "Godkend"
 msgid "Approver's notes: %1"
 msgstr "Apprtover's noter: %1"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "Apr."
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "Stigende"
 
-#: lib/RT/Queue_Overlay.pm:97
-msgid "Assign and remove custom fields"
-msgstr "Tilføj og slet custom felter"
-
-#: lib/RT/Queue_Overlay.pm:97
-msgid "AssignCustomFields"
-msgstr "TilknytCustomFelter"
-
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "Vedhæft"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "Vedhæftet fil"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "Vedhæftede fil '%1' kunne ikke indlæses"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "Vedhæftet fil oprettet"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "Vedhæftetfilnavn"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Vedhæftede filer"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
-msgstr "Attribut Slet"
+msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "Aug."
 
@@ -875,6 +793,10 @@ msgstr "Autosvar til Requestere"
 msgid "AutoreplyToRequestors"
 msgstr "AutoSvarTilRequestere"
 
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
 msgstr "Ubrugelig PGP Signatur: %1\\n"
@@ -891,19 +813,19 @@ msgstr "DÃ¥rlige data i %1"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "Ubrugeligt transaktionsnummer for vedhæftet fil. %1 skulle være %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "Basics"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "Vær sikker på at gemme dine ændringer"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "Før"
 
@@ -911,117 +833,92 @@ msgstr "Før"
 msgid "Begin Approval"
 msgstr "PÃ¥begynd godkendelse"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Binary"
-msgstr "Binær"
-
 #: etc/initialdata:217
 msgid "Blank"
 msgstr "Tom"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr "Fed"
-
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
 msgstr "URl for denne søgning som kan gemmes som bookmark"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
-msgstr "Bogmærkbart link"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "Korte headers"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "Masse-ticket opdatering"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "Kan ikke modificere system brugere"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr "Kan denne principal se denne kø"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "Kan ikke tilføje custom felt værdi uden et navn"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
-msgstr "Kan ikke finde en gemt søgning til at arbejde med"
+msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "Kan ikke linke en ticket til den selv"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "Kan ikke sammensætte ind i en sammensat ticket. Du skulle aldrig få denne fejl"
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
-msgstr "Kan ikke gemme denne søgning"
+msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "Kan ikke specificere både base og mål"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "Kan ikke oprette bruger: %1"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Cc"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "Skift adgangskode"
 
-#: html/Elements/Submit:100
-msgid "Check All"
-msgstr "Vælg Alle"
-
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "Vælg boks for at slette"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "Vælg boks for a indrage rettighed"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "Børn"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "By"
 
-#: html/Elements/Submit:102
-msgid "Clear All"
-msgstr "Fravælg Alle"
-
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "Lukket"
 
-#: NOT FOUND IN SOURCE
+#: html/SelfService/Closed.html:24
 msgid "Closed Tickets"
 msgstr "Lukkede Tickets"
 
@@ -1029,7 +926,7 @@ msgstr "Lukkede Tickets"
 msgid "Closed requests"
 msgstr "Lukkede requests"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr "Lukkede requests"
 
@@ -1037,11 +934,11 @@ msgstr "Lukkede requests"
 msgid "Command not understood!\\n"
 msgstr "Kommando ikke forstået!\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Kommentar"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "Kommentar adresse"
 
@@ -1049,11 +946,11 @@ msgstr "Kommentar adresse"
 msgid "Comment not recorded"
 msgstr "Kommentar ikke skrevet"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr "Kommentér på tickets"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr "KommenterPÃ¥Ticket"
 
@@ -1061,11 +958,11 @@ msgstr "KommenterPÃ¥Ticket"
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "Kommentarer (ikke sendt til requestere)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "Kommentarer (ikke sendt til requestere)"
 
@@ -1073,15 +970,15 @@ msgstr "Kommentarer (ikke sendt til requestere)"
 msgid "Comments about %1"
 msgstr "Kommentarer på %1"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "Kommentarer om denne bruger"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "Kommentarer tilføjet"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr "Commit Ryddet"
 
@@ -1089,23 +986,23 @@ msgstr "Commit Ryddet"
 msgid "Compile Restrictions"
 msgstr "Oversættelses Restriktioner"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "Betingelse"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr "Betingelser matcher..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "Betingelse ikke fundet"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "Bekræft"
 
@@ -1117,17 +1014,17 @@ msgstr "KontaktInfomationsSystem"
 msgid "Contacted date '%1' could not be parsed"
 msgstr "Dato kontaktet: '%1' kunne ikke parses"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "Indhold"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
-msgstr "Content-Type"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:64
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
-msgstr "Kopier"
+msgstr ""
 
 #: etc/initialdata:286
 msgid "Correspondence"
@@ -1137,7 +1034,7 @@ msgstr "Korrespondance"
 msgid "Correspondence Address"
 msgstr "Korrespondance adresse"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "Korrenspondance tilføjet"
 
@@ -1145,47 +1042,33 @@ msgstr "Korrenspondance tilføjet"
 msgid "Correspondence not recorded"
 msgstr "Korrespondance ikke gemt"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
 msgstr "Ikke muligt at tilføje ny custom felt værdi for ticket. "
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr "Kunne ikke tilføje ny custom felt værdi"
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr "Kunne ikke tilføje ny custom felt værdi. %1"
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "Ikke muligt at skifte ejer"
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "Ikke muligt at oprette Custom felt"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr "Kunne ikke oprette CustomField: %1"
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "Ikke muligt at oprette gruppe"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "Ikke muligt at oprette template: %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "Ikke muligt at oprette ticket. Kø ikke sat"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "Ikke muligt at oprette bruger"
 
@@ -1197,11 +1080,11 @@ msgstr "Ikke muligt at finde ticket med id %1"
 msgid "Could not find group %1."
 msgstr "Ikke muligt at finde gruppe %1"
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "Ikke muligt at finde eller oprette den bruger"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "Ikke muligt at finde principal"
 
@@ -1209,34 +1092,21 @@ msgstr "Ikke muligt at finde principal"
 msgid "Could not find user %1."
 msgstr "Ikke muligt at finde bruger %1"
 
-#: html/Admin/CustomFields/Objects.html:69
-msgid "Could not load CustomField %1"
-msgstr "Kunne ikke indlæse CustomFelt %1"
-
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "Ikke muligt at indlæse gruppe"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "Kunne ikke g¯re den principal %1 for denne k¯"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "Kunne ikke g¯re den prinicipal %1 for denne ticket"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "Kunne ikke fjerne den principal %1 for denne k¯"
@@ -1245,15 +1115,15 @@ msgstr "Kunne ikke fjerne den principal %1 for denne k¯"
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "msgstr "Kunne ikke fjerne den principal %1 for denne ticket" "
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
-msgstr "Kunne ikke sætte bruger info"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "Kunne ikke tilf¯je medlem til gruppe"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "Kunne ikke oprette en lave transaktion: %1"
@@ -1266,65 +1136,50 @@ msgstr "Kunne ikke afg¯re hvad som skulle foretages ud fra GPG's svar\\n"
 msgid "Couldn't find group\\n"
 msgstr "Kunne ikke finde gruppe\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr "Kunne ikke finde row"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "Kunne ikke finde den principal"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
-msgstr "Kunne ikke finde den værdi"
+msgstr "Kunne ikke finde den vÊrdi"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find user\\n"
 msgstr "Kunne ikke finde bruger\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
-msgstr "Kunne ikke indlæse %1 fra bruger database.\\n"
-
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
-msgid "Couldn't load Class %1"
-msgstr "Kunne ikke indlæse klasse %1"
-
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
-msgid "Couldn't load CustomField %1"
-msgstr "Kunne ikke indlæse CustomField %1"
+msgstr "Kunne ikke indlÊse %1 fra bruger database.\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load RT config file '%1' %2"
-msgstr "Kunne ikke indlæse RT konfigurations fil '%1' %2"
+msgstr "Kunne ikke indlÊse RT konfigurations fil '%1' %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load Scrips."
-msgstr "Kunne ikke indlæse Scrips."
+msgstr "Kunne ikke indlÊse Scrips."
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
-msgstr "Kunne ikke indlæse gruppe %1"
+msgstr "Kunne ikke indlÊse gruppe %1"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
-msgstr "Kunne ikke indlæse link"
+msgstr "Kunne ikke indlÊse link"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
-msgid "Couldn't load object %1"
-msgstr "Kunne ikke indlæse object %1"
-
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
-msgstr "Kunne ikke indlæse k¯"
+msgstr "Kunne ikke indlÊse k¯"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "Kunne ikke indlÊse k¯ %1"
@@ -1341,26 +1196,16 @@ msgstr "Kunne ikke indlÊse template"
 msgid "Couldn't load that user (%1)"
 msgstr "Kunne ikke indlÊse den bruger (%1)"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "Kunne ikke indlÊse ticket '%1'"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "Land"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "opret"
 
@@ -1368,16 +1213,16 @@ msgstr "opret"
 msgid "Create Tickets"
 msgstr "opret Tickets"
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "opret et Custom felt"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr "opret et Custom felt for k¯ %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:47
 msgid "Create a CustomField which applies to all queues"
 msgstr "opret et Custom felt som gÊlder for alle k¯er"
 
@@ -1389,11 +1234,11 @@ msgstr "opret et nyt Custom felt"
 msgid "Create a new global scrip"
 msgstr "opret en ny global scrip"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "opret en ny gruppe"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "opret en ny personlig gruppe"
 
@@ -1409,15 +1254,15 @@ msgstr "opret en ny scrip"
 msgid "Create a new template"
 msgstr "opret en ny template"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "opret en ny ticket"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "opret en ny bruger"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "opret en ny k¯"
 
@@ -1429,16 +1274,16 @@ msgstr "opret en k¯ med navnet"
 msgid "Create a request"
 msgstr "opret en request"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr "opret en scrip for k¯ %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "opret en template"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr "opret en ticket"
 
@@ -1446,19 +1291,19 @@ msgstr "opret en ticket"
 msgid "Create new tickets based on this scrip's template"
 msgstr "opret en ny ticket baseret p denne scrip's template"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "opret ticket"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr "opret tickets i denne k¯"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "opret, slet og rediger custom felter"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr "opret, slet og rediger k¯er"
 
@@ -1466,27 +1311,23 @@ msgstr "opret, slet og rediger k¯er"
 msgid "Create, delete and modify the members of any user's personal groups"
 msgstr "opret, slet og rediger medlemmerne af vilkÂrlig brugers personlige grupper"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "opret, slet og rediger medlemmernes personlie grupper"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "opret, slet og rediger brugere"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr "OpretGemtSøgning"
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr "OpretTicket"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "Oprettet"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "Oprettede Customer felt %1"
@@ -1495,23 +1336,23 @@ msgstr "Oprettede Customer felt %1"
 msgid "Created template %1"
 msgstr "Oprettede template %1"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
-msgstr "Opretter"
+msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "Nuværende relationer"
 
-#: html/Admin/Elements/EditScrips:51
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "Nuværende Scrips"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "Nuværende medlemmer"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Nuværende rettigheder"
 
@@ -1519,63 +1360,60 @@ msgstr "Nuværende rettigheder"
 msgid "Current search criteria"
 msgstr "Nuværende søgekriterier"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
-msgstr "Nuværende watchere"
+msgstr "NuvÊrende watchere"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
 msgid "Custom Field #%1"
-msgstr "Custom Felt #%1"
+msgstr "Custom Field #%1"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "Custom Felter"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
-msgid "Custom Fields for %1"
-msgstr "Custom Felter for %1"
-
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr "Custom aktion oprydnings kode"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "Custom aktion forberedelses kode"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "Custom betingelse"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "Custom felt %1 %2 %3"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "Custom felt %1 har vÊrdi."
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "Custom felt %1 har ingen vÊrdi."
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "Custom felt %1 ikke fundet"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
 msgstr "Custom felt slettet"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "Custom felt ikke fundet"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "Custom felt vÊrdi %1 kunne ikke blive fundet for custom felt %2"
@@ -1584,27 +1422,27 @@ msgstr "Custom felt vÊrdi %1 kunne ikke blive fundet for custom felt %2"
 msgid "Custom field value changed from %1 to %2"
 msgstr "Custom felt vÊrdi Êndret fra %1 to %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "Custom felt vÊrdi kunne ikke slettes"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "Custom felt vÊrdi kunne ikke findes"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "Custom felt vÊrdi slettet"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr "CustomFelt"
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Datoer"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "Dec."
 
@@ -1616,13 +1454,13 @@ msgstr "Default Autosvars Template"
 msgid "Default Autoresponse template"
 msgstr "Default autosvars template"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
-msgstr "Default Kø"
+msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
-msgstr "Default Requestor"
+msgstr ""
 
 #: etc/initialdata:296
 msgid "Default admin comment template"
@@ -1640,72 +1478,64 @@ msgstr "Default korrespondance template"
 msgid "Default transaction template"
 msgstr "Default transaktions template"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "Default: %1/%2 Êndret til %3 to %4"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "Overdrag rettigheder"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr "Overdrag specifikke rettigeder som er blevet tildelt til dig."
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr "OverdragRettigheder"
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "Overdragelse"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "Slet"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
-msgstr "Slet Template"
-
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
-msgstr "Slet valgte scrips"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr "Slet tickets"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr "SletTicket"
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "Sletning af dette objekt kan ¯delÊgge referentiel integritet"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "Sletning af dette objekt vil ¯delÊgge referentiel integritet"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "Sletning af dette objekt vil stride mod referentiel integritet"
 
-#: html/Approvals/Elements/Approve:66
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "Afvis"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "Afhængighed til"
 
@@ -1713,39 +1543,39 @@ msgstr "Afhængighed til"
 msgid "Dependencies: \\n"
 msgstr "Afhængigheder: \\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr "Afhængighed til %1 tilf¯jet"
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr "Afhængighed til %1 slettet"
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr "Afhængighed af %1 tilf¯jet"
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr "Afhængighed af %1 slettet"
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "Afhængig af"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "Faldende"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "Beskriv problemet nedenfor"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -1753,51 +1583,47 @@ msgstr "Beskrivelse"
 msgid "Details"
 msgstr "Detaljer"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "Vis"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr "Vis Adgangs Kontrol Liste"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
-msgstr "Vis Kolonner"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr "Vis Scrip templates for denne kø"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr "Vis scrips for denne kø"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "Visnings modus"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
-msgstr "Vis gemte søgninger fir denne gruppe"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Display ticket #%1"
 msgstr "Vis ticket #%1"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
-msgstr "Distribueret under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> af GNU GPL'en.</a>"
+msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "Gør noget og alting"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr "Foretag Søgningen"
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "Genindlæs ikke denne side-"
 
@@ -1805,15 +1631,11 @@ msgstr "Genindlæs ikke denne side-"
 msgid "Don't show search results"
 msgstr "Vis ikke søge resultater"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "Download"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
-msgid "Download as a tab-delimited file"
-msgstr "Download som en tab-opdelt fil"
-
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "Forfaldende"
 
@@ -1829,45 +1651,33 @@ msgstr "FEJL: Kunne ikke indlæse ticket '%1': %2.\\n"
 msgid "Edit"
 msgstr "Editér"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "Editér customer felter for %1"
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
-msgstr ""
-
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "Editér forhold"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
-msgstr "Editér Søgning"
+msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr "Editér Templates for kø %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
-msgstr "Editér gemte søgniner for denne gruppe"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Edit scrips"
 msgstr "Editér scrips"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "Editér system templates"
 
@@ -1875,11 +1685,11 @@ msgstr "Editér system templates"
 msgid "Edit templates for %1"
 msgstr "Editér templates for %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
-msgstr "EditerGemteSøgninger"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr "Editér Konfiguration for kø %1"
@@ -1888,17 +1698,17 @@ msgstr "Editér Konfiguration for kø %1"
 msgid "Editing Configuration for user %1"
 msgstr "Editerer Konfiguration for bruger %1"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "Editerer Custom felt %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "Editerer medlemskab for gruppe %1"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "Editerer medlemskab for personlig gruppe %1"
@@ -1907,15 +1717,15 @@ msgstr "Editerer medlemskab for personlig gruppe %1"
 msgid "Editing template %1"
 msgstr "Editerer template %1"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "Enten base eller mål skal være specificeret"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "E-mail adresse i brug"
 
@@ -1927,65 +1737,60 @@ msgstr "E-mailAdresse"
 msgid "EmailEncoding"
 msgstr "E-mail encoding"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr "Aktiveret (Fravalg af denne boks deaktiverer dette custom felt)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "Aktiveret (Fravalg af denne boks deaktiverer denne gruppe)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "Aktiveret  (Fravalg af denne boks deaktiverer denne kø)"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
 msgstr "Aktiverede Custom felter"
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr "Aktiverede Køer"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "Aktiverede status %1"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
-msgid "Enabled status: %1"
-msgstr "Tilvalgt status: %1"
-
-#: lib/RT/CustomField_Overlay.pm:64
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "Indtast flere værdier"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
-msgstr "Angiv objecter eller URIs for linkning af objekter. Separér flere med mellemrum"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "Indtast en værdi"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
-msgstr "Angiv køer eller URIs til linkning køer til. Separér flere med mellemrum"
+msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
-msgstr "Indtast tickets eller URIs for linkning af tickets. Separer flere værdier med mellemrum."
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:66
-msgid "Enter up to %1 values"
-msgstr "Skriv op til %1 værdier"
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Indtast tickets eller URIs for linkning af tickets. Separer flere værdier med mellemrum."
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Fejl"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "Fejl i parametre til Queue->AddWatcher"
 
@@ -1993,11 +1798,11 @@ msgstr "Fejl i parametre til Queue->AddWatcher"
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "Fejl i parametre til Queue->DelWatcher"
 
-#: lib/RT/Queue_Overlay.pm:830
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
-msgstr "Fejl i parametre til Queue->DeleteWatcher"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "Fejl i parametre til Ticket->AddWatcher"
 
@@ -2005,23 +1810,23 @@ msgstr "Fejl i parametre til Ticket->AddWatcher"
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "Fejl i parametre til Ticket->DelWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
-msgstr "Fejl i parametre til Ticket->DeleteWatcher"
+msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
-msgstr "Eskalér tickets"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
-msgstr "Estimeret"
+msgstr ""
 
 #: etc/initialdata:20
 msgid "Everyone"
 msgstr "Alle"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "Eksempel:"
 
@@ -2033,93 +1838,56 @@ msgstr "ExternalAuthId"
 msgid "ExternalContactInfoId"
 msgstr "ExternalContactInfoId"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "Ekstra information"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:377
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "Fejlede i lokalisering 'Priviledged' brugere pseudogruppe."
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "Fejlede i lokalisering af 'Unproviledged' brugere pseudogruppe"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr "Fejlede i indlæsningen af modul %1. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "Feb."
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
-msgstr "Filnavn"
-
-#: lib/RT/CustomField_Overlay.pm:69
-msgid "Fill in multiple text areas"
-msgstr "Udfyld flere tekst områder"
-
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
-msgid "Fill in one text area"
-msgstr "Udfyld i et tekst område"
-
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
-msgid "Fill in up to %1 text areas"
-msgstr "Udfyld op til %1 tekst områder"
-
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Fin"
 msgstr "Slut"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "Endelig Prioritet"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr "EndeligPrioritet"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
 msgid "Find group whose"
 msgstr "Find gruppe hvis"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
-msgid "Find groups whose"
-msgstr "Find grupper hvis"
-
 #: NOT FOUND IN SOURCE
 msgid "Find new/open tickets"
 msgstr "Find nye/Ã¥bne tickets"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "Find folk hvis"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "Find tickets"
 
@@ -2127,7 +1895,7 @@ msgstr "Find tickets"
 msgid "Finish Approval"
 msgstr "Afslut godkendelse"
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "Første"
 
@@ -2135,94 +1903,78 @@ msgstr "Første"
 msgid "First page"
 msgstr "Første side"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "Foo Bar Baz"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "Foo!"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "gennemtving ændring"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "Fandt %quant(%1,ticket)"
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "Fandt Objekt"
 
 #: NOT FOUND IN SOURCE
-msgid "Freeform"
-msgstr "Freeform"
-
-#: NOT FOUND IN SOURCE
 msgid "FreeformContactInfo"
 msgstr "FreeformContactInfo"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:37
 msgid "FreeformMultiple"
 msgstr "FreeformMultiple"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:36
 msgid "FreeformSingle"
 msgstr "FreeformSingle"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "Fre."
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "Fulde headers"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
-msgstr "Hent template fra fil"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "Henter the nuværende bruger fra en PGP signatur\\n"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "Givet til %1"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Global"
 
-#: html/Admin/Elements/EditCustomFields:55
-msgid "Global Custom Fields"
-msgstr "Globale custom felter"
-
 #: NOT FOUND IN SOURCE
 msgid "Global Scrips"
 msgstr "Globale Scrips"
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr "Global custom felt configuration"
-
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "Global template: %1"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
-msgstr "Go"
+msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "Start!"
 
@@ -2234,11 +1986,11 @@ msgstr "God PGP signatur fra %1\\n"
 msgid "Goto page"
 msgstr "GÃ¥ til side"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "GÃ¥ til ticket"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Gruppe"
 
@@ -2246,28 +1998,28 @@ msgstr "Gruppe"
 msgid "Group %1 %2: %3"
 msgstr "Gruppe %1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "Gruppe Rettigheder"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "Gruppe har allerede medlem"
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "Gruppe kunne ikke blive oprettet: %1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "Gruppe oprettet"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "Gruppen har sådan et medlem"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Gruppe ikke fundet"
 
@@ -2279,54 +2031,36 @@ msgstr "Gruppe ikke fundet.\\n"
 msgid "Group not specified.\\n"
 msgstr "Gruppe ikke angivet.\\n"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Grupper"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "Grupper kan ikke være medlemmer af deres medlemmer"
 
-#: html/Admin/Groups/index.html:82
-msgid "Groups matching search criteria"
-msgstr "Grupper som matcher søge kriterier"
-
-#: html/Ticket/Elements/ShowRequestor:77
-msgid "Groups this user belongs to"
-msgstr "Grupper denne bruger hører til"
-
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "Hej!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "Hej, %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "Historie"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
-msgid "History of the group %1"
-msgstr "Historie for gruppen %1"
-
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
-msgid "History of the user %1"
-msgstr "Historie for brugeren %1"
-
 #: NOT FOUND IN SOURCE
 msgid "HomePhone"
 msgstr "HjemmeTelefon"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Homepage"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "Jeg har %quant(%1,concrete mixer)."
@@ -2335,15 +2069,11 @@ msgstr "Jeg har %quant(%1,concrete mixer)."
 msgid "I have [quant,_1,concrete mixer]."
 msgstr "Jeg har [quant,_1,concrete mixer]."
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr "jeg er fortabt"
-
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "Id"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Identitet"
 
@@ -2351,88 +2081,76 @@ msgstr "Identitet"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "Hvis en godkendelse bliver afvist, afvis den originale og slet ventede godkendelser"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "Hvis ingen Requestor er specificeret, opret da tickets med denne requestor"
+msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
-msgstr "Hvis ingen kø er oprettet, opret tickets i denne kø"
+msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr "Hvis dette værktøj var setgid, kunne en fjendtlig bruger benytte dette værktøj til at opnå administrat adgang til RT."
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "Hvis du har opdateret noget ovenfor, vær da sikker på at"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "Ulovlig værdi for %1"
 
-#: NOT FOUND IN SOURCE
-msgid "Image"
-msgstr "Billede"
-
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "Uforanderligt felt"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "Medtag deaktiverede custom felter i liste."
 
-#: html/Admin/Groups/index.html:65
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
-msgstr "Inkludér ikke tilvalgte grupper i denne liste."
+msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
 msgstr "Medtag deaktiverede køer i liste."
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "Medtag deaktiverede brugere i liste."
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr "Ukomplet Søgning"
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr "Ukomplet søgning"
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "Initiel Prioritet"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr "InitielPrioritet"
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "Input fejl"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "Intern Fejl"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "Intern Fejl: %1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "Ikke valid Gruppe Type"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "Ikke valid Rettighed"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "Ikke valide data"
 
@@ -2440,64 +2158,60 @@ msgstr "Ikke valide data"
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "Ikke valid ejer, Default'er til 'nobody'"
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "Ikke valid kø"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "Ikke valid rettighed"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "Ikke valid værdi for %1"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "Ikke valid værdi for custom felt"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "Ikke valid værdi for status"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr "Det er af højeste vigtighed at ikke-privilegerede brugere ikke får adgang til at køre dette værktøj."
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr "Det anbefales at du opretter en ikke-priviligeret unix bruger med det korrekte gruppe medlemsjab og RT adgang for at benytte dette værktøj."
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr "Det tager adskellige argumenter:"
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr "Kursiv"
-
 #: NOT FOUND IN SOURCE
 msgid "Items pending my approval"
 msgstr "Elementer som afventer min godkendelse"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "Jan."
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "Tilslut eller forlad denne gruppe"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "Jul."
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "Jumbo"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "Jun."
 
@@ -2509,23 +2223,19 @@ msgstr "Nøgleord"
 msgid "Lang"
 msgstr "Sprog"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
-msgstr "Sprog"
-
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr "Stor"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "Sidste"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "Sidste kontakt"
 
-#: html/Elements/SelectDateType:50
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "Sidst kontaktet"
 
@@ -2533,23 +2243,23 @@ msgstr "Sidst kontaktet"
 msgid "Last Notified"
 msgstr "Sidst Notificeret"
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "Sidst Opdateret"
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
-msgstr "SidstOpdateretAf"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "Tilbage"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "Lad denne bruger få adgang til RT"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "Lad denne bruger få rettigheder"
 
@@ -2561,255 +2271,213 @@ msgstr "Begrænser ejer til %1 %2"
 msgid "Limiting queue to %1 %2"
 msgstr "Begrænser kø til %1 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "Link eksisterer allerede"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "Link kunne ikke blive oprettet"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "Link oprettet (%1)"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "Link slettet (%1)"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Link ikke fundet"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "Link ticket #%1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Links"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
-msgstr "Indlæs"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
-msgstr "Indlæs gemt søgning:"
-
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr "IndlæsGemtSøgning"
+msgstr ""
 
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
-msgstr "Indlæste Perl moduler"
-
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "Lokation"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "Log directory %1 kunne ikke findes eller skrive til.\\n RT kan ikke køre."
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "Logget ind som %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "Log ind"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "Log ud"
 
-#: lib/RT/CustomField_Overlay.pm:866
-msgid "Lookup type mismatch"
-msgstr "Opslagstype misforhold"
-
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "Lav Ejer"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "Lav Status"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "Sæt forfaldsdato"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "Sæt løsnings dato"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
-msgstr "Sæt start dato"
+msgstr "Sæt startet dato"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
-msgstr "Sæt startes dato"
+msgstr "Sæ startes dato"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "Sæt dato fortalt"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "Sæt Prioritet"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "Sæt kø"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "Sæt emne"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
-msgstr "Gør denne gruppe synlig for bruger"
-
-#: html/Admin/index.html:78
-msgid "Manage custom fields and custom field values"
-msgstr "Administrer custom felter og custom felt værdier"
-
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "Administrer grupper og gruppe medlemskab"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "Administrer egenskaber og konfiguration som gælder for alle køer"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr "Administrer køer og kø-specifikke egenskaber"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "Administrer brugere og adgangskoder"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "Mar."
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "Maj."
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr "Medlem %1 tilføjet"
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr "Medlem %1 slettet"
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "Medlem tilføjet"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "Medlem slettet"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "Medlem ikke slettet"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "Medlem af"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "Medlemmer"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr "Medlemskan af %1 tilføjet"
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr "Medlemskab af %1 slettet"
 
-#: html/Admin/Elements/UserTabs:61
-msgid "Memberships"
-msgstr "Medlemskaber"
-
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
-msgid "Memberships of the user %1"
-msgstr "Medlemskaber for brugeren %1"
-
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "Sammensmeltning succesfuld"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "Sammensmeltning fejlede. Kunne ikke sætte EffectiveId"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr "Sammensmeltning mislykkedes. Kunne ikke sætte status"
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "Sammensmelt med"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
-msgstr "Sammensmeltet med %1"
+msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "Besked"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
-msgstr "Besked kunne ikke blive gemt"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
+#: lib/RT/Ticket_Overlay.pm:2517
 msgid "Message recorded"
-msgstr "Besked gemt"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
+#: html/Ticket/Elements/PreviewScrips:70
 msgid "Messages about this ticket will not be sent to..."
-msgstr "Beskeder angående denne ticket vil ikke blive sent til..."
-
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
-msgstr "Ikke-matchende parenteser"
+msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "Mangler en primærnøgle?: %1"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "Mobil"
 
@@ -2817,7 +2485,7 @@ msgstr "Mobil"
 msgid "MobilePhone"
 msgstr "MobilTelefon"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "Modificér Adgangs Kontrol Liste"
 
@@ -2825,37 +2493,27 @@ msgstr "Modificér Adgangs Kontrol Liste"
 msgid "Modify Custom Field %1"
 msgstr "Modificér Custom Felt %1"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr "Modificér Custom Felter som gælder for %1 for alle %2"
-
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
-msgid "Modify Custom Fields which apply to all %1"
-msgstr "Modificér Customer Felter som gælder for alle %1"
-
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "Modificér Custom felter som gælder for alle køer"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
-msgstr "Modificér Gruppe Rettigheder"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
-msgstr "Modificér Medlemmer"
+msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
-msgstr "Modificér Rettigheder"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr "Modificér Scrip templates for denne kø"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "Modificér Scrips for denne kø"
 
@@ -2863,52 +2521,43 @@ msgstr "Modificér Scrips for denne kø"
 msgid "Modify Template %1"
 msgstr "Modificér Template %1"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
-msgstr "Modificér Brugerrettigheder"
+msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
 msgstr "Modificér CustomFelt for kø %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:52
 msgid "Modify a CustomField which applies to all queues"
 msgstr "Modificér CustomFelt som gælder for alle køer"
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr "Modificér et scrip for kø %1"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "Modificér et scrip som gælder for alle køer"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
-msgid "Modify associated objects for %1"
-msgstr "Modificér objekter associerede med %1"
-
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "Modific+er datoer for #%1"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "Modificér datoer for ticket # %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr "Modificér globale custom felter"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "Modificér globale gruppe rettiheder"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "Modificér globale gruppe rettiheder"
 
@@ -2916,110 +2565,100 @@ msgstr "Modificér globale gruppe rettiheder"
 msgid "Modify global scrips"
 msgstr "Modificér globale scrips"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "Modificér globale bruger rettiheder"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "Modificér globake bruger rettigehder"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "Modificér gruppe metadata eller slet gruppe"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
-msgid "Modify group rights for custom field %1"
-msgstr "Modificér gruppe rettigheder for custom felter %1"
-
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "Modificér gruppe rettigheder for gruppe %1"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "Modificér gruppe rettigheder for kø %1"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "Modificér medlemskabsliste for denne gruppe"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr "Modificér ens egen RT konto"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr "Modificér folk relateret til kø %1"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "Modificér folk relateret til ticket #%1"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "Modificér scrips for kø %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr "Modificér scrips som gælder for alle køer"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "Modificér template %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "Modificér templates som gælder for alle køer"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "Modificér gruppen %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "Modificér kø watchers"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "Modificer brugeren %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "Modificer ticket # %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "Modificer ticket #%1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "Modificer tickets"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
-msgid "Modify user rights for custom field %1"
-msgstr "Modificér brugerrettigheder custom felter for %1"
-
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "Modificer bruger rettigheder for gruppe %1"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr "Modificer bruger rettigheder for kø %1"
@@ -3028,64 +2667,60 @@ msgstr "Modificer bruger rettigheder for kø %1"
 msgid "Modify watchers for queue '%1'"
 msgstr "Modificer watchers for kø '%1'"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr "ModificerACL"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr "ModifyCustomField"
-
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "ModificerEgetMedlemskab"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr "ModificerQueueWatchers"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr "ModificerScrips"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr "ModificerSelv"
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr "ModificerTemplate"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr "ModificerTicket"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "Man."
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "Mere om %1"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr "Flyt ned"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr "Flyt op"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "Flere"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "'Name' attribut skal angives"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr "Mine %1 tickets"
@@ -3094,19 +2729,19 @@ msgstr "Mine %1 tickets"
 msgid "My Approvals"
 msgstr "Mine Godkendelser"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "Mine godkendelser"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
-msgstr "Mine gemte søgninger"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Navn"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "Navn i brug"
 
@@ -3114,19 +2749,19 @@ msgstr "Navn i brug"
 msgid "Need approval from system administrator"
 msgstr "Behøver godkendelse af system adminstrator"
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "Aldrig"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "Ny"
 
-#: html/Elements/EditLinks:115
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "Nye relationer"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "Ny adgangskode"
 
@@ -3134,31 +2769,31 @@ msgstr "Ny adgangskode"
 msgid "New Pending Approval"
 msgstr "Ny afventende godkendelse"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
-msgstr "Ny Søgestreng"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "New Search"
 msgstr "Ny Søgning"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "Nyt custom felt"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "Ny gruppe"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "Ny adgangskode"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "Ny adgangskode notifikation afsendt"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "Ny kø"
 
@@ -3166,11 +2801,11 @@ msgstr "Ny kø"
 msgid "New request"
 msgstr "Ny request"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "Nye rettigheder"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "Ny scrip"
 
@@ -3178,27 +2813,27 @@ msgstr "Ny scrip"
 msgid "New search"
 msgstr "Ny søgning"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "Ny template"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr "Ny ticket"
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "Ny ticket eksisterer ikke"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "Ny bruger"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "Ny bruger kaldet"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "Nye watchers"
 
@@ -3206,13 +2841,13 @@ msgstr "Nye watchers"
 msgid "New window setting"
 msgstr "Ny vindues indstilling"
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "Næste"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
-msgstr "Næste Side"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Next page"
@@ -3222,39 +2857,31 @@ msgstr "Næste side"
 msgid "NickName"
 msgstr "NickName"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "Nickname"
 
-#: html/Admin/CustomFields/UserRights.html:145
-msgid "No Class defined"
-msgstr "Ingen klasse defineret"
-
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "Intet Custom felt"
 
-#: html/Admin/CustomFields/GroupRights.html:103
-msgid "No CustomField defined"
-msgstr "Intet CustomField defineret"
-
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "Ingen grupper definerede"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
-msgstr "Ingen Søgestreng"
+msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "Ingen kø defineret"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr "Ingen RT bruger fundet. Kontakt venligst din RT administrator.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "Ingen Template"
 
@@ -3266,11 +2893,11 @@ msgstr "Ingen ticket angivet. Afbryder ticket"
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
 msgstr "Ingen ticket angivet. Afbryder ticket ændringer\\n\\n"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "Ingen aktion"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr "Ingen kolonne angivet"
 
@@ -3278,7 +2905,7 @@ msgstr "Ingen kolonne angivet"
 msgid "No command found\\n"
 msgstr "Ingen kommando fundet\\n"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "Ingen kommentar inddateret for denne bruger"
 
@@ -3286,89 +2913,80 @@ msgstr "Ingen kommentar inddateret for denne bruger"
 msgid "No correspondence attached"
 msgstr "Ingen korrespondance vedhæftet"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "Ingen beskrivelse af %1"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "Ingen gruppe angivet"
 
-#: html/Admin/Groups/index.html:52
-msgid "No groups matching search criteria found."
-msgstr "Ingen grupper som matcher søge kriterier fundet"
-
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
-msgstr "Ingen medelelse vedhæftet"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "Ingen adgangskode sat"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr "Ingen rettighed til at oprette køer"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "Ingen adgang til at oprette tickets i denne kø '%1'"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "Ingen rettighed til at oprette brugere"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
-msgstr "Ingen adgang til at vise denne ticket"
+msgstr "Ingen adagang til at vise denne ticket"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "Ingen adgang til at vise opdater ticket"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "Ingen principal angivet"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "Ingen principaler valgt."
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr "Ingen køer fundet som matcher søge kriterie."
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "Ingen rettigheder fundet"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "Ingen rettigheder tildelt."
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "Ingen søgning at arbejde med."
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
-msgstr "Intet emne"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "No ticket id specified"
 msgstr "Ingen ticket id angivet"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "Ingen transaktions type angivet"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "Ingen brugere fundet som matcher søge kriterie"
 
@@ -3376,15 +2994,15 @@ msgstr "Ingen brugere fundet som matcher søge kriterie"
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "Ingen valid RT bruger fundet. RT CVS handler frakoblet. Kontakt venligst din RT administrator.\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr "Ingen værdi sent til _Set!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "Ingen"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr "Ikke eksisterende felt?"
 
@@ -3392,15 +3010,15 @@ msgstr "Ikke eksisterende felt?"
 msgid "Not logged in"
 msgstr "Ikke logget ind"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "Ikke logget ind."
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "Ikke sat"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "Endnu ikke implementeret."
 
@@ -3408,11 +3026,11 @@ msgstr "Endnu ikke implementeret."
 msgid "Not yet implemented...."
 msgstr "Endnu ikke implementeret..."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "Noter"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "Notification kunne ikke sendes"
 
@@ -3426,11 +3044,11 @@ msgstr "Notificér AdminCc'ere som kommentar"
 
 #: etc/initialdata:93 etc/upgrade/3.1.17/content:6
 msgid "Notify Ccs"
-msgstr "Notificér Ccs"
+msgstr ""
 
 #: etc/initialdata:89 etc/upgrade/3.1.17/content:2
 msgid "Notify Ccs as Comment"
-msgstr "Notificér Ccs som Kommentarer"
+msgstr ""
 
 #: etc/initialdata:128
 msgid "Notify Other Recipients"
@@ -3484,57 +3102,35 @@ msgstr "Notificér Requestere, Cc'ere og AdminCc'ere"
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "Notificér Requestere, Cc'ere og AdminCc'ere som kommentar"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "Nov."
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr "ELLER"
-
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr "Objekt kunne ikke oprettes"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr "Objekt kunne ikke slettes"
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr "Objekt oprettet"
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr "Objekt slettet"
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
-msgid "Object of type %1 cannot take custom fields"
-msgstr "Objekt af typen %1 kan ikke håndtere custom felter"
-
-#: lib/RT/CustomField_Overlay.pm:901
-msgid "Object type mismatch"
-msgstr "Objekt type misforhold"
-
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "Okt."
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
-msgstr "Offline"
+msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
-msgstr "Offline editeringer"
+msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
-msgstr "Offline upload"
+msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "Ved"
 
@@ -3556,7 +3152,7 @@ msgstr "Ved ejerskifte"
 
 #: etc/initialdata:177 etc/upgrade/3.1.17/content:15
 msgid "On Priority Change"
-msgstr "Ved prioritets ændring"
+msgstr ""
 
 #: etc/initialdata:192
 msgid "On Queue Change"
@@ -3574,21 +3170,21 @@ msgstr "Ved statusskifte"
 msgid "On Transaction"
 msgstr "Ved transaktion"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "Vis kun godkendelser for requests oprettet efter %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "Vis kun godkendelser for requests oprettet før %1"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Ã…ben"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Ã…ben den"
 
@@ -3596,7 +3192,7 @@ msgstr "Ã…ben den"
 msgid "Open requests"
 msgstr "Ã…ben requests"
 
-#: html/SelfService/Elements/Tabs:63
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr "Ã…ben tickets"
 
@@ -3612,44 +3208,44 @@ msgstr "Ã…ben tickets (fra liste) i andet vindue"
 msgid "Open tickets on correspondence"
 msgstr "Ã…ben tickets ved korrespondance"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
-msgstr "Sortér efter"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ordering and sorting"
 msgstr "Orden og sortering"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Organisation"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "Oprindelig ticket: #%1"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
-msgstr "Udgående e-mail omkring en kommentar gemt"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
-msgstr "Udgående e-mail gemt"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "Tid overskredet, prioritet går mod"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr "Egne tickets"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr "EgenTicket"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "Ejer"
 
@@ -3657,11 +3253,11 @@ msgstr "Ejer"
 msgid "Owner changed from %1 to %2"
 msgstr "Ejere ændret fra %1 til %2"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
-msgstr "Ejer kunne ikke defineres."
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "Ejer skiftet forceret fra %1 to %2"
@@ -3670,12 +3266,12 @@ msgstr "Ejer skiftet forceret fra %1 to %2"
 msgid "Owner is"
 msgstr "Ejer er"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
-msgstr "Side %1 af %2"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "Bipper"
 
@@ -3683,53 +3279,36 @@ msgstr "Bipper"
 msgid "PagerPhone"
 msgstr "BipperTelefon"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "Forældre"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "Adgangskode"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "Adgangskode husker"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr "Adgangskode ændret"
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "Adgangskode for kort"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "Adgangskode: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
 msgstr "Adgangskoder matcher ikke."
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr "Adgangskoder matcher ikke. Din adgangskode er ikke blevet skiftet"
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "Folk"
 
@@ -3737,27 +3316,27 @@ msgstr "Folk"
 msgid "Perform a user-defined action"
 msgstr "Udfør en bruger-defineret aktion"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
-msgstr "Perl konfiguration"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "Adgang afvist"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "Personlige Grupper"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Personlige grupper"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Personlige grupper:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "Telefon numre"
 
@@ -3765,7 +3344,7 @@ msgstr "Telefon numre"
 msgid "Placeholder"
 msgstr "Placeholder"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "Præferencer"
 
@@ -3773,17 +3352,17 @@ msgstr "Præferencer"
 msgid "Prefs"
 msgstr "Præferencer"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "Prepare ryddet"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "Forr."
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
-msgstr "Forrige Side"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Previous page"
@@ -3793,33 +3372,33 @@ msgstr "Forrige side"
 msgid "Pri"
 msgstr "Pri"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "Principal %1 ikke fundet."
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Prioritet"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "Prioritet starter ved"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
-msgstr "Privat:"
+msgstr ""
 
 #: etc/initialdata:25
 msgid "Privileged"
 msgstr "Priviligeret"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "Priviligeret status: %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "Priviligerede brugere"
 
@@ -3827,19 +3406,19 @@ msgstr "Priviligerede brugere"
 msgid "Pseudogroup for internal use"
 msgstr "Pseudogruppe til intern brug"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
-msgstr "Søgestreng"
+msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
-msgstr "Søgestrengs Bygger"
+msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "Kø"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
@@ -3849,7 +3428,7 @@ msgstr "Kø %1 ikke fundet"
 msgid "Queue '%1' not found\\n"
 msgstr "Kø '%1' ikke fundet\\n"
 
-#: html/Admin/Queues/Modify.html:64
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "Kø Navn"
 
@@ -3857,19 +3436,19 @@ msgstr "Kø Navn"
 msgid "Queue Scrips"
 msgstr "Kø Scrips"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "Kø eksisterer allerede"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr "Kø kunne ikke oprettes"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr "Kø kunne ikke indlæses"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "Kø oprettet"
 
@@ -3877,32 +3456,32 @@ msgstr "Kø oprettet"
 msgid "Queue is not specified."
 msgstr "Kø ikke angivet"
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "Kø ikke fundet"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "Køer"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr "Kø søgning"
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
-msgstr "Kvik ticket oprettelse"
+msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
-msgstr "RSS"
+msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 for %2"
@@ -3915,7 +3494,7 @@ msgstr "RT %1 fra <a href=\"http://bestpractical.com\">Best Practical Solutions,
 msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "RT Administration"
 
@@ -3935,7 +3514,7 @@ msgstr "RT Konfigurationsfejl"
 msgid "RT Critical error. Message not recorded!"
 msgstr "RT Kritisk fejl. Meddelelse ikke gemt!"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "RT Fejl"
 
@@ -3947,11 +3526,11 @@ msgstr "RT modtog e-mail (%1) fra sig selv"
 msgid "RT Self Service / Closed Tickets"
 msgstr "RT Selv-betjening / Lukkede Tickets"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
-msgstr "RT Variable"
+msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "RT set fra oven"
 
@@ -3967,15 +3546,11 @@ msgstr "RT kunne ikke finde requester via sit eksterne database opslag"
 msgid "RT couldn't find the queue: %1"
 msgstr "RT kunne ikke finde køen: %1"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "RT kunne ikke validere denne PGP signatur. \\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "RT for %1"
@@ -4004,7 +3579,7 @@ msgstr "RT vil processere denne besked som var den var usigneret.\\n"
 msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
 msgstr "RT's e-mail kommando modus kræver PGP authentikering. Enten har du ikke signeret din besked, eller også kunne din signatur ikke verificeres."
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "Fulde Navn"
 
@@ -4012,31 +3587,31 @@ msgstr "Fulde Navn"
 msgid "RealName"
 msgstr "FuldeNavn"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr "Reference fra %1 tilføjet"
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr "Reference fra %1 slettet"
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr "Reference til %1 tilføjet"
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr "Reference til %1 slettet"
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "Referreret til af"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "Refererer til"
 
@@ -4048,44 +3623,44 @@ msgstr "Forfin"
 msgid "Refine search"
 msgstr "Forfin søgning"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Genindlæs denne side hver %1 minutter"
 
-#: html/Search/Bulk.html:116
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "Fjern AdminCc"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Fjern Cc"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "Fjern Requestor"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Svar"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
-msgstr "Svar Adresse"
+msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
-msgstr "Svar til requestors"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "Svar på tickets"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "SvarPÃ¥Ticket"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "Requestor"
 
@@ -4097,37 +3672,37 @@ msgstr "Requestor e-mail adresse"
 msgid "Requestor(s)"
 msgstr "Requestor(s)"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "Requestors"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "Request skulle være forefaldende om"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
-msgstr "Påkrævet parameter '%1' ikke specificeret"
+msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Reset"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Residens"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "Løs"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "Løs ticket #%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "Løst"
 
@@ -4135,7 +3710,7 @@ msgstr "Løst"
 msgid "Response to requestors"
 msgstr "Svar til requestors"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "Resultater"
 
@@ -4143,61 +3718,61 @@ msgstr "Resultater"
 msgid "Results per page"
 msgstr "Resultater per side"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "Genskriv adgangskode"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
-msgstr "Faldtilbage"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "Rettighed %1 ikke fundet for %2 %3 i scope %4 (%5)\\n"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "Rettighed overdraget"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "Rettighed Tildelt"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "Rettighed Indlæst"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "Rettighed kunne ikke inddrages"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "Rettighed ikke fundet"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "Rettighed ikke indlæst."
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "Rettighed inddraget"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Rettigheder"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "Rettigheder kunne ikke tildeles %1"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "Rettigheder kunne ikke inddrages for %1"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "Roller"
 
@@ -4205,59 +3780,53 @@ msgstr "Roller"
 msgid "RootApproval"
 msgstr "RootGodkendelse"
 
-#: html/Search/Elements/DisplayOptions:83
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
-msgstr "Rækker per side"
+msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "Lør."
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
-msgstr "Gem"
+msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "Gem Ændringer"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
-msgstr "Gem Præferencer"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "Gem Ændringer"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
-msgstr "Gemte søgninger"
+msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr "Scrip #%1"
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "Scrip Oprettet"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
-msgstr "Scrip Felter"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "Scrip slettet"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "Scrips"
 
@@ -4265,11 +3834,11 @@ msgstr "Scrips"
 msgid "Scrips for %1\\n"
 msgstr "Scrip for %1\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr "Scrips som gælder for alle køer"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "Søg"
 
@@ -4277,143 +3846,82 @@ msgstr "Søg"
 msgid "Search Criteria"
 msgstr "Søgekriterier"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
-
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr "Søg efter godkendelser"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
-msgstr ""
-
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr "Sikkerhed:"
 
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "See custom fields"
-msgstr "Se custom felter"
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
-msgstr "See nøjagtige udgående e-mail beskeder og deres modtagere"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
-msgstr "Se ticket private kommentarer"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
-msgstr "Se ticket sammenfatninger"
-
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "SeeCustomField"
-msgstr "SeCustomFelt"
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr "SeGruppe"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
 msgstr "SeKø"
 
-#: NOT FOUND IN SOURCE
-msgid "Select"
-msgstr "Vælg"
-
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
-msgid "Select a Custom Field"
-msgstr "Vælg et Custom felt"
-
-#: html/Admin/Groups/index.html:78
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "Vælg en gruppe"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "Vælg en kø"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr "Vælg en kø til din næste nye ticket"
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "Vælg en bruger"
 
-#: html/Admin/Elements/CustomFieldTabs:90
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
 msgid "Select custom field"
 msgstr "Vælg custom felt"
 
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr "Vælg custom felter for alle brugergrupper"
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr "Vælg custom felter for alle brugere"
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
-msgstr "Vælg custom felter for tickets i alle køer"
-
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr "Vælg custom felter for transaktioner på tickets i alle køer"
-
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "Vælg gruppe"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr "Vælg flere værdier"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr "Vælg en værdi"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr "Vælg kø"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr "Vælg scrip"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr "Vælg template"
 
-#: lib/RT/CustomField_Overlay.pm:61
-msgid "Select up to %1 values"
-msgstr "Vælg op til %1 værdier"
-
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr "Vælg bruger"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectMultiple"
 msgstr "VælgFlere"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:34
 msgid "SelectSingle"
 msgstr "VælgEnkelt"
 
-#: html/Admin/Elements/EditCustomFields:58
-msgid "Selected Custom Fields"
-msgstr "Valgte Custom Felter"
-
-#: html/Admin/CustomFields/Objects.html:59
-msgid "Selected objects"
-msgstr "Valgte objekter"
-
 #: NOT FOUND IN SOURCE
 msgid "Self Service"
 msgstr "Selv-betjening"
@@ -4444,11 +3952,11 @@ msgstr "Sender e-mail til explicit listede Ccs og Bccs"
 
 #: etc/initialdata:94 etc/upgrade/3.1.17/content:7
 msgid "Sends mail to the Ccs"
-msgstr "Sender e-mail til Cc'ere"
+msgstr ""
 
 #: etc/initialdata:90 etc/upgrade/3.1.17/content:3
 msgid "Sends mail to the Ccs as a comment"
-msgstr "Sender e-mail to Ccøere som en kommentar"
+msgstr ""
 
 #: etc/initialdata:102
 msgid "Sends mail to the administrative Ccs"
@@ -4462,47 +3970,47 @@ msgstr "Sender e-mail til de administrative Cc som en kommentar"
 msgid "Sends mail to the owner"
 msgstr "Sender e-mail til ejeren"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "Sep."
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
-msgstr "Vis"
+msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
-msgstr "Vis Godkendelser"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
-msgstr "Vis Kolonner"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "Vis Resultater"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "Vis godkendte requests"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "Vis basic"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "Vis afviste requests"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "Vis detaljer"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "Vis afventede requests"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "Vis requests som afventer andre godkendelser"
 
@@ -4514,47 +4022,43 @@ msgstr "Vis ticket private kommentar"
 msgid "Show ticket summaries"
 msgstr "Vis ticket opsummeringer"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
 msgstr "VisACL"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr "VisKonfigurationTab"
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
-msgstr "VisUdgåendeEmail"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
-msgstr "VisGemteSøgninger"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr "VisScrips"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr "VisTemplate"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr "VisTicket"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr "VisTicketKommentarer"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr "Tilmeld som en ticket requestor eller ticket eller kø Cc"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "Tilmeld som en ticket eller kø AdminCc"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "Signatur"
 
@@ -4562,23 +4066,15 @@ msgstr "Signatur"
 msgid "Signed in as %1"
 msgstr "Tilsluttet som %1"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "Enkelt"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr "Skip Menu"
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr "Lille"
-
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
 msgstr "Sorter"
 
@@ -4594,9 +4090,9 @@ msgstr "Sorter resultat efter"
 msgid "SortOrder"
 msgstr "SorteringsOrden"
 
-#: html/Admin/Elements/EditScrip:87
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
-msgstr "Trin"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Stalled"
@@ -4606,7 +4102,7 @@ msgstr "Stalled"
 msgid "Start page"
 msgstr "Start side"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "Startet"
 
@@ -4614,7 +4110,7 @@ msgstr "Startet"
 msgid "Started date '%1' could not be parsed"
 msgstr "Startet dato '%1' kunne ikke parses"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "Starter"
 
@@ -4626,11 +4122,11 @@ msgstr "Starter den"
 msgid "Starts date '%1' could not be parsed"
 msgstr "Starter dato '%1' kunne ikke parses"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Tilstand"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Status"
 
@@ -4638,7 +4134,8 @@ msgstr "Status"
 msgid "Status Change"
 msgstr "Status Ændring"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "Status ændret fra %1 til %2"
 
@@ -4646,37 +4143,33 @@ msgstr "Status ændret fra %1 til %2"
 msgid "StatusChange"
 msgstr "StatusÆndring"
 
-#: html/Ticket/Elements/Tabs:170
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "Stjæl"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
 msgstr "Stjæl tickets"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr "StjælTicket"
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
+msgid "Stolen from %1 "
 msgstr "Stjålet fra %1"
 
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
-
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Emne"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "Emne ændret til %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "Send"
 
@@ -4684,48 +4177,43 @@ msgstr "Send"
 msgid "Submit Workflow"
 msgstr "Send Workflow"
 
-#: lib/RT/Group_Overlay.pm:782
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "Lykkedes"
 
-#: lib/RT/Date.pm:419
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "Søn."
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "SuperBruger"
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "System"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
-msgstr "System Konfiguration"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "System Fejl"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr ""
-
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
-msgstr "System Værktøjer"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "System fejl. Rettighed ikke overdraget"
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "System fejl. Rettighed ikke tildelt"
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "System grupper"
 
@@ -4733,40 +4221,40 @@ msgstr "System grupper"
 msgid "SystemRolegroup for internal use"
 msgstr "SystemRolleGruppe for intern brug"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "Tag"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
 msgstr "Tag tickets"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr "TagTickets"
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "Taget"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Template"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "Template #%1"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "Template slettet"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Template ikke fundet"
 
@@ -4774,11 +4262,11 @@ msgstr "Template ikke fundet"
 msgid "Template not found\\n"
 msgstr "Template ikke fundet\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Template parset"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Templates"
 
@@ -4786,37 +4274,33 @@ msgstr "Templates"
 msgid "Templates for %1\\n"
 msgstr "Templates for %1\\n"
 
-#: NOT FOUND IN SOURCE
-msgid "Text"
-msgstr "Tekst"
-
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "Det er allerede den nuværende værdi"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "Det er ikke værdi for dette custom felt"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "Det er den samme værdi"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
 msgstr "Den principal har allerede den rettighed"
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "Den principal er allerede en %1 for denne kø"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "Den principal er allerede en %1 for denne ticket"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "Den principal er ikke en %1 for denne kø"
@@ -4825,11 +4309,11 @@ msgstr "Den principal er ikke en %1 for denne kø"
 msgid "That principal is not a %1 for this ticket"
 msgstr "Den principal er ikke en %1 for denne ticket"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr "Den kø eksisterer ikke"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "Denne har ticket har uløste afhængigheder"
 
@@ -4837,47 +4321,47 @@ msgstr "Denne har ticket har uløste afhængigheder"
 msgid "That user already has that right"
 msgstr "Den bruger har den rettighed"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr "Brugeren ejer allerede den ticket"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "Brugeren eksisterer ikke"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "Brugere er allerede priviligeret"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr "Brugeren er allerede upriviligeret"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "Brugeren er nu priviligeret"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr "Brugere er nu upriviligeret"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr "Den bruger må ikke eje tickets i den kø"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "Det er ikke en numerisk værdi"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "Det Grundlæggende"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr "CC for en ticket"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr "Den administrative CC for en ticket"
 
@@ -4885,7 +4369,7 @@ msgstr "Den administrative CC for en ticket"
 msgid "The comment has been recorded"
 msgstr "Kommentarer er blevet gemt"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr "Den følgende kommando vil finde alle aktive tickets i køen 'general' og vil sætte deres prioritet til 99 hvis de ikke er blevet rørt i 4 timer:"
 
@@ -4893,47 +4377,43 @@ msgstr "Den følgende kommando vil finde alle aktive tickets i køen 'general' o
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "De følgende kommandoer blev ikke processeret:\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "Den nye værdi er blevet sat"
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr "Ejeren af en ticket"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "Anmoderen af en ticket"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "Disse kommentarer er ikke generelt synlige for brugeren"
 
-#: lib/RT/CustomField_Overlay.pm:912
-msgid "This custom field does not apply to that object"
-msgstr "Dette custom felt gælder ikke for dette objekt"
-
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
-msgstr "Denne feature er kun tilgængelig for system administratorer"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
-msgstr "Denne besked vil blive sendt til..."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "Denne ticket %1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "Dette værktøj tillader brugeren at benyttet vilkårlige Perl moduler inde fra RT."
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "Denne transaktion synes ikke at have noget indhold"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
 msgstr "Denne brugers højest prioriterede tickets"
@@ -4942,7 +4422,7 @@ msgstr "Denne brugers højest prioriterede tickets"
 msgid "This user's 25 highest priority tickets"
 msgstr "Denne bruger 25 højest prioriterede tickets"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "Tors."
 
@@ -4950,24 +4430,24 @@ msgstr "Tors."
 msgid "Ticket # %1  %2"
 msgstr "ticket # %1 %2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "ticket #%1 Jumbo opdatering: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "ticket #%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
-msgstr "Ticket %1"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "ticket %1 oprettet i kø '%2'"
@@ -4976,16 +4456,12 @@ msgstr "ticket %1 oprettet i kø '%2'"
 msgid "Ticket %1 loaded\\n"
 msgstr "Ticket %1 indlæst\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "Ticket %1 : %2"
 
-#: html/Admin/Elements/QueueTabs:74
-msgid "Ticket Custom Fields"
-msgstr "Ticket Custom Felter"
-
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr "Ticket Historie # %1 %2"
@@ -4998,27 +4474,23 @@ msgstr "Ticket ID"
 msgid "Ticket Resolved"
 msgstr "Ticket Løst"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
-msgid "Ticket Transactions"
-msgstr "Ticket Transaktioner"
-
 #: NOT FOUND IN SOURCE
 msgid "Ticket attachment"
 msgstr "Ticket vedhæftet fil"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "Ticket indhold"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "Ticket indholds type"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "Ticket kunne ikke oprettes pga. en intern fejl"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "Ticket oprettet"
 
@@ -5026,7 +4498,7 @@ msgstr "Ticket oprettet"
 msgid "Ticket creation failed"
 msgstr "Ticket oprettelse mislykkedes"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "Ticket slettet"
 
@@ -5034,9 +4506,9 @@ msgstr "Ticket slettet"
 msgid "Ticket id not found"
 msgstr "Ticket ID ikke fundet"
 
-#: html/Ticket/Display.html:55
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
-msgstr "Ticket metadata"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket not found"
@@ -5050,20 +4522,17 @@ msgstr "Ticket status ændret"
 msgid "Ticket watchers"
 msgstr "Ticket iagtagere"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr "TicketSQL søge modul"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "Tickets"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "Tickets %1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "Tickets %1 af %2"
 
@@ -5071,42 +4540,38 @@ msgstr "Tickets %1 af %2"
 msgid "Tickets from %1"
 msgstr "Tickets fra %1"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr "Tickets som afhænger af denne godkendelse:"
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
-msgstr "Tid Estimeret"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "Resterende tid"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "Tid Arbejdet"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "Resterende tid"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "Tid for visning"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "Tid arbejdet"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
 msgstr "TidArbejdet"
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:"
 msgstr "For at generere en diff af denne commit:"
@@ -5115,45 +4580,37 @@ msgstr "For at generere en diff af denne commit:"
 msgid "To generate a diff of this commit:\\n"
 msgstr "For at generere en difference af denne commit:\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
-msgstr "Forespørgsel ang. support, træning, special udvikling eller licensering, kontakt venligst %1"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "Fortalt"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
-msgstr "Værktøjer"
+msgstr ""
 
 #: etc/initialdata:252
 msgid "Transaction"
 msgstr "Transaktion"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "Transaktion %1 tømt"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "Transaktion Oprettet"
 
-#: html/Admin/Elements/QueueTabs:78
-msgid "Transaction Custom Fields"
-msgstr "Transaktions Custom Felter"
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:92
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "Transaktion->Opret kunne ikke gennemføres, da du ikke specificerede en ticket id"
 
-#: lib/RT/Transaction_Overlay.pm:125
-msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr "Transaktion->Opret kunne ikke gennemføres, da du ikke specificerede en object type og id"
-
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "Transaktioner er uforanderlige"
 
@@ -5161,19 +4618,19 @@ msgstr "Transaktioner er uforanderlige"
 msgid "Trying to delete a right: %1"
 msgstr "Forsøger at slette en rettighed: %1"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "Tirs."
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "Type"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "Uimplementeret"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Unix login"
 
@@ -5181,148 +4638,107 @@ msgstr "Unix login"
 msgid "UnixUsername"
 msgstr "UnixBrugernavn"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "Ukendt ContentEncoding %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr "Ukendt felt: $key"
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "Ubegrænset"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
-msgstr "Unavngiven søgning"
+msgstr ""
 
 #: etc/initialdata:32
 msgid "Unprivileged"
 msgstr "Upriviligeret"
 
-#: html/Admin/Elements/EditCustomFields:60
-msgid "Unselected Custom Fields"
-msgstr "Ikke-valgte Custom Felter"
-
-#: html/Admin/CustomFields/Objects.html:61
-msgid "Unselected objects"
-msgstr "Ikke-valgte objekter"
-
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "Ikke-tagede"
 
-#: html/Search/Bulk.html:54
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Opdater"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
-msgstr "Opdatér Alle"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update ID"
 msgstr "Opdater ID"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
-msgstr "Opdatér Ticket"
+msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
-msgstr "Opdatér type"
+msgstr "Opdater type"
 
 #: NOT FOUND IN SOURCE
 msgid "Update all these tickets at once"
-msgstr "Opdatér alle disse tickets på en gang"
+msgstr "Opdater alle disse tickets på en gang"
 
 #: NOT FOUND IN SOURCE
 msgid "Update email"
-msgstr "Opdatér email"
+msgstr "Opdater email"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
-msgstr "Opdatér flere tickets"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update name"
-msgstr "Opdatér navn"
+msgstr "Opdater navn"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "Opdatering ikke registreret"
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
-msgstr "Opdatér valgte tickets"
+msgstr "Opdater valgte tickets"
 
 #: NOT FOUND IN SOURCE
 msgid "Update signature"
-msgstr "Opdatér signatur"
+msgstr "Opdater signatur"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
-msgstr "Opdatér ticket"
+msgstr "Opdater ticket"
 
 #: NOT FOUND IN SOURCE
 msgid "Update ticket # %1"
-msgstr "Opdatér ticket # %1"
+msgstr "Opdater ticket # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
-msgstr "Opdatér ticket #%1"
+msgstr "Opdater ticket #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
-msgstr "Opdatér ticket #%1 (%2)"
+msgstr "Opdater ticket #%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "Opdaterings type var hverken korrespondance eller kommentar"
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "Opdateret"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
-msgstr "Upload"
-
-#: lib/RT/CustomField_Overlay.pm:84
-msgid "Upload multiple files"
-msgstr "Upload flere filer"
-
-#: lib/RT/CustomField_Overlay.pm:79
-msgid "Upload multiple images"
-msgstr "Upload flere billeder"
-
-#: lib/RT/CustomField_Overlay.pm:85
-msgid "Upload one file"
-msgstr "Upload en fil"
-
-#: lib/RT/CustomField_Overlay.pm:80
-msgid "Upload one image"
-msgstr "Upload et billede"
-
-#: lib/RT/CustomField_Overlay.pm:86
-msgid "Upload up to %1 files"
-msgstr "Upload op til %1 filer"
-
-#: lib/RT/CustomField_Overlay.pm:81
-msgid "Upload up to %1 images"
-msgstr "Upload op til %1 billeder"
+msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
-msgstr "Upload dine ændringer"
-
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5333,10 +4749,10 @@ msgstr "Bruger %1 %2: %3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "Bruger %1 Adgangskode: %2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
-msgstr "Bruger '%1' kunne ikke findes"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User '%1' not found"
@@ -5350,41 +4766,36 @@ msgstr "Bruger '%1' ikke fundet\\n"
 msgid "User Defined"
 msgstr "Bruger defineret"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
-msgstr "Bruger definerede betingelser og aktioner"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User ID"
 msgstr "Bruger ID"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "Bruger ID"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "Bruger Rettigheder"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
-msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr "Bruger bad om en ukent opdateringstype for custom felt %1 for %1 objekt #%3"
-
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "Bruger kunne ikke oprettes: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "Brugere oprettet"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Bruger definerede grupper"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
 msgstr "Bruger indlæst"
 
@@ -5396,43 +4807,39 @@ msgstr "Bruger notificeret"
 msgid "User view"
 msgstr "Bruger visning"
 
-#: html/Admin/Groups/index.html:99
-msgid "User-defined groups"
-msgstr "Bruger-definerede grupper"
-
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "Brugernavn"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Brugere"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "Brugere som matcher søgekriterier"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
-msgstr "Valid Søgestreng"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "ValueOfQueue"
 msgstr "KøVærdi"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Værdier"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr "Watch"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr "WatchSomAdminCC"
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "Watchers"
 
@@ -5440,7 +4847,7 @@ msgstr "Watchers"
 msgid "WebEncoding"
 msgstr "WebEncoding"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "Ons."
 
@@ -5474,7 +4881,7 @@ msgstr "Når en tickets ejer ændres"
 
 #: etc/initialdata:178 etc/upgrade/3.1.17/content:16
 msgid "Whenever a ticket's priority changes"
-msgstr "Når en ticketøs prioritet ændres"
+msgstr ""
 
 #: etc/initialdata:193
 msgid "Whenever a ticket's queue changes"
@@ -5496,31 +4903,35 @@ msgstr "NÃ¥r kommentarer kommer ind"
 msgid "Whenever correspondence comes in"
 msgstr "NÃ¥r korrespondance ankommer"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Arbejde"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
-msgstr "Arbejd offline"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "WorkPhone"
 msgstr "Arbejdstelefon"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "Arbejdede"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "Du ejer allerede denne ticket"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "Du er ikke en authoriseret bruger"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "Du kan kun tildele tickets du ejer eller som ikker ejet"
 
@@ -5528,24 +4939,24 @@ msgstr "Du kan kun tildele tickets du ejer eller som ikker ejet"
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "Du har ikke tilladelse til at se den ticket.\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "Du fandt %1 tickets i kø %2"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "Du er blevet logget ud af RT."
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "Du har ikke tilladelse til at lave requests i den kø"
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "Du må ikke oprette requests i den kø"
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "Du er velkommen til at logge ind igen"
 
@@ -5573,36 +4984,24 @@ msgstr "Din anmodning blev afvist"
 msgid "Your request was rejected."
 msgstr "Din anmodning blev afvist"
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "Dit brugernavn eller adgangskode er ukorrekt"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "Postnummer"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
-msgstr "tillad oprettelse af gemte søgninger"
-
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
-msgstr "tillad indlæsning af gemte søgninger"
-
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "som givet til %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr "tilhører"
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr "lukket"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "indeholder"
 
@@ -5622,11 +5021,7 @@ msgstr "korrespondance (muligvis) ikke sendt"
 msgid "correspondence sent"
 msgstr "korrespondance afsendt"
 
-#: NOT FOUND IN SOURCE
-msgid "current: $current, want $want, Error near ->$val<- expecting a "
-msgstr "nuværnede: $current, vil have $want, Fejl nær ->$val<- forventer "
-
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "dage"
 
@@ -5634,92 +5029,64 @@ msgstr "dage"
 msgid "delete"
 msgstr "slet"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "slettet"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr "tilhører ikke"
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "matcher ikke"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "indeholder ikke"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "equal to"
 msgstr "lig med"
 
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr "fejl: kan ikke flytte ned"
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr "fejl: kan ikke flytte til venstre"
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr "fejl: kan ikke flytte op"
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr "fejl: intet at slette"
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr "fejl: intet at flytte"
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr "fejl: intet at skifte"
-
 #: NOT FOUND IN SOURCE
 msgid "filename"
 msgstr "filnavn"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "større end"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "gruppe '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "timer"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "id"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "er"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "er ikke"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "mindre end"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "matcher"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "min."
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "minutter"
 
@@ -5727,79 +5094,75 @@ msgstr "minutter"
 msgid "modifications\\n\\n"
 msgstr "ændringer\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "måneder"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "ny"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
-msgstr "intet navn"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "ingen værdi"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "ingen"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "ikke lig med"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "Ã¥ben"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "personlig gruppe '%1' for bruger '%2'"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "kø %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "afvist"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "løst"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "sek."
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr "vis Konfigurations tab"
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
-msgstr "regneark"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "stallet"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "system %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "system gruppe '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "den kaldende komponent specificerede ikke hvorfor"
 
@@ -5807,12 +5170,12 @@ msgstr "den kaldende komponent specificerede ikke hvorfor"
 msgid "ticket #%1"
 msgstr "ticket #%1"
 
-#: lib/RT/Group_Overlay.pm:238
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "ticket #%1 %2"
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "ubeskrevet gruppe %1"
@@ -5821,12 +5184,12 @@ msgstr "ubeskrevet gruppe %1"
 msgid "undescripbed group %1"
 msgstr "ubeskrevet gruppe %1"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "bruger %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "uger"
 
@@ -5834,7 +5197,7 @@ msgstr "uger"
 msgid "with template %1"
 msgstr "med template %1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "Ã¥r"
 
diff --git a/rt/lib/RT/I18N/de.po b/rt/lib/RT/I18N/de.po
index 0b7f1ef..6c1f3be 100644
--- a/rt/lib/RT/I18N/de.po
+++ b/rt/lib/RT/I18N/de.po
@@ -1,6 +1,5 @@
 # German localization catalog for Request Tracker (RT)
 # FIRST AUTHOR: Florian Bischof <flo@fxb.de>, May 2002
-# Update by Torsten Brumm <torsten.brumm@kuehne-nagel.com>
 #
 msgid ""
 msgstr ""
@@ -13,188 +12,240 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: NOT FOUND IN SOURCE
+msgid "#"
+msgstr "#"
+
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr "#%1: %2"
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
-msgstr "$prefix %1"
+msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
-msgstr "%1 #%2"
+msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%1 %3. %2 %7, %4:%5:%6"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "%1 %2 hinzugefügt"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "vor %1 %2"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 %2 geändert in %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
 msgstr "%1 %2 gelöscht"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "%1 %2 mit der Vorlage %3"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 dieses Ticket\\n"
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
-msgstr "%1 (%2) von %3"
+msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
-msgstr "%1 (Unverändert)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 - %2 shown"
+msgstr "%1 - %2 angezeigt"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
-msgstr "%1 - Ein Argument zur Ãœbergabe an %2"
+msgstr "%1 - ein Argument zur Ãœbergabe an %2"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
-msgstr "%1 - Statusausgabe auf STDOUT"
+msgstr ""
 
-#: bin/rt-crontool:204
+#msgstr "%1 - Schreibe Statusupdates nach STDOUT"
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
-msgstr "%1 - Gibt an, welches Action-Modul benutzt werden soll"
+msgstr "%1 - Gebe an, welches Action-Modul benutzt werden soll"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
-msgstr "%1 - Gibt an, welches Condition-Modul benutzt werden soll"
+msgstr "%1 - Gebe an, welches Condition-Modul benutzt werden soll"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
-msgstr "%1 - Gibt an, welches Search-Modul benutzt werden soll"
+msgstr "%1 - Gebe an, welches Search-Modul benutzt werden soll"
 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
+    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
+     $RT::VERSION, 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "ScripAction %1 geladen"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "%1 als Wert für %2 hinzugefügt"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr ""
+
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
-msgstr ""
-"%1 konnte nicht in der Datenbank gefunden werden obwohl es ein lokales "
-"Objekt zu sein scheint"
+msgstr "%1 konnte nicht in der Datenbank gefunden werden obwohl es ein lokales Objekt zu sein scheint"
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
-msgstr "%1 von %2"
+msgstr "am %1 von %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 von %2 in %3 geändert"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
-msgstr "%1 kopieren"
+msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "%1 konnte nicht auf %2 gesetzt werden."
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
-msgstr ""
-"%1 konnte den Status nicht auf erledigt setzen. Die RT-Datenbank könnte "
-"inkonsistent sein."
+msgstr "%1 konnte den Status nicht auf erledigt setzen. Die RT-Datenbank könnte inkonsistent sein."
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
-msgid "%1 created"
-msgstr "%1 erstellt"
+#: html/Elements/MyTickets:24
+#. ($rows)
+msgid "%1 highest priority tickets I own"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
-msgid "%1 deleted"
-msgstr "%1 gelöscht"
+#: NOT FOUND IN SOURCE
+msgid "%1 highest priority tickets I own..."
+msgstr "%1 mir zugewiesene Anfragen mit höchster Priorität..."
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:26
 #. ($rows)
-msgid "%1 highest priority tickets I own"
-msgstr "Ihre %1 Anfragen höchster Priorität"
+msgid "%1 highest priority tickets I requested..."
+msgstr "Die %1 von mir ausgelösten Anfragen mit höchster Priorität"
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
-msgstr ""
+msgstr "%1 ist ein Werkzeug um Anfragen über externe Terminierungstools wie \"cron\" zu verarbeiten"
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
-msgstr "%1 ist kein %2 dieses Bereichs mehr."
+msgstr "%1 ist kein %2 dieses Stapels mehr."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 ist nicht mehr %2 dieser Anfrage."
+
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 ist kein Wert des benutzerdefinierten Feldes %2 mehr"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 ist keine gültige Stapel-Id."
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr "%1 enthält"
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -203,174 +254,226 @@ msgstr "%1 ist kein %2 dieses Bereichs mehr."
 msgid "%1 min"
 msgstr "%1 Min"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr "%1 zuletzt überarbeitete Artikel"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr "%1 neueste Artikel"
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
-msgstr "Die %1 neusten Anfragen ohne Besitzer"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:827
-msgid "%1 objects"
-msgstr "%1 Objekte"
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr ""
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "%1 Rechte"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
-msgstr "%1 wird alle Mitglieder eines erledigten Gruppentickets anführen."
+msgstr "%1 wird alle Mitglieder eines erledigten Gruppentickets erledigen."
 
-#: lib/RT/CustomField_Overlay.pm:828
-msgid "%1's %2 objects"
-msgstr "%1's %2 Objekte"
-
-#: lib/RT/CustomField_Overlay.pm:829
-msgid "%1's %2's %3 objects"
-msgstr "%1's %2's %3 Objekte"
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
-msgstr "%1's gespeicherte Suchanfragen"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: kein Anhang angegeben"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1b"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1k"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
-msgstr  "'%1' ist ein ung\303\274ltiger Wert f\303\274r Status"
+msgstr "'%1' ist ein ungültiger Wert für Status"
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr ""
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(Markieren um Scrip zu löschen)"
+
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
-msgstr "(Auswahl wird gelöscht)"
+msgstr "(Markieren um zu löschen)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
-msgstr "(Benachrichtigung der markierten Empfänger wird unterdrückt)"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
-msgstr "(Benachrichtigungen an markierte Empfänger aktivieren)"
+msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
-msgstr "(Geben Sie die Anfrage IDs oder URLs getrennt durch Leerzeichen ein)"
+msgstr "(Gib Anfragenummern oder URLs getrennt durch Leerzeichen ein)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(Standardwert: %1)"
+msgid "(If left blank, will default to %1"
+msgstr "(Bei Freilassen %1"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(Keine benutzerdefinierten Felder)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(Keine Mitglieder)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "(Keine Scrips)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr "(Keine Vorlagen)"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
-msgid "(None)"
-msgstr "(Nichts)"
-
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Schickt eine Blindkopie dieser Aktualisierung an eine durch Komma getrennte Liste von E-Mail-Adressen. Ändert <b>nicht</b> wer künftig Aktualisierungen geschickt bekommt.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr ""
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
-msgstr ""
+msgstr "(Schickt eine Kopie dieser Aktualisierung an eine durch Komma getrennte Liste von administrativen E-Mail-Adressen. Diese <b>werden</b> künftig Aktualisierungen erhalten.)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Schickt eine Kopie dieser Aktualisierung an eine durch Komma getrennte Liste von E-Mail-Adressen. Ändert <b>nicht</b> wer künftig Aktualisierungen geschickt bekommt.)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr ""
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
-msgstr ""
+msgstr "(Schickt eine Kopie dieser Aktualisierung an eine durch Komma getrennte Liste von E-Mail-Adressen. Diese <b>werden</b> künftig Aktualisierungen erhalten.)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
-msgstr "(Benutze diese Felder, für 'Benutzer definierte' Bedingungen oder Aktionen)"
+msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(leer)"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr "keine Zusammenfassung"
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
-msgstr "(kein Name gelistet)"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
-msgid "(no value)"
-msgstr "(kein Wert)"
+#: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr "(kein Name)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
-msgid "(no values)"
-msgstr "(keine Werte)"
+#: NOT FOUND IN SOURCE
+msgid "(no subject)"
+msgstr "(kein Betreff)"
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
+msgid "(no value)"
+msgstr "(keine Angabe)"
+
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(nur eine Anfrage)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(wartet auf Freigabe)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
-msgstr "(wartet auf andere Sammlung)"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:71
+#: NOT FOUND IN SOURCE
+msgid "(pending other tickets)"
+msgstr "(wartet auf andere Anfragen)"
+
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(notwendig)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(unbenannt)"
 
-#: html/Ticket/Elements/ShowBasics:53
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
-msgstr "<% $Ticket->Status%>"
+msgstr ""
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
-msgstr "<% $_ %>"
+msgstr ""
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
-msgstr "<%$_%>"
+msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Neue Anfrage in\">&nbsp;%1"
@@ -379,122 +482,123 @@ msgstr "<input type=\"submit\" value=\"Neue Anfrage in\">&nbsp;%1"
 msgid "A blank template"
 msgstr "Eine leere Vorlage"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE nicht gefunden"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "ACEs können nur erstellt und gelöscht werden."
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr "UND"
+#: NOT FOUND IN SOURCE
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Breche ab um ungewünschte Veränderungen an der Anfrage zu verhindern.\\n"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "Ãœber mich"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "Zugriffskontrolle"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Aktion"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "Aktion %1 nicht gefunden"
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr "Aktion durchgeführt.\\n"
+#: bin/rt-crontool:119
+msgid "Action committed."
+msgstr "Aktion durchgeführt."
 
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "Aktion vorbereitet..."
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
-msgstr "Hinzufügen"
+msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "AdminCC hinzufügen"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "CC hinzufügen"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr "Spalten hinzufügen"
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
-msgstr "Kriterium hinzufügen"
+msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
+msgstr "Mehr Dateien anhängen"
 msgstr "Weitere Dateien anhängen"
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "Klient hinzufügen"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
-msgstr "Wert hinzufügen"
+msgstr ""
 
-#: html/Admin/Global/Scrip.html:76
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "Erstelle ein neues globales Scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "Erstelle ein Scrip für diesen Stapel"
+
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
-msgstr "Scrip erstellen, das auf alle Bereiche angewendet wird"
+msgstr "Scrip erstellen, das auf alle Stapel angewendet wird"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
-msgstr "zusätzliches Kriterium hinzufügen"
+msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "Füge den ausgewählten Anfragen Kommentare oder Antworten hinzu"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "Mitglieder hinzufügen"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Neue Beobachter hinzufügen"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr "Hinzufügen, Löschen und Ändern von Werten benutzerdefinierter Felder von Objekten"
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
-msgstr "Rolle wurde als %1 für diesen Bereich hinzugefügt"
+msgstr "Habe einen Hauptverantwortlichen als %1 für diesen Stapel hinzugefügt"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
-msgstr "Rolle wurde als %1 für diese Anfrage hinzugefügt"
+msgstr "Habe einen Hauptverantwortlichen als %1 für diese Anfrage hinzugefügt"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "Adresse 1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "Adresse 2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "Admin CC"
 
@@ -506,112 +610,156 @@ msgstr "Admin Kommentar"
 msgid "Admin Correspondence"
 msgstr "Admin Korrespondenz"
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
-msgstr "Admin Bereiche"
+msgstr "Admin Stapel"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr ""
+
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "Admin/Globale Einstellungen"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Queue/Basics"
+msgstr "Admin/Stapel/Basics"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
-msgstr "AdminCc"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:101
-msgid "AdminCustomField"
-msgstr "AdminBenutzerdefiniertesFeld"
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Queue_Overlay.pm:73
+msgid "AdminCustomFields"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
-msgstr "AdminGruppe"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
-msgstr "AdminGruppenZugehörigkeit"
+msgstr ""
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
-msgstr "AdminEigenePersönlicheGruppen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
-msgstr "AdminBereich"
+msgstr ""
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
-msgstr "AdminBenutzer"
+msgstr ""
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "Administrative CC"
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
-msgstr "Erweitert"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "Erweiterte Suche"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr "Erweiterte Suchkriterien"
 
-#: html/Elements/SelectDateRelation:57
+#: html/Elements/SelectDateRelation:35
 msgid "After"
-msgstr "nach dem"
+msgstr "Nach dem"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr "Operator"
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "Alter"
 
 #: etc/initialdata:363
 msgid "All Approvals Passed"
-msgstr "Alle Freigaben genehmigt"
+msgstr ""
 
-#: html/Admin/Queues/index.html:75
-msgid "All Queues"
-msgstr "Alle Bereiche"
+#: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr "Alle Klassen"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr "Und/Oder"
+#: html/Admin/Elements/EditCustomFields:94
+msgid "All Custom Fields"
+msgstr "Alle benutzerdefinierten Felder"
 
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
-msgid "Applies to"
-msgstr "gilt für"
+#: html/Admin/Queues/index.html:52
+msgid "All Queues"
+msgstr "Alle Stapel"
 
-#: html/Search/Edit.html:64
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr ""
+
+#: html/Search/Edit.html:42
 msgid "Apply"
-msgstr "anwenden"
+msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
-msgstr "Änderungen anwenden"
+msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "Freigabe"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "Freigabe #%1: %2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
-msgstr "Freigabe #%1: Notiz wurde aufgrund eines Systemfehlers nicht gespeichert"
+msgstr "Freigabe #%1: Notiz wurde aufgrund eines Systemfehlers nicht vermerkt"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
-msgstr "Freigabe #%1: Notiz gespeichert"
+msgstr "Freigabe #%1: Notiz vermerkt"
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr ""
 
 #: etc/initialdata:351
 msgid "Approval Passed"
-msgstr "Freigabe genehmigt"
+msgstr ""
 
 #: etc/initialdata:374
 msgid "Approval Rejected"
-msgstr "Freigabe abgelehnt"
+msgstr ""
 
-#: html/Approvals/Elements/Approve:65
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "Freigeben"
 
@@ -619,1933 +767,2171 @@ msgstr "Freigeben"
 msgid "Approver's notes: %1"
 msgstr "Notizen des Freigebenden: %1"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
-msgstr "Apr."
+msgstr "Apr"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
-msgid "Ascending"
-msgstr "aufsteigend"
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr "Sind Sie sicher, dass sie diesen Artikel löschen wollen?"
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr "Artikel #%1 gelöscht"
 
-#: lib/RT/Queue_Overlay.pm:97
-msgid "Assign and remove custom fields"
-msgstr "Zuweisen und Entfernen von benutzerdefinierten Feldern"
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr "Artikel #%1: %2"
 
-#: lib/RT/Queue_Overlay.pm:97
-msgid "AssignCustomFields"
-msgstr "BenutzerdefiniertesFeldZuweisen"
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr "Artikel wurde nicht gefunden"
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr "Artikel"
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
+msgid "Ascending"
+msgstr "aufsteigend"
+
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "Anhängen"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "Dateianhang"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "Anhang '%1' konnte nicht geladen werden"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "Anhang erstellt"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "Dateiname des Anhangs"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
-msgstr "Attribut gelöscht"
+msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
-msgstr "Aug."
+msgstr "Aug"
+
+#: NOT FOUND IN SOURCE
+msgid "AuthSystem"
+msgstr "AuthSystem"
 
 #: etc/initialdata:221
 msgid "Autoreply"
-msgstr "Automatische Antwort"
+msgstr "Autoreply"
 
 #: etc/initialdata:72
 msgid "Autoreply To Requestors"
-msgstr "Automatische Antwort an Klienten"
+msgstr "Autoreply an Klienten"
+
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr ""
+
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Fehlerhafte PGP-Signatur: %1\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: NOT FOUND IN SOURCE
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Fehlerhafte Anhangs-Id. Konnte Anhang '%1' nicht finden\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad data in %1"
+msgstr "Fehlerhafte Daten in %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Fehlerhafte Transaktionsnummer für den Anhang. %1 solle %2 sein\\n"
+
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "Grundlagen"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "BCC"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
-msgstr "Änderungen speichern"
+msgstr "Denke daran, Deine Änderungen zu speichern"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+### wieder - Duzen???
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "vor dem"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
-msgid "Binary"
-msgstr "Binär"
+msgid "Begin Approval"
+msgstr ""
 
 #: etc/initialdata:217
 msgid "Blank"
 msgstr "Leer"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr "Fett"
+#: NOT FOUND IN SOURCE
+msgid "Bookmarkable URL for this search"
+msgstr "Speicherbare URL für diese Suche"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
-msgstr "Speicherbarer Link"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "Kurze Kopfzeilen"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
-msgstr "Massen Anfrageaktualisierung"
+msgstr "Massen Ticketupdate"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "Kann Systembenutzer nicht ändern"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
-msgstr "Kann diese Rolle diesen Bereich sehen"
+msgstr "Kann dieser Hauptverantwortliche diesen Stapel sehen"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "Kann kein benutzerdefiniertes Feld ohne Namen hinzufügen"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
-msgstr "Kann keine gespeicherte Suche finden"
+msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
-msgstr "Kann kein Anfrage auf sich selbst verweisen lassen!"
+msgstr "Kann kein Ticket auf sich selbst verweisen lassen!"
 
-#: html/Search/Build.html:766
+#: lib/RT/Ticket_Overlay.pm:2716
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Konnte das Ticket nicht in ein vereinigtes Ticket vereinigen. Diesen Fehler sollten Sie niemals sehen"
+
+#: html/Search/Build.html:699
 msgid "Can't save this search"
-msgstr "Kann diese Suche nicht speichern"
+msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "Sie können Basis und Ziel nicht gleichzeitig angeben"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "Kann Benutzer nicht anlegen: %1"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "CC"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: html/Elements/Submit:100
-msgid "Check All"
-msgstr "Alle auswählen"
-
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
-msgstr "Zum Löschen anwählen"
+msgstr "Zum Löschen ankreuzen"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
-msgstr "Zum Entziehen einer Berechtigung anwählen"
+msgstr "Zum Entziehen einer Berechtigung ankreuzen"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "Kinder"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "Stadt"
 
-#: html/Elements/Submit:102
-msgid "Clear All"
-msgstr "Alles löschen"
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr "Klasse"
 
-#: html/Ticket/Elements/ShowDates:68
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr "Klassenname"
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr "Klasse ist"
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr "Klassen"
+
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr "Geschlossene Anfragen"
+
+#: NOT FOUND IN SOURCE
+msgid "Closed requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr "Geschlossene Anfragen"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Kommentar"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "Kommentaradresse"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
-msgstr "Kommentiere Anfragen"
+msgstr "Kommentiere Tickets"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
-msgstr "AnfrageKommentieren"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Comments"
+msgstr "Kommantare"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
-msgstr "Kommentare (werden nicht an Klienten geschickt)"
+msgstr "Kommentar (wird nicht an Klienten geschickt)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
-msgstr "Kommentare (werden nicht an Klienten geschickt)"
+msgstr "Kommentar (wird nicht an Klienten geschickt)"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: NOT FOUND IN SOURCE
+msgid "Comments about %1"
+msgstr "Kommentar über %1"
+
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
-msgstr "Kommentare zu diesem Benutzer"
+msgstr "Kommentar zu diesen Benutzer"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "Kommentar hinzugefügt"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
-msgstr "Commit Stumpf ausgeführt"
+msgstr "Ãœbergabe abgehakt"
 
-#: html/Admin/Elements/EditScrip:63
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "Bedingung"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
-msgstr "Bedingung trifft zu..."
+msgstr "Condition trifft zu..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "Bedingung nicht gefunden"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: NOT FOUND IN SOURCE
+msgid "ContactInfoSystem"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr ""
+
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "Inhalt"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
-msgstr "Inhaltstyp"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:64
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
-msgstr "Kopie"
+msgstr ""
 
 #: etc/initialdata:286
 msgid "Correspondence"
 msgstr "Korrespondenz"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: NOT FOUND IN SOURCE
+msgid "Correspondence Address"
+msgstr "Korrespondenzadresse"
+
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "Korrespondenz hinzugefügt"
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr "Konnte keinen neuen benutzerdefinierten Wert hinzufügen"
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr ""
 
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr "Konnte kein neuen benutzerdefinierten Wert hinzufügen. %1 "
+#: lib/RT/Ticket_Overlay.pm:3471
+msgid "Could not add new custom field value for ticket. "
+msgstr "Konnte dem Ticket kein neues benutzerdefiniertes Feld hinzufügen. "
 
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
-msgstr "Konnte den Besitzer nicht ändern. "
+msgstr "Konnte den Inhaber nicht ändern. "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
-msgstr "Konnte benutzerdefiniertes Feld nicht erzeugen"
+msgstr "Konnte benutzerdefiniertes Feld nicht anlegen"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr "Konnte benutzerdefiniertes Feld nicht erzeugen: %1"
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "Konnte Gruppe nicht anlegen"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "Konnte Vorlage nicht anlegen: %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
-msgstr "Konnte Anfrage nicht anlegen. Bereich nicht angegeben"
+msgstr "Konnte Ticket nicht anlegen. Stapel nicht bestimmt"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "Konnte Benutzer nicht anlegen"
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "Konnte diesen Benutzer nicht finden oder anlegen"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
-msgstr "Konnte diese Rolle nicht finden"
+msgstr "Konnte diesen Hauptverantwortlichen nicht finden"
 
-#: html/Admin/CustomFields/Objects.html:69
-msgid "Could not load CustomField %1"
-msgstr "Konnte benutzerdefiniertes Feld %1 nicht laden"
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr ""
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "Konnte die Gruppe nicht laden"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
-msgstr "Konnte diese Rolle nicht zu einen %1 dieses Bereichs machen"
+msgstr "Konnte den Hauptverantwortlichen nicht zu einen %1 dieses Stapels machen"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
-msgstr "Konnte diese Rolle nicht zu einem %1 dieses Anfragen machen"
+msgstr "Konnte diesen Hauptverantwortlichen nicht zu einem %1 dieses Tickets machen"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
-msgstr "Konnte diese Rolle nicht als %1 dieses Bereichs entfernen"
+msgstr "Konnte diesen Hauptverantwortlichen nicht als %1 dieses Stapels entfernen"
 
-#: lib/RT/User_Overlay.pm:192
+#: NOT FOUND IN SOURCE
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "Konnte diesen Hauptverantwortlichen nicht als %1 dieses Tickets entfernen"
+
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
-msgstr "Konnte Benutzerinformation nicht speichern"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
-msgstr "Konnte Benutzer nicht der Gruppe hinzufügen"
+msgstr "Konnte Mitglied nicht der Gruppe hinzufügen"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "Konnte die Transaktion nicht anlegen: %1"
 
-#: lib/RT/Record.pm:939
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr ""
+
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
-msgstr "Konnte Zeile nicht finden"
+msgstr "Konne Zeile nicht finden"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
-msgstr "Konnte diese Rolle nicht finden"
+msgstr "Konnte diesen Hauptverantwortlichen nicht finden"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "Konnte diesen Wert nicht finden"
 
-#: lib/RT/CurrentUser.pm:146
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr ""
+
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "Konnte %1 nicht aus der Benutzerdatenbank laden.\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr "Konnte die Klasse %1 nicht laden"
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr "Konnte das benutzerdefinierte Feld %1 nicht laden"
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "Konnte Gruppe %1 nicht laden"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "Konnte den Verweis nicht laden"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
-msgid "Couldn't load object %1"
-msgstr "Konnte Objekt %1 nicht laden"
-
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
-msgstr "Konnte den Bereich nicht laden"
+msgstr "Konnte den Stapel nicht laden"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
-msgstr "Konnte den Bereich %1 nicht laden"
+msgstr "Konnte den Stapel %1 nicht laden"
 
-#: html/SelfService/Display.html:156
-#. ($id)
-msgid "Couldn't load ticket '%1'"
-msgstr "Konnte das Anfrage '%1' nicht laden"
-
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load that user (%1)"
+msgstr "Konnte diesen Benutzer nicht laden (%1)"
+
+#: html/SelfService/Display.html:116
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "Konnte das Ticket '%1' nicht laden"
+
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "Land"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "Erstellen"
 
 #: etc/initialdata:135
 msgid "Create Tickets"
-msgstr "Erstelle Anfragen"
+msgstr "Erstelle Tickets"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr "Erstelle eine Klasse"
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "Erstelle ein benutzerdefiniertes Feld"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
-msgstr "Erstelle ein benutzerdefiniertes Feld für den Bereich %1"
+msgstr "Erstelle ein benutzerdef. Feld für Stapel %1"
+
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr "Erstelle ein benutzerdef. Feld für alle Stapel"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr "Erstelle einen neuen Artikel"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr ""
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "Erstelle eine neue Gruppe"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "Erstelle eine neue persönliche Gruppe"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr ""
+
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
-msgstr "Erstelle eine neue Anfrage"
+msgstr "Erstelle ein neues Ticket"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "Erstelle einen neuen Benutzer"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
-msgstr "Erstelle einen Bereich"
+msgstr "Erstelle einen Stapel"
 
-#: html/Admin/Queues/Scrip.html:80
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a request"
+msgstr "Erstelle ein Ticket"
+
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
-msgstr "Erstelle ein Scrip für den Bereich %1"
+msgstr "Erstelle ein Scrip für den Stapel %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "Erstelle eine Vorlage"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr "Neue Anfrage"
 
+#: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr "Erstelle einen Artikel"
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr "Erstelle einen Artikel in der Klasse..."
+
 #: etc/initialdata:137
 msgid "Create new tickets based on this scrip's template"
-msgstr "Erstelle neue Anfragen basierend auf der Vorlage dieses Scrips"
+msgstr "Erstelle neue Tickets basierend auf der Vorlage dieses Scrips"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
-msgstr "Anfrage erzeugen"
+msgstr "Ãœbermitteln"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
-msgstr "Erstelle Anfragen in diesem Bereich"
+msgstr "Erstelle Tickets in diesem Stapel"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
-msgstr "Erstellen, löschen und modifizieren von benutzerdefinierten Felder"
+msgstr "Erstellen, löschen und modifizieren von benutzerdef. Felder"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
-msgstr "Erstelle, lösche und modifiziere Bereich"
+msgstr "Erstelle, lösche und modifiziere Stapel"
+
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr ""
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "Erstellen, löschen und modifizieren von Mitgliedern persönlicher Gruppen"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "Erstellen, löschen und modifizieren von Benutzern"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr "GespeicherteSucheErstellen"
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
-msgstr "AnfrageErstellen"
+msgstr ""
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "Angelegt"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "Erstelle ein benutzerdefiniertes Feld %1"
 
-#: html/Search/Elements/PickBasics:102
+#: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr "Angelegt von"
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr "Erstellt zwischen"
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr ""
+
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
-msgstr "Ersteller"
+msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "Momentane Beziehungen"
 
-#: html/Admin/Elements/EditScrips:51
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "Aktuelle Scrips"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "Aktuelle Mitglieder"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Aktuelle Rechte"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: NOT FOUND IN SOURCE
+msgid "Current search criteria"
+msgstr "Aktuelle Suchkriterien"
+
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "Aktuelle Beobachter"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
-msgid "Custom Fields"
-msgstr "Benutzerdefinierte Felder"
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "Benutzerdef. Feld #%1"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
-msgid "Custom Fields for %1"
-msgstr "Benutzerdefinierte Felder für %1"
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Benutzerdef. Felder"
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
-msgstr "Benutzerdefinierter Aktions-Aufräum-Code"
+msgstr "Benutzerdefinierter Action-Cleanup-Code"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "Benutzerdefinierter Aktions-Vorbereitungs-Code"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "Benutzerdefinierte Bedingung"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Benutzerdefiniertes Feld %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "Benutzerdefiniertes Feld %1 hat einen Wert."
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "Benutzerdefiniertes Feld %1 hat keinen Wert."
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "Benutzerdefiniertes Feld %1 nicht gefunden"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
+msgid "Custom field deleted"
+msgstr "Benutzerdefiniertes Feld wurde gelöscht"
+
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "Benutzerdefiniertes Feld nicht gefunden"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "Wert %1 des benutzerdefinierten Feldes %2 konnte nicht gefunden werden"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "Wert des benutzerdefinierten Felds konnte nicht gelöscht werden"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "Wert des benutzerdefinierten Feldes konnte nicht gefunden werden"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "Wert des benutzerdefinierten Feldes gelöscht"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
-msgstr "BenutzerdefiniertesFeld"
+msgstr ""
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Datumsangaben"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
-msgstr "Dez."
+msgstr "Dez"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr ""
 
 #: etc/initialdata:222
 msgid "Default Autoresponse template"
-msgstr "Standard Vorlage für automatische Antworten"
+msgstr "Standard Autoresponse-Vorlage"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
-msgstr "Standard Bereich"
+msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
-msgstr "Standard Klient"
+msgstr ""
 
 #: etc/initialdata:296
 msgid "Default admin comment template"
-msgstr "Standard Vorlage für Admin-Kommentar"
+msgstr "Standard Admin-Kommentar-Vorlage"
 
 #: etc/initialdata:275
 msgid "Default admin correspondence template"
-msgstr "Standard Vorlage für Admin-Korrespondenz"
+msgstr "Standard Admin-Korrespondenz-Vorlage"
 
 #: etc/initialdata:287
 msgid "Default correspondence template"
-msgstr "Standard Vorlage für Korrespondenz"
+msgstr "Standard Korrespondenz-Vorlage"
 
 #: etc/initialdata:253
 msgid "Default transaction template"
-msgstr "Standard Vorlage für Transaktion"
+msgstr "Standard Transaktions-Vorlage"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
-msgstr "Standard: %1/%2 von \"%3\" auf \"%4\" geändert."
+msgstr "Standard: %1/%2 von \"%3\" in \"%4\" geändert."
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "Rechte weitergeben"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr "Ihnen gewährte Rechte weitergeben"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
-msgstr "RechteWeitergabe"
+msgstr ""
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "Rechteweitergabe"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "Löschen"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
-msgstr "Vorlage löschen"
-
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
+msgstr "Lösche Artikel #%1"
+
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
-msgstr "Ausgewähltes Script löschen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
-msgstr "Anfragen löschen"
+msgstr "Lösche Tickets"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
-msgstr "AnfrageLöschen"
-
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
 msgstr ""
 
-# Are these three strings really different?
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
-msgstr "Löschen dieses Objektes würde die referenzielle Integrität verletzen"
+msgstr "Löschen dieses Objektes kann die referenzielle Integrität gefährden"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
-msgstr "Löschen dieses Objektes würde die referenzielle Integrität verletzen"
+msgstr "Löschen dieses Objektes würde die referenzielle Integrität gefährden"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "Löschen dieses Objektes würde die referenzielle Integrität verletzen"
 
-#: html/Approvals/Elements/Approve:66
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
-msgstr "Ist Voraussetzung von"
+msgstr "Abhängig gemacht von"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
-msgstr "Als Voraussetzung von %1 hinzugefügt"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
-msgstr "Als Voraussetzung von %1 gelöscht"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
-msgstr "Setzt jetzt %1 voraus"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
-msgstr "Setzt %1 nicht mehr voraus "
+msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
-msgstr "Voraussetzungen"
+msgstr "Abhängig von"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "absteigend"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
-msgstr "Beschreiben Sie hier das Problem"
+msgstr "Beschreibe hier das Problem"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Beschreibung"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: NOT FOUND IN SOURCE
+msgid "Details"
+msgstr "Details"
+
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
-msgstr "Anzeige"
+msgstr "Anzeigen"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
-msgstr "Zeige Zugriffskontrollliste (ACL) an"
+msgstr "Zeige Zugriffskontrollliste an"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
-msgstr "Spalten anzeigen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
-msgstr "Zeige Scrip-Vorlagen für diesen Bereich"
+msgstr "Zeige Scrip-Vorlagen für diesen Stapel"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
-msgstr "Zeige Scrips für diesen Bereich"
+msgstr "Zeige Scrips für diesen Stapel"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "Anzeigemodus"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
-msgstr "Gespeicherte Suchanfragen für diese Gruppe anzeigen"
+msgstr ""
 
-#: html/Elements/Footer:60
+#: NOT FOUND IN SOURCE
+msgid "Display ticket #%1"
+msgstr "Zeige Ticket #%1 an"
+
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "Mache irgend etwas und alles"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr "Suche durchführen"
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
-msgstr "Diese Seite nicht aktualisieren."
+msgstr "Seite nicht aktualisieren."
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
-msgid "Download"
-msgstr "Herunterladen"
+#: NOT FOUND IN SOURCE
+msgid "Don't show search results"
+msgstr "Suchergebnisse nicht anzeigen"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
-msgid "Download as a tab-delimited file"
-msgstr "Als Tabulator separierte Datei speichern"
+#: html/Ticket/Elements/ShowTransactionAttachments:60
+msgid "Download"
+msgstr "Download"
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "Fällig"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
-msgid "Edit Custom Fields for %1"
-msgstr "Bearbeite benutzerdefinierte Felder für %1"
-
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
+#: NOT FOUND IN SOURCE
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "FEHLER: Konnte Ticket '%1' nicht laden: %2.\\n"
 
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Edit"
 msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Bearbeite benutzerdefinierte Felder für %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
+msgstr "Bearbeite benutzerdefinierte Felder für Klasse %1"
+
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "Bearbeite Beziehungen"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
-msgstr "Bearbeite Suche"
+msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
-msgstr "Bearbeite Vorlagen für den Bereich %1"
+msgstr "Bearbeite Vorlagen für Stapel %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
-msgstr "Bearbeite gespeicherte Suchanfragen für diese Gruppe"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "Bearbeite Systemvorlagen"
 
-#: lib/RT/Group_Overlay.pm:175
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
-msgstr "GespeicherteSucheEditieren"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr "Bearbeite Konfiguration für die Klasse %1"
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
-msgstr "Bearbeite Konfiguration für den Bereich %1"
+msgstr "Bearbeite Konfiguration für den Stapel %1"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for user %1"
+msgstr "Bearbeite Konfiguration für Benutzer %1"
+
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "Bearbeite benutzerdefiniertes Feld %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "Bearbeite Mitgliedschaft für die Gruppe %1"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "Bearbeite Mitgliedschaft der persönlichen Gruppe %1"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr ""
+
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
-msgstr "Es muss entweder eine Basis oder ein Ziel angegeben werden"
+msgstr "Es muß entweder eine Basis oder ein Ziel angegeben werden"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "E-Mail"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "E-Mail-Adresse bereits in Gebrauch"
 
-# ## muss das überhaupt übersetzt werden???
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "EmailAddress"
+msgstr "E-Mail-Adresse"
+
+### muss das überhaupt übersetzt werden???
+#: NOT FOUND IN SOURCE
+msgid "EmailEncoding"
+msgstr "E-Mail-Kodierung"
+
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr "Aktiviert (Abwählen deaktiviert diese Klasse)"
+
+### muss das überhaupt übersetzt werden???
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
-msgstr "Aktiviert (Abwählen deaktiviert dieses benutzerdefinierte Feld)"
+msgstr "Aktiviert (Abwählen deaktiviert dieses benutzerdef. Feld)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "Aktiviert (Abwählen deaktiviert diese Gruppe)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
-msgstr "Aktiviert (Abwählen deaktiviert diesen Bereich)"
+msgstr "Aktiviert (Abwählen deaktiviert diesen Stapel)"
 
-#: html/Admin/Queues/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr "Aktivierte Klassen"
+
+#: html/Admin/Elements/EditCustomFields:97
+msgid "Enabled Custom Fields"
+msgstr "Aktivierte benutzerdefinierte Felder"
+
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
-msgstr "Aktivierte Bereiche"
+msgstr "Aktivierte Stapel"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
-msgstr "Status aktiviert: %1"
+msgstr "Status %1 aktiviert"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
-msgid "Enabled status: %1"
-msgstr "Status aktiviert: %1"
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr "Artikel oder URIs getrennt durch Leerzeichen eingeben."
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "Mehrere Werte eingeben"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "Einen Wert eingeben"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
 msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:66
-msgid "Enter up to %1 values"
-msgstr "Gib bis zu %1 Werte ein"
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Ticketnummern oder URIs getrennt durch Leerzeichen eingeben."
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Fehler"
 
-# Queue->AddWatcher ist ein Code-Teil, nicht übersetzen
-#: lib/RT/Queue_Overlay.pm:669
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
-msgstr "Fehler in den Parametern zu Queue->AddWatcher"
+msgstr "Fehler in den Parameter für Queue-AddWatcher"
 
-# Queue->DeleteWatcher ist ein Code-Teil, nicht übersetzen
-#: lib/RT/Queue_Overlay.pm:830
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Fehler in den Paramter für Queue->DelWatcher"
+
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
-msgstr "Fehler in den Parametern zu Queue->DeleteWatcher"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
-msgstr "Fehler in den Parametern zu Ticket->AddWatcher"
+msgstr "Fehler in den Parameter für Ticket->AddWatcher"
+
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Fehler in den Parameter für Ticket->DelWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
-msgstr "Fehler in den Parametern zu Ticket->DeleteWatcher"
+msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
-msgstr "Anfragen eskalieren"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
-msgstr "Geschätzt"
+msgstr ""
 
 #: etc/initialdata:20
 msgid "Everyone"
-msgstr "Jeder"
+msgstr "Everyone"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "Beispiel:"
 
-#: html/Admin/Users/Modify.html:99
+#: NOT FOUND IN SOURCE
+msgid "ExternalAuthId"
+msgstr "ExternalAuthId"
+
+#: NOT FOUND IN SOURCE
+msgid "ExternalContactInfoId"
+msgstr "ExternalContactInfoId"
+
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "Zusatzinformationen"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
-msgstr ""
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
+msgstr "Extrahiere Artikel aus Anfrage #%1"
 
-#: lib/RT/User_Overlay.pm:377
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr "Extrahiere Artikel aus Anfrage #%1 in die Klasse %2"
+
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "Konnte die Pseudogruppe 'Privileged' nicht finden."
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
-msgstr "Konnte die Pseudogruppe 'Unprivileged' nicht finden."
+msgstr "Failed to find 'Unprivileged' users pseudogroup"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr "Konnte Modul %1 nicht laden. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
-msgstr "Feb."
+msgstr "Feb"
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
-msgstr "Dateiname"
-
-#: lib/RT/CustomField_Overlay.pm:69
-msgid "Fill in multiple text areas"
-msgstr "Mehrere Textfelder füllen"
-
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
-msgid "Fill in one text area"
-msgstr "Ein Textfeld füllen"
-
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:71
-msgid "Fill in up to %1 text areas"
-msgstr "%1 Textfelder füllen"
-
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
+#: NOT FOUND IN SOURCE
+msgid "Fin"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "Endpriorität"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
-msgstr "EndPriorität"
+msgstr ""
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
-msgid "Find groups whose"
-msgstr "Finde Gruppen dessen"
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr "Finde Gruppe wessen"
 
-msgid" Find groups whose"
-msgstr "Finde Gruppen dessen"
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: NOT FOUND IN SOURCE
+msgid "Find new/open tickets"
+msgstr "Finde neue/offene Tickets"
+
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "Finde Leute deren"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "Anfragen suchen"
 
-#: html/Ticket/Elements/Tabs:81
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "Erste"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: NOT FOUND IN SOURCE
+msgid "First page"
+msgstr "Erste Seite"
+
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "Foo Bar Baz"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "Foo!"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
-msgstr "Änderung erzwingen"
-
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
+msgstr "erzwinge Änderung"
 
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
-msgstr "%1 Anfrage(n) gefunden"
+msgstr "%quant(%1,ticket) gefunden"
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "Objekt gefunden"
 
 #: NOT FOUND IN SOURCE
-msgid "Freeform"
-msgstr "Freie Eingabe"
+msgid "FreeformContactInfo"
+msgstr "FreeformContactInfo"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr "FreieMehrfachauswahl"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr "FreieEinzelauswahl"
+
+#: lib/RT/Date.pm:392
 msgid "Fri."
-msgstr "Fr."
+msgstr "Fr"
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "Alle Kopfzeilen"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
-msgstr "Vorlage von Datei nehmen"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
-msgstr "An %1 übergeben"
+msgstr "An %1 gegeben"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Global"
 
-#: html/Admin/Elements/EditCustomFields:55
-msgid "Global Custom Fields"
-msgstr "Globale benutzerdefinierte Felder"
-
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr "Konfiguration globaler benutzerdefinierter Felder"
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr ""
 
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "Globale Vorlage: %1"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
-msgstr "Start"
+msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "Los!"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Goto page"
+msgstr "Gehe zu Seite"
+
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "Zeige Anfrage"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Gruppe"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "Gruppenrechte"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "Gruppe hat bereits Mitglieder"
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "Gruppe konnte nicht erstellt werden: %1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "Gruppe angelegt"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "Gruppe hat kein solches Mitglied"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Gruppe nicht gefunden"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr ""
+
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Gruppen"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "Gruppen können nicht Mitglied eines ihrer Mitglieder sein"
 
-#: html/Admin/Groups/index.html:82
-msgid "Groups matching search criteria"
-msgstr "Gruppen auf die das Suchkriterium passt"
-
-#: html/Ticket/Elements/ShowRequestor:77
-msgid "Groups this user belongs to"
-msgstr "Gruppen zu denen der Benutzer gehört"
-
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "Hallo!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "Hallo %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
-msgstr "Geschichte"
+msgstr "Historie"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
-msgid "History of the group %1"
-msgstr "Geschichte der Gruppe %1"
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr "Historie für Artikel #%1"
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
-msgid "History of the user %1"
-msgstr "Geschichte des Benutzers %1"
+#: NOT FOUND IN SOURCE
+msgid "HomePhone"
+msgstr "TelefonZuhause"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Start"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
-msgstr "Ich habe %quant(%1, Betonmischer)"
+msgstr ""
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr "Ich bin verwirrt"
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "Nr."
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Identität"
 
 #: etc/initialdata:429
 msgid "If an approval is rejected, reject the original and delete pending approvals"
-msgstr ""
-"Wenn eine Freigabe abgewiesen wird, weise das Original ab und lösche "
-"wartende Freigaben"
+msgstr "Wenn eine Freigabe abgewiesen wird, weise das Original ab und lösche wartende Freigaben"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "Wenn kein Klient spezifiziert ist, dann generiere Anfragen mit diesem Klienten"
+msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
-msgstr "Wenn kein Bereich spezifiziert ist, dann generiere das Anfrage in diesem Bereich"
+msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
-msgstr ""
+msgstr "Wenn dieses Werkzeug 'setgid' wäre könnte ein feindlicher lokaler Benutzer dadurch administrativen Zugriff auf RT erlangen."
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
-msgstr "Wenn Sie etwas aktualisiert haben, denken Sie daran hier zu speichern"
+msgstr "Wenn Sie irgend etwas aktualisiert haben, denken Sie daran hier zu klicken"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "Unerlaubter Wert für %1"
 
-#: NOT FOUND IN SOURCE
-msgid "Image"
-msgstr "Bild"
-
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "Unveränderbares Feld"
 
-#: html/Admin/Groups/index.html:65
+#: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr "Zeige auch deaktivierte Klassen an."
+
+#: html/Admin/Elements/EditCustomFields:72
+msgid "Include disabled custom fields in listing."
+msgstr "Zeige auch deaktivierte benutzerdefinierte Felder an."
+
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
-msgstr "Zeige auch deaktivierte Gruppen an."
+msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
-msgstr "Zeige auch deaktivierte Bereiche an."
+msgstr "Zeige auch deaktivierte Stapel an."
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "Zeige deaktivierte Benutzer auch in der Suche an."
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr "Unvollständige Suche"
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr "Unvollständige Anfrage"
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "Anfängliche Priorität"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
-msgstr "AnfänglichePriorität"
+msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "Eingabefehler"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
-msgstr "Interner Fehler: %1"
+msgstr "Internet Fehler: %1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "Ungültige Gruppenart"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "Ungültiges Recht"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "Ungültige Daten"
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: NOT FOUND IN SOURCE
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Ungültiger Inhaber. Zurücksetzung auf 'nobody'."
+
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
-msgstr "Ungültiger Bereich"
+msgstr "Ungültiger Stapel"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "Ungültiges Recht"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "Ungültiger Wert für %1"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "Ungültiger Wert für das benutzerdefinierte Feld"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "Ungültiger Statuswert"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
-msgstr ""
+msgstr "Es ist sehr wichtig dass nichtprivilegierte Benutzer dieses Werkzeug nicht aufrufen können."
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
-msgstr ""
+msgstr "Es wird empfohlen einen nichtprivilegierten Unix-User mit korrekter Gruppenzugehörigkeit zum Zugriff auf RT anzulegen um dieses Werkzeug aufzurufen."
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr "Es verarbeitet verschiedene Parameter:"
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr "kursiv"
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr ""
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
-msgstr "Jan."
+msgstr "Jan"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "Betrete oder verlasse diese Gruppe"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
-msgstr "Jul."
+msgstr "Jul"
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "Alles"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
-msgstr "Jun."
+msgstr "Jun"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
-msgid "Language"
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Lang"
 msgstr "Sprache"
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr "Groß"
+#: html/User/Prefs.html:54
+msgid "Language"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
-msgstr "Letzter Kontakt"
+msgstr "letzter Kontakt"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "Letzter Kontakt"
 
-#: html/Elements/SelectDateType:50
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "Zuletzt Kontaktiert"
 
-#: html/Elements/SelectDateType:51
+#: NOT FOUND IN SOURCE
+msgid "Last Notified"
+msgstr "Letzte Änderung"
+
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "Zuletzt Aktualisiert"
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
-msgstr "ZuletztBearbeitetVon"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
-msgstr "Links"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "Diesem Benutzer RT-Zugriff gewähren"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
-msgstr "Diesem Benutzer Rechte zuweisen lassen"
+msgstr "Diesem Benutzer mehr Rechte gewähren"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
 msgstr ""
 
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "Beziehung existiert bereits"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "Beziehung konnte nicht erstellt werden"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "Beziehung erstellt (%1)"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "Beziehung gelöscht (%1)"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Beziehung nicht gefunden"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
-msgstr "Verweise auf Anfrage #%1"
+msgstr "Verweise auf Ticket #%1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Beziehungen"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
-msgstr "Laden"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
-msgstr "Gespeicherte Suchanfragen laden"
-
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr "GespeicherteSucheLaden"
+msgstr ""
 
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
-msgstr "Geladene Perl Module"
-
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "Adresse"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
-msgstr ""
-"Log-Verzeichnis %1 nicht gefunden oder kein Schreibzugriff.\\n RT kann nicht "
-"starten."
+msgstr "Log-Verzeichnis %1 nicht gefunden oder kein Schreibzugriff.\\n RT kann nicht starten."
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "Angemeldet als %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "Anmelden"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "Abmelden"
 
-#: lib/RT/CustomField_Overlay.pm:866
-msgid "Lookup type mismatch"
-msgstr "Suchtyp unpassend"
-
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
-msgstr "Besitzer festlegen"
+msgstr "Mach Inhaber"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
-msgstr "Status festlegen"
+msgstr "Mach Status"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
-msgstr "Fälligkeitsdatum festlegen"
+msgstr "Mach Fälligkeitsdatum"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
-msgstr "Erledigungsdatum festlegen"
+msgstr "Mach Erledigungsdatum"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
-msgstr "Anfangsdatum festlegen"
+msgstr "Mach Datum gestartet"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
-msgstr "Startdatum festlegen"
+msgstr "Mach Startdatum"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
-msgstr "Eingangsdatum festlegen"
+msgstr "Mach Eingangsdatum"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
-msgstr "Priorität festlegen"
+msgstr "Mach Priorität"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
-msgstr "Bereich festlegen"
+msgstr "Mach Stapel"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
-msgstr "Betreff festlegen"
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
-msgstr "Diese Gruppe dem Benutzer anzeigen"
+msgstr "Betreff setzen"
 
-#: html/Admin/index.html:78
-msgid "Manage custom fields and custom field values"
-msgstr "Verwalte benutzerdefinierte Felder und Werte"
-
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "Gruppen und Gruppenmitglieder verwalten"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
-msgstr "Eigenschaften und Einstellungen für alle Bereiche verwalten"
+msgstr "Eigenschaften und Einstellungen für alle Stapel verwalten"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
-msgstr "Bereich und bereichspezifische Einstellungen verwalten"
+msgstr "Stapel und stapelspezifische Einstellungen verwalten"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "Benutzer und Passworte verwalten"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
-msgstr "Mär."
+msgstr "Mär"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
-msgstr "Mai"
+msgstr "Mai."
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
-msgstr "Mitglied %1 hinzugefügt"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
-msgstr "Mitglied %1 gelöscht"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "Mitglied hinzugefügt"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "Mitglied gelöscht"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "Mitglied nicht gelöscht"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "Mitglied von"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "Mitglieder"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
-msgstr "Mitgliedschaft in %1 hinzugefügt"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
-msgstr "Mitgliedschaft in %1 gelöscht"
-
-#: html/Admin/Elements/UserTabs:61
-msgid "Memberships"
-msgstr "Mitgliedschaft"
-
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
-msgid "Memberships of the user %1"
-msgstr "Mitgliedschaft des Benutzers %1"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
-msgstr "Vereinigung erfolgreich"
+msgstr "Zusammenführung erfolgreich"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
-msgstr "Vereinigung fehlgeschlagen. Konnte EffectiveId nicht setzen"
+msgstr "Zusammenführung fehlgeschlagen. Konnte EffectiveId nicht setztn"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr "Vereinigung fehlgeschlagen. Konnte Status nicht setzen"
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
-msgstr "Vereinigen mit"
+msgstr "Zusammenführen in"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
-msgstr "Vereinigt mit %1"
+msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "Nachricht"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
-msgstr "Nachricht konnte nicht gespeichert werden"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
+#: lib/RT/Ticket_Overlay.pm:2517
 msgid "Message recorded"
-msgstr "Nachricht gespeichert"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
+#: html/Ticket/Elements/PreviewScrips:70
 msgid "Messages about this ticket will not be sent to..."
-msgstr "Nachrichten über diese Anfrage werden nicht an diese Empfänger gesendet:"
-
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
-msgstr "Unausgeglichene Klammerung"
+msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "%1: Fehlt ein Primärschlüssel?"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
-msgstr "Handy"
+msgstr "Mobil"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "MobilePhone"
+msgstr "Mobiltelefon"
+
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr "Geändert"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr "Ändern"
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
-msgstr "Ändere Zugriffskontrollliste (ACL)"
+msgstr "Ändere Zugriffskontrollliste"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr "Alle benutzerdefinierten Felder %2, die zu %1 gehören, ändern"
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
-msgid "Modify Custom Fields which apply to all %1"
-msgstr "Alle benutzerdefinierten Felder, die zu %1 gehören, ändern"
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "Ändere benutzdefinierte Felder für diesen Stapel"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
-msgstr "Gruppenrechte ändern"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
-msgstr "Mitglieder ändern"
+msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
-msgstr "Rechte ändern"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
-msgstr "Ändere Scrip-Vorlagen für diesen Bereich"
+msgstr "Ändere Scrip-Vorlagen für diesen Stapel"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
-msgstr "Ändere Scrips für diesen Bereich"
+msgstr "Ändere Scrips für diesen Stapel"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
-msgstr "Ändern der Benutzerrechte"
+msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
-msgstr "Ändere ein benutzerdefiniertes Feld für den Bereich %1"
+msgstr "Ändere ein benutzerdefiniertes Feld für Stapel %1"
+
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr "Ändere ein globales benutzerdefiniertes Feld"
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
-msgstr "Ändere ein Scrip für den Bereich %1"
+msgstr "Ändere ein Scrip für den Stapel %1"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "Ändere ein globales benutzerdefiniertes Feld"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
-msgid "Modify associated objects for %1"
-msgstr "Ändern der assoziierte Objekte von %1"
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr "Ändere Artikel #%1"
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "Ändere Datumsangaben für #%1"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
-msgstr "Ändere Datumsangaben für Anfrage #%1"
+msgstr "Ändere Datumsangaben für Ticket #%1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr "Ändern der globalen benutzerdefinierten Felder"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "Ändere globale Gruppenrechte"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "Ändere globale Gruppenrechte."
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "Ändere globale Benutzerrechte"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "Ändere globale Benutzerrechte."
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "Ändere Gruppen-Metadaten oder lösche die Gruppe"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
 msgstr "Ändere Gruppenrechte für das benutzerdefinierte Feld %1"
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "Ändere die Gruppenrechte der Gruppe %1"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
-msgstr "Ändere Gruppenrechte für den Bereich %1"
+msgstr "Ändere Gruppenrechte für Stapel %1"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "Ändere Mitgliedsverzeichnis dieser Gruppe"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
-msgstr "Ändert den eigenen RT-Zugang"
+msgstr "Ändere jemandens eigenen RT-Zugang"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
-msgstr "Ändere Personen im Zusammenhang mit diesem Bereich %1"
+msgstr "Ändere Leute bezogen auf Stapel %1"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
-msgstr "Ändere Personen der Anfragen #%1"
+msgstr "Ändere Personen des Tickets #%1"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
-msgstr "Ändere Scrips für den Bereich %1"
+msgstr "Ändere Scrips für den Stapel %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
-msgstr "Ändere auf alle Bereiche angewandte Scrips"
+msgstr "Ändere auf alle Stapel angewandte Scrips"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "Ändere Vorlage %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
-msgstr "Ändere globale Vorlagen"
+msgstr "Ändere globale Templates"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "Ändere Gruppe %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
-msgstr "Ändere die Bereichsbeobachter"
+msgstr "Ändere die Stapelbeobachter"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "Ändere Benutzer %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
-msgstr "Ändere Anfrage #%1"
+msgstr "Ändere Ticket #%1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
-msgstr "Ändere Anfrage #%1"
+msgstr "Ändere Ticket #%1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
-msgstr "Ändere Anfragen"
+msgstr "Ändere Tickets"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
-msgid "Modify user rights for custom field %1"
-msgstr "Ändere Benutzerrechte für benutzerdefinierte Felder von %1"
-
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "Ändere Benutzerrechte für die Gruppe %1"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
-msgstr "Ändere Benutzerrechte für den Bereich %1"
+msgstr "Ändere Benutzerrechte für Stapel %1"
 
-#: lib/RT/Queue_Overlay.pm:95
-msgid "ModifyACL"
-msgstr "ACLBearbeiten"
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr "BenutzerdefiniertesFeldBearbeiten"
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyACL"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
-msgstr "EigeneMitgliedschaftBearbeiten"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
-msgstr "BereichsBeobachterBearbeiten"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
-msgstr "ScripsBearbeiten"
+msgstr ""
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
-msgstr "SelbstBearbeiten"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
-msgstr "VorlageBearbeiten"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
-msgstr "AnfrageBearbeiten"
+msgstr ""
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
-msgstr "Mo."
+msgstr "Mo"
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "Mehr über %1"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
-msgstr "Hinunter verschieben"
+msgstr "Runter verschieben"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
-msgstr "Hinauf verschieben"
+msgstr "Hoch verschieben"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "Mehrere"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "Sie müssen eine Angabe bei 'Name' machen"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr "Meine %1 Anfragen"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr ""
+
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "Meine Freigaben"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
-msgstr "Meine gespeicherten Suchanfragen"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Name"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "Benutzername ist bereits in Gebrauch"
 
-#: html/Ticket/Elements/ShowDates:73
+#: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr "Name enthält"
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "Niemals"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "Neu"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr "Neuer Artikel"
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "Neue Beziehungen"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "Neues Passwort"
 
@@ -2553,231 +2939,284 @@ msgstr "Neues Passwort"
 msgid "New Pending Approval"
 msgstr "Neue wartende Freigaben"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New Search"
 msgstr "Neue Suche"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr "Neue Klasse"
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
-msgstr "Neues benutzerdefiniertes Feld"
+msgstr "Neues benutzerdef. Feld"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "Neue Gruppe"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "Neue Passworterinnerung wurde verschickt"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
-msgstr "Neuer Bereich"
+msgstr "Neuer Stapel"
+
+#: NOT FOUND IN SOURCE
+msgid "New request"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "Neue Rechte"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "Neues Scrip"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr ""
+
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr "Neue Anfrage"
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
-msgstr "Neue Anfrage existiert nicht"
+msgstr "Neues Ticket existiert nicht"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
-msgstr "Neuer Benutzer aufgerufen"
+msgstr "Neues Benutzer aufgerufen"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "Neue Beobachter"
 
-#: html/Ticket/Elements/Tabs:92
+#: NOT FOUND IN SOURCE
+msgid "New window setting"
+msgstr "Speichere Fenstereinstellungen"
+
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "Nächste"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Next page"
 msgstr "Nächste Seite"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: NOT FOUND IN SOURCE
+msgid "NickName"
+msgstr "Spitzname"
+
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr "Nein"
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr "Keine Klasse definiert"
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "Kein benutzerdefiniertes Feld"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
 msgstr "Kein benutzerdefiniertes Feld definiert"
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "Keine Gruppe definiert"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
-msgstr "Keine Suche"
+msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
-msgstr "Kein Bereich vorhanden"
+msgstr "Kein Stapel vorhanden"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
-msgstr ""
-"Kein RT-Benutzer gefunden. Bitte kontaktiere Sie Ihren "
-"RT-Administrator.\\n"
+msgstr "Kein RT-Benutzer gefunden. Bitte kontaktiere Deinen RT-Administrator.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "Keine Vorlage"
 
-#: html/Approvals/Elements/Approve:67
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket "
+msgstr "Kein Ticket angegeben. Bereche Ticket ab "
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "Keine Aktion"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr "Keine Spalte angegeben"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
-msgstr "Kein Kommentar zu diesem Benutzer angegeben"
+msgstr "Kein Kommentar über diesen Benutzer angegeben"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: NOT FOUND IN SOURCE
+msgid "No correspondence attached"
+msgstr "Keine Korrespondenz aufgezeichnet"
+
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "Keine Beschreibung für %1 vorhanden"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "Keine Gruppe angegeben"
 
-#: html/Admin/Groups/index.html:52
-msgid "No groups matching search criteria found."
-msgstr "Keine Gruppe mit diesen Kriterien gefunden"
-
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
-msgstr "Keine Nachricht angefügt"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "Kein Passwort gesetzt"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
-msgstr "Keine Erlaubnis Bereiche anzulegen"
+msgstr "Kein Recht Stapel anzulegen"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
-msgstr "Kein Erlaubnis um Anfragen im Bereich '%1' anzulegen"
+msgstr "Kein Recht um Tickets im Stapel '%1' anzulegen"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "Kein Recht Benutzer anzulegen"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
-msgstr "Kein Recht dieses Anfrage anzuzeigen"
+msgstr "Kein Recht dieses Ticket anzuzeigen"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
-msgstr "Kein Recht dieses Anfrage zu aktualisieren"
+msgstr "Kein Recht dieses Ticket zu aktualisieren"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
-msgstr "Keine Rolle angegeben"
+msgstr "Kein Hauptverantwortlicher angegeben"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
-msgstr "Keine Rolle ausgewählt."
+msgstr "Keine Hauptverantwortliche ausgewählt."
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
-msgstr "Keine den Suchkriterien entsprechenden Bereiche gefunden"
+msgstr "Keine den Suchkriterien entsprechenden Stapel gefunden"
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "Keine Rechte gefunden"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "Keine Rechte gewährt."
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
-msgstr "Keine Suche zu bearbeiten."
+msgstr "Keine Suchliste zum bearbeiten."
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
-msgstr "Kein Betreff"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "Kein Transaktionstyp angegeben"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "Keine auf die Suchkriterien passende Benutzer gefunden"
 
-#: lib/RT/Record.pm:932
+#: NOT FOUND IN SOURCE
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "Kein gültiger RT-Benutzer gefunden. RT CVS-Handler weggefallen. Bitte kontaktiere Deinen RT-Administrator.\\n"
+
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr "Kein Wert an _Set geschickt!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "Niemand"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr "Nichtexistierendes Feld?"
 
-#: html/Elements/Header:96
+#: NOT FOUND IN SOURCE
+msgid "Not logged in"
+msgstr "Nicht angemeldet"
+
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "Nicht angemeldet."
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "Nicht angegeben"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "Noch nicht implementiert."
 
-#: html/Approvals/Elements/Approve:70
+#: NOT FOUND IN SOURCE
+msgid "Not yet implemented...."
+msgstr "Noch nicht implementiert..."
+
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "Bemerkungen"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "Benachrichtigung konnte nicht verschickt werden"
 
@@ -2791,11 +3230,11 @@ msgstr "Benachrichtige AdminCCs als Kommentar"
 
 #: etc/initialdata:93 etc/upgrade/3.1.17/content:6
 msgid "Notify Ccs"
-msgstr "Benachrichtige CCs"
+msgstr ""
 
 #: etc/initialdata:89 etc/upgrade/3.1.17/content:2
 msgid "Notify Ccs as Comment"
-msgstr "Benachrichtige CCs als Kommentar"
+msgstr ""
 
 #: etc/initialdata:128
 msgid "Notify Other Recipients"
@@ -2807,31 +3246,27 @@ msgstr "Benachrichtige andere Empfänger als Kommentar"
 
 #: etc/initialdata:85
 msgid "Notify Owner"
-msgstr "Benachrichtige Besitzer"
+msgstr "Benachrichte Inhaber"
 
 #: etc/initialdata:81
 msgid "Notify Owner as Comment"
-msgstr "Benachrichtige Besitzer als Kommentar"
+msgstr "Benachrichtige Inhaber als Kommentar"
 
 #: etc/initialdata:376
 msgid "Notify Owner of their rejected ticket"
-msgstr "Besitzer über ihre abgewiesene Anfrage informieren"
+msgstr ""
 
 #: etc/initialdata:365
 msgid "Notify Owner of their ticket has been approved by all approvers"
 msgstr ""
-"Benachrichtige Besitzer, dass sein Anfrage von allen Entscheidungsträgern "
-"freigegeben wurde"
 
 #: etc/initialdata:353
 msgid "Notify Owner of their ticket has been approved by some approver"
 msgstr ""
-"Benachrichtige Besitzer, dass sein Anfrage von einigen Entscheidungsträgern "
-"freigegeben wurde"
 
 #: etc/initialdata:334
 msgid "Notify Owners and AdminCcs of new items pending their approval"
-msgstr "Benachrichtige Besitzer und AdminCCs neuer auf Freigabe wartende Anfragen"
+msgstr "Benachrichtige Inhaber und AdminCCs neuer auf Freigabe wartende Anfragen"
 
 #: etc/initialdata:77
 msgid "Notify Requestors"
@@ -2853,57 +3288,35 @@ msgstr "Benachrichtige die Klienten, CCs und AdminCCs"
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "Benachrichtige die Klienten, CCs und AdminCCs als Kommentar"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
-msgstr "Nov."
+msgstr "Nov"
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr "Oder"
-
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr "Objekt konnte nicht erstellt werden"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr "Objekt konnte nicht gelöscht werden"
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr "Objekt erstellt"
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr "Objekt gelöscht"
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
-msgid "Object of type %1 cannot take custom fields"
-msgstr "Objekt vom Typ %1 kann keine benutzerdefinierten Felder haben"
-
-#: lib/RT/CustomField_Overlay.pm:901
-msgid "Object type mismatch"
-msgstr "Objekt Typ passt nicht"
-
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
-msgstr "Okt."
+msgstr "Okt"
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
-msgstr "Offline"
+msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
-msgstr "Offline Bearbeitung"
+msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
-msgstr "Offline Upload"
+msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "am"
 
@@ -2921,15 +3334,15 @@ msgstr "Bei Erstellen"
 
 #: etc/initialdata:184
 msgid "On Owner Change"
-msgstr "Bei Besitzerwechsel"
+msgstr "Bei Eigentümerwechsel"
 
 #: etc/initialdata:177 etc/upgrade/3.1.17/content:15
 msgid "On Priority Change"
-msgstr "Bei Änderung der Priorität"
+msgstr ""
 
 #: etc/initialdata:192
 msgid "On Queue Change"
-msgstr "Bei Änderung des Bereichs"
+msgstr "Bei Stapelwechsel"
 
 #: etc/initialdata:198
 msgid "On Resolve"
@@ -2937,140 +3350,155 @@ msgstr "Beim Erledigen"
 
 #: etc/initialdata:169
 msgid "On Status Change"
-msgstr "Beim Ändern des Status"
+msgstr "Bei Statuswechsel"
 
 #: etc/initialdata:150
 msgid "On Transaction"
 msgstr "Bei einer Transaktion"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "Zeige nur Freigaben für nach dem %1 erstelle Anfragen"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "Zeige nur Freigaben für vor dem %1 erstellte Anfragen"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Offen"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Öffnen"
 
-#: html/SelfService/Elements/Tabs:63
+#: NOT FOUND IN SOURCE
+msgid "Open requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr "Offene Anfragen"
 
+#: NOT FOUND IN SOURCE
+msgid "Open tickets (from listing) in a new window"
+msgstr "Öffne Anfragen (aus der Liste) in neuem Fenster"
+
+#: NOT FOUND IN SOURCE
+msgid "Open tickets (from listing) in another window"
+msgstr "Öffne Anfragen (aus der Liste) in ein anderes Fenster"
+
 #: etc/initialdata:140
 msgid "Open tickets on correspondence"
 msgstr "Öffne Anfragen bei Korrespondenz"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
-msgstr "Sortiert nach"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: NOT FOUND IN SOURCE
+msgid "Ordering and sorting"
+msgstr "Sortierung und Reihenfolge"
+
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Organisation"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "Ursprüngliche Anfrage: #%1"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
-msgstr "Ausgehende Mail eines Kommentars gespeichert"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
-msgstr "Ausgehende Mail gespeichert"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "Mit der Zeit steigt die Priorität auf"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr "Ãœbersicht"
+
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
-msgstr "Eigene Anfragen"
+msgstr "Eigene Anfrage"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
-msgstr "EigeneAnfrage"
+msgstr ""
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
-msgstr "Besitzer"
+msgstr "Inhaber"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: NOT FOUND IN SOURCE
+msgid "Owner changed from %1 to %2"
+msgstr "Inhaberwechsel von %1 zu %2"
+
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
-msgstr "Besitzer konnte nicht gesetzt werden"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
-msgstr "Besitzer mit Gewalt von %1 in %2 geändert"
+msgstr "Inhaber mit Gewalt von %1 in %2 geändert"
+
+#: NOT FOUND IN SOURCE
+msgid "Owner is"
+msgstr "Inhaber ist"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
-msgstr "Seite %1 von %2"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "Pager"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: NOT FOUND IN SOURCE
+msgid "PagerPhone"
+msgstr "PagerTelefon"
+
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "Eltern"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "Passwort"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "Passworterinnerung"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr "Passwort geändert"
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "Passwort ist zu kurz"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "Passwort: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
-msgstr "Passwörter verschieden"
+msgstr ""
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
-msgstr "Passwörter verschieden, keine Änderung"
+msgstr ""
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "Personen"
 
@@ -3078,73 +3506,89 @@ msgstr "Personen"
 msgid "Perform a user-defined action"
 msgstr "Führe eine benutzerdefinierte Aktion aus"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
-msgstr "Perl Konfiguration"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "Zugriff verweigert"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "Persönliche Gruppen"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Persönliche Gruppen"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Persönliche Gruppen:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "Telefonnummern"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: NOT FOUND IN SOURCE
+msgid "Placeholder"
+msgstr "Platzhalter"
+
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "Voreinstellungen"
 
-#: lib/RT/Action/Generic.pm:196
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr ""
+
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
-msgstr "Prepare Stumpf ausgeführt"
+msgstr "Vorbereitung abgehakt"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "Vorherige"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Previous page"
 msgstr "Vorherige Seite"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
-msgstr "Rolle %1 nicht gefunden."
+msgstr "Hauptverantwortlichen %1 nicht gefunden."
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Priorität"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "Priorität beginnt bei"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
-msgstr "Privatsphäre:"
+msgstr ""
 
 #: etc/initialdata:25
 msgid "Privileged"
 msgstr "Privilegiert"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "Privilegierungsstatus: %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "Privilegierte Benutzer"
 
@@ -3152,713 +3596,862 @@ msgstr "Privilegierte Benutzer"
 msgid "Pseudogroup for internal use"
 msgstr "Pseudogruppe für internen Gebrauch"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
-msgstr "Suche"
+msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
-msgstr "Suche erstellen"
+msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
-msgstr "Bereich"
+msgstr "Stapel"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
-msgstr "Bereich %2 nicht gefunden"
+msgstr "Stapel %2 nicht gefunden"
 
-#: html/Admin/Queues/Modify.html:64
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
-msgstr "Name des Bereichs"
+msgstr "Name des Stapels"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
-msgstr "Bereich existiert bereits"
+msgstr "Stapel existiert bereits"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
-msgstr "Bereich konnte nicht angelegt werden"
+msgstr "Stapel konne nicht angelegt werden"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
-msgstr "Bereich konnte nicht geladen werden"
+msgstr "Stapel konnte nicht geladen werden"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
-msgstr "Bereich angelegt"
+msgstr "Stapel angelegt"
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr ""
+
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
-msgstr "Bereich nicht gefunden"
+msgstr "Stapel nicht gefunden"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
-msgstr "Bereiche"
+msgstr "Stapel"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr "Schnellsuche"
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
-msgstr "Schnelle Anfrageerstellung"
+msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
-msgstr "RSS"
+msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 für %2"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 von <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "RT Administration"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr ""
+
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "RT Fehler"
 
-#: html/Admin/Tools/Configuration.html:73
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr "RT Selbstbedienung"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service / Closed Tickets"
+msgstr ""
+
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
-msgstr "RT Variablen"
+msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "RT auf einen Blick"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
 msgstr ""
 
-#: html/Elements/PageLayout:108
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr ""
+
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "RT für %1"
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT hat Ihre Befehle verarbeitet"
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Vertrieben unter der <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr "RTFM Fehler"
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
-msgstr "Echter Name"
+msgstr "Realer Name"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: NOT FOUND IN SOURCE
+msgid "RealName"
+msgstr "RealerName"
+
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
-msgstr "Referenz von %1 hinzugefügt"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
-msgstr "Referenz von %1 gelöscht"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
-msgstr "Referenz auf %1 hinzugefügt"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
-msgstr "Referenz auf %1 gelöscht"
+msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
-msgstr "Referenziert von"
+msgstr "Bezogen von"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "Bezieht sich auf"
 
-#: html/Elements/Refresh:57
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Refine search"
+msgstr "Suche Verfeinen"
+
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Seite alle %1 Minuten aktualisieren."
 
-#: html/Search/Bulk.html:116
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "Entferne AdminCC"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Entferne CC"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "Entferne Klient"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Antworten"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
-msgstr "Antwort Adresse"
+msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
-msgstr "Antwort an Klienten"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "Antworte auf Anfragen"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
-msgstr "AnfrageBeantwortung"
+msgstr ""
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "Klient"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: NOT FOUND IN SOURCE
+msgid "Requestor email address"
+msgstr "email-Adresse des Klienten"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr ""
+
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "Klienten"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
-msgstr "Anfragen sollten erlegt werden innerhalb"
+msgstr "Anfragen sollten erlegt werden in"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
-msgstr "Benötigter Parameter '%1' nicht angegeben"
+msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Zuhause"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "Erledigen"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
-msgstr "Erledige Anfrage #%1 (%2)"
+msgstr "Erledige Anfrage Nr. %1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "Erledigt"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: NOT FOUND IN SOURCE
+msgid "Response to requestors"
+msgstr "Antwort an alle Klienten"
+
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "Ergebnisse"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: NOT FOUND IN SOURCE
+msgid "Results per page"
+msgstr "Ergebnisse pro Seite"
+
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "Passwort wiederholen"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
-msgstr "Zurücksetzen"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
-msgstr "Recht weitergegeben"
+msgstr "Recht delegiert"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "Recht erteilt"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "Recht geladen"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "Recht konnte nicht zurückgezogen werden"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "Recht nicht gefunden"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "Recht nicht gefunden."
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "Recht zurückgezogen"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Rechte"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
-msgstr "Rechte für %1 konnten nicht gewährt werden"
+msgstr "Rechte konnten für %1 nicht gewährt werden"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
-msgstr "Rechte für %1 konnten nicht entzogen werden"
+msgstr "Rechte konnten nicht für %1 entzogen werden"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "Rollen"
 
-#: html/Search/Elements/DisplayOptions:83
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
-msgstr "Zeilen pro Seite"
+msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
-msgstr "Sa."
+msgstr "Sa"
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
-msgstr "Speichern"
+msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "Änderungen Sichern"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
-msgstr "Einstellungen speichern"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "Änderungen Sichern"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
-msgstr "Gespeicherte Suchanfragen"
+msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
-msgstr "Scrip #%1"
+msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "Scrip angelegt"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
-msgstr "Scrip Felder"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "Scrip gelöscht"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "Scrips"
 
-#: html/Admin/Queues/Scrips.html:55
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Scrips für %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
-msgstr "Auf alle Bereiche angewandte Scrips"
+msgstr "Auf alle Stapel angewande Scrips"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "Suchen"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr "Suche nach Freigaben"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
-msgstr ""
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
+msgstr "Artikel suchen"
 
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "See custom fields"
-msgstr "Benutzerdefinierte Felder anzeigen"
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
-msgstr "Anzeigen der gesendeten Nachricht und deren Empfänger"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
-msgstr "Anzeigen von anfrage-privaten Kommentaren"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
-msgstr "Anfrage Zusammenfassungen anzeigen"
-
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "SeeCustomField"
-msgstr "Benutzerdefiniertes Feld anzeigen"
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr "GruppeAnzeigen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
-msgstr "BereichAnzeigen"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
-msgid "Select"
-msgstr "Auswahl"
+msgid "Select a Class"
+msgstr "Wähle eine Klasse aus"
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
-msgid "Select a Custom Field"
-msgstr "Wählen Sie ein benutzerdefiniertes Feld aus"
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
+msgstr "Wähle ein benutzerdefiniertes Feld aus"
 
-#: html/Admin/Groups/index.html:78
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
-msgstr "Wählen Sie eine Gruppe aus"
+msgstr "Wähle eine Gruppe aus"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr ""
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr "Wählen Sie einen Bereich für Ihre neue Anfrage"
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
-msgstr "Wählen Sie einen Benutzer aus"
-
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr "Wählen Sie ein benutzerdefiniertes Feld"
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr "Wählen Sie benutzerdefinierte Felder für alle Benutzergruppen aus"
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr "Wählen Sie benutzerdefinierte Felder für alle Benutzer aus"
+msgstr "Wähle einen Benutzer aus"
 
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
-msgstr "Wählen Sie benutzerdefinierte Felder für alle Anfragen in allen Bereichen aus"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
+msgstr "Wähle eine Klasse"
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr "Wählen Sie benutzerdefinierte Felder für Transaktionen mit Anfragen in allen Bereichen aus "
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "Wähle ein benutzerdef. Feld"
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
-msgstr "Wählen Sie eine Gruppe aus"
+msgstr "Wähle eine Gruppe"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
-msgstr "Wählen Sie mehrere Werte aus"
+msgstr "Wähle mehrere Werte"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
-msgstr "Wählen Sie einen Wert aus"
+msgstr "Wähle einen Wert"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
-msgstr "Wählen Sie einen Bereich aus"
+msgstr "Wähle einen Stapel"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
-msgstr "Wählen Sie ein Scrip aus"
+msgstr "Wähle ein Scrip"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
-msgstr "Wählen Sie eine Vorlage aus"
+msgstr "Wähle eine Vorlage"
 
-#: lib/RT/CustomField_Overlay.pm:61
-msgid "Select up to %1 values"
-msgstr "Wählen Sie bis zu %1 Werte aus"
-
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
-msgstr "Wählen Sie einen Benutzer aus"
+msgstr "Wähle einen Benutzer"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
+msgstr "Mehrfachauswahlfeld"
 
-#: html/Admin/Elements/EditCustomFields:58
-msgid "Selected Custom Fields"
-msgstr "Ausgewählte Benutzerdefinierte Felder"
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
+msgstr "Einzelauswahlfeld"
 
-#: html/Admin/CustomFields/Objects.html:59
-msgid "Selected objects"
-msgstr "Ausgewählte Objekte"
+#: NOT FOUND IN SOURCE
+msgid "Self Service"
+msgstr "Selbstbedienung"
 
 #: etc/initialdata:121
 msgid "Send mail to all watchers"
-msgstr "Schickt eine Nachricht an alle Beobachter"
+msgstr "Schicke eine Mail an alle Beobachter"
 
 #: etc/initialdata:117
 msgid "Send mail to all watchers as a \"comment\""
-msgstr "Schickt einen Kommentar an alle Beobachter"
+msgstr "Schicke eine Mail an alle Beobachter als \"Kommentar\""
 
 #: etc/initialdata:112
 msgid "Send mail to requestors and Ccs"
-msgstr "Schickt eine Nachricht an die Klienten und CCs"
+msgstr "Schicke eine Mail an die Klienten und CCs"
 
 #: etc/initialdata:107
 msgid "Send mail to requestors and Ccs as a comment"
-msgstr "Schickt einen Kommentar an die Klienten und CCs"
+msgstr "Schicke eine Mail an die Klienten und CCs als Kommentar"
 
 #: etc/initialdata:78
 msgid "Sends a message to the requestors"
-msgstr "Schickt eine Nachricht an die Klienten"
+msgstr "Schicke eine Mail an die Klienten"
 
 #: etc/initialdata:125 etc/initialdata:129
 msgid "Sends mail to explicitly listed Ccs and Bccs"
-msgstr "Schickt eine Nachricht an die direkt angegebenen CCs und BCCs"
+msgstr "Schicke eine Mail an die direkt angegebenen CCs und BCCs"
 
 #: etc/initialdata:94 etc/upgrade/3.1.17/content:7
 msgid "Sends mail to the Ccs"
-msgstr "Schickt eine Nachricht an alle CCs"
+msgstr ""
 
 #: etc/initialdata:90 etc/upgrade/3.1.17/content:3
 msgid "Sends mail to the Ccs as a comment"
-msgstr "Schickt einen Kommentar an alle CCs "
+msgstr ""
 
 #: etc/initialdata:102
 msgid "Sends mail to the administrative Ccs"
-msgstr "Schickt eine Nachricht an die administrativen CCs"
+msgstr "Schicke eine Mail an die administrativen CCs"
 
 #: etc/initialdata:98
 msgid "Sends mail to the administrative Ccs as a comment"
-msgstr "Schickt einen Kommentar an die administrativen CCs"
+msgstr "Schicke eine Mail an die administrativen CCs als Kommentar"
 
 #: etc/initialdata:82 etc/initialdata:86
 msgid "Sends mail to the owner"
-msgstr "Schickt eine Nachricht an den Besitzer"
+msgstr "Schicke eine Mail an den Inhaber"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
-msgstr "Sep."
+msgstr "Sep"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr "Mehrere URLs getrennt durch Leerzeichen eingeben"
+
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
-msgstr "Zeige"
+msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
-msgstr "Zeige Freigaben"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
-msgstr "Zeige Spalten"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
-msgstr "Zeige Ergebnisse"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr "Zeige erweiterte Suchoptionen an..."
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "Zeige freigegebene Anfragen"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "Zeige Grundlagen"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "Zeige abgelehnte Anfragen"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "Zeige Details"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
-msgstr "Zeige anhängige Anfragen"
+msgstr "Zeige schwebende Anfragen"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "Zeige auf andere Freigaben wartende Anfragen"
 
-#: lib/RT/Queue_Overlay.pm:94
-msgid "ShowACL"
-msgstr "ACLAnzeigen"
+#: NOT FOUND IN SOURCE
+msgid "Show ticket private commentary"
+msgstr "Zeige private Kommentare des Anfragen"
+
+#: NOT FOUND IN SOURCE
+msgid "Show ticket summaries"
+msgstr "Zeige Kurzfassungen der Anfragen"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr "KonfigurationsMenüAnzeigen"
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ShowACL"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
-msgstr "AusgehendeNachrichtenAnzeigen"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
-msgstr "GespeicherteSuchanfragenAnzeigen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
-msgstr "ScripsAnzeigen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
-msgstr "VorlagenAnzeigen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
-msgstr "AnfragenAnzeigen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
-msgstr "AnfrageKommentareAnzeigen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
-msgstr "Als Klient einer Anfrage oder Anfrage- bzw. Bereichs-CC eintragen"
+msgstr "Als Klient einer Anfrage oder Anfrage- bzw. Stapel-CC eintragen"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
-msgstr "Als Anfrage- oder Bereichs-AdminCC eintragen"
+msgstr "Als Anfrage- oder Stapel-AdminCC eintragen"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "E-Mail-Signatur"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
+msgstr "Angemeldet als %1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "Einzel"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr "Überspringe Menü"
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr "Klein"
-
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
-msgstr "Sortieren"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Sort Order"
+msgstr "Sortierreihenfolge"
+
+#: NOT FOUND IN SOURCE
+msgid "Sort key"
+msgstr "Sortierschlüssel"
+
+#: NOT FOUND IN SOURCE
+msgid "Sort results by"
+msgstr "Sortiere Ergebnisse nach"
+
+#: NOT FOUND IN SOURCE
+msgid "SortOrder"
+msgstr "Sortierreihenfolge"
 
-#: html/Admin/Elements/EditScrip:87
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
-msgstr "Phase"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr ""
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr ""
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "Begonnen"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr ""
+
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "Beginnt"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Staat"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Status"
 
 #: etc/initialdata:309
 msgid "Status Change"
-msgstr "Statusänderung"
+msgstr "Ändere Status"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "Status von %1 auf %2 geändert"
 
-#: html/Ticket/Elements/Tabs:170
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
-msgstr "Ãœbernehmen"
+msgstr "Stehlen"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
-msgstr "Anfragen übernehmen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
-msgstr "AnfrageÃœbernehmen"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "Gestohlen von %1"
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
+msgid "Stolen from %1 "
+msgstr "Gestohlen von %1 "
 
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Betreff"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "Betreff wurde auf %1 geändert"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "Ãœbermitteln"
 
-#: lib/RT/Group_Overlay.pm:782
+#: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr "Suchen"
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
-msgstr "Gelungen"
+msgstr "Geglückt"
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr "Zusammenfassung enthält"
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
-msgstr "So."
+msgstr "So"
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
-msgstr "SuperBenutzer"
+msgstr ""
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "System"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
-msgstr "System Konfiguration"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "Systemfehler"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr ""
-
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
-msgstr "System Werkzeuge"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "Systemfehler. Recht nicht delegiert."
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "Systemfehler. Recht nicht gewährt."
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "Systemgruppen"
 
@@ -3866,568 +4459,659 @@ msgstr "Systemgruppen"
 msgid "SystemRolegroup for internal use"
 msgstr "SystemRolegroup für internen Gebrauch"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "Ãœbernehmen"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
-msgstr "Anfragen übernehmen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
-msgstr "AnfrageÃœbernehmen"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "Ãœbernommen"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Vorlage"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "Vorlage #%1"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "Vorlage gelöscht"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Vorlage nicht gefunden"
 
-#: lib/RT/Template_Overlay.pm:376
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr ""
+
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Vorlagen eingelesen"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Vorlagen"
 
 #: NOT FOUND IN SOURCE
-msgid "Text"
-msgstr "Text"
+msgid "Templates for %1\\n"
+msgstr "Vorlagen für %1\\n"
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "Das ist bereits der aktuelle Wert"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "Dies ist kein gültiger Wert für dieses benutzerdefinierte Feld"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "Das ist der gleiche Wert"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
-msgstr "Diese Rolle hat dieses Recht bereits"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
-msgstr "Diese Rolle ist bereits ein %1 dieses Bereichs"
+msgstr "Dieser Hauptverantwortliche ist bereits ein %1 dieses Stapels"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
-msgstr "Diese Rolle ist bereits ein %1 dieser Anfrage"
+msgstr "Dieser Hauptverantwortliche ist bereits ein %1 dieser Anfrage"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
-msgstr "Diese Rolle ist nicht ein %1 dieses Bereichs"
+msgstr "Dieser Hauptverantwortliche ist nicht ein %1 dieses Stapels"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: NOT FOUND IN SOURCE
+msgid "That principal is not a %1 for this ticket"
+msgstr "Dieser Hauptverantwortliche ist nicht ein %1 dieser Anfrage"
+
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
-msgstr "Dieser Bereich existiert nicht"
+msgstr "Dieser Stapel existiert nicht"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "Diese Anfrage hat ungelöste Abhängigkeiten"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: NOT FOUND IN SOURCE
+msgid "That user already has that right"
+msgstr "msgstr "Dieser Benutzer hat dieses Recht bereits" "
+
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
-msgstr "Diese Anfrage gehört bereits diesem Benutzer"
+msgstr "Diesem Benutzer gehört diese Anfrage bereits"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "Dieser Benutzer existiert nicht"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "Dieser Benutzer ist bereits privilegiert"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
-msgstr "Dieser Benutzer ist bereits unprivilegiert"
+msgstr "Dieser Benutzer ist bereits ungeprivilegiert"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "Dieser Benutzer ist jetzt privilegiert"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
-msgstr "Dieser Benutzer ist jetzt unprivilegiert"
+msgstr "Dieser Benutzer ist jetzt unprivelegiert"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
-msgstr "Diesem Benutzer dürfen keine Anfragen aus diesen Bereich gehören"
+msgstr "Diesem Benutzer dürfen keine Anfragen aus diesen Stapel gehören"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
-msgstr "Dies ist keine numerische ID"
+msgstr "Dies ist keine numerische Id"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "Grundlagen"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr "Der CC einer Anfrage"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr "Der administrative CC einer Anfrage"
 
-#: bin/rt-crontool:223
+#: NOT FOUND IN SOURCE
+msgid "The comment has been recorded"
+msgstr "Der Kommentar wurde aufgezeichnet"
+
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
-msgstr ""
+msgstr "Das folgende Kommando wird alle aktiven Anfragen des Stapels 'general' finden und ihre Priorität auf 99 setzen, wenn sie innerhalb der letzten 4 Stunden nicht angefasst wurden:"
 
-#: lib/RT/Record.pm:934
+#: NOT FOUND IN SOURCE
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "Die folgenden Kommandos wurden nicht verarbeitet:\\n\\n"
+
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "Der neue Wert wurde gesetzt."
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
-msgstr "Der Besitzer einer Anfrage"
+msgstr "Der Inhaber einer Anfrage"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "Der Klient einer Anfrage"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "Diese Kommentare sind generell nicht für den Benutzer sichtbar"
 
-#: lib/RT/CustomField_Overlay.pm:912
-msgid "This custom field does not apply to that object"
-msgstr "Dieses benutzerdefinierte Feld passt nicht zum Objekt"
-
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
-msgstr "Dieses Feature ist nur für Systemadministratoren verfügbar"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
-msgstr "Diese Nachricht wird an folgende Empfänger gesendet:"
+msgstr ""
 
-#: bin/rt-crontool:214
-msgid "This tool allows the user to run arbitrary perl modules from within RT."
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
 msgstr ""
-"Dieses Werkzeug erlaubt es Benutzern beliebige Perl-Module von RT aus "
-"aufzurufen."
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: bin/rt-crontool:185
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "Dieses Werkzeug erlaubt es Benutzern beliebige Perl-Module von RT aus aufzurufen."
+
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "Diese Transaktion scheint keinen Inhalt zu haben"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
-msgstr "Die %1 dringensten Anfragen dieses Benutzers"
+msgstr "Die %1 höchstpriorisiertesten Anfragen dieses Benutzers"
 
-#: lib/RT/Date.pm:416
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr ""
+
+#: lib/RT/Date.pm:391
 msgid "Thu."
-msgstr "Do."
+msgstr "Do"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
-msgstr "Anfrage #%1 Alles aktualisieren: %2"
+msgstr "Anfrage Nr. %1 Alles aktualisieren: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
-msgstr "Anfrage #%1: %2"
+msgstr "Anfrage Nr. %1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
-msgstr "Anfrage %1"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
-msgstr "Anfrage %1 wurde im Bereich '%2' angelegt"
+msgstr "Anfrage %1 wurde in Anfrage '%2' angelegt"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket %1 loaded\\n"
+msgstr "Anfrage %1 geladen\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "Anfrage %1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
-msgid "Ticket Custom Fields"
-msgstr "Benutzerdefinierte Anfrage Felder"
-
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
-msgstr "Geschichte von Anfrage #%1 %2"
+msgstr "Verlauf von Anfrage Nr. %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket Id"
+msgstr "msgstr "Anfrage Nr." "
 
 #: etc/initialdata:324
 msgid "Ticket Resolved"
 msgstr "Anfrage erledigt"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
-msgid "Ticket Transactions"
-msgstr "Anfrage Transaktion"
+#: NOT FOUND IN SOURCE
+msgid "Ticket attachment"
+msgstr "Anhang der Anfrage"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "Inhalt der Anfrage"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "Art des Inhalts der Anfrage"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "Anfrage konnte aufgrund eines internen Fehlers nicht angelegt werden"
 
-#: html/Ticket/Display.html:55
+#: lib/RT/Transaction_Overlay.pm:497
+msgid "Ticket created"
+msgstr "Anfrage angelegt"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:502
+msgid "Ticket deleted"
+msgstr "Anfrage gelöscht"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket id not found"
+msgstr "Anfragenummer nicht gefunden"
+
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
-msgstr "Anfrage Metadaten"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket not found"
+msgstr "Anfrage nicht gefunden"
 
 #: etc/initialdata:310
 msgid "Ticket status changed"
 msgstr "Status der Anfrage geändert"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr "SQL Anfrage Suchmodul"
+#: NOT FOUND IN SOURCE
+msgid "Ticket watchers"
+msgstr "Beobachter der Anfrage"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "Anfragen"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "Anfragen %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "Anfragen %2 von %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Tickets from %1"
+msgstr "Anfragen von %1"
+
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr "Anfragen, die von dieser Freigabe abhängen:"
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
-msgstr "Geschätzte Zeit"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
-msgstr "Verbleibende Zeit"
+msgstr "Ãœbrige Zeit"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "Arbeitszeit"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
-msgstr "Verbleibende Zeit"
+msgstr "Ãœbrige Zeit"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
-msgstr ""
+msgstr "Benötigte Zeit"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
-msgstr "Gearbeitete Zeit"
+msgstr "Arbeitszeit"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
-msgstr "Arbeitszeit"
+msgstr "Gearbeitete Zeit"
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
+#: NOT FOUND IN SOURCE
+msgid "To generate a diff of this commit:"
+msgstr "Um ein 'diff' dieser Ãœbergabe zu erstellen:"
+
+#: NOT FOUND IN SOURCE
+msgid "To generate a diff of this commit:\\n"
+msgstr "Um ein 'diff' dieser Ãœbergabe zu erstellen:\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "Eingegangen"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
-msgstr "Werkzeuge"
+msgstr ""
 
 #: etc/initialdata:252
 msgid "Transaction"
 msgstr "Transaktion"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
-msgstr "Transaktion %1 eliminiert"
+msgstr "Transaktion %1 durchgeprügelt"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "Transaktion erstellt"
 
-#: html/Admin/Elements/QueueTabs:78
-msgid "Transaction Custom Fields"
-msgstr "Benutzerdefinierte Felder bei Transaktionen"
-
-#: lib/RT/Transaction_Overlay.pm:125
-msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr "Transaction->Create fehlgeschlagen, da Objekttyp und ID nicht angegeben wurden"
+#: lib/RT/Transaction_Overlay.pm:92
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Transaction->Create konnte nicht ausgeführt werden da keine Ticketnummer angegeben wurde"
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "Transaktionen sind unveränderbar"
 
-#: lib/RT/Date.pm:414
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr ""
+
+#: lib/RT/Date.pm:389
 msgid "Tue."
-msgstr "Di."
+msgstr "Di"
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "Typ"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr "Artikel kann nicht geladen werden"
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "Nicht implementiert"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Unix Login"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: NOT FOUND IN SOURCE
+msgid "UnixUsername"
+msgstr "UnixBenutzername"
+
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
-msgstr "Unbekannte Inhaltskodierung (Content-Encoding) %1"
+msgstr "Unbekannte Inhalts-Kodierung %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr "Unbekanntes Feld: $key"
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "unbegrenzt"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
-msgstr "Unbenannte Suche"
+msgstr ""
 
 #: etc/initialdata:32
 msgid "Unprivileged"
 msgstr "Unprivilegiert"
 
-#: html/Admin/Elements/EditCustomFields:60
-msgid "Unselected Custom Fields"
-msgstr "Nichtausgewähltes benutzerdefiniertes Feld"
-
-#: html/Admin/CustomFields/Objects.html:61
-msgid "Unselected objects"
-msgstr "Nichtausgewähltes Objekte"
-
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "Zurückgegeben"
 
-#: html/Search/Bulk.html:54
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
-msgstr "Alles aktualisieren"
+msgstr ""
 
-#: html/Ticket/Update.html:133
+#: NOT FOUND IN SOURCE
+msgid "Update ID"
+msgstr "Aktualisierungs-ID"
+
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
-msgstr "Anfrage Aktualisieren"
+msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "Aktualisierungtyp"
 
-#: html/Search/Results.html:80
+#: NOT FOUND IN SOURCE
+msgid "Update all these tickets at once"
+msgstr "Aktualisiere alle diese Anfragen auf einmal"
+
+#: NOT FOUND IN SOURCE
+msgid "Update email"
+msgstr "Aktualisiere E-Mail"
+
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
-msgstr "Mehrere Anfragen aktualisieren"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Update name"
+msgstr "Aktualisiere Name"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
-msgstr "Aktualisierung nicht gespeichert."
+msgstr "Aktualisierung nicht aufgezeichnet."
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "Aktualisiere ausgewählte Anfragen"
 
-#: html/Ticket/ModifyAll.html:84
+#: NOT FOUND IN SOURCE
+msgid "Update signature"
+msgstr "Aktualisiere Unterschrift"
+
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "Aktualisiere Anfrage"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: NOT FOUND IN SOURCE
+msgid "Update ticket # %1"
+msgstr "Aktualisiere Anfrage Nr. %1"
+
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
-msgstr "Aktualisiere Anfrage #%1"
+msgstr "Aktualisiere Anfrage Nr. %1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
-msgstr "Aktualisiere Anfrage #%1 (%2)"
+msgstr "Aktualisiere Anfrage Nr. %1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "Aktualisierungstyp war weder Korrespondenz noch Kommentar."
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
-msgstr "Hochladen"
-
-#: lib/RT/CustomField_Overlay.pm:84
-msgid "Upload multiple files"
-msgstr "Hochladen mehrerer Dateien"
-
-#: lib/RT/CustomField_Overlay.pm:79
-msgid "Upload multiple images"
-msgstr "Hochladen mehrerer Bilder"
-
-#: lib/RT/CustomField_Overlay.pm:85
-msgid "Upload one file"
-msgstr "Hochladen einer Datei"
-
-#: lib/RT/CustomField_Overlay.pm:80
-msgid "Upload one image"
-msgstr "Hochladen eines Bildes"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:86
-msgid "Upload up to %1 files"
-msgstr "Hochladen von bis zu %1 Dateien"
+#: html/Tools/Offline.html:73
+msgid "Upload your changes"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:81
-msgid "Upload up to %1 images"
-msgstr "Hochladen von bis zu %1 Bildern"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
+msgstr "Ãœber die Auswahllisten kann bestimmt werden welche Transaktionen in den neuen RTFM Artikel extrahiert werden"
 
-#: html/Tools/Offline.html:95
-msgid "Upload your changes"
-msgstr "Änderungen hochladen"
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
-msgstr "Benutzer '%1' konnte nicht gefunden werden"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr ""
 
 #: etc/initialdata:132 etc/initialdata:206
 msgid "User Defined"
 msgstr "Benutzerdefiniert"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
-msgstr "Benutzerdefinierte Konditionen und Aktionen"
+msgstr ""
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: NOT FOUND IN SOURCE
+msgid "User ID"
+msgstr "Benutzer-ID"
+
+#: html/Elements/SelectUsers:25
+msgid "User Id"
+msgstr "Benutzername"
+
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "Benutzerrechte"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
-msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr ""
-"Benutzer hat einen unbekannten Aktualisierungstyp für das benutzerdefinierte "
-"Feld %1 bei %2-Objekt #%3 verlangt"
-
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "Benutzer konnte nicht angelegt werden: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "Benutzer angelegt"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Benutzerdefinierte Gruppe"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
-msgstr "Benutzer geladen"
+msgstr ""
 
-#: html/Admin/Groups/index.html:99
-msgid "User-defined groups"
-msgstr "Benutzerdefinierte Gruppe"
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: NOT FOUND IN SOURCE
+msgid "User view"
+msgstr "Benutzeransicht"
+
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "Benutzername"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Benutzer"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
-msgstr "Auf diese Kriterien zutreffende Benutzer"
+msgstr "Auf diese Kriterien zutreffenede Benutzer"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
-msgstr "Gültige Suche"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ValueOfQueue"
+msgstr "ValueOfQueue"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Werte"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
-msgstr "Beobachte"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
-msgstr "BeobachteAlsAdminCc"
+msgstr ""
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "Beobachter"
 
-#: lib/RT/Date.pm:415
+#: NOT FOUND IN SOURCE
+msgid "WebEncoding"
+msgstr "Webkodierung"
+
+#: lib/RT/Date.pm:390
 msgid "Wed."
-msgstr "Mi."
+msgstr "Mi"
 
 #: etc/initialdata:521
 msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
-msgstr ""
+msgstr "Füge Korrespondenz zum Originalticket, wenn eine Anfrage von allen Freigebenden freigegeben wurde"
 
 #: etc/initialdata:485
 msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
-msgstr ""
+msgstr "Füge Korrespondenz zum Originalticket wenn eine Anfrage  von einem Freigebenden freigegeben wurde"
 
 #: etc/initialdata:146
 msgid "When a ticket is created"
-msgstr "Wenn eine Anfrage erstellt wird"
+msgstr "Wenn eine Afrage erstellt wird"
 
 #: etc/initialdata:418
 msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
-msgstr ""
+msgstr "Benachrichtige Inhaber und AdminCCs der auf Freigabe wartende Anfrage wenn ein Freigabeticket erstellt wurde"
 
 #: etc/initialdata:151
 msgid "When anything happens"
@@ -4435,19 +5119,19 @@ msgstr "Wenn irgendetwas passiert"
 
 #: etc/initialdata:199
 msgid "Whenever a ticket is resolved"
-msgstr "Immer wenn eine Anfrage erledigt wird"
+msgstr "Immer wenn eine Anfrage  erledigt wird"
 
 #: etc/initialdata:185
 msgid "Whenever a ticket's owner changes"
-msgstr "Immer wenn der Besitzer einer Anfrage wechselt"
+msgstr "Immer wenn der Eigentümer einer Anfrage wechselt"
 
 #: etc/initialdata:178 etc/upgrade/3.1.17/content:16
 msgid "Whenever a ticket's priority changes"
-msgstr "Immer wenn sich die Priorität eines Anfragen ändert"
+msgstr ""
 
 #: etc/initialdata:193
 msgid "Whenever a ticket's queue changes"
-msgstr "Immer wenn eine Anfrage den Bereich wechselt"
+msgstr "Immer wenn eine Anfrage den Stapel wechselt"
 
 #: etc/initialdata:170
 msgid "Whenever a ticket's status changes"
@@ -4461,289 +5145,333 @@ msgstr "Immer wenn eine benutzerdefinierte Bedingung auftritt"
 msgid "Whenever comments come in"
 msgstr "Immer wenn ein neuer Kommentar eingeht"
 
-1c7f

-itialdata:157
 #: etc/initialdata:157
 msgid "Whenever correspondence comes in"
 msgstr "Immer wenn neue Korrespondenz eingeht"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr "Bezogen von"
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr "Beziehen sich auf"
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Arbeit"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
-msgstr "Offline arbeiten"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: NOT FOUND IN SOURCE
+msgid "WorkPhone"
+msgstr "Arbeitstelefon"
+
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "Arbeitszeit"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr "Ja"
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
-msgstr "Sie sind bereits Besitzer dieser Anfrage"
+msgstr "Sie besitzen diese Anfrage bereits"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
-msgstr "Sie sind kein autorisierter Benutzer"
+msgstr "Sie sind kein authorisierter Benutzer"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
-msgstr "Sie können nur Anfragen ohne Besitzer zuweisen"
+msgstr "Sie können nur Anfragen ohne Inhaber zuweisen"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
-msgstr "Sie haben %1 Anfragen im Bereich %2 gefunden"
+msgstr "Sie haben %1 Anfragen in Stapel %2 gefunden"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "Sie wurden von RT abgemeldet."
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
-msgstr "Sie haben kein Recht, Anfragen in diesem Bereich anzulegen."
+msgstr "Sie haben kein Recht, Anfragen in diesen Stapel anzulegen."
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
-msgstr "Sie dürfen in diesem Bereich keine Anfragen erstellen"
+msgstr "Sie dürfen in diesem Stapel keine Anfragen erstellen"
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "Sie können sich gerne wieder anmelden"
 
+#: NOT FOUND IN SOURCE
+msgid "Your %1 requests"
+msgstr "Meine %1 Anfragen"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr ""
+
 #: etc/initialdata:502
 msgid "Your request has been approved by %1. Other approvals may still be pending."
-msgstr ""
-"Ihre Anfrage wurde von %1 freigegeben. Andere Freigaben können noch "
-"ausstehen."
+msgstr "Ihre Anfrage wurde von %1 freigegeben. Andere Freigaben können noch ausstehen."
 
 #: etc/initialdata:540
 msgid "Your request has been approved."
 msgstr "Ihre Anfrage wurde freigegeben."
 
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr ""
+
 #: etc/initialdata:445
 msgid "Your request was rejected."
 msgstr "Ihre Anfrage wurde abgewiesen"
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "Ihr Benutzername oder Passwort ist falsch"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "PLZ"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
-msgstr "Erlaube Erstellung von gespeicherten Suchabfragen"
+#: NOT FOUND IN SOURCE
+msgid "and is not"
+msgstr "und ist nicht"
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
-msgstr "Erlaube das Laden von gespeicherten Suchabfragen"
+#: NOT FOUND IN SOURCE
+msgid "and not"
+msgstr "und nicht"
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "wie an %1 gewährt"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr "gehört zu"
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
-msgstr "geschlossen"
+msgstr "geschlossenen"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "enthält"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: NOT FOUND IN SOURCE
+msgid "content"
+msgstr "Inhalt"
+
+#: NOT FOUND IN SOURCE
+msgid "content-type"
+msgstr "content-type"
+
+#: NOT FOUND IN SOURCE
+msgid "correspondence (probably) not sent"
+msgstr "Korrepsondenz (möglicherweise) nicht verschickt"
+
+#: NOT FOUND IN SOURCE
+msgid "correspondence sent"
+msgstr "Korrespondenz verschickt"
+
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "Tage"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: NOT FOUND IN SOURCE
+msgid "delete"
+msgstr "löschen"
+
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "gelöscht"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr "gehört nicht zu"
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
-msgstr "enthält nicht"
+msgstr "entspricht nicht"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "enthält nicht"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "equal to"
-msgstr "gleich"
-
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr "Fehler: Kann nicht hinunter bewegen"
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr "Fehler: Kann nicht nach links bewegen"
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr "Fehler: Kann nicht hinauf bewegen"
+msgstr "entspricht"
 
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr "Fehler: Nichts zu löschen"
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr "Fehler: Nichts zu bewegen"
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr "Fehler: Nichts zum Umschalten"
+#: NOT FOUND IN SOURCE
+msgid "filename"
+msgstr "Dateiname"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "größer als"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "Gruppe '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "Stunden"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
-msgstr "ID"
+msgstr ""
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr "%1"
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "ist"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "ist nicht"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "kleiner als"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
-msgstr "enthält"
+msgstr "entspricht"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "Min"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "Minuten"
 
-#: lib/RT/Date.pm:350
+#: NOT FOUND IN SOURCE
+msgid "modifications\\n\\n"
+msgstr "Änderungen\\n\\n"
+
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "Monate"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "neu"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
-msgstr "kein Name"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "kein Wert"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "keine"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
-msgstr "ungleich"
+msgstr "entspricht nicht"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "offen"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "persönliche Gruppe '%1' für Benutzer '%2'"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
-msgstr "Bereich %1 %2"
+msgstr "Stapel %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "abgewiesen"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "erledigt"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "Sek"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr "Zeige Konfigurationsmenü"
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
-msgstr "Tabellenkalkulation"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "zurückgestellt"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "System %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "Systemgruppe '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "die aufrufende Komponente gab nicht an warum"
 
-#: lib/RT/Group_Overlay.pm:238
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
-msgstr "Anfrage #%1 %2"
+msgstr "Ticket #%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "till"
+msgstr "und"
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "unbeschriebene Gruppe %1"
 
-#: lib/RT/Group_Overlay.pm:219
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "Benutzer %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "Wochen"
 
-#: lib/RT/Date.pm:354
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr ""
+
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "Jahre"
 
diff --git a/rt/lib/RT/I18N/en.po b/rt/lib/RT/I18N/en.po
index 28a8406..95df3f7 100644
--- a/rt/lib/RT/I18N/en.po
+++ b/rt/lib/RT/I18N/en.po
@@ -1,88 +1,88 @@
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "Apr"
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "Aug"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "Dec"
 
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "Feb"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "Fri"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Home"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "Jan"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "Jul"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "Jun"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "Mar"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "May"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "Mon"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "Nov"
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "Oct"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Open"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Home"
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "Sat"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "Sep"
 
-#: lib/RT/Date.pm:419
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "Sun"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "Thu"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "Tue"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "Wed"
 
diff --git a/rt/lib/RT/I18N/en_malkovich.po b/rt/lib/RT/I18N/en_malkovich.po
new file mode 100644
index 0000000..74769f1
--- /dev/null
+++ b/rt/lib/RT/I18N/en_malkovich.po
@@ -0,0 +1,3973 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($Ticket->id, $Ticket->Subject)
+#. ($ticket->Id, $ticket->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "#%1: %2"
+msgstr "#%1: %2"
+
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
+#. ($s, $time_unit)
+#. ($option, $subtype)
+msgid "%1 %2"
+msgstr "%1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
+#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
+msgid "%1 %2 %3 %4:%5:%6 %7"
+msgstr "%1 %2 %3 %4:%5:%6 %7"
+
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
+#. ($cf->Name, $new_value->Content)
+#. ($field, $self->NewValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 added"
+msgstr "%1 %2 Malkovich"
+
+#: lib/RT/Date.pm:334
+#. ($s, $time_unit)
+msgid "%1 %2 ago"
+msgstr "%1 %2 ago"
+
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
+#. ($field, $self->OldValue, $self->NewValue)
+msgid "%1 %2 changed to %3"
+msgstr "%1 %2 Malkovich to %3"
+
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
+#. ($field, $self->OldValue)
+#. ($self->Field, $principal->Object->Name)
+msgid "%1 %2 deleted"
+msgstr "%1 %2 Malkovich"
+
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
+#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
+msgid "%1 %2 with template %3"
+msgstr "%1 %2 Malkovich %3"
+
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
+#. ("--search-argument", "--search")
+#. ("--condition-argument", "--condition")
+#. ("--action-argument", "--action")
+msgid "%1 - An argument to pass to %2"
+msgstr "%1 - A Malkovich to pass to %2"
+
+#: bin/rt-crontool:181
+#. ("--verbose")
+msgid "%1 - Output status updates to STDOUT"
+msgstr "%1 - Malkovich Malkovich to MALKOVICH"
+
+#: bin/rt-crontool:175
+#. ("--action")
+msgid "%1 - Specify the action module you want to use"
+msgstr "%1 - Malkovich the Malkovich Malkovich to use"
+
+#: bin/rt-crontool:169
+#. ("--condition")
+msgid "%1 - Specify the condition module you want to use"
+msgstr "%1 - Malkovich the Malkovich Malkovich to use"
+
+#: bin/rt-crontool:162
+#. ("--search")
+msgid "%1 - Specify the search module you want to use"
+msgstr "%1 - Malkovich the Malkovich Malkovich to use"
+
+#: lib/RT/ScripAction_Overlay.pm:114
+#. ($self->Id)
+msgid "%1 ScripAction loaded"
+msgstr "%1 Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:3484
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 added as a value for %2"
+msgstr "%1 Malkovich as a Malkovich %2"
+
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
+#. ($args{'Base'})
+#. ($args{'Target'})
+msgid "%1 appears to be a local object, but can't be found in the database"
+msgstr "%1 Malkovich to be a Malkovich, but can't be Malkovich in the Malkovich"
+
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
+#. ($self->BriefDescription , $self->CreatorObj->Name)
+#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
+msgid "%1 by %2"
+msgstr "%1 by %2"
+
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
+#. ($self->Field , $q1->Name , $q2->Name)
+#. ($self->Field, $t2->AsString, $t1->AsString)
+#. ($self->Field, $self->OldValue, $self->NewValue)
+msgid "%1 changed from %2 to %3"
+msgstr "%1 Malkovich %2 to %3"
+
+#: lib/RT/Record.pm:739
+msgid "%1 could not be set to %2."
+msgstr "%1 Malkovich be set to %2."
+
+#: lib/RT/Ticket_Overlay.pm:2739
+#. ($self)
+msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
+msgstr "%1 couldn't Malkovich to Malkovich. RT's Malkovich be Malkovich."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 highest priority tickets I own..."
+msgstr "%1 Malkovich Malkovich I Malkovich..."
+
+#: html/Elements/MyTickets:26
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "%1 Malkovich Malkovich I Malkovich..."
+
+#: bin/rt-crontool:157
+#. ($0)
+msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
+msgstr "%1 is a tool to act on Malkovich a Malkovich Malkovich, such as cron."
+
+#: lib/RT/Queue_Overlay.pm:784
+#. ($principal->Object->Name, $args{'Type'})
+msgid "%1 is no longer a %2 for this queue."
+msgstr "%1 is no Malkovich a %2 Malkovich."
+
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 is no Malkovich a Malkovich Malkovich %2"
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
+#. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
+#. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
+#. ($Ticket->TimeEstimated)
+#. ($Ticket->TimeWorked)
+#. ($Ticket->TimeLeft)
+msgid "%1 min"
+msgstr "%1 min"
+
+#: html/User/Elements/DelegateRights:75
+#. (loc($ObjectType =~ /^RT::(.*)$/))
+msgid "%1 rights"
+msgstr "%1 Malkovich"
+
+#: lib/RT/Action/ResolveMembers.pm:41
+#. (ref $self)
+msgid "%1 will resolve all members of a resolved group ticket."
+msgstr "%1 Malkovich Malkovich of a Malkovich Malkovich."
+
+#: lib/RT/Transaction_Overlay.pm:408
+#. ($self)
+msgid "%1: no attachment specified"
+msgstr "%1: no Malkovich Malkovich"
+
+#: html/Ticket/Elements/ShowTransactionAttachments:56
+#. ($size)
+msgid "%1b"
+msgstr "%1b"
+
+#: html/Ticket/Elements/ShowTransactionAttachments:53
+#. (int( $size / 102.4 ) / 10)
+msgid "%1k"
+msgstr "%1k"
+
+#: lib/RT/Ticket_Overlay.pm:1252
+#. ($args{'Status'})
+msgid "'%1' is an invalid value for status"
+msgstr "'%1' is a Malkovich Malkovich"
+
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
+msgid "(Check box to delete)"
+msgstr "(Malkovich to Malkovich)"
+
+#: html/Ticket/Elements/PreviewScrips:49
+msgid "(Check boxes to disable notifications to the listed recipients)"
+msgstr "(Malkovich to Malkovich Malkovich to the Malkovich Malkovich)"
+
+#: html/Ticket/Elements/PreviewScrips:71
+msgid "(Check boxes to enable notifications to the listed recipients)"
+msgstr "(Malkovich to Malkovich Malkovich to the Malkovich Malkovich)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr "(Malkovich Malkovich or URLs, Malkovich Malkovich)"
+
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
+#. ($RT::CorrespondAddress)
+#. ($RT::CommentAddress)
+msgid "(If left blank, will default to %1"
+msgstr "(If Malkovich, Malkovich to %1"
+
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
+msgid "(No custom fields)"
+msgstr "(No Malkovich)"
+
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
+msgid "(No members)"
+msgstr "(No Malkovich)"
+
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
+msgid "(No scrips)"
+msgstr "(No Malkovich)"
+
+#: html/Admin/Elements/EditTemplates:30
+msgid "(No templates)"
+msgstr "(No Malkovich)"
+
+#: html/Ticket/Update.html:66
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Malkovich a Malkovich-copy of Malkovich to a Malkovich-Malkovich of Malkovich. Does <b>not</b> Malkovich Malkovich Malkovich Malkovich.)"
+
+#: html/Ticket/Create.html:78
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Malkovich a Malkovich-copy of Malkovich to a Malkovich-Malkovich of Malkovich Malkovich Malkovich. Malkovich <b>will</b> Malkovich Malkovich.)"
+
+#: html/Ticket/Update.html:62
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
+msgstr "(Malkovich a Malkovich-copy of Malkovich to a Malkovich-Malkovich of Malkovich. Does <b>not</b> Malkovich Malkovich Malkovich Malkovich.)"
+
+#: html/Ticket/Create.html:68
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
+msgstr "(Malkovich a Malkovich-copy of Malkovich to a Malkovich-Malkovich of Malkovich. Malkovich <b>will</b> Malkovich Malkovich.)"
+
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
+msgid "(empty)"
+msgstr "(Malkovich)"
+
+#: html/Admin/Users/index.html:38
+msgid "(no name listed)"
+msgstr "(no Malkovich)"
+
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
+msgid "(no value)"
+msgstr "(no Malkovich)"
+
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
+msgid "(only one ticket)"
+msgstr "(Malkovich)"
+
+#: html/Elements/TicketList:167
+msgid "(pending approval)"
+msgstr "(Malkovich Malkovich)"
+
+#: html/Elements/TicketList:170
+msgid "(pending other Collection)"
+msgstr "(Malkovich Malkovich)"
+
+#: NOT FOUND IN SOURCE
+msgid "(pending other tickets)"
+msgstr "(Malkovich Malkovich)"
+
+#: html/Admin/Users/Modify.html:49
+msgid "(required)"
+msgstr "(Malkovich)"
+
+#: html/Ticket/Elements/ShowTransactionAttachments:60
+msgid "(untitled)"
+msgstr "(Malkovich)"
+
+#: NOT FOUND IN SOURCE
+msgid "..."
+msgstr "..."
+
+#: html/Ticket/Elements/ShowBasics:31
+msgid "<% $Ticket->Status%>"
+msgstr "<% $Ticket->Status %>"
+
+#: html/Elements/SelectTicketTypes:26
+msgid "<% $_ %>"
+msgstr "<% $_ %>"
+
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
+#. ($m->scomp('/Elements/SelectNewTicketQueue'))
+msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Malkovich in\">&nbsp;%1"
+
+#: etc/initialdata:218
+msgid "A blank template"
+msgstr "A Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
+msgid "ACE not found"
+msgstr "Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:830
+msgid "ACEs can only be created and deleted."
+msgstr "Malkovich be Malkovich and Malkovich."
+
+#: NOT FOUND IN SOURCE
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Malkovich to Malkovich Malkovich Malkovich Malkovich.\\n"
+
+#: html/User/Elements/Tabs:31
+msgid "About me"
+msgstr "Malkovich me"
+
+#: html/Admin/Users/Modify.html:79
+msgid "Access control"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditScrip:49
+msgid "Action"
+msgstr "Malkovich"
+
+#: lib/RT/Scrip_Overlay.pm:148
+#. ($args{'ScripAction'})
+msgid "Action %1 not found"
+msgstr "Malkovich %1 Malkovich"
+
+#: bin/rt-crontool:119
+msgid "Action committed."
+msgstr "Malkovich Malkovich."
+
+#: bin/rt-crontool:115
+msgid "Action prepared..."
+msgstr "Malkovich..."
+
+#: html/Search/Bulk.html:93
+msgid "Add AdminCc"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:89
+msgid "Add Cc"
+msgstr "Add Cc"
+
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
+msgid "Add More Files"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:85
+msgid "Add Requestor"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/AddCustomFieldValue:24
+msgid "Add Value"
+msgstr "Malkovich"
+
+#: html/Admin/Global/Scrip.html:54
+msgid "Add a scrip which will apply to all queues"
+msgstr "Add a Malkovich Malkovich to Malkovich"
+
+#: html/Search/Bulk.html:125
+msgid "Add comments or replies to selected tickets"
+msgstr "Malkovich or Malkovich to Malkovich Malkovich"
+
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
+msgid "Add members"
+msgstr "Malkovich"
+
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
+msgid "Add new watchers"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:684
+#. ($args{'Type'})
+msgid "Added principal as a %1 for this queue"
+msgstr "Malkovich as a %1 Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:1547
+#. ($self->loc($args{'Type'}))
+msgid "Added principal as a %1 for this ticket"
+msgstr "Malkovich as a %1 Malkovich"
+
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
+msgid "Address1"
+msgstr "Malkovich1"
+
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
+msgid "Address2"
+msgstr "Malkovich2"
+
+#: html/Ticket/Create.html:73
+msgid "Admin Cc"
+msgstr "Malkovich Cc"
+
+#: etc/initialdata:295
+msgid "Admin Comment"
+msgstr "Malkovich"
+
+#: etc/initialdata:274
+msgid "Admin Correspondence"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
+msgid "Admin queues"
+msgstr "Malkovich"
+
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
+msgid "Admin/Global configuration"
+msgstr "Malkovich/Malkovich Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Queue/Basics"
+msgstr "Malkovich/Malkovich/Malkovich"
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
+msgid "AdminCc"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "AdminCustomFields"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "AdminGroup"
+msgstr "Malkovich"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "AdminGroupMembership"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/System.pm:58
+msgid "AdminOwnPersonalGroups"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "AdminQueue"
+msgstr "Malkovich"
+
+#: lib/RT/System.pm:59
+msgid "AdminUsers"
+msgstr "Malkovich"
+
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
+msgid "Administrative Cc"
+msgstr "Malkovich Cc"
+
+#: html/Elements/SelectDateRelation:35
+msgid "After"
+msgstr "Malkovich"
+
+#: etc/initialdata:363
+msgid "All Approvals Passed"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Elements/EditCustomFields:94
+msgid "All Custom Fields"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Queues/index.html:52
+msgid "All Queues"
+msgstr "Malkovich"
+
+#: html/Elements/Tabs:58
+msgid "Approval"
+msgstr "Malkovich"
+
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
+#. ($Ticket->Id, $Ticket->Subject)
+#. ($ticket->id, $msg)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Approval #%1: %2"
+msgstr "Malkovich #%1: %2"
+
+#: html/Approvals/index.html:53
+#. ($ticket->Id)
+msgid "Approval #%1: Notes not recorded due to a system error"
+msgstr "Malkovich #%1: Malkovich Malkovich to a Malkovich"
+
+#: html/Approvals/index.html:51
+#. ($ticket->Id)
+msgid "Approval #%1: Notes recorded"
+msgstr "Malkovich #%1: Malkovich"
+
+#: etc/initialdata:351
+msgid "Approval Passed"
+msgstr "Malkovich"
+
+#: etc/initialdata:374
+msgid "Approval Rejected"
+msgstr "Malkovich Malkovich"
+
+#: html/Approvals/Elements/Approve:43
+msgid "Approve"
+msgstr "Malkovich"
+
+#: etc/initialdata:504
+msgid "Approver's notes: %1"
+msgstr "Malkovich's Malkovich: %1"
+
+#: lib/RT/Date.pm:414
+msgid "Apr."
+msgstr "Apr."
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
+msgid "Ascending"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
+msgid "Attach"
+msgstr "Malkovich"
+
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
+msgid "Attach file"
+msgstr "Malkovich"
+
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
+msgid "Attached file"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:416
+msgid "Attachment created"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Tickets_Overlay.pm:1251
+msgid "Attachment filename"
+msgstr "Malkovich Malkovich"
+
+#: html/Ticket/Elements/ShowAttachments:25
+msgid "Attachments"
+msgstr "Malkovich"
+
+#: lib/RT/Attributes_Overlay.pm:158
+msgid "Attribute Deleted"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Date.pm:418
+msgid "Aug."
+msgstr "Aug."
+
+#: NOT FOUND IN SOURCE
+msgid "AuthSystem"
+msgstr "Malkovich"
+
+#: etc/initialdata:221
+msgid "Autoreply"
+msgstr "Malkovich"
+
+#: etc/initialdata:72
+msgid "Autoreply To Requestors"
+msgstr "Malkovich To Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad data in %1"
+msgstr "Malkovich in %1"
+
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
+msgid "Basics"
+msgstr "Malkovich"
+
+#: html/Ticket/Update.html:64
+msgid "Bcc"
+msgstr "Bcc"
+
+#: html/Admin/Elements/EditScrip:73
+msgid "Be sure to save your changes"
+msgstr "Be sure to Malkovich Malkovich"
+
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
+msgid "Before"
+msgstr "Malkovich"
+
+#: etc/initialdata:217
+msgid "Blank"
+msgstr "Malkovich"
+
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
+msgid "Brief headers"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
+msgid "Bulk ticket update"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/User_Overlay.pm:1533
+msgid "Can not modify system users"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "Can this principal see this queue"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:211
+msgid "Can't add a custom field value without a name"
+msgstr "Can't add a Malkovich Malkovich Malkovich a name"
+
+#: lib/RT/Link_Overlay.pm:126
+msgid "Can't link a ticket to itself"
+msgstr "Can't link a Malkovich to Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2716
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Can't Malkovich a Malkovich. Malkovich Malkovich Malkovich"
+
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
+msgid "Can't specifiy both base and target"
+msgstr "Can't Malkovich Malkovich and Malkovich"
+
+#: html/autohandler:132
+#. ($msg)
+msgid "Cannot create user: %1"
+msgstr "Malkovich Malkovich: %1"
+
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
+msgid "Cc"
+msgstr "Cc"
+
+#: html/SelfService/Prefs.html:30
+msgid "Change password"
+msgstr "Malkovich"
+
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
+msgid "Check box to delete"
+msgstr "Malkovich to Malkovich"
+
+#: html/Admin/Elements/SelectRights:30
+msgid "Check box to revoke right"
+msgstr "Malkovich to Malkovich"
+
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
+msgid "Children"
+msgstr "Malkovich"
+
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
+msgid "City"
+msgstr "City"
+
+#: html/Ticket/Elements/ShowDates:47
+msgid "Closed"
+msgstr "Malkovich"
+
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr "Malkovich"
+
+#: html/SelfService/Elements/Tabs:44
+msgid "Closed tickets"
+msgstr "Malkovich"
+
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
+msgid "Comment"
+msgstr "Malkovich"
+
+#: html/Admin/Queues/Modify.html:57
+msgid "Comment Address"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "Comment on tickets"
+msgstr "Malkovich on Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:88
+msgid "CommentOnTicket"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Comments"
+msgstr "Malkovich"
+
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
+msgid "Comments (Not sent to requestors)"
+msgstr "Malkovich (Malkovich to Malkovich)"
+
+#: html/Search/Bulk.html:129
+msgid "Comments (not sent to requestors)"
+msgstr "Malkovich (Malkovich to Malkovich)"
+
+#: NOT FOUND IN SOURCE
+msgid "Comments about %1"
+msgstr "Malkovich %1"
+
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
+msgid "Comments about this user"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:537
+msgid "Comments added"
+msgstr "Malkovich"
+
+#: lib/RT/Action/Generic.pm:149
+msgid "Commit Stubbed"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditScrip:41
+msgid "Condition"
+msgstr "Malkovich"
+
+#: bin/rt-crontool:105
+msgid "Condition matches..."
+msgstr "Malkovich Malkovich..."
+
+#: lib/RT/Scrip_Overlay.pm:164
+msgid "Condition not found"
+msgstr "Malkovich Malkovich"
+
+#: html/Elements/Tabs:52
+msgid "Configuration"
+msgstr "Malkovich"
+
+#: html/SelfService/Prefs.html:32
+msgid "Confirm"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "ContactInfoSystem"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
+msgid "Content"
+msgstr "Malkovich"
+
+#: etc/initialdata:286
+msgid "Correspondence"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence Address"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:533
+msgid "Correspondence added"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:3471
+msgid "Could not add new custom field value for ticket. "
+msgstr "Malkovich Malkovich Malkovich Malkovich Malkovich. "
+
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
+msgid "Could not change owner. "
+msgstr "Malkovich Malkovich. "
+
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
+#. ($msg)
+msgid "Could not create CustomField"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
+msgid "Could not create group"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
+#. ($msg)
+msgid "Could not create template: %1"
+msgstr "Malkovich Malkovich: %1"
+
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
+msgid "Could not create ticket. Queue not set"
+msgstr "Malkovich Malkovich. Malkovich"
+
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
+msgid "Could not create user"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
+msgid "Could not find or create that user"
+msgstr "Malkovich or Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
+msgid "Could not find that principal"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
+msgid "Could not load group"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:682
+#. ($args{'Type'})
+msgid "Could not make that principal a %1 for this queue"
+msgstr "Malkovich Malkovich Malkovich a %1 Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:1536
+#. ($self->loc($args{'Type'}))
+msgid "Could not make that principal a %1 for this ticket"
+msgstr "Malkovich Malkovich Malkovich a %1 Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:781
+#. ($args{'Type'})
+msgid "Could not remove that principal as a %1 for this queue"
+msgstr "Malkovich Malkovich Malkovich as a %1 Malkovich"
+
+#: lib/RT/Group_Overlay.pm:977
+msgid "Couldn't add member to group"
+msgstr "Couldn't Malkovich to Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
+#. ($Msg)
+msgid "Couldn't create a transaction: %1"
+msgstr "Couldn't Malkovich a Malkovich: %1"
+
+#: lib/RT/Record.pm:748
+msgid "Couldn't find row"
+msgstr "Couldn't Malkovich"
+
+#: lib/RT/Group_Overlay.pm:951
+msgid "Couldn't find that principal"
+msgstr "Couldn't Malkovich Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:245
+msgid "Couldn't find that value"
+msgstr "Couldn't Malkovich"
+
+#: lib/RT/CurrentUser.pm:123
+#. ($self->Id)
+msgid "Couldn't load %1 from the users database.\\n"
+msgstr "Couldn't load %1 from the Malkovich.\\n"
+
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
+#. ($id)
+msgid "Couldn't load group %1"
+msgstr "Couldn't Malkovich %1"
+
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
+msgid "Couldn't load link"
+msgstr "Couldn't Malkovich"
+
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
+#. ($id)
+msgid "Couldn't load queue"
+msgstr "Couldn't Malkovich"
+
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
+#. ($id)
+msgid "Couldn't load queue %1"
+msgstr "Couldn't Malkovich %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load that user (%1)"
+msgstr "Couldn't Malkovich (%1)"
+
+#: html/SelfService/Display.html:116
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr "Couldn't Malkovich '%1'"
+
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
+msgid "Country"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
+msgid "Create"
+msgstr "Malkovich"
+
+#: etc/initialdata:135
+msgid "Create Tickets"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditCustomField:74
+msgid "Create a CustomField"
+msgstr "Malkovich a Malkovich"
+
+#: html/Admin/Queues/CustomField.html:47
+#. ($QueueObj->Name())
+msgid "Create a CustomField for queue %1"
+msgstr "Malkovich a Malkovich Malkovich %1"
+
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr "Malkovich a Malkovich Malkovich to Malkovich"
+
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
+msgid "Create a new group"
+msgstr "Malkovich a Malkovich"
+
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
+msgid "Create a new personal group"
+msgstr "Malkovich a Malkovich Malkovich"
+
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
+msgid "Create a new ticket"
+msgstr "Malkovich a Malkovich"
+
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
+msgid "Create a new user"
+msgstr "Malkovich a Malkovich"
+
+#: html/Admin/Queues/Modify.html:103
+msgid "Create a queue"
+msgstr "Malkovich a Malkovich"
+
+#: html/Admin/Queues/Scrip.html:58
+#. ($QueueObj->Name)
+msgid "Create a scrip for queue %1"
+msgstr "Malkovich a Malkovich %1"
+
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
+msgid "Create a template"
+msgstr "Malkovich a Malkovich"
+
+#: html/SelfService/Create.html:24
+msgid "Create a ticket"
+msgstr "Malkovich a Malkovich"
+
+#: etc/initialdata:137
+msgid "Create new tickets based on this scrip's template"
+msgstr "Malkovich Malkovich on Malkovich's Malkovich"
+
+#: html/SelfService/Create.html:77
+msgid "Create ticket"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "Create tickets in this queue"
+msgstr "Malkovich in Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "Create, delete and modify custom fields"
+msgstr "Malkovich, Malkovich and Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:69
+msgid "Create, delete and modify queues"
+msgstr "Malkovich, Malkovich and Malkovich"
+
+#: lib/RT/System.pm:58
+msgid "Create, delete and modify the members of personal groups"
+msgstr "Malkovich, Malkovich and Malkovich the Malkovich of Malkovich"
+
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify users"
+msgstr "Malkovich, Malkovich and Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:86
+msgid "CreateTicket"
+msgstr "Malkovich"
+
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
+msgid "Created"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditCustomField:87
+#. ($CustomFieldObj->Name())
+msgid "Created CustomField %1"
+msgstr "Malkovich Malkovich %1"
+
+#: html/Elements/EditLinks:27
+msgid "Current Links"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Elements/EditScrips:29
+msgid "Current Scrips"
+msgstr "Malkovich"
+
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
+msgid "Current members"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/SelectRights:28
+msgid "Current rights"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Current search criteria"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
+msgid "Current watchers"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "Malkovich #%1"
+
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
+msgid "Custom Fields"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditScrip:101
+msgid "Custom action cleanup code"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/Admin/Elements/EditScrip:93
+msgid "Custom action preparation code"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/Admin/Elements/EditScrip:85
+msgid "Custom condition"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Malkovich %1 %2 %3"
+
+#: lib/RT/Tickets_Overlay.pm:1688
+#. ($CF->Name)
+msgid "Custom field %1 has a value."
+msgstr "Malkovich %1 has a Malkovich."
+
+#: lib/RT/Tickets_Overlay.pm:1685
+#. ($CF->Name)
+msgid "Custom field %1 has no value."
+msgstr "Malkovich %1 has no Malkovich."
+
+#: lib/RT/Ticket_Overlay.pm:3373
+#. ($args{'Field'})
+msgid "Custom field %1 not found"
+msgstr "Malkovich %1 Malkovich"
+
+#: html/Admin/Elements/EditCustomFields:195
+msgid "Custom field deleted"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:3523
+msgid "Custom field not found"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:355
+#. ($args{'Content'}, $self->Name)
+msgid "Custom field value %1 could not be found for custom field %2"
+msgstr "Malkovich Malkovich %1 Malkovich be Malkovich Malkovich %2"
+
+#: lib/RT/CustomField_Overlay.pm:255
+msgid "Custom field value could not be deleted"
+msgstr "Malkovich Malkovich Malkovich be Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:361
+msgid "Custom field value could not be found"
+msgstr "Malkovich Malkovich Malkovich be Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
+msgid "Custom field value deleted"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:541
+msgid "CustomField"
+msgstr "Malkovich"
+
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
+msgid "Dates"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:422
+msgid "Dec."
+msgstr "Dec."
+
+#: etc/initialdata:222
+msgid "Default Autoresponse template"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: etc/initialdata:296
+msgid "Default admin comment template"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: etc/initialdata:287
+msgid "Default correspondence template"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: etc/initialdata:253
+msgid "Default transaction template"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "Malkovich: %1/%2 Malkovich %3 to %4"
+
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
+msgid "Delegate rights"
+msgstr "Malkovich"
+
+#: lib/RT/System.pm:62
+msgid "Delegate specific rights which have been granted to you."
+msgstr "Malkovich Malkovich Malkovich Malkovich Malkovich to you."
+
+#: lib/RT/System.pm:62
+msgid "DelegateRights"
+msgstr "Malkovich"
+
+#: html/User/Elements/Tabs:37
+msgid "Delegation"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
+msgid "Delete"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditScrips:52
+msgid "Delete selected scrips"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:91
+msgid "Delete tickets"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:91
+msgid "DeleteTicket"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:162
+msgid "Deleting this object could break referential integrity"
+msgstr "Malkovich Malkovich Malkovich Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:329
+msgid "Deleting this object would break referential integrity"
+msgstr "Malkovich Malkovich Malkovich Malkovich Malkovich"
+
+#: lib/RT/User_Overlay.pm:478
+msgid "Deleting this object would violate referential integrity"
+msgstr "Malkovich Malkovich Malkovich Malkovich Malkovich Malkovich"
+
+#: html/Approvals/Elements/Approve:44
+msgid "Deny"
+msgstr "Deny"
+
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
+msgid "Depended on by"
+msgstr "Malkovich on by"
+
+#: lib/RT/Transaction_Overlay.pm:621
+#. ($value)
+msgid "Dependency by %1 added"
+msgstr "Malkovich by %1 Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:661
+#. ($value)
+msgid "Dependency by %1 deleted"
+msgstr "Malkovich by %1 Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:618
+#. ($value)
+msgid "Dependency on %1 added"
+msgstr "Malkovich on %1 Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:658
+#. ($value)
+msgid "Dependency on %1 deleted"
+msgstr "Malkovich on %1 Malkovich"
+
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
+msgid "Depends on"
+msgstr "Malkovich on"
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
+msgid "Descending"
+msgstr "Malkovich"
+
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
+msgid "Describe the issue below"
+msgstr "Malkovich the Malkovich"
+
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
+msgid "Description"
+msgstr "Malkovich"
+
+#: html/Ticket/Elements/Tabs:86
+msgid "Display"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "Display Access Control List"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "Display Scrip templates for this queue"
+msgstr "Malkovich Malkovich Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "Display Scrips for this queue"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/Ticket/Elements/ShowHistory:34
+msgid "Display mode"
+msgstr "Malkovich"
+
+#: lib/RT/System.pm:53
+msgid "Do anything and everything"
+msgstr "Do Malkovich and Malkovich"
+
+#: html/Elements/Refresh:29
+msgid "Don't refresh this page."
+msgstr "Don't Malkovich Malkovich."
+
+#: NOT FOUND IN SOURCE
+msgid "Don't show search results"
+msgstr "Don't Malkovich Malkovich"
+
+#: html/Ticket/Elements/ShowTransactionAttachments:60
+msgid "Download"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr "Malkovich the Malkovich as a Malkovich Malkovich"
+
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
+msgid "Due"
+msgstr "Due"
+
+#: NOT FOUND IN SOURCE
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "MALKOVICH: Couldn't Malkovich '%1': %2.\\n"
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Malkovich Malkovich %1"
+
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
+msgid "Edit Links"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Queues/Templates.html:41
+#. ($QueueObj->Name)
+msgid "Edit Templates for queue %1"
+msgstr "Malkovich Malkovich %1"
+
+#: html/Admin/Global/index.html:45
+msgid "Edit system templates"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Queues/Modify.html:118
+#. ($QueueObj->Name)
+msgid "Editing Configuration for queue %1"
+msgstr "Malkovich Malkovich Malkovich %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for user %1"
+msgstr "Malkovich Malkovich Malkovich %1"
+
+#: html/Admin/Elements/EditCustomField:90
+#. ($CustomFieldObj->Name())
+msgid "Editing CustomField %1"
+msgstr "Malkovich Malkovich %1"
+
+#: html/Admin/Groups/Members.html:31
+#. ($Group->Name)
+msgid "Editing membership for group %1"
+msgstr "Malkovich Malkovich Malkovich %1"
+
+#: html/User/Groups/Members.html:128
+#. ($Group->Name)
+msgid "Editing membership for personal group %1"
+msgstr "Malkovich Malkovich Malkovich Malkovich %1"
+
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
+msgid "Either base or target must be specified"
+msgstr "Malkovich or Malkovich be Malkovich"
+
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
+msgid "Email"
+msgstr "Malkovich"
+
+#: lib/RT/User_Overlay.pm:206
+msgid "Email address in use"
+msgstr "Malkovich in use"
+
+#: NOT FOUND IN SOURCE
+msgid "EmailAddress"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "EmailEncoding"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditCustomField:50
+msgid "Enabled (Unchecking this box disables this custom field)"
+msgstr "Malkovich (Malkovich Malkovich Malkovich Malkovich Malkovich)"
+
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
+msgid "Enabled (Unchecking this box disables this group)"
+msgstr "Malkovich (Malkovich Malkovich Malkovich Malkovich)"
+
+#: html/Admin/Queues/Modify.html:83
+msgid "Enabled (Unchecking this box disables this queue)"
+msgstr "Malkovich (Malkovich Malkovich Malkovich Malkovich)"
+
+#: html/Admin/Elements/EditCustomFields:97
+msgid "Enabled Custom Fields"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Queues/index.html:55
+msgid "Enabled Queues"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
+#. (loc_fuzzy($msg))
+msgid "Enabled status %1"
+msgstr "Malkovich %1"
+
+#: lib/RT/CustomField_Overlay.pm:433
+msgid "Enter multiple values"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:430
+msgid "Enter one value"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Malkovich or URIs to Malkovich to. Malkovich Malkovich Malkovich Malkovich."
+
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
+msgid "Error"
+msgstr "Error"
+
+#: lib/RT/Queue_Overlay.pm:593
+msgid "Error in parameters to Queue->AddWatcher"
+msgstr "Malkovich in Malkovich to Malkovich->Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Malkovich in Malkovich to Malkovich->Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:1468
+msgid "Error in parameters to Ticket->AddWatcher"
+msgstr "Malkovich in Malkovich to Malkovich->Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Malkovich in Malkovich to Malkovich->Malkovich"
+
+#: etc/initialdata:20
+msgid "Everyone"
+msgstr "Malkovich"
+
+#: bin/rt-crontool:190
+msgid "Example:"
+msgstr "Malkovich:"
+
+#: NOT FOUND IN SOURCE
+msgid "ExternalAuthId"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "ExternalContactInfoId"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Users/Modify.html:72
+msgid "Extra info"
+msgstr "Malkovich"
+
+#: lib/RT/User_Overlay.pm:342
+msgid "Failed to find 'Privileged' users pseudogroup."
+msgstr "Malkovich to find 'Malkovich' Malkovich Malkovich."
+
+#: lib/RT/User_Overlay.pm:349
+msgid "Failed to find 'Unprivileged' users pseudogroup"
+msgstr "Malkovich to find 'Malkovich' Malkovich Malkovich"
+
+#: bin/rt-crontool:134
+#. ($modname, $@)
+msgid "Failed to load module %1. (%2)"
+msgstr "Malkovich to Malkovich %1. (%2)"
+
+#: lib/RT/Date.pm:412
+msgid "Feb."
+msgstr "Feb."
+
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
+msgid "Final Priority"
+msgstr "Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:1274
+msgid "FinalPriority"
+msgstr "Malkovich"
+
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
+msgid "Find people whose"
+msgstr "Malkovich Malkovich"
+
+#: html/Search/Results.html:72
+msgid "Find tickets"
+msgstr "Malkovich"
+
+#: html/Ticket/Elements/Tabs:59
+msgid "First"
+msgstr "Malkovich"
+
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
+msgid "Foo Bar Baz"
+msgstr "Malkovich"
+
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
+msgid "Foo!"
+msgstr "Foo!"
+
+#: html/Search/Bulk.html:84
+msgid "Force change"
+msgstr "Malkovich"
+
+#: html/Search/Results.html:70
+#. ($ticketcount)
+msgid "Found %quant(%1,ticket)"
+msgstr "Malkovich %quant(%1,Malkovich)"
+
+#: lib/RT/Record.pm:750
+msgid "Found Object"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "FreeformContactInfo"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:392
+msgid "Fri."
+msgstr "Fri."
+
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
+msgid "Full headers"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:587
+#. ($New->Name)
+msgid "Given to %1"
+msgstr "Malkovich to %1"
+
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
+msgid "Global"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/SelectTemplate:37
+#. (loc($Template->Name))
+msgid "Global template: %1"
+msgstr "Malkovich: %1"
+
+#: html/Tools/Offline.html:69
+msgid "Go"
+msgstr "Go"
+
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
+msgid "Go!"
+msgstr "Go!"
+
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
+msgid "Goto ticket"
+msgstr "Malkovich"
+
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
+msgid "Group"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
+msgid "Group Rights"
+msgstr "Malkovich"
+
+#: lib/RT/Group_Overlay.pm:957
+msgid "Group already has member"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Groups/Modify.html:76
+#. ($create_msg)
+msgid "Group could not be created: %1"
+msgstr "Malkovich be Malkovich: %1"
+
+#: lib/RT/Group_Overlay.pm:497
+msgid "Group created"
+msgstr "Malkovich"
+
+#: lib/RT/Group_Overlay.pm:1129
+msgid "Group has no such member"
+msgstr "Malkovich no Malkovich"
+
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
+msgid "Group not found"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
+msgid "Groups"
+msgstr "Malkovich"
+
+#: lib/RT/Group_Overlay.pm:963
+msgid "Groups can't be members of their members"
+msgstr "Malkovich can't be Malkovich of Malkovich"
+
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
+msgid "Hello!"
+msgstr "Malkovich!"
+
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
+#. ($name)
+msgid "Hello, %1"
+msgstr "Malkovich, %1"
+
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
+msgid "History"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "HomePhone"
+msgstr "Malkovich"
+
+#: html/Elements/Tabs:43
+msgid "Homepage"
+msgstr "Malkovich"
+
+#: lib/RT/Base.pm:86
+#. (6)
+msgid "I have %quant(%1,concrete mixer)."
+msgstr "I have %quant(%1,Malkovich)."
+
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
+msgid "Id"
+msgstr "Id"
+
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
+msgid "Identity"
+msgstr "Malkovich"
+
+#: etc/initialdata:429
+msgid "If an approval is rejected, reject the original and delete pending approvals"
+msgstr "If a Malkovich is Malkovich, Malkovich the Malkovich and Malkovich Malkovich"
+
+#: bin/rt-crontool:186
+msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
+msgstr "If Malkovich Malkovich, a Malkovich Malkovich Malkovich Malkovich to Malkovich Malkovich Malkovich to RT."
+
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
+msgid "If you've updated anything above, be sure to"
+msgstr "If you've Malkovich Malkovich, be sure to"
+
+#: lib/RT/Record.pm:742
+msgid "Illegal value for %1"
+msgstr "Malkovich Malkovich %1"
+
+#: lib/RT/Record.pm:745
+msgid "Immutable field"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditCustomFields:72
+msgid "Include disabled custom fields in listing."
+msgstr "Malkovich Malkovich Malkovich in Malkovich."
+
+#: html/Admin/Queues/index.html:42
+msgid "Include disabled queues in listing."
+msgstr "Malkovich Malkovich in Malkovich."
+
+#: html/Admin/Users/index.html:46
+msgid "Include disabled users in search."
+msgstr "Malkovich Malkovich in Malkovich."
+
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
+msgid "Initial Priority"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
+msgid "InitialPriority"
+msgstr "Malkovich"
+
+#: lib/RT/ScripAction_Overlay.pm:97
+msgid "Input error"
+msgstr "Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:3797
+msgid "Internal Error"
+msgstr "Malkovich"
+
+#: lib/RT/Record.pm:186
+#. ($id->{error_message})
+msgid "Internal Error: %1"
+msgstr "Malkovich: %1"
+
+#: lib/RT/Group_Overlay.pm:644
+msgid "Invalid Group Type"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Principal_Overlay.pm:127
+msgid "Invalid Right"
+msgstr "Malkovich"
+
+#: lib/RT/Record.pm:747
+msgid "Invalid data"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Malkovich. Malkovich to 'Malkovich'."
+
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
+msgid "Invalid queue"
+msgstr "Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
+msgid "Invalid right"
+msgstr "Malkovich"
+
+#: lib/RT/Record.pm:161
+#. ($key)
+msgid "Invalid value for %1"
+msgstr "Malkovich Malkovich %1"
+
+#: lib/RT/Ticket_Overlay.pm:3380
+msgid "Invalid value for custom field"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:385
+msgid "Invalid value for status"
+msgstr "Malkovich Malkovich"
+
+#: bin/rt-crontool:187
+msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
+msgstr "It is Malkovich Malkovich Malkovich Malkovich Malkovich be Malkovich to Malkovich."
+
+#: bin/rt-crontool:188
+msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
+msgstr "It is Malkovich Malkovich a non-Malkovich Malkovich the Malkovich Malkovich and RT Malkovich to Malkovich."
+
+#: bin/rt-crontool:159
+msgid "It takes several arguments:"
+msgstr "It Malkovich Malkovich:"
+
+#: lib/RT/Date.pm:411
+msgid "Jan."
+msgstr "Jan."
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "Join or leave this group"
+msgstr "Join or Malkovich Malkovich"
+
+#: lib/RT/Date.pm:417
+msgid "Jul."
+msgstr "Jul."
+
+#: html/Ticket/Elements/Tabs:100
+msgid "Jumbo"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:416
+msgid "Jun."
+msgstr "Jun."
+
+#: NOT FOUND IN SOURCE
+msgid "Lang"
+msgstr "Lang"
+
+#: html/User/Prefs.html:54
+msgid "Language"
+msgstr "Malkovich"
+
+#: html/Ticket/Elements/Tabs:74
+msgid "Last"
+msgstr "Last"
+
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
+msgid "Last Contact"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr "Malkovich</a>"
+
+#: html/Elements/SelectDateType:28
+msgid "Last Contacted"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Last Notified"
+msgstr "Malkovich"
+
+#: html/Elements/SelectDateType:29
+msgid "Last Updated"
+msgstr "Malkovich"
+
+#: html/Admin/Users/Modify.html:82
+msgid "Let this user access RT"
+msgstr "Malkovich Malkovich RT"
+
+#: html/Admin/Users/Modify.html:86
+msgid "Let this user be granted rights"
+msgstr "Malkovich be Malkovich"
+
+#: lib/RT/Record.pm:1086
+msgid "Link already exists"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Record.pm:1100
+msgid "Link could not be created"
+msgstr "Malkovich be Malkovich"
+
+#: lib/RT/Record.pm:1106
+#. ($TransString)
+msgid "Link created (%1)"
+msgstr "Malkovich (%1)"
+
+#: lib/RT/Record.pm:1167
+#. ($TransString)
+msgid "Link deleted (%1)"
+msgstr "Malkovich (%1)"
+
+#: lib/RT/Record.pm:1173
+msgid "Link not found"
+msgstr "Malkovich"
+
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
+#. ($Ticket->Id)
+msgid "Link ticket #%1"
+msgstr "Malkovich #%1"
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
+msgid "Links"
+msgstr "Malkovich"
+
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
+msgid "Location"
+msgstr "Malkovich"
+
+#: lib/RT.pm:184
+#. ($RT::LogDir)
+msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
+msgstr "Malkovich %1 Malkovich or couldn't be Malkovich.\\n RT can't run."
+
+#: html/Elements/Header:69
+#. ("<b>".$session{'CurrentUser'}->Name."</b>")
+msgid "Logged in as %1"
+msgstr "Malkovich in as %1"
+
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
+msgid "Login"
+msgstr "Malkovich"
+
+#: html/Elements/Header:66
+msgid "Logout"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:83
+msgid "Make Owner"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:107
+msgid "Make Status"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:115
+msgid "Make date Due"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:117
+msgid "Make date Resolved"
+msgstr "Malkovich Malkovich"
+
+#: html/Search/Bulk.html:111
+msgid "Make date Started"
+msgstr "Malkovich Malkovich"
+
+#: html/Search/Bulk.html:109
+msgid "Make date Starts"
+msgstr "Malkovich Malkovich"
+
+#: html/Search/Bulk.html:113
+msgid "Make date Told"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:103
+msgid "Make priority"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:105
+msgid "Make queue"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:101
+msgid "Make subject"
+msgstr "Malkovich"
+
+#: html/Admin/index.html:32
+msgid "Manage groups and group membership"
+msgstr "Malkovich and Malkovich Malkovich"
+
+#: html/Admin/index.html:38
+msgid "Manage properties and configuration which apply to all queues"
+msgstr "Malkovich Malkovich and Malkovich Malkovich to Malkovich"
+
+#: html/Admin/index.html:35
+msgid "Manage queues and queue-specific properties"
+msgstr "Malkovich and Malkovich-Malkovich Malkovich"
+
+#: html/Admin/index.html:29
+msgid "Manage users and passwords"
+msgstr "Malkovich and Malkovich"
+
+#: lib/RT/Date.pm:413
+msgid "Mar."
+msgstr "Mar."
+
+#: lib/RT/Date.pm:415
+msgid "May."
+msgstr "May."
+
+#: lib/RT/Transaction_Overlay.pm:634
+#. ($value)
+msgid "Member %1 added"
+msgstr "Malkovich %1 Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:674
+#. ($value)
+msgid "Member %1 deleted"
+msgstr "Malkovich %1 Malkovich"
+
+#: lib/RT/Group_Overlay.pm:974
+msgid "Member added"
+msgstr "Malkovich"
+
+#: lib/RT/Group_Overlay.pm:1136
+msgid "Member deleted"
+msgstr "Malkovich"
+
+#: lib/RT/Group_Overlay.pm:1140
+msgid "Member not deleted"
+msgstr "Malkovich Malkovich"
+
+#: html/Elements/SelectLinkType:25
+msgid "Member of"
+msgstr "Malkovich of"
+
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
+msgid "Members"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:631
+#. ($value)
+msgid "Membership in %1 added"
+msgstr "Malkovich in %1 Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:671
+#. ($value)
+msgid "Membership in %1 deleted"
+msgstr "Malkovich in %1 Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2813
+msgid "Merge Successful"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2733
+msgid "Merge failed. Couldn't set EffectiveId"
+msgstr "Malkovich. Couldn't Malkovich"
+
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
+msgid "Merge into"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
+msgid "Message"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr "Malkovich Malkovich Malkovich it is Malkovich or is Malkovich."
+
+#: lib/RT/Ticket_Overlay.pm:2514
+msgid "Message could not be recorded"
+msgstr "Malkovich Malkovich be Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2517
+msgid "Message recorded"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Record.pm:749
+msgid "Missing a primary key?: %1"
+msgstr "Malkovich a Malkovich?: %1"
+
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
+msgid "Mobile"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "MobilePhone"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "Modify Access Control List"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "Malkovich Malkovich Malkovich to Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:74
+msgid "Modify Scrip templates for this queue"
+msgstr "Malkovich Malkovich Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:77
+msgid "Modify Scrips for this queue"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/Admin/Queues/CustomField.html:44
+#. ($QueueObj->Name())
+msgid "Modify a CustomField for queue %1"
+msgstr "Malkovich a Malkovich Malkovich %1"
+
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr "Malkovich a Malkovich Malkovich to Malkovich"
+
+#: html/Admin/Queues/Scrip.html:53
+#. ($QueueObj->Name)
+msgid "Modify a scrip for queue %1"
+msgstr "Malkovich a Malkovich %1"
+
+#: html/Admin/Global/Scrip.html:47
+msgid "Modify a scrip which applies to all queues"
+msgstr "Malkovich a Malkovich Malkovich to Malkovich"
+
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
+#. ($TicketObj->Id)
+msgid "Modify dates for #%1"
+msgstr "Malkovich Malkovich #%1"
+
+#: html/Ticket/ModifyDates.html:34
+#. ($TicketObj->Id)
+msgid "Modify dates for ticket # %1"
+msgstr "Malkovich Malkovich # %1"
+
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
+msgid "Modify global group rights"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/Admin/Global/GroupRights.html:32
+msgid "Modify global group rights."
+msgstr "Malkovich Malkovich Malkovich."
+
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
+msgid "Modify global user rights"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Global/UserRights.html:32
+msgid "Modify global user rights."
+msgstr "Malkovich Malkovich."
+
+#: lib/RT/Group_Overlay.pm:146
+msgid "Modify group metadata or delete group"
+msgstr "Malkovich Malkovich or Malkovich"
+
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
+#. ($GroupObj->Name)
+msgid "Modify group rights for group %1"
+msgstr "Malkovich Malkovich Malkovich %1"
+
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
+#. ($QueueObj->Name)
+msgid "Modify group rights for queue %1"
+msgstr "Malkovich Malkovich Malkovich %1"
+
+#: lib/RT/Group_Overlay.pm:148
+msgid "Modify membership roster for this group"
+msgstr "Malkovich Malkovich Malkovich Malkovich"
+
+#: lib/RT/System.pm:60
+msgid "Modify one's own RT account"
+msgstr "Malkovich's own RT Malkovich"
+
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
+#. ($QueueObj->Name)
+msgid "Modify people related to queue %1"
+msgstr "Malkovich Malkovich to Malkovich %1"
+
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
+#. ($Ticket->id)
+#. ($Ticket->Id)
+msgid "Modify people related to ticket #%1"
+msgstr "Malkovich Malkovich to Malkovich #%1"
+
+#: html/Admin/Queues/Scrips.html:45
+#. ($QueueObj->Name)
+msgid "Modify scrips for queue %1"
+msgstr "Malkovich Malkovich %1"
+
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
+msgid "Modify scrips which apply to all queues"
+msgstr "Malkovich Malkovich to Malkovich"
+
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
+#. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
+msgid "Modify template %1"
+msgstr "Malkovich %1"
+
+#: html/Admin/Global/Templates.html:43
+msgid "Modify templates which apply to all queues"
+msgstr "Malkovich Malkovich Malkovich to Malkovich"
+
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
+#. ($Group->Name)
+msgid "Modify the group %1"
+msgstr "Malkovich the Malkovich %1"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "Modify the queue watchers"
+msgstr "Malkovich the Malkovich"
+
+#: html/Admin/Users/Modify.html:263
+#. ($UserObj->Name)
+msgid "Modify the user %1"
+msgstr "Malkovich the user %1"
+
+#: html/Ticket/ModifyAll.html:36
+#. ($Ticket->Id)
+msgid "Modify ticket # %1"
+msgstr "Malkovich # %1"
+
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
+#. ($TicketObj->Id)
+msgid "Modify ticket #%1"
+msgstr "Malkovich #%1"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "Modify tickets"
+msgstr "Malkovich"
+
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
+#. ($GroupObj->Name)
+msgid "Modify user rights for group %1"
+msgstr "Malkovich Malkovich Malkovich %1"
+
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
+#. ($QueueObj->Name)
+msgid "Modify user rights for queue %1"
+msgstr "Malkovich Malkovich Malkovich %1"
+
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyACL"
+msgstr "Malkovich"
+
+#: lib/RT/Group_Overlay.pm:149
+msgid "ModifyOwnMembership"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:72
+msgid "ModifyQueueWatchers"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:77
+msgid "ModifyScrips"
+msgstr "Malkovich"
+
+#: lib/RT/System.pm:60
+msgid "ModifySelf"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:74
+msgid "ModifyTemplate"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:90
+msgid "ModifyTicket"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:388
+msgid "Mon."
+msgstr "Mon."
+
+#: html/Ticket/Elements/ShowRequestor:40
+#. ($name)
+msgid "More about %1"
+msgstr "Malkovich %1"
+
+#: html/Admin/Elements/EditCustomFields:60
+msgid "Move down"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:26
+msgid "Multiple"
+msgstr "Malkovich"
+
+#: lib/RT/User_Overlay.pm:197
+msgid "Must specify 'Name' attribute"
+msgstr "Malkovich 'Name' Malkovich"
+
+#: html/SelfService/Elements/MyRequests:48
+#. ($friendly_status)
+msgid "My %1 tickets"
+msgstr "My %1 Malkovich"
+
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
+msgid "My approvals"
+msgstr "My Malkovich"
+
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
+msgid "Name"
+msgstr "Name"
+
+#: lib/RT/User_Overlay.pm:204
+msgid "Name in use"
+msgstr "Name in use"
+
+#: html/Ticket/Elements/ShowDates:52
+msgid "Never"
+msgstr "Malkovich"
+
+#: html/Elements/Quicksearch:29
+msgid "New"
+msgstr "New"
+
+#: html/Elements/EditLinks:93
+msgid "New Links"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
+msgid "New Password"
+msgstr "Malkovich"
+
+#: etc/initialdata:332
+msgid "New Pending Approval"
+msgstr "Malkovich Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "New Search"
+msgstr "Malkovich"
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
+msgid "New custom field"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
+msgid "New group"
+msgstr "Malkovich"
+
+#: html/SelfService/Prefs.html:31
+msgid "New password"
+msgstr "Malkovich"
+
+#: lib/RT/User_Overlay.pm:773
+msgid "New password notification sent"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/Admin/Elements/QueueTabs:69
+msgid "New queue"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/SelectRights:41
+msgid "New rights"
+msgstr "Malkovich"
+
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
+msgid "New scrip"
+msgstr "Malkovich"
+
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
+msgid "New template"
+msgstr "Malkovich"
+
+#: html/SelfService/Elements/Tabs:47
+msgid "New ticket"
+msgstr "Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2700
+msgid "New ticket doesn't exist"
+msgstr "Malkovich doesn't Malkovich"
+
+#: html/Admin/Elements/UserTabs:50
+msgid "New user"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/CreateUserCalled:25
+msgid "New user called"
+msgstr "Malkovich"
+
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
+msgid "New watchers"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "New window setting"
+msgstr "Malkovich Malkovich"
+
+#: html/Ticket/Elements/Tabs:70
+msgid "Next"
+msgstr "Next"
+
+#: NOT FOUND IN SOURCE
+msgid "NickName"
+msgstr "Malkovich"
+
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
+msgid "Nickname"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
+msgid "No CustomField"
+msgstr "No Malkovich"
+
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
+msgid "No Group defined"
+msgstr "No Malkovich"
+
+#: lib/RT/Tickets_Overlay_SQL.pm:452
+msgid "No Query"
+msgstr "No Malkovich"
+
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
+msgid "No Queue defined"
+msgstr "No Malkovich"
+
+#: bin/rt-crontool:52
+msgid "No RT user found. Please consult your RT administrator.\\n"
+msgstr "No RT Malkovich. Malkovich Malkovich RT Malkovich.\\n"
+
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
+msgid "No Template"
+msgstr "No Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket "
+msgstr "No Malkovich Malkovich. Malkovich "
+
+#: html/Approvals/Elements/Approve:45
+msgid "No action"
+msgstr "No Malkovich"
+
+#: lib/RT/Record.pm:744
+msgid "No column specified"
+msgstr "No Malkovich Malkovich"
+
+#: html/Ticket/Elements/ShowRequestor:46
+msgid "No comment entered about this user"
+msgstr "No Malkovich Malkovich Malkovich"
+
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
+#. (ref $self)
+msgid "No description for %1"
+msgstr "No Malkovich %1"
+
+#: lib/RT/Users_Overlay.pm:159
+msgid "No group specified"
+msgstr "No Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2475
+msgid "No message attached"
+msgstr "No Malkovich Malkovich"
+
+#: lib/RT/User_Overlay.pm:991
+msgid "No password set"
+msgstr "No Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:296
+msgid "No permission to create queues"
+msgstr "No Malkovich to Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "No permission to create tickets in the queue '%1'"
+msgstr "No Malkovich to Malkovich in the Malkovich '%1'"
+
+#: lib/RT/User_Overlay.pm:157
+msgid "No permission to create users"
+msgstr "No Malkovich to Malkovich"
+
+#: html/SelfService/Display.html:125
+msgid "No permission to display that ticket"
+msgstr "No Malkovich to Malkovich Malkovich"
+
+#: html/SelfService/Update.html:68
+msgid "No permission to view update ticket"
+msgstr "No Malkovich to Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
+msgid "No principal specified"
+msgstr "No Malkovich Malkovich"
+
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
+msgid "No principals selected."
+msgstr "No Malkovich Malkovich."
+
+#: html/Admin/Queues/index.html:34
+msgid "No queues matching search criteria found."
+msgstr "No Malkovich Malkovich Malkovich Malkovich."
+
+#: html/Admin/Elements/SelectRights:81
+msgid "No rights found"
+msgstr "No Malkovich"
+
+#: html/Admin/Elements/SelectRights:32
+msgid "No rights granted."
+msgstr "No Malkovich."
+
+#: html/Search/Bulk.html:162
+msgid "No search to operate on."
+msgstr "No Malkovich to Malkovich on."
+
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
+msgid "No transaction type specified"
+msgstr "No Malkovich Malkovich Malkovich"
+
+#: html/Admin/Users/index.html:35
+msgid "No users matching search criteria found."
+msgstr "No Malkovich Malkovich Malkovich Malkovich."
+
+#: NOT FOUND IN SOURCE
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "No Malkovich RT Malkovich. RT Malkovich Malkovich. Malkovich Malkovich RT Malkovich.\\n"
+
+#: lib/RT/Record.pm:741
+msgid "No value sent to _Set!\\n"
+msgstr "No Malkovich to _Set!\\n"
+
+#: lib/RT/Record.pm:746
+msgid "Nonexistant field?"
+msgstr "Malkovich Malkovich?"
+
+#: html/Elements/Header:71
+msgid "Not logged in."
+msgstr "Malkovich in."
+
+#: lib/RT/Date.pm:369
+msgid "Not set"
+msgstr "Malkovich"
+
+#: html/NoAuth/Reminder.html:26
+msgid "Not yet implemented."
+msgstr "Malkovich Malkovich."
+
+#: html/Approvals/Elements/Approve:48
+msgid "Notes"
+msgstr "Malkovich"
+
+#: lib/RT/User_Overlay.pm:776
+msgid "Notification could not be sent"
+msgstr "Malkovich Malkovich be sent"
+
+#: etc/initialdata:101
+msgid "Notify AdminCcs"
+msgstr "Malkovich"
+
+#: etc/initialdata:97
+msgid "Notify AdminCcs as Comment"
+msgstr "Malkovich as Malkovich"
+
+#: etc/initialdata:128
+msgid "Notify Other Recipients"
+msgstr "Malkovich Malkovich"
+
+#: etc/initialdata:124
+msgid "Notify Other Recipients as Comment"
+msgstr "Malkovich Malkovich as Malkovich"
+
+#: etc/initialdata:85
+msgid "Notify Owner"
+msgstr "Malkovich"
+
+#: etc/initialdata:81
+msgid "Notify Owner as Comment"
+msgstr "Malkovich as Malkovich"
+
+#: etc/initialdata:376
+msgid "Notify Owner of their rejected ticket"
+msgstr "Malkovich of Malkovich Malkovich"
+
+#: etc/initialdata:365
+msgid "Notify Owner of their ticket has been approved by all approvers"
+msgstr "Malkovich of Malkovich Malkovich Malkovich by Malkovich"
+
+#: etc/initialdata:353
+msgid "Notify Owner of their ticket has been approved by some approver"
+msgstr "Malkovich of Malkovich Malkovich Malkovich by Malkovich"
+
+#: etc/initialdata:334
+msgid "Notify Owners and AdminCcs of new items pending their approval"
+msgstr "Malkovich and Malkovich of Malkovich Malkovich Malkovich"
+
+#: etc/initialdata:77
+msgid "Notify Requestors"
+msgstr "Malkovich Malkovich"
+
+#: etc/initialdata:111
+msgid "Notify Requestors and Ccs"
+msgstr "Malkovich Malkovich and Ccs"
+
+#: etc/initialdata:106
+msgid "Notify Requestors and Ccs as Comment"
+msgstr "Malkovich Malkovich and Ccs as Malkovich"
+
+#: etc/initialdata:120
+msgid "Notify Requestors, Ccs and AdminCcs"
+msgstr "Malkovich Malkovich, Ccs and Malkovich"
+
+#: etc/initialdata:116
+msgid "Notify Requestors, Ccs and AdminCcs as Comment"
+msgstr "Malkovich Malkovich, Ccs and Malkovich as Malkovich"
+
+#: lib/RT/Date.pm:421
+msgid "Nov."
+msgstr "Nov."
+
+#: lib/RT/Record.pm:200
+msgid "Object could not be created"
+msgstr "Malkovich Malkovich be Malkovich"
+
+#: lib/RT/Record.pm:219
+msgid "Object created"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:420
+msgid "Oct."
+msgstr "Oct."
+
+#: html/Elements/SelectDateRelation:34
+msgid "On"
+msgstr "On"
+
+#: etc/initialdata:163
+msgid "On Comment"
+msgstr "On Malkovich"
+
+#: etc/initialdata:156
+msgid "On Correspond"
+msgstr "On Malkovich"
+
+#: etc/initialdata:145
+msgid "On Create"
+msgstr "On Malkovich"
+
+#: etc/initialdata:184
+msgid "On Owner Change"
+msgstr "On Malkovich"
+
+#: etc/initialdata:192
+msgid "On Queue Change"
+msgstr "On Malkovich"
+
+#: etc/initialdata:198
+msgid "On Resolve"
+msgstr "On Malkovich"
+
+#: etc/initialdata:169
+msgid "On Status Change"
+msgstr "On Malkovich"
+
+#: etc/initialdata:150
+msgid "On Transaction"
+msgstr "On Malkovich"
+
+#: html/Approvals/Elements/PendingMyApproval:49
+#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
+msgid "Only show approvals for requests created after %1"
+msgstr "Malkovich Malkovich Malkovich Malkovich Malkovich %1"
+
+#: html/Approvals/Elements/PendingMyApproval:47
+#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
+msgid "Only show approvals for requests created before %1"
+msgstr "Malkovich Malkovich Malkovich Malkovich Malkovich %1"
+
+#: html/Elements/Quicksearch:30
+msgid "Open"
+msgstr "Open"
+
+#: html/Ticket/Elements/Tabs:137
+msgid "Open it"
+msgstr "Open it"
+
+#: html/SelfService/Elements/Tabs:41
+msgid "Open tickets"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Open tickets (from listing) in a new window"
+msgstr "Malkovich (Malkovich) in a Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Open tickets (from listing) in another window"
+msgstr "Malkovich (Malkovich) in Malkovich"
+
+#: etc/initialdata:140
+msgid "Open tickets on correspondence"
+msgstr "Malkovich on Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Ordering and sorting"
+msgstr "Malkovich and Malkovich"
+
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
+msgid "Organization"
+msgstr "Malkovich"
+
+#: html/Approvals/Elements/Approve:32
+#. ($approving->Id, $approving->Subject)
+msgid "Originating ticket: #%1"
+msgstr "Malkovich Malkovich: #%1"
+
+#: html/Admin/Queues/Modify.html:68
+msgid "Over time, priority moves toward"
+msgstr "Malkovich, Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:89
+msgid "Own tickets"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:89
+msgid "OwnTicket"
+msgstr "Malkovich"
+
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
+msgid "Owner"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:575
+#. ($Old->Name , $New->Name)
+msgid "Owner forcibly changed from %1 to %2"
+msgstr "Malkovich Malkovich Malkovich %1 to %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Owner is"
+msgstr "Malkovich is"
+
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
+msgid "Pager"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "PagerPhone"
+msgstr "Malkovich"
+
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
+msgid "Parents"
+msgstr "Malkovich"
+
+#: html/Elements/Login:52 html/User/Prefs.html:83
+msgid "Password"
+msgstr "Malkovich"
+
+#: html/NoAuth/Reminder.html:24
+msgid "Password Reminder"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
+msgid "Password too short"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
+#. (loc_fuzzy($msg))
+msgid "Password: %1"
+msgstr "Malkovich: %1"
+
+#: html/Admin/Users/Modify.html:318
+msgid "Passwords do not match."
+msgstr "Malkovich do Malkovich."
+
+#: html/User/Prefs.html:211
+msgid "Passwords do not match. Your password has not been changed"
+msgstr "Malkovich do Malkovich. Malkovich Malkovich Malkovich"
+
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
+msgid "People"
+msgstr "Malkovich"
+
+#: etc/initialdata:133
+msgid "Perform a user-defined action"
+msgstr "Malkovich a user-Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
+msgid "Permission Denied"
+msgstr "Malkovich Malkovich"
+
+#: html/User/Elements/Tabs:34
+msgid "Personal Groups"
+msgstr "Malkovich"
+
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
+msgid "Personal groups"
+msgstr "Malkovich"
+
+#: html/User/Elements/DelegateRights:36
+msgid "Personal groups:"
+msgstr "Malkovich:"
+
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
+msgid "Phone numbers"
+msgstr "Malkovich"
+
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
+msgid "Preferences"
+msgstr "Malkovich"
+
+#: lib/RT/Action/Generic.pm:169
+msgid "Prepare Stubbed"
+msgstr "Malkovich"
+
+#: html/Ticket/Elements/Tabs:62
+msgid "Prev"
+msgstr "Prev"
+
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
+#. ($args{'PrincipalId'})
+msgid "Principal %1 not found."
+msgstr "Malkovich %1 Malkovich."
+
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
+msgid "Priority"
+msgstr "Malkovich"
+
+#: html/Admin/Queues/Modify.html:64
+msgid "Priority starts at"
+msgstr "Malkovich at"
+
+#: etc/initialdata:25
+msgid "Privileged"
+msgstr "Malkovich"
+
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
+#. (loc_fuzzy($msg))
+msgid "Privileged status: %1"
+msgstr "Malkovich Malkovich: %1"
+
+#: html/Admin/Users/index.html:61
+msgid "Privileged users"
+msgstr "Malkovich Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Projects"
+msgstr "Malkovich"
+
+#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
+msgid "Pseudogroup for internal use"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
+msgid "Queue"
+msgstr "Malkovich"
+
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
+#. ($Queue)
+#. ($id)
+msgid "Queue %1 not found"
+msgstr "Malkovich %1 Malkovich"
+
+#: html/Admin/Queues/Modify.html:42
+msgid "Queue Name"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:300
+msgid "Queue already exists"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
+msgid "Queue could not be created"
+msgstr "Malkovich not be Malkovich"
+
+#: html/Ticket/Create.html:208
+msgid "Queue could not be loaded."
+msgstr "Malkovich be Malkovich."
+
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
+msgid "Queue created"
+msgstr "Malkovich"
+
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
+msgid "Queue not found"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
+msgid "Queues"
+msgstr "Malkovich"
+
+#: html/Elements/Quicksearch:24
+msgid "Quick search"
+msgstr "Malkovich"
+
+#: html/Elements/Login:44
+#. ($RT::VERSION)
+msgid "RT %1"
+msgstr "RT %1"
+
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
+#. ($RT::VERSION, $RT::rtname)
+msgid "RT %1 for %2"
+msgstr "RT %1 for %2"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 from <a href=\"http://Malkovich.com\">Malkovich Malkovich, LLC</a>."
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
+msgid "RT Administration"
+msgstr "RT Malkovich"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:40
+msgid "RT Error"
+msgstr "RT Malkovich"
+
+#: html/index.html:50 html/index.html:53
+msgid "RT at a glance"
+msgstr "RT at a Malkovich"
+
+#: html/Elements/PageLayout:85
+#. ($RT::rtname)
+msgid "RT for %1"
+msgstr "RT for %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT is &copy; Malkovich 1996-%1 Malkovich <Malkovich@Malkovich.com>.  It is Malkovich Malkovich <a href=\"http://www.gnu.org/copyleft/gpl.html\">Malkovich 2 of the Malkovich Malkovich Malkovich.</a>"
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
+msgid "Real Name"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "RealName"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:628
+#. ($value)
+msgid "Reference by %1 added"
+msgstr "Malkovich by %1 Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:668
+#. ($value)
+msgid "Reference by %1 deleted"
+msgstr "Malkovich by %1 Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:625
+#. ($value)
+msgid "Reference to %1 added"
+msgstr "Malkovich to %1 Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:665
+#. ($value)
+msgid "Reference to %1 deleted"
+msgstr "Malkovich to %1 Malkovich"
+
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
+msgid "Referred to by"
+msgstr "Malkovich to by"
+
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
+msgid "Refers to"
+msgstr "Malkovich to"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine search"
+msgstr "Malkovich"
+
+#: html/Elements/Refresh:35
+#. ($value/60)
+msgid "Refresh this page every %1 minutes."
+msgstr "Malkovich Malkovich %1 Malkovich."
+
+#: html/Search/Bulk.html:95
+msgid "Remove AdminCc"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:91
+msgid "Remove Cc"
+msgstr "Malkovich Cc"
+
+#: html/Search/Bulk.html:87
+msgid "Remove Requestor"
+msgstr "Malkovich Malkovich"
+
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
+msgid "Reply"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "Reply to tickets"
+msgstr "Malkovich to Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:87
+msgid "ReplyToTicket"
+msgstr "Malkovich"
+
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
+msgid "Requestor"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor email address"
+msgstr "Malkovich Malkovich"
+
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
+msgid "Requestors"
+msgstr "Malkovich"
+
+#: html/Admin/Queues/Modify.html:74
+msgid "Requests should be due in"
+msgstr "Malkovich be due in"
+
+#: html/Elements/Submit:61
+msgid "Reset"
+msgstr "Malkovich"
+
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
+msgid "Residence"
+msgstr "Malkovich"
+
+#: html/Ticket/Elements/Tabs:133
+msgid "Resolve"
+msgstr "Malkovich"
+
+#: html/Ticket/Update.html:119
+#. ($TicketObj->id, $TicketObj->Subject)
+msgid "Resolve ticket #%1 (%2)"
+msgstr "Malkovich #%1 (%2)"
+
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
+msgid "Resolved"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Response to requestors"
+msgstr "Malkovich to Malkovich"
+
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
+msgid "Results"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Results per page"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
+msgid "Retype Password"
+msgstr "Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:612
+msgid "Right Delegated"
+msgstr "Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:302
+msgid "Right Granted"
+msgstr "Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:160
+msgid "Right Loaded"
+msgstr "Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
+msgid "Right could not be revoked"
+msgstr "Malkovich be Malkovich"
+
+#: html/User/Delegation.html:63
+msgid "Right not found"
+msgstr "Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
+msgid "Right not loaded."
+msgstr "Malkovich Malkovich."
+
+#: lib/RT/ACE_Overlay.pm:688
+msgid "Right revoked"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Rights"
+msgstr "Malkovich"
+
+#: lib/RT/Interface/Web.pm:869
+#. ($object_type)
+msgid "Rights could not be granted for %1"
+msgstr "Malkovich Malkovich be Malkovich %1"
+
+#: lib/RT/Interface/Web.pm:899
+#. ($object_type)
+msgid "Rights could not be revoked for %1"
+msgstr "Malkovich Malkovich be Malkovich %1"
+
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
+msgid "Roles"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:393
+msgid "Sat."
+msgstr "Sat."
+
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
+msgid "Save Changes"
+msgstr "Malkovich"
+
+#: html/Ticket/Elements/PreviewScrips:79
+msgid "Save changes"
+msgstr "Malkovich"
+
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
+#. ($id)
+#. ($ARGS{'id'})
+msgid "Scrip #%1"
+msgstr "Malkovich #%1"
+
+#: lib/RT/Scrip_Overlay.pm:180
+msgid "Scrip Created"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditScrips:85
+msgid "Scrip deleted"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
+msgid "Scrips"
+msgstr "Malkovich"
+
+#: html/Admin/Queues/Scrips.html:33
+msgid "Scrips which apply to all queues"
+msgstr "Malkovich Malkovich to Malkovich"
+
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
+msgid "Search"
+msgstr "Malkovich"
+
+#: html/Approvals/Elements/PendingMyApproval:38
+msgid "Search for approvals"
+msgstr "Malkovich Malkovich"
+
+#: bin/rt-crontool:184
+msgid "Security:"
+msgstr "Malkovich:"
+
+#: lib/RT/Queue_Overlay.pm:68
+msgid "SeeQueue"
+msgstr "Malkovich"
+
+#: html/Admin/Groups/index.html:50
+msgid "Select a group"
+msgstr "Malkovich a Malkovich"
+
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
+msgid "Select a user"
+msgstr "Malkovich a user"
+
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
+msgid "Select group"
+msgstr "Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:427
+msgid "Select multiple values"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:424
+msgid "Select one value"
+msgstr "Malkovich Malkovich"
+
+#: html/Admin/Elements/QueueTabs:66
+msgid "Select queue"
+msgstr "Malkovich"
+
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
+msgid "Select scrip"
+msgstr "Malkovich"
+
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
+msgid "Select template"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/UserTabs:46
+msgid "Select user"
+msgstr "Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
+msgstr "Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
+msgstr "Malkovich"
+
+#: etc/initialdata:121
+msgid "Send mail to all watchers"
+msgstr "Malkovich to Malkovich"
+
+#: etc/initialdata:117
+msgid "Send mail to all watchers as a \"comment\""
+msgstr "Malkovich to Malkovich as a \"Malkovich\""
+
+#: etc/initialdata:112
+msgid "Send mail to requestors and Ccs"
+msgstr "Malkovich to Malkovich and Ccs"
+
+#: etc/initialdata:107
+msgid "Send mail to requestors and Ccs as a comment"
+msgstr "Malkovich to Malkovich and Ccs as a Malkovich"
+
+#: etc/initialdata:78
+msgid "Sends a message to the requestors"
+msgstr "Malkovich a Malkovich to the Malkovich"
+
+#: etc/initialdata:125 etc/initialdata:129
+msgid "Sends mail to explicitly listed Ccs and Bccs"
+msgstr "Malkovich to Malkovich Malkovich and Bccs"
+
+#: etc/initialdata:102
+msgid "Sends mail to the administrative Ccs"
+msgstr "Malkovich to the Malkovich Malkovich"
+
+#: etc/initialdata:98
+msgid "Sends mail to the administrative Ccs as a comment"
+msgstr "Malkovich to the Malkovich Malkovich as a Malkovich"
+
+#: etc/initialdata:82 etc/initialdata:86
+msgid "Sends mail to the owner"
+msgstr "Malkovich to the Malkovich"
+
+#: lib/RT/Date.pm:419
+msgid "Sep."
+msgstr "Sep."
+
+#: html/Approvals/Elements/PendingMyApproval:43
+msgid "Show approved requests"
+msgstr "Malkovich Malkovich"
+
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
+msgid "Show basics"
+msgstr "Malkovich"
+
+#: html/Approvals/Elements/PendingMyApproval:44
+msgid "Show denied requests"
+msgstr "Malkovich Malkovich"
+
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
+msgid "Show details"
+msgstr "Malkovich"
+
+#: html/Approvals/Elements/PendingMyApproval:42
+msgid "Show pending requests"
+msgstr "Malkovich Malkovich"
+
+#: html/Approvals/Elements/PendingMyApproval:45
+msgid "Show requests awaiting other approvals"
+msgstr "Malkovich Malkovich Malkovich Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Show ticket private commentary"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Show ticket summaries"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ShowACL"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:79
+msgid "ShowScrips"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:76
+msgid "ShowTemplate"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:80
+msgid "ShowTicket"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:81
+msgid "ShowTicketComments"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Sign up as a ticket Requestor or ticket or queue Cc"
+msgstr "Sign up as a Malkovich Malkovich or Malkovich or Malkovich Cc"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "Sign up as a ticket or queue AdminCc"
+msgstr "Sign up as a Malkovich or Malkovich"
+
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
+msgid "Signature"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:25
+msgid "Single"
+msgstr "Malkovich"
+
+#: html/Elements/Header:62
+msgid "Skip Menu"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
+msgstr "Sort"
+
+#: NOT FOUND IN SOURCE
+msgid "Sort results by"
+msgstr "Malkovich by"
+
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/Admin/Elements/EditScrip:65
+msgid "Stage"
+msgstr "Malkovich"
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
+msgid "Started"
+msgstr "Malkovich"
+
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
+msgid "Starts"
+msgstr "Malkovich"
+
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
+msgid "State"
+msgstr "Malkovich"
+
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
+msgid "Status"
+msgstr "Malkovich"
+
+#: etc/initialdata:309
+msgid "Status Change"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Malkovich Malkovich %1 to %2"
+
+#: html/Ticket/Elements/Tabs:148
+msgid "Steal"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:94
+msgid "Steal tickets"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:94
+msgid "StealTicket"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:581
+#. ($Old->Name)
+msgid "Stolen from %1 "
+msgstr "Malkovich %1 "
+
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
+msgid "Subject"
+msgstr "Malkovich"
+
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
+#. ($self->Data)
+msgid "Subject changed to %1"
+msgstr "Malkovich to %1"
+
+#: html/Elements/Submit:58
+msgid "Submit"
+msgstr "Malkovich"
+
+#: lib/RT/Group_Overlay.pm:749
+msgid "Succeeded"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:394
+msgid "Sun."
+msgstr "Sun."
+
+#: lib/RT/System.pm:53
+msgid "SuperUser"
+msgstr "Malkovich"
+
+#: html/User/Elements/DelegateRights:76
+msgid "System"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
+msgid "System Error"
+msgstr "Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:615
+msgid "System error. Right not delegated."
+msgstr "Malkovich. Malkovich Malkovich."
+
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
+msgid "System error. Right not granted."
+msgstr "Malkovich. Malkovich Malkovich."
+
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
+msgid "System groups"
+msgstr "Malkovich"
+
+#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
+msgid "SystemRolegroup for internal use"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: lib/RT/CurrentUser.pm:334
+msgid "TEST_STRING"
+msgstr "TEST_MALKOVICH"
+
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
+msgid "Take"
+msgstr "Take"
+
+#: lib/RT/Queue_Overlay.pm:92
+msgid "Take tickets"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:92
+msgid "TakeTicket"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:566
+msgid "Taken"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
+msgid "Template"
+msgstr "Malkovich"
+
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
+#. ($TemplateObj->Id())
+msgid "Template #%1"
+msgstr "Malkovich #%1"
+
+#: html/Admin/Elements/EditTemplates:88
+msgid "Template deleted"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Scrip_Overlay.pm:156
+msgid "Template not found"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Template_Overlay.pm:348
+msgid "Template parsed"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
+msgid "Templates"
+msgstr "Malkovich"
+
+#: lib/RT/Record.pm:740
+msgid "That is already the current value"
+msgstr "That is Malkovich the Malkovich"
+
+#: lib/RT/CustomField_Overlay.pm:248
+msgid "That is not a value for this custom field"
+msgstr "That is not a Malkovich Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2086
+msgid "That is the same value"
+msgstr "That is the Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
+msgid "That principal already has that right"
+msgstr "Malkovich Malkovich Malkovich Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:674
+#. ($args{'Type'})
+msgid "That principal is already a %1 for this queue"
+msgstr "Malkovich is Malkovich a %1 Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:1527
+#. ($self->loc($args{'Type'}))
+msgid "That principal is already a %1 for this ticket"
+msgstr "Malkovich is Malkovich a %1 Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:773
+#. ($args{'Type'})
+msgid "That principal is not a %1 for this queue"
+msgstr "That Malkovich is not a %1 Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2082
+msgid "That queue does not exist"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:3152
+msgid "That ticket has unresolved dependencies"
+msgstr "Malkovich Malkovich Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2956
+msgid "That user already owns that ticket"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2928
+msgid "That user does not exist"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/User_Overlay.pm:355
+msgid "That user is already privileged"
+msgstr "Malkovich is Malkovich Malkovich"
+
+#: lib/RT/User_Overlay.pm:376
+msgid "That user is already unprivileged"
+msgstr "Malkovich is Malkovich Malkovich"
+
+#: lib/RT/User_Overlay.pm:368
+msgid "That user is now privileged"
+msgstr "Malkovich is Malkovich"
+
+#: lib/RT/User_Overlay.pm:389
+msgid "That user is now unprivileged"
+msgstr "Malkovich is Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:2949
+msgid "That user may not own tickets in that queue"
+msgstr "Malkovich Malkovich Malkovich in Malkovich"
+
+#: lib/RT/Link_Overlay.pm:200
+msgid "That's not a numerical id"
+msgstr "That's not a Malkovich id"
+
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
+msgid "The Basics"
+msgstr "The Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:87
+msgid "The CC of a ticket"
+msgstr "The CC of a Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:88
+msgid "The administrative CC of a ticket"
+msgstr "The Malkovich CC of a Malkovich"
+
+#: bin/rt-crontool:194
+msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
+msgstr "The Malkovich Malkovich Malkovich Malkovich Malkovich in the Malkovich 'Malkovich' and Malkovich Malkovich to 99 if they haven't Malkovich in 4 Malkovich:"
+
+#: NOT FOUND IN SOURCE
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "The Malkovich Malkovich Malkovich Malkovich:\\n\\n"
+
+#: lib/RT/Record.pm:743
+msgid "The new value has been set."
+msgstr "The Malkovich Malkovich."
+
+#: lib/RT/ACE_Overlay.pm:85
+msgid "The owner of a ticket"
+msgstr "The Malkovich of a Malkovich"
+
+#: lib/RT/ACE_Overlay.pm:86
+msgid "The requestor of a ticket"
+msgstr "The Malkovich of a Malkovich"
+
+#: html/Admin/Elements/EditUserComments:25
+msgid "These comments aren't generally visible to the user"
+msgstr "Malkovich aren't Malkovich Malkovich to the user"
+
+#: bin/rt-crontool:185
+msgid "This tool allows the user to run arbitrary perl modules from within RT."
+msgstr "Malkovich Malkovich the user to Malkovich Malkovich Malkovich Malkovich RT."
+
+#: lib/RT/Transaction_Overlay.pm:226
+msgid "This transaction appears to have no content"
+msgstr "Malkovich Malkovich to have no Malkovich"
+
+#: html/Ticket/Elements/ShowRequestor:48
+#. ($rows)
+msgid "This user's %1 highest priority tickets"
+msgstr "Malkovich's %1 Malkovich Malkovich"
+
+#: lib/RT/Date.pm:391
+msgid "Thu."
+msgstr "Thu."
+
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket #%1 Jumbo update: %2"
+msgstr "Malkovich #%1 Malkovich: %2"
+
+#: html/Approvals/Elements/ShowDependency:45
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
+msgid "Ticket #%1: %2"
+msgstr "Malkovich #%1: %2"
+
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
+#. ($self->Id, $QueueObj->Name)
+msgid "Ticket %1 created in queue '%2'"
+msgstr "Malkovich %1 Malkovich in Malkovich '%2'"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket %1 loaded\\n"
+msgstr "Malkovich %1 Malkovich\\n"
+
+#: html/Search/Bulk.html:216
+#. ($Ticket->Id,$_)
+msgid "Ticket %1: %2"
+msgstr "Malkovich %1: %2"
+
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
+#. ($Ticket->Id, $Ticket->Subject)
+msgid "Ticket History # %1 %2"
+msgstr "Malkovich # %1 %2"
+
+#: etc/initialdata:324
+msgid "Ticket Resolved"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket attachment"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Tickets_Overlay.pm:1228
+msgid "Ticket content"
+msgstr "Malkovich"
+
+#: lib/RT/Tickets_Overlay.pm:1274
+msgid "Ticket content type"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
+msgid "Ticket could not be created due to an internal error"
+msgstr "Malkovich Malkovich be Malkovich to a Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:497
+msgid "Ticket created"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:502
+msgid "Ticket deleted"
+msgstr "Malkovich"
+
+#: etc/initialdata:310
+msgid "Ticket status changed"
+msgstr "Malkovich Malkovich"
+
+#: html/Elements/Tabs:46
+msgid "Tickets"
+msgstr "Malkovich"
+
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "Malkovich %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "Malkovich %1 by %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Tickets from %1"
+msgstr "Malkovich %1"
+
+#: html/Approvals/Elements/ShowDependency:26
+msgid "Tickets which depend on this approval:"
+msgstr "Malkovich Malkovich on Malkovich:"
+
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
+msgid "Time Left"
+msgstr "Malkovich"
+
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
+msgid "Time Worked"
+msgstr "Malkovich"
+
+#: lib/RT/Tickets_Overlay.pm:1201
+msgid "Time left"
+msgstr "Malkovich"
+
+#: html/Elements/Footer:44
+msgid "Time to display"
+msgstr "Time to Malkovich"
+
+#: lib/RT/Tickets_Overlay.pm:1177
+msgid "Time worked"
+msgstr "Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:1277
+msgid "TimeWorked"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "To generate a diff of this commit:"
+msgstr "To Malkovich a diff of Malkovich:"
+
+#: NOT FOUND IN SOURCE
+msgid "To generate a diff of this commit:\\n"
+msgstr "To Malkovich a diff of Malkovich:\\n"
+
+#: lib/RT/Ticket_Overlay.pm:1280
+msgid "Told"
+msgstr "Told"
+
+#: etc/initialdata:252
+msgid "Transaction"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:705
+#. ($self->Data)
+msgid "Transaction %1 purged"
+msgstr "Malkovich %1 Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:136
+msgid "Transaction Created"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:92
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Malkovich->Malkovich couldn't, as you didn't Malkovich a Malkovich id"
+
+#: lib/RT/Transaction_Overlay.pm:760
+msgid "Transactions are immutable"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: lib/RT/Date.pm:389
+msgid "Tue."
+msgstr "Tue."
+
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
+msgid "Type"
+msgstr "Type"
+
+#: lib/RT/ScripCondition_Overlay.pm:103
+msgid "Unimplemented"
+msgstr "Malkovich"
+
+#: html/Admin/Users/Modify.html:67
+msgid "Unix login"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "UnixUsername"
+msgstr "Malkovich"
+
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
+msgstr "Malkovich Malkovich %1"
+
+#: html/Elements/SelectResultsPerPage:36
+msgid "Unlimited"
+msgstr "Malkovich"
+
+#: etc/initialdata:32
+msgid "Unprivileged"
+msgstr "Malkovich"
+
+#: lib/RT/Transaction_Overlay.pm:562
+msgid "Untaken"
+msgstr "Malkovich"
+
+#: html/Search/Bulk.html:32
+msgid "Update"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Update ID"
+msgstr "Malkovich ID"
+
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
+msgid "Update Type"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Update all these tickets at once"
+msgstr "Malkovich Malkovich at once"
+
+#: NOT FOUND IN SOURCE
+msgid "Update email"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Update name"
+msgstr "Malkovich"
+
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
+msgid "Update not recorded."
+msgstr "Malkovich Malkovich."
+
+#: html/Search/Bulk.html:78
+msgid "Update selected tickets"
+msgstr "Malkovich Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "Update signature"
+msgstr "Malkovich Malkovich"
+
+#: html/Ticket/ModifyAll.html:62
+msgid "Update ticket"
+msgstr "Malkovich"
+
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
+#. ($Ticket->id)
+msgid "Update ticket #%1"
+msgstr "Malkovich #%1"
+
+#: html/Ticket/Update.html:121
+#. ($TicketObj->id, $TicketObj->Subject)
+msgid "Update ticket #%1 (%2)"
+msgstr "Malkovich #%1 (%2)"
+
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
+msgid "Update type was neither correspondence nor comment."
+msgstr "Malkovich Malkovich Malkovich Malkovich Malkovich."
+
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
+msgid "Updated"
+msgstr "Malkovich"
+
+#: etc/initialdata:132 etc/initialdata:206
+msgid "User Defined"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "User ID"
+msgstr "User ID"
+
+#: html/Elements/SelectUsers:25
+msgid "User Id"
+msgstr "User Id"
+
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
+msgid "User Rights"
+msgstr "Malkovich"
+
+#: html/Admin/Users/Modify.html:252
+#. ($msg)
+msgid "User could not be created: %1"
+msgstr "Malkovich be Malkovich: %1"
+
+#: lib/RT/User_Overlay.pm:296
+msgid "User created"
+msgstr "Malkovich"
+
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
+msgid "User defined groups"
+msgstr "Malkovich Malkovich"
+
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
+msgid "User loaded"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "User view"
+msgstr "Malkovich"
+
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
+msgid "Username"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
+msgid "Users"
+msgstr "Malkovich"
+
+#: html/Admin/Users/index.html:64
+msgid "Users matching search criteria"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: lib/RT/Tickets_Overlay_SQL.pm:494
+msgid "Valid Query"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/EditCustomField:56
+msgid "Values"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:84
+msgid "Watch"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:85
+msgid "WatchAsAdminCc"
+msgstr "Malkovich"
+
+#: html/Admin/Elements/QueueTabs:41
+msgid "Watchers"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "WebEncoding"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:390
+msgid "Wed."
+msgstr "Wed."
+
+#: etc/initialdata:521
+msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
+msgstr "When a Malkovich Malkovich by Malkovich, Malkovich Malkovich to the Malkovich"
+
+#: etc/initialdata:485
+msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
+msgstr "When a Malkovich Malkovich by Malkovich, Malkovich Malkovich to the Malkovich"
+
+#: etc/initialdata:146
+msgid "When a ticket is created"
+msgstr "When a Malkovich is Malkovich"
+
+#: etc/initialdata:418
+msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
+msgstr "When a Malkovich is Malkovich, Malkovich the Malkovich and Malkovich of the Malkovich Malkovich Malkovich"
+
+#: etc/initialdata:151
+msgid "When anything happens"
+msgstr "Malkovich Malkovich"
+
+#: etc/initialdata:199
+msgid "Whenever a ticket is resolved"
+msgstr "Malkovich a Malkovich is Malkovich"
+
+#: etc/initialdata:185
+msgid "Whenever a ticket's owner changes"
+msgstr "Malkovich a Malkovich's Malkovich"
+
+#: etc/initialdata:193
+msgid "Whenever a ticket's queue changes"
+msgstr "Malkovich a Malkovich's Malkovich"
+
+#: etc/initialdata:170
+msgid "Whenever a ticket's status changes"
+msgstr "Malkovich a Malkovich's Malkovich"
+
+#: etc/initialdata:207
+msgid "Whenever a user-defined condition occurs"
+msgstr "Malkovich a user-Malkovich Malkovich"
+
+#: etc/initialdata:164
+msgid "Whenever comments come in"
+msgstr "Malkovich Malkovich in"
+
+#: etc/initialdata:157
+msgid "Whenever correspondence comes in"
+msgstr "Malkovich Malkovich Malkovich in"
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
+msgid "Work"
+msgstr "Work"
+
+#: NOT FOUND IN SOURCE
+msgid "WorkPhone"
+msgstr "Malkovich"
+
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
+msgid "Worked"
+msgstr "Malkovich"
+
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr "MALKOVICH Malkovich a Malkovich"
+
+#: lib/RT/Ticket_Overlay.pm:3059
+msgid "You already own this ticket"
+msgstr "Malkovich Malkovich Malkovich"
+
+#: html/autohandler:142
+msgid "You are not an authorized user"
+msgstr "Malkovich a Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr "Malkovich it with the Malkovich on the Malkovich."
+
+#: lib/RT/Ticket_Overlay.pm:2941
+msgid "You can only reassign tickets that you own or that are unowned"
+msgstr "Malkovich Malkovich Malkovich Malkovich or Malkovich Malkovich"
+
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
+#. ($num, $queue)
+msgid "You found %1 tickets in queue %2"
+msgstr "Malkovich %1 Malkovich in Malkovich %2"
+
+#: html/NoAuth/Logout.html:30
+msgid "You have been logged out of RT."
+msgstr "Malkovich Malkovich of RT."
+
+#: html/SelfService/Display.html:79
+msgid "You have no permission to create tickets in that queue."
+msgstr "Malkovich no Malkovich to Malkovich in that Malkovich."
+
+#: lib/RT/Ticket_Overlay.pm:2095
+msgid "You may not create requests in that queue."
+msgstr "Malkovich Malkovich Malkovich in Malkovich."
+
+#: html/NoAuth/Logout.html:34
+msgid "You're welcome to login again"
+msgstr "You're Malkovich to Malkovich"
+
+#: etc/initialdata:502
+msgid "Your request has been approved by %1. Other approvals may still be pending."
+msgstr "Malkovich Malkovich Malkovich by %1. Malkovich Malkovich be Malkovich."
+
+#: etc/initialdata:540
+msgid "Your request has been approved."
+msgstr "Malkovich Malkovich Malkovich."
+
+#: etc/initialdata:445
+msgid "Your request was rejected."
+msgstr "Malkovich Malkovich."
+
+#: html/autohandler:177
+msgid "Your username or password is incorrect"
+msgstr "Malkovich or Malkovich is Malkovich"
+
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
+msgid "Zip"
+msgstr "Zip"
+
+#: html/User/Elements/DelegateRights:58
+#. ($right->PrincipalObj->Object->SelfDescription)
+msgid "as granted to %1"
+msgstr "as Malkovich to %1"
+
+#: html/SelfService/Closed.html:27
+msgid "closed"
+msgstr "Malkovich"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
+msgid "contains"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "content"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "content-type"
+msgstr "Malkovich-type"
+
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
+msgid "days"
+msgstr "days"
+
+#: lib/RT/Queue_Overlay.pm:64
+msgid "deleted"
+msgstr "Malkovich"
+
+#: html/Search/Elements/PickBasics:33
+msgid "does not match"
+msgstr "Malkovich"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
+msgid "doesn't contain"
+msgstr "doesn't Malkovich"
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr "Malkovich to"
+
+#: NOT FOUND IN SOURCE
+msgid "filename"
+msgstr "Malkovich"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
+msgid "greater than"
+msgstr "Malkovich"
+
+#: lib/RT/Group_Overlay.pm:196
+#. ($self->Name)
+msgid "group '%1'"
+msgstr "Malkovich '%1'"
+
+#: lib/RT/Date.pm:315
+msgid "hours"
+msgstr "Malkovich"
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
+msgid "is"
+msgstr "is"
+
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
+msgid "isn't"
+msgstr "isn't"
+
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
+msgid "less than"
+msgstr "Malkovich"
+
+#: html/Search/Elements/PickBasics:32
+msgid "matches"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:311
+msgid "min"
+msgstr "min"
+
+#: html/Ticket/Update.html:42
+msgid "minutes"
+msgstr "Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "modifications\\n\\n"
+msgstr "Malkovich\\n\\n"
+
+#: lib/RT/Date.pm:327
+msgid "months"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:59
+msgid "new"
+msgstr "new"
+
+#: html/Admin/Elements/EditCustomFields:42
+msgid "no name"
+msgstr "no name"
+
+#: html/Admin/Elements/EditScrips:42
+msgid "no value"
+msgstr "no Malkovich"
+
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
+msgid "none"
+msgstr "none"
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "not equal to"
+msgstr "Malkovich to"
+
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
+msgid "open"
+msgstr "open"
+
+#: lib/RT/Group_Overlay.pm:201
+#. ($self->Name, $user->Name)
+msgid "personal group '%1' for user '%2'"
+msgstr "Malkovich '%1' Malkovich '%2'"
+
+#: lib/RT/Group_Overlay.pm:209
+#. ($queue->Name, $self->Type)
+msgid "queue %1 %2"
+msgstr "Malkovich %1 %2"
+
+#: lib/RT/Queue_Overlay.pm:63
+msgid "rejected"
+msgstr "Malkovich"
+
+#: lib/RT/Queue_Overlay.pm:62
+msgid "resolved"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:307
+msgid "sec"
+msgstr "sec"
+
+#: lib/RT/Queue_Overlay.pm:61
+msgid "stalled"
+msgstr "Malkovich"
+
+#: lib/RT/Group_Overlay.pm:204
+#. ($self->Type)
+msgid "system %1"
+msgstr "Malkovich %1"
+
+#: lib/RT/Group_Overlay.pm:215
+#. ($self->Type)
+msgid "system group '%1'"
+msgstr "Malkovich '%1'"
+
+#: html/Elements/Error:42 html/SelfService/Error.html:41
+msgid "the calling component did not specify why"
+msgstr "the Malkovich Malkovich Malkovich Malkovich"
+
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr "Malkovich #%1"
+
+#: lib/RT/Group_Overlay.pm:212
+#. ($self->Instance, $self->Type)
+msgid "ticket #%1 %2"
+msgstr "Malkovich #%1 %2"
+
+#: lib/RT/Group_Overlay.pm:218
+#. ($self->Id)
+msgid "undescribed group %1"
+msgstr "Malkovich Malkovich %1"
+
+#: lib/RT/Group_Overlay.pm:193
+#. ($user->Object->Name)
+msgid "user %1"
+msgstr "user %1"
+
+#: lib/RT/Date.pm:323
+msgid "weeks"
+msgstr "Malkovich"
+
+#: lib/RT/Date.pm:331
+msgid "years"
+msgstr "Malkovich"
+
diff --git a/rt/lib/RT/I18N/es.po b/rt/lib/RT/I18N/es.po
index 87759ee..2a95e94 100644
--- a/rt/lib/RT/I18N/es.po
+++ b/rt/lib/RT/I18N/es.po
@@ -18,64 +18,67 @@ msgstr "#"
 msgid "#%1"
 msgstr "#%1"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr "#%1: %2"
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%1 %2 %3 %4:%5:%6 %7"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "Añadido %1 %2"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "Hace %1 %2"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 %2 ha cambiado a %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
 msgstr "%1 %2 borrado"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "%1 %2 con la plantilla %3"
@@ -84,16 +87,16 @@ msgstr "%1 %2 con la plantilla %3"
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 este caso\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
 msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
 msgstr ""
 
@@ -101,29 +104,29 @@ msgstr ""
 msgid "%1 - %2 shown"
 msgstr "%1 - %2 mostrados"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr "%1 - Un parametro para pasar a %2"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr "%1 - El estado de la salida actualiza STDOUT"
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr "%1 - Especifica el modulo de accion que quieres usar"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr "%1 - Especifica el modulo de condicion que quieres usar"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - Especifica el modulo de busqueda que quieres usar"
@@ -134,35 +137,20 @@ msgstr "%1 - Especifica el modulo de busqueda que quieres usar"
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "%1 ScripAction cargado"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "$1 añadido como un valor de %2"
@@ -179,31 +167,32 @@ msgstr "%1 alias requieren un TicketId en el que trabajar "
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
 msgstr "%1 alias requieren un TicketId en el que trabajar (de %2) %3"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 parece ser un objeto local, pero no se encuentra en la base de datos"
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 por %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 ha cambiado de %2 a %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
 msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "%1 no se ha podido fijar a %2"
 
@@ -211,22 +200,12 @@ msgstr "%1 no se ha podido fijar a %2"
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 no pudo iniciar una transacción (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 no pudo fijar el estado a resuelto. La base de datos de RT podría ser inconsistente."
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
-msgid "%1 created"
-msgstr ""
-
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
-msgid "%1 deleted"
-msgstr ""
-
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
 msgstr ""
@@ -235,16 +214,17 @@ msgstr ""
 msgid "%1 highest priority tickets I own..."
 msgstr "Los %1 tickets de mayor prioridad que poseo... "
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "Los %1 tickets de mayor prioridad que he pedido"
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr "$1 es una herramienta para actuar sobre los tickets con una herramienta de planificacion externa, como crom"
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 ha dejado de ser un %2 para esta cola."
@@ -253,7 +233,8 @@ msgstr "%1 ha dejado de ser un %2 para esta cola."
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 ha dejado de ser un %2 para este ticket."
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 ha dejado de ser un valor para campo personalizable %2"
 
@@ -261,7 +242,11 @@ msgstr "%1 ha dejado de ser un valor para campo personalizable %2"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 no es un identificador de Cola válido."
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -270,7 +255,15 @@ msgstr "%1 no es un identificador de Cola válido."
 msgid "%1 min"
 msgstr "%1 min"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
 msgstr ""
@@ -279,11 +272,7 @@ msgstr ""
 msgid "%1 not shown"
 msgstr "%1 no mostrado"
 
-#: lib/RT/CustomField_Overlay.pm:827
-msgid "%1 objects"
-msgstr ""
-
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "%1 privilegios"
@@ -304,7 +293,7 @@ msgstr "%1 tipo desconocido para %2"
 msgid "%1 was created without a CurrentUser\\n"
 msgstr "%1 se creó sin CurrentUser\\n"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 resolverá todos los miembros de un grupo de tickets resueltos."
@@ -313,36 +302,28 @@ msgstr "%1 resolverá todos los miembros de un grupo de tickets resueltos."
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "%1 pondrá como pendiente una BASE [local] si es dependiente [o miembro] de una solicitud ligada."
 
-#: lib/RT/CustomField_Overlay.pm:828
-msgid "%1's %2 objects"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:829
-msgid "%1's %2's %3 objects"
-msgstr ""
-
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: ningún archivo adjunto especificado"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1b"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1k"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' es un valor inválido para el estado"
@@ -359,7 +340,7 @@ msgstr "(Marque la caja para borrar al miembro del grupo)"
 msgid "(Check box to delete scrip)"
 msgstr "(Marque la caja para borrar el scrip)"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(Marque la caja para borrar)"
 
@@ -367,49 +348,49 @@ msgstr "(Marque la caja para borrar)"
 msgid "(Check boxes to delete)"
 msgstr "(Marque las cajas para borrar)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
+msgstr "(Introduzca los identificadores de ticket o URLs, separados por espacios)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(Si se deja vacio, pasara por defecto a %1)"
+msgid "(If left blank, will default to %1"
+msgstr "(Si se deja vacio, pasara por defecto a %1"
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
 msgstr "(Sin Valor)"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(No hay campos custom)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(Sin miembros)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "(Sin scrips)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr "(Sin plantillas)"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
-msgid "(None)"
-msgstr ""
-
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Envia una copia oculta de esta actualizacion a una lista delimitada por comas de direcciones de email. <b>NO</b> cambia quien recibirá futuras actualizaciones)"
 
@@ -417,11 +398,11 @@ msgstr "(Envia una copia oculta de esta actualizacion a una lista delimitada por
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Envía una copia oculta de esta actualización a una lista de direcciones de correo delimitada por comas. <b>No</b> cambia a quien recibirá futuras actualizaciones.)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Envia una copia oculta de esta actualización a una lista delimitada por comas de direcciones de email administrativas. Estas personas <b>recibirán</b> las futuras actualizaciones.)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Envia una copia oculta de esta actualización a una lista delimitada por comas de direcciones de email.<b>NO</b> cambia quien recibirá futuras actualizaciones."
 
@@ -429,43 +410,47 @@ msgstr "(Envia una copia oculta de esta actualización a una lista delimitada po
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Manda una copia de esta actualización a una lista de direcciones de correo delimitada por comas. <b>No</b> cambia a quien recibirá futuras actualizaciones.)"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Envia una copia de esta actualización a una lista de direcciones de correo delimitada por comas. Estas personas <b>recibirán</b> actualizaciones futuras."
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
 msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(vacío)"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr "(no hay nombres listados)"
 
 #: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "(no subject)"
 msgstr "(sin asunto)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(sin valor)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
-msgid "(no values)"
-msgstr ""
-
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(solo un ticket)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(pendiente de aprobacion)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
 msgstr ""
 
@@ -473,15 +458,19 @@ msgstr ""
 msgid "(pending other tickets)"
 msgstr "(pendiente de otros tickets)"
 
-#: html/Admin/Users/Modify.html:71
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(requerido)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(sin titulo)"
 
 #: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I own..."
 msgstr "Los 25 tickets de mayor prioridad que poseo..."
 
@@ -489,23 +478,23 @@ msgstr "Los 25 tickets de mayor prioridad que poseo..."
 msgid "25 highest priority tickets I requested..."
 msgstr "Los 25 tickets de mayor prioridad que he solicitado..."
 
-#: html/Ticket/Elements/ShowBasics:53
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr "<% $Ticket->Status%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr "<% $_ %>"
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Nuevo ticket en\">&nbsp;%1"
@@ -514,10 +503,6 @@ msgstr "<input type=\"submit\" value=\"Nuevo ticket en\">&nbsp;%1"
 msgid "A blank template"
 msgstr "Una plantilla en blanco"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "ACE Deleted"
 msgstr "ACE Borrado"
@@ -534,80 +519,68 @@ msgstr "ACE no se pudo borrar"
 msgid "ACE could not be found"
 msgstr "ACE no se encontró"
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE no encontrado"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "ACEs solo pueden ser creadas o borradas."
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "Abortando para prevenir modificaciones no intencionadas al ticket\\n"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "Sobre mi"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "Control de acceso"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Acción"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "Acción %1 no encontrada"
 
-#: NOT FOUND IN SOURCE
+#: bin/rt-crontool:119
 msgid "Action committed."
 msgstr "Action committed."
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr ""
-
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "Acción preparada..."
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
 msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "Añadir AdminCc"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "Añadir Cc"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
 msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "Añadir más archivos"
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "Añadir solicitante"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr ""
 
@@ -623,53 +596,49 @@ msgstr "Añadir un nuevo scrip global"
 msgid "Add a scrip to this queue"
 msgstr "Añadir un scrip a esta cola"
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr "Añadir un scrip que se aplicará a todas las colas"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
 msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "Añadir comentarios o respuestas a los tickets seleccionados"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "Añadir miembro"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Añadir nuevos observadores"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "AddNextState"
 msgstr "AddNextState"
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "Principal ha sido añadido como %1 para esta cola"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "Principal ha sido añadido como %1 para este ticket"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "Dirección 1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "Dirección 2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "Admin Cc"
 
@@ -681,7 +650,7 @@ msgstr "Admin Comment"
 msgid "Admin Correspondence"
 msgstr "Admin Correspondence"
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "Administración de colas"
 
@@ -689,7 +658,7 @@ msgstr "Administración de colas"
 msgid "Admin users"
 msgstr "Administración de usuarios"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "Adminsitración de la configuración global"
 
@@ -705,7 +674,7 @@ msgstr "Administración de una cola"
 msgid "AdminAllPersonalGroups"
 msgstr "AdminAllPersonalGroups"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "AdminCc"
 
@@ -717,39 +686,35 @@ msgstr "AdminComment"
 msgid "AdminCorrespondence"
 msgstr "AdminCorrespondence"
 
-#: lib/RT/CustomField_Overlay.pm:101
-msgid "AdminCustomField"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Queue_Overlay.pm:73
 msgid "AdminCustomFields"
 msgstr "AdminCustomFields"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "AdminGroup"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "AdminGroupMembership"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr "AdminOwnPersonalGroups"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr "AdminQueue"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr "AdminUsers"
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "Cc Administrativa"
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
 msgstr ""
 
@@ -757,7 +722,11 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: html/Elements/SelectDateRelation:57
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "Después"
 
@@ -765,19 +734,19 @@ msgstr "Después"
 msgid "Age"
 msgstr "Edad"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr ""
-
 #: etc/initialdata:363
 msgid "All Approvals Passed"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "Todos los campos custom"
 
-#: html/Admin/Queues/index.html:75
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "Todas las colas"
 
@@ -785,39 +754,31 @@ msgstr "Todas las colas"
 msgid "Always sends a message to the requestors independent of message sender"
 msgstr "Siempre envia un mensaje a los solicitantes independientemente del remitente del mensaje"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr ""
-
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
-msgid "Applies to"
-msgstr ""
-
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
 msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "Aprobacion"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "Aprobacion #%1: %2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr "Aprobación #%1: No se han guardado las notas debido a un error del sistema"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr "Aprobacion #%1: Notas guardadas"
@@ -838,7 +799,7 @@ msgstr ""
 msgid "Approval diagram"
 msgstr "Diagrama de la aprobación"
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "Aprobar"
 
@@ -846,7 +807,7 @@ msgstr "Aprobar"
 msgid "Approver's notes: %1"
 msgstr "Notas del aprobador: %1"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "Abr."
 
@@ -854,52 +815,64 @@ msgstr "Abr."
 msgid "April"
 msgstr "Abril"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
-msgid "Ascending"
-msgstr "Ascendente"
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
-msgid "Assign and remove custom fields"
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
-msgid "AssignCustomFields"
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
 msgstr ""
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "Adjunto"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "Adjuntar archivo"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "Archivo adjunto"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "Archivo adjunto '%1' no pudo ser cargado"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "Archivo adjunto creado"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "Nombre del archivo adjunto"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Archivos adjuntos"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
 msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "Ago."
 
@@ -923,6 +896,10 @@ msgstr "Autorespuesta a los solicitantes"
 msgid "AutoreplyToRequestors"
 msgstr "AutoreplyToRequestors"
 
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
 msgstr "Firma PGP incorrecta: %1\\n"
@@ -939,19 +916,19 @@ msgstr "Datos incorrectos en %1"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "Número de transacción incorrecta para el archivo adjunto. %1 debe ser %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "Basicos"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "Asegúrese de salvar sus cambios"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "Antes"
 
@@ -959,117 +936,116 @@ msgstr "Antes"
 msgid "Begin Approval"
 msgstr "Begin Approval"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
-msgstr ""
-
 #: etc/initialdata:217
 msgid "Blank"
 msgstr "Vacio"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
 msgstr "URL para guardar esta búsqueda en sus marcadores"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
 msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "Encabezados breves"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "Actualización de varios tickets a la vez"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "No se pueden modificar los usuarios del sistema"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr "Can this principal see this queue"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "No se puede agregar un campo personalizable si no tiene un nombre"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
 msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "No se puede ligar un ticket a sí mismo"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "No se puede fusionar dentro de un caso ya fusionado. Nunca deberia recibir este error"
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
 msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "No se puede especificar origen y destino al mismo tiempo"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "No se puede crear el usuario: %1"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Cc"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: html/Elements/Submit:100
-msgid "Check All"
-msgstr ""
-
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "Check box to delete"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "Seleccione la caja para quitar el permiso"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "Hijo"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "Ciudad"
 
-#: html/Elements/Submit:102
-msgid "Clear All"
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
 msgstr ""
 
-#: html/Ticket/Elements/ShowDates:68
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "Cerrado"
 
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Closed requests"
 msgstr "Solicitudes cerradas"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr ""
 
@@ -1077,11 +1053,11 @@ msgstr ""
 msgid "Command not understood!\\n"
 msgstr "No se entendió el comando!\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Comentario"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "Dirección de comentario"
 
@@ -1089,11 +1065,11 @@ msgstr "Dirección de comentario"
 msgid "Comment not recorded"
 msgstr "Comentario no grabado"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr "Comentario sobre los tickets"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr "CommentOnTicket"
 
@@ -1101,11 +1077,11 @@ msgstr "CommentOnTicket"
 msgid "Comments"
 msgstr "Comentarios"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "Comentarios (no se envían a los solicitantes)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "Comentarios (no se envían a los solicitantes)"
 
@@ -1113,15 +1089,15 @@ msgstr "Comentarios (no se envían a los solicitantes)"
 msgid "Comments about %1"
 msgstr "Comentarios acerca de %1"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "Comentarios acerca de este usuario"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "Comentarios añadidos"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr "Acción realizada"
 
@@ -1129,23 +1105,23 @@ msgstr "Acción realizada"
 msgid "Compile Restrictions"
 msgstr "Compilar restricciones"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "Condición"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr "La condicion coincide..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "Condición no encontrada"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "Configuración"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1157,11 +1133,11 @@ msgstr "Información de contacto"
 msgid "Contacted date '%1' could not be parsed"
 msgstr "Fecha de contacto '%1' no pudo ser leida"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "Contenido"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr ""
 
@@ -1169,7 +1145,7 @@ msgstr ""
 msgid "Coould not create group"
 msgstr "No se pudo crear grupo"
 
-#: html/Search/Elements/EditSearches:64
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
 msgstr ""
 
@@ -1181,7 +1157,7 @@ msgstr "Correspondencia"
 msgid "Correspondence Address"
 msgstr "Dirección de corresponencia"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "Correspondencia agregada"
 
@@ -1189,7 +1165,7 @@ msgstr "Correspondencia agregada"
 msgid "Correspondence not recorded"
 msgstr "Correspondencia no guardada"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
 msgstr "No se pudo añadir un nuevo valor de campo personalizable para el ticket. "
 
@@ -1197,43 +1173,29 @@ msgstr "No se pudo añadir un nuevo valor de campo personalizable para el ticket
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "No se pudo añadir un nuevo valor de campo personalizable para el ticket. %1 "
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr ""
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "No se pudo cambiar el propietario. "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "No se puede crear un CampoPersonalizable"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "No se pudo crear el grupo"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "No se pudo crear la plantilla: %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "No se pudo crear el ticket. Cola no seleccionada"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "No se pudo crear el usuario"
 
@@ -1249,11 +1211,11 @@ msgstr "No se pudo encontrar un ticket con identificador $1"
 msgid "Could not find group %1."
 msgstr "No se pudo encontrar el grupo %1."
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "No se pudo encontrar o crear el usuario"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "No se pudo encontrar ese principal"
 
@@ -1261,34 +1223,21 @@ msgstr "No se pudo encontrar ese principal"
 msgid "Could not find user %1."
 msgstr "No se pudo encontrar el usuario %1."
 
-#: html/Admin/CustomFields/Objects.html:69
-msgid "Could not load CustomField %1"
-msgstr ""
-
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "No se puede cargar el grupo"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "No se pudo hacer ese principal un %1 para esta cola"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "No se pudo hacer ese principal un %1 para este ticket"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "No se pudo quitar ese principal como un %1 para esta cola"
@@ -1297,15 +1246,15 @@ msgstr "No se pudo quitar ese principal como un %1 para esta cola"
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "No se pudo quitar ese principal como un %1 para este ticket"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "No se pudo agregar el miembro al grupo"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "No se pudo crear la transacción: %1"
@@ -1318,15 +1267,15 @@ msgstr "No se pudo averiguar que hacer a partir de la firma gpg de la respuesta"
 msgid "Couldn't find group\\n"
 msgstr "No se pudo encontrar el grupo\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr "No se pudo encontrar la fila"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "No pudo enconcontrar ese principal"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "No se pudo encontrar ese valor"
 
@@ -1338,18 +1287,16 @@ msgstr "No se pudo encontrar ese observador"
 msgid "Couldn't find user\\n"
 msgstr "No se pudo encontrar el usuario\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "No se pudo cargar %1 desde la base de datos de usuarios.\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr ""
 
@@ -1365,26 +1312,21 @@ msgstr "No se pudo cargar el archivo de configuración de RT '%1' %2"
 msgid "Couldn't load Scrips."
 msgstr "No se pudieron cargar los Scrips."
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "No se pudo cargar el grupo %1"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "No se puedo cargar el enlace"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
-msgid "Couldn't load object %1"
-msgstr ""
-
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "No se pudo cargar la cola"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "No se pudo cargar la cola %1"
@@ -1401,26 +1343,16 @@ msgstr "No se pudo cargar la plantilla"
 msgid "Couldn't load that user (%1)"
 msgstr "No se pudo cargar ese usuario (%1)"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "No se pudo cargar el ticket '%1'"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "País"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "Crear"
 
@@ -1428,16 +1360,20 @@ msgstr "Crear"
 msgid "Create Tickets"
 msgstr "Crear Tickets"
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "Crear CampoPersonalizable"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr "Crear un campo personalizables para la cola %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:47
 msgid "Create a CustomField which applies to all queues"
 msgstr "Crear un campo personalizable que se aplique a todas las colas"
 
@@ -1446,14 +1382,18 @@ msgid "Create a new Custom Field"
 msgstr "Crear un nuevo campo personalizable"
 
 #: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create a new global scrip"
 msgstr "Crear un nuevo scrip global"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "Creat un nuevo grupo"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "Crear un nuevo grupo personal"
 
@@ -1469,15 +1409,15 @@ msgstr "Crear un nuevo scrip"
 msgid "Create a new template"
 msgstr "Crear una nueva plantilla"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "Crear un nuevo ticket"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "Crear un nuevo usuario"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "Crear una cola"
 
@@ -1489,20 +1429,28 @@ msgstr "Crear una cola llamada "
 msgid "Create a request"
 msgstr "Crear una solicitud"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr "Crear un scrip para la cola %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "Crear una plantilla"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create failed: %1 / %2 / %3 "
 msgstr "Creación fallida: %1 / %2 / %3 "
 
@@ -1514,19 +1462,19 @@ msgstr "Creación fallida: %1 / %2 / %3 "
 msgid "Create new tickets based on this scrip's template"
 msgstr "Crear nuevos tickets basados en esta plantilla de scrip"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "Crear ticket"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr "Crear tickets en esta cola"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "Crear, borrar y modifical campos personalizables"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr "Crear, borrar y modificar colas"
 
@@ -1534,52 +1482,56 @@ msgstr "Crear, borrar y modificar colas"
 msgid "Create, delete and modify the members of any user's personal groups"
 msgstr "Crear, borrar y modificar los miembros de cualquier grupo personal de usuario"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "Crear, borrar y modificar los miembros de los grupos personales"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "Crear, borrar y modificar usuarios"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr "CreateTicket"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "Creado"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "CampoPersonalizable %1 creado"
 
 #: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr "Plantilla %1 creada"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
 msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "Relaciones actuales"
 
-#: html/Admin/Elements/EditScrips:51
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "Scrips actuales"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "Miembros actuales"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Permisos actuales"
 
@@ -1587,63 +1539,60 @@ msgstr "Permisos actuales"
 msgid "Current search criteria"
 msgstr "Criterio de busqueda actual"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "Observadores actuales"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
 msgid "Custom Field #%1"
 msgstr "Campo personalizable #%1"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "Campos personalizables"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
-msgid "Custom Fields for %1"
-msgstr ""
-
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr "Codigo de limpieza de accion personalizable"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "Codigo de preparacion de accion personalizable"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "Condicion personalizable"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "Campo personalizado %1 %2 %3"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "Campo personalizado %1 tiene un valor."
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "Campo personalizado %1 no tiene un valor."
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "Campo personalizado %1 no encontrado"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
 msgstr "Campo personalizable borrado"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "Campo personalizado no encontrado"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "El valor del campo %1 no pudo ser encontrado para el campo %2"
@@ -1652,19 +1601,19 @@ msgstr "El valor del campo %1 no pudo ser encontrado para el campo %2"
 msgid "Custom field value changed from %1 to %2"
 msgstr "Valor del campo cambiado de %1 a %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "El valor del campo no pudo ser borrado"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "El valor del campo no pudo se encontrado"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "Valor del campo borrado"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr "CustomField"
 
@@ -1672,11 +1621,11 @@ msgstr "CustomField"
 msgid "Data error"
 msgstr "Error de datos"
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Fechas"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "Dic."
 
@@ -1692,11 +1641,11 @@ msgstr "Plantilla de autorespuesta por defecto"
 msgid "Default Autoresponse template"
 msgstr "Plantilla de autorespuesta por defect"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
 msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
 msgstr ""
 
@@ -1716,64 +1665,60 @@ msgstr "Plantilla de correspondencia por defecto"
 msgid "Default transaction template"
 msgstr "Plantilla de trasacciones por defecto"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "Por defecto: %1/%2 ha cambiado de %3 a %4"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "Delegar derechos"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr "Delegar derechos especificos que te han sido concedidos"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr "DelegateRights"
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "Delegar"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "Borrar"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr "Borrar tickets"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr "DeleteTicket"
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "Al borrar este objeto, se puede romper la integridad referencial"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "Al borrar este objeto, se romperá la integridad referencial"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "Al borrar este objeto, se violará la integridad referencial"
 
@@ -1785,11 +1730,11 @@ msgstr "Al borrar este objeto, se violará la integridad referencial."
 msgid "Deleting this object would violate referential integrity. That's bad."
 msgstr "Al borrar este objeto, se violará la integridad referencial. Eso es malo."
 
-#: html/Approvals/Elements/Approve:66
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "Denegar"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "Dependen de este ticket"
 
@@ -1797,27 +1742,27 @@ msgstr "Dependen de este ticket"
 msgid "Dependencies: \\n"
 msgstr "Dependencias: \\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "Depende de"
 
@@ -1825,15 +1770,15 @@ msgstr "Depende de"
 msgid "DependsOn"
 msgstr "DependsOn"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "Descendiente"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "Describa el problema debajo"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Descripción"
 
@@ -1841,31 +1786,31 @@ msgstr "Descripción"
 msgid "Details"
 msgstr "Detalles"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "Despliegue"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr "Mostrar Lista de Control de Acceso"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr "Mostrar plantillas de scrip para esta cola"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr "Mostrar scrips para esta cola"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "Modo de despliegue"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
 msgstr ""
 
@@ -1873,19 +1818,15 @@ msgstr ""
 msgid "Display ticket #%1"
 msgstr "Despliega ticket #%1"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "Hacer cualquier cosa y todo"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "No recargar esta página"
 
@@ -1893,15 +1834,15 @@ msgstr "No recargar esta página"
 msgid "Don't show search results"
 msgstr "No mostrar los resultados de la busqueda"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "Descargar"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
-msgid "Download as a tab-delimited file"
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
 msgstr ""
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "Retraso"
 
@@ -1917,32 +1858,24 @@ msgstr "ERROR: No se pudo cargar el ticket '%1': %2.\\n"
 msgid "Edit"
 msgstr "Editar"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "Editar campos personalizados para %1"
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
 msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "Editar relaciones"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
 msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr "Editar plantillas para la cola %1"
@@ -1951,7 +1884,7 @@ msgstr "Editar plantillas para la cola %1"
 msgid "Edit keywords"
 msgstr "Editar palabras clave"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr ""
 
@@ -1959,7 +1892,7 @@ msgstr ""
 msgid "Edit scrips"
 msgstr "Editar acciones"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "Editar plantillas del sistema"
 
@@ -1967,11 +1900,15 @@ msgstr "Editar plantillas del sistema"
 msgid "Edit templates for %1"
 msgstr "Editar plantillas para %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr "Editando configuración para la cola %1"
@@ -1980,17 +1917,17 @@ msgstr "Editando configuración para la cola %1"
 msgid "Editing Configuration for user %1"
 msgstr "Editando configuración para el usuario %1"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "Editando campo %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "Editando los miembros del grupo %1"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "Editando los miembros para el grupo personal %1"
@@ -1999,15 +1936,15 @@ msgstr "Editando los miembros para el grupo personal %1"
 msgid "Editing template %1"
 msgstr "Editando plantilla %1"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "La base o el destinatario deben ser especificados"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "Correo"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "La dirección de correo ya está en uso"
 
@@ -2019,62 +1956,69 @@ msgstr "Correo Electrónico"
 msgid "EmailEncoding"
 msgstr "Codificación para el correo"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr "Habilitado (Desmarcar esta caja deshabilita este campo personalizable)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "Habilitado (Desmarcar esta caja deshabilita este campo personalizable)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "Habilitado (Desmarcar esta caja, deshabilita esta cola)"
 
 #: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
 msgstr "Campos Personalizables Habilitados"
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr "Colas habilitadas"
 
 	
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "Estado %1 habilitado"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
-msgid "Enabled status: %1"
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "Introducir multiples valores"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "Introducir un valor"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
 msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
-msgstr "Ingrese los números de ticket o las URL que llevan hacia el ticket. Separe multiples entradas con espacios"
-
-#: lib/RT/CustomField_Overlay.pm:66
-msgid "Enter up to %1 values"
 msgstr ""
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Ingrese los números de ticket o las URL que llevan hacia el ticket. Separe multiples entradas con espacios"
+
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Error"
 
@@ -2082,7 +2026,7 @@ msgstr "Error"
 msgid "Error adding watcher"
 msgstr "Error añadiendo observador"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "Error en los parámetros para Queue->AddWatcher"
 
@@ -2090,11 +2034,11 @@ msgstr "Error en los parámetros para Queue->AddWatcher"
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "Error en los parámetros para Queue->DelWatcher"
 
-#: lib/RT/Queue_Overlay.pm:830
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "Error en los parámetros para Queue->AddWatcher"
 
@@ -2102,15 +2046,15 @@ msgstr "Error en los parámetros para Queue->AddWatcher"
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "Error en los parámetros para Queue->DelWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
 msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
 msgstr ""
 
@@ -2118,7 +2062,7 @@ msgstr ""
 msgid "Everyone"
 msgstr "Todos"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "Ejemplo"
 
@@ -2130,33 +2074,32 @@ msgstr "ExternalAuthId"
 msgid "ExternalContactInfoId"
 msgstr "ExternalContactInfoId"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "Información extra"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "Problema para encontrar el pseudogrupo de usuarios 'Privileged'"
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "Problema para encontrar el pseudogrupo de usuarios 'Unprivileged'"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr "Error al cargar el modulo %1. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "Feb."
 
@@ -2164,63 +2107,35 @@ msgstr "Feb."
 msgid "February"
 msgstr "Febrero"
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:69
-msgid "Fill in multiple text areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
-msgid "Fill in one text area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
-msgid "Fill in up to %1 text areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Fin"
 msgstr "Fin"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "Prioridad Final"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr "FinalPriority"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
 msgid "Find group whose"
 msgstr "Encontrar grupo que"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
-msgid "Find groups whose"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Find new/open tickets"
 msgstr "Encontrar tickets nuevos/abiertos"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "Encontrar gente que"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "Encontrar tickets"
 
@@ -2228,7 +2143,7 @@ msgstr "Encontrar tickets"
 msgid "Finish Approval"
 msgstr "Aprobacion final"
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "Primero"
 
@@ -2236,28 +2151,24 @@ msgstr "Primero"
 msgid "First page"
 msgstr "Primera página"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "Foo Bar Baz"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "Foo!"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "Forzar cambio"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "Encontrado %quant(%1,ticket)"
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "Objeto encontrado"
 
@@ -2265,23 +2176,23 @@ msgstr "Objeto encontrado"
 msgid "FreeformContactInfo"
 msgstr "FreeformContactInfo"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:37
 msgid "FreeformMultiple"
 msgstr "FreeformMultiple"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:36
 msgid "FreeformSingle"
 msgstr "FreeformSingle"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "Vie."
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "Encabezados completos"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
 msgstr ""
 
@@ -2289,19 +2200,15 @@ msgstr ""
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "Obteniendo el usuario de la firma pgp"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "Given to %1"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Global"
 
-#: html/Admin/Elements/EditCustomFields:55
-msgid "Global Custom Fields"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Global Keyword Selections"
 msgstr "Seleccion de palabras clave globales"
@@ -2310,20 +2217,16 @@ msgstr "Seleccion de palabras clave globales"
 msgid "Global Scrips"
 msgstr "Acciones Globales"
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr ""
-
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "Plantilla global"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
 msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr " Ir "
 
@@ -2335,11 +2238,11 @@ msgstr "Firma pgp correcta de %1\\n"
 msgid "Goto page"
 msgstr "Ir a página"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "Ir a ticket"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Grupo"
 
@@ -2347,11 +2250,11 @@ msgstr "Grupo"
 msgid "Group %1 %2: %3"
 msgstr "Grupo %1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "Derechos del grupo"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "El grupo ya tiene miembros"
 
@@ -2359,20 +2262,20 @@ msgstr "El grupo ya tiene miembros"
 msgid "Group could not be created."
 msgstr "El grupo no se pudo crear"
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "El grupo no se pudo crear: %1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "Grupo creado"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "El grupo no tiene este miembro"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Grupo no encontrado"
 
@@ -2384,54 +2287,40 @@ msgstr "Grupo no entontrado\\n"
 msgid "Group not specified.\\n"
 msgstr "Grupo no especificado\\n"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Grupos"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "Los grupos no pueden ser miembros de sus propios miembros"
 
-#: html/Admin/Groups/index.html:82
-msgid "Groups matching search criteria"
-msgstr ""
-
-#: html/Ticket/Elements/ShowRequestor:77
-msgid "Groups this user belongs to"
-msgstr ""
-
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "Hola!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "Hola, %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "Historial"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
-msgid "History of the group %1"
-msgstr ""
-
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
-msgid "History of the user %1"
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "HomePhone"
 msgstr "Tel Casa"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Inicio"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "Tengo %quant(%1,concrete mixer)."
@@ -2440,15 +2329,11 @@ msgstr "Tengo %quant(%1,concrete mixer)."
 msgid "I have [quant,_1,concrete mixer]."
 msgstr "Tengo [quant,_1,concrete mixer]."
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr ""
-
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "Id"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Identidad"
 
@@ -2456,63 +2341,59 @@ msgstr "Identidad"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "Si una aprobacion es rechazada, rechazar la original y borrar las aprobaciones pendientes"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
 msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
 msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr "Si esta herramienta estaba setgid, un usuario hostil local podria usar esta herramienta para conseguir acceso administrativo a RT."
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "Si ha actualizado algo más arriba, no olvide"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "Valor ilegal para %1"
 
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "Campo inmutable"
 
 #: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "Incluir campos personalizables deshabilitados en el listado."
 
-#: html/Admin/Groups/index.html:65
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
 msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
 msgstr "Incluir colas deshabilitadas en el listado"
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "Incluir usuarios deshabilitados en la búsqueda"
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "Prioridad inicial"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr "InitialPriority"
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "Error de entrada"
 
@@ -2520,20 +2401,20 @@ msgstr "Error de entrada"
 msgid "Interest noted"
 msgstr "Interest noted"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "Error interno: %1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "Tipo de grupo inválido"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "Derechos inválidos"
 
@@ -2541,7 +2422,7 @@ msgstr "Derechos inválidos"
 msgid "Invalid Type"
 msgstr "Tipo inválido"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "Datos no válidos"
 
@@ -2549,48 +2430,44 @@ msgstr "Datos no válidos"
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "Propietario inválido. Estableciéndolo a 'nobody'."
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "�rea inválida"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "Permiso inválido"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "Valor inválido para %1"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "Valor inválido para el campo personalizable"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "Valor inválido para el estado"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr "Es increiblemente importante que los usuarios sin privilegios no puedan ejecutar esta herramienta"
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr "Es recomendable crear un usuario unix sin privilegios que pertenezca al grupo correcto y que tenga aceso a ejecutar esta herramienta"
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr "Tiene varios parametros:"
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Items pending my approval"
 msgstr "Items pendientes de mi aprobación"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "Ene."
 
@@ -2598,11 +2475,11 @@ msgstr "Ene."
 msgid "January"
 msgstr "Enero"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "Unirse o abandonar este grupo"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "Jul."
 
@@ -2610,11 +2487,11 @@ msgstr "Jul."
 msgid "July"
 msgstr "Julio"
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "Todo"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "Jun."
 
@@ -2630,23 +2507,23 @@ msgstr "Palabras clave"
 msgid "Lang"
 msgstr "Leng"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr ""
-
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "Último"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "Último contacto"
 
-#: html/Elements/SelectDateType:50
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
+
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "Último contactado"
 
@@ -2654,7 +2531,7 @@ msgstr "Último contactado"
 msgid "Last Notified"
 msgstr "Se le notifico por ultima vez"
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "Actualizado por ultima vez"
 
@@ -2662,19 +2539,19 @@ msgstr "Actualizado por ultima vez"
 msgid "LastUpdated"
 msgstr "LastUpdated"
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "Izquierda"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "Permitir a este usuario acceder al RT"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "Permitir que este usuario tenga privilegios adicionales"
 
@@ -2686,33 +2563,29 @@ msgstr "Limitando propietario a %1 %2"
 msgid "Limiting queue to %1 %2"
 msgstr "Limitando cola a %1 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "El vínculo ya existe"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "El vínculo no pudo ser creado"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "Vínculo creado (%2)"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "Vínculo borrado (%1)"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Vínculo no encontrado"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "Vincular caso #%1"
@@ -2721,122 +2594,105 @@ msgstr "Vincular caso #%1"
 msgid "Link ticket %1"
 msgstr "Enlazar ticket %1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Enlaces"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "Direccion"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "El directorio del log %1 no pudo ser encontrado o no se pudo escribir en él.\\n RT no puede ejecutarse."
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "Autenticado como %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "Entrar"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "Salir"
 
-#: lib/RT/CustomField_Overlay.pm:866
-msgid "Lookup type mismatch"
-msgstr ""
-
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "Hacer propietario a"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "Establecer estatus"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "Establecer fecha de plazo"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "Establecer fecha de resolución"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "Establecer fecha de inicio"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "Establecer fecha de inicio"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "Establecer fecha de último cambio"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "Establecer prioridad"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "Establecer cola"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "Establecer título"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
-msgstr ""
-
-#: html/Admin/index.html:78
-msgid "Manage custom fields and custom field values"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
 msgstr ""
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "Administrar grupos y miembros"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "Administrar propiedades y configuracion que se aplique a todas las colas"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr "Administrar colas y propiedades especificas"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "Administrar usuarios y contraseñas"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "Mar."
 
@@ -2848,33 +2704,33 @@ msgstr "Marzo"
 msgid "May"
 msgstr "Mayo"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "May."
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "Miembro añadido"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "Miembro borrado"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "Miembro no borrado"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "Miembro de"
 
@@ -2882,75 +2738,66 @@ msgstr "Miembro de"
 msgid "MemberOf"
 msgstr "MemberOf"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "Miembros"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:61
-msgid "Memberships"
-msgstr ""
-
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
-msgid "Memberships of the user %1"
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "Fusión exitosa"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "Fusión fallida. No se pudo establecer el EffectiveId"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "Fusionar dentro de"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
 msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "Mensaje"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
-msgid "Message recorded"
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
-msgid "Messages about this ticket will not be sent to..."
+#: lib/RT/Ticket_Overlay.pm:2517
+msgid "Message recorded"
 msgstr ""
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
+#: html/Ticket/Elements/PreviewScrips:70
+msgid "Messages about this ticket will not be sent to..."
 msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "Falta una clave primaria?: %1"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "Movil"
 
@@ -2958,7 +2805,15 @@ msgstr "Movil"
 msgid "MobilePhone"
 msgstr "Telefono Movil"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "Modificar lista de control de acceso"
 
@@ -2966,37 +2821,27 @@ msgstr "Modificar lista de control de acceso"
 msgid "Modify Custom Field %1"
 msgstr "Modificar el campo personalizable %1"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr ""
-
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
-msgid "Modify Custom Fields which apply to all %1"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "Modificar los campos personalizables que se apliquen a todas las colas"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
 msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr "Modificar plantillas Sript para esta cola"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "Modificar Scrips para esta cola"
 
@@ -3008,56 +2853,51 @@ msgstr "Modificar ACLs de sistema"
 msgid "Modify Template %1"
 msgstr "Modificar plantilla %1"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
 msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
 msgstr "Modificar un campo personalizable para la cola %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:52
 msgid "Modify a CustomField which applies to all queues"
 msgstr "Modificar un campo personalizable que se aplique a todas las colas"
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr "Modificar un scrip para la cola %1"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "Modificar un scrip que se aplique a todas las colas"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
-msgid "Modify associated objects for %1"
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Modify dates for # %1"
 msgstr "Modificar fechas para # %1"
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "Modificar fechas para #%1"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "Modificar fechas para ticket # %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "Modificar privilegios globales de grupo"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "Modificar privilegios globales de grupo."
 
@@ -3073,110 +2913,104 @@ msgstr "Modificar privilegios globales para usuarios"
 msgid "Modify global scrips"
 msgstr "Modificar acciones globales"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "Modificar derechos globales de usuario"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "Modificar privilegios globales de usuario"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "Modificar metadatos del grupo o borrar grupo"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "Modificar privilegios de grupo para %1"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "Modificar privilegios de grupo para la cola %1"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "Modificar miembros de este grupo"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr "Modificar la propia cuenta RT"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr "Modificar personas relacionadas al cola %1"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "Modificar personas relacionadas al ticket #%1"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "Modificar acciones para la cola %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr "Modificar scrips que se aplican a todas las colas"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "Modificar plantilla %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "Modificar plantillas que se aplican a todas las colas"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "Modificar el grupo %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "Modificar los observadores de la cola"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "Modificar el usuario %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "Modificar el ticket # %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "Modificar el ticket #%1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "Modificar tickets"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
-msgid "Modify user rights for custom field %1"
-msgstr ""
-
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "Modificar privilegios de usuario para el grupo %1"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr "Modificar derechos de usuario para la cola %1"
@@ -3185,64 +3019,60 @@ msgstr "Modificar derechos de usuario para la cola %1"
 msgid "Modify watchers for queue '%1'"
 msgstr "Modificar observadores para la cola '%1'"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr "ModifyACL"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "ModifyOwnMembership"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr "ModifyQueueWatchers"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr "ModifyScrips"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr "ModifySelf"
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr "ModifyTemplate"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr "ModifyTicket"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "Lun."
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "Más acerca de %1"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr "Mover hacia abajo"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr "Move hacia arriba"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "Múltiple"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "Se debe especificar un nombre"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr ""
@@ -3251,47 +3081,55 @@ msgstr ""
 msgid "My Approvals"
 msgstr "Mis aprobaciones"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "Mis aprobaciones"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Nombre"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "Nombre en uso"
 
 #: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Need approval from system administrator"
 msgstr "Se necesita aprobacion del administrador del sistema"
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "Nunca"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "Nuevo"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "Nuevas relaciones"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
-msgstr "Nueva contraseña"
+msgstr "Nueva contraseñaa"
 
 #: etc/initialdata:332
 msgid "New Pending Approval"
 msgstr "Nueva pendiente de aprobación"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
 msgstr ""
 
@@ -3299,23 +3137,27 @@ msgstr ""
 msgid "New Search"
 msgstr "Nueva búsqueda"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "Nuevo campo personalizable"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "Nuevo grupo"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
-msgstr "Nueva contraseña"
+msgstr "Nueva contraseñaa"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "Notificación de nueva contraseña enviada"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "Nueva cola"
 
@@ -3323,11 +3165,11 @@ msgstr "Nueva cola"
 msgid "New request"
 msgstr "Nueva solicitud"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "Nuevos privilegios"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "Nuevo scrip"
 
@@ -3335,27 +3177,27 @@ msgstr "Nuevo scrip"
 msgid "New search"
 msgstr "Nueva búsqueda"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "Nueva plantilla"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "El ticket nuevo no existe"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "Nuevo usuario"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "Nuevo usuario llamado"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "Nuevo observador"
 
@@ -3363,11 +3205,11 @@ msgstr "Nuevo observador"
 msgid "New window setting"
 msgstr "Establecer nueva ventana "
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "Siguiente"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
 msgstr ""
 
@@ -3379,39 +3221,43 @@ msgstr "Siguiente página"
 msgid "NickName"
 msgstr "Alias"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "Alias"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "No hay campo personalizable"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "No hay grupo definido"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
 msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "No hay cola definida"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr "No se encontró el usuario. Por favor consulte al administrador.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "No hay plantilla"
 
@@ -3423,11 +3269,11 @@ msgstr "No se especificó el ticket. Abortada la transacción"
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
 msgstr "No se especificó ticket. Abortando las modificaciones al ticket\\n\\n"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "No action"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr "No se ha especificado ninguna columna"
 
@@ -3435,7 +3281,7 @@ msgstr "No se ha especificado ninguna columna"
 msgid "No command found\\n"
 msgstr "Comando no encontrado\\n"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "No hay comentarios sobre este usuario"
 
@@ -3443,77 +3289,68 @@ msgstr "No hay comentarios sobre este usuario"
 msgid "No correspondence attached"
 msgstr "No hay ningún archivo adjunto"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "No hay descripción para %1"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "No hay grupo especificado"
 
-#: html/Admin/Groups/index.html:52
-msgid "No groups matching search criteria found."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "No hay contraseña definida"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr "No tiene privilegios para crear colas"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "No tiene privilegios para crear tickets en la cola '%1'"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "No tiene privilegios para crear usuarios"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "No tiene privilegios para mostrar el ticket"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "Sin permiso para ver la actualización del ticket"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "No hay un principal especificado"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "No hay principales seleccionados"
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr "No hay colas que concuerden con los criterios de búsqueda"
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "No se encontraron derechos"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "Sin privilegios concedidos"
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "No hay búsqueda sobre la que operar"
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
 msgstr ""
 
@@ -3521,7 +3358,7 @@ msgstr ""
 msgid "No ticket id specified"
 msgstr "No se especificó el identificador del ticket"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "No se especificó el tipo de transacción"
 
@@ -3529,7 +3366,7 @@ msgstr "No se especificó el tipo de transacción"
 msgid "No user or email address specified"
 msgstr "No se especificó email o usuario"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "No se encontraron usuarios que concuerden con los criterios de búsqueda"
 
@@ -3537,15 +3374,15 @@ msgstr "No se encontraron usuarios que concuerden con los criterios de búsqueda
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "Usuario no encontrado. El manejador cvs está deshabilitado. Por favor consulte a su administrador.\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr "No se envió ningun valor a _Set!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "Nadie"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr "Campo no existente?"
 
@@ -3553,15 +3390,15 @@ msgstr "Campo no existente?"
 msgid "Not logged in"
 msgstr "No autenticado"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "No autenticado."
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "No establecido"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "No se ha implementado."
 
@@ -3569,11 +3406,11 @@ msgstr "No se ha implementado."
 msgid "Not yet implemented...."
 msgstr "No está implementado..."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "Notas"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "La notificación no se pudo enviar"
 
@@ -3645,7 +3482,7 @@ msgstr "Notificar solicitantes, Ccs y AdminCcs"
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "Notificar solicitantes, Ccs y AdminCcs como comentario"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "Nov."
 
@@ -3653,37 +3490,15 @@ msgstr "Nov."
 msgid "November"
 msgstr "Noviembre"
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr ""
-
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr "No se pudo crear el objeto"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr "Objeto creado"
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
-msgid "Object of type %1 cannot take custom fields"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:901
-msgid "Object type mismatch"
-msgstr ""
-
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "Oct."
 
@@ -3691,19 +3506,19 @@ msgstr "Oct."
 msgid "October"
 msgstr "Octubre"
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
 msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
 msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "en "
 
@@ -3743,21 +3558,21 @@ msgstr "Al cambiar de status"
 msgid "On Transaction"
 msgstr "Al hacer transaccion"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "Solo muestra aprobaciones para solicitudes creadas despues de %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "Solo muestra aprobaciones para solicitudes creadas antes de %1"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Abierto"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Abrirlo"
 
@@ -3765,7 +3580,7 @@ msgstr "Abrirlo"
 msgid "Open requests"
 msgstr "Solicitudes abiertas"
 
-#: html/SelfService/Elements/Tabs:63
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr ""
 
@@ -3781,7 +3596,7 @@ msgstr "Tickets abiertos (del listado) en otra ventana"
 msgid "Open tickets on correspondence"
 msgstr "Open tickets on correspondence"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
 msgstr ""
 
@@ -3789,36 +3604,40 @@ msgstr ""
 msgid "Ordering and sorting"
 msgstr "Ordenación y clasificación"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Organización"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "Ticket originario: #%1"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "Pasada la fecha de gracia, la prioridad se mueve a"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr "Tickets poseidos"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr "OwnTicket"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "Propietario"
 
@@ -3826,11 +3645,11 @@ msgstr "Propietario"
 msgid "Owner changed from %1 to %2"
 msgstr "Propietario cambiado de %1 a %2"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "Propietario cambiado forzosamente de %1 a %2"
@@ -3839,12 +3658,12 @@ msgstr "Propietario cambiado forzosamente de %1 a %2"
 msgid "Owner is"
 msgstr "El propietario es"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "Buscapersonas"
 
@@ -3852,53 +3671,36 @@ msgstr "Buscapersonas"
 msgid "PagerPhone"
 msgstr "Buscapersonas Tel."
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "Padres"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
-msgstr "Contraseña"
+msgstr "Contraseñaa"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "Recordatorio de contraseña"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr "Contraseña cambiado"
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "Contraseña demasiado corta"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "Contraseña: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
 msgstr ""
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr ""
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "Personas"
 
@@ -3906,27 +3708,27 @@ msgstr "Personas"
 msgid "Perform a user-defined action"
 msgstr "Realizar una acion definida por el usuario"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "Permiso denegado"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "Grupos personales"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Grupos personales"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Grupos personales:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "Números de teléfono"
 
@@ -3934,7 +3736,7 @@ msgstr "Números de teléfono"
 msgid "Placeholder"
 msgstr "Placeholder"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -3942,15 +3744,15 @@ msgstr "Preferencias"
 msgid "Prefs"
 msgstr "Prefs"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "Preparación cortada"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "Prev"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
 msgstr ""
 
@@ -3962,20 +3764,20 @@ msgstr "Página anterior"
 msgid "Pri"
 msgstr "Pri"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "No se encontró el principal %1"
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Prioridad"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "La prioridad empieza en"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
 msgstr ""
 
@@ -3983,32 +3785,36 @@ msgstr ""
 msgid "Privileged"
 msgstr "Privilegiado"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "Estado privilegiado: %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "Usuarios privilegiados:"
 
+#: NOT FOUND IN SOURCE
+msgid "Projects"
+msgstr ""
+
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr "Pseudogrupo para uso interno"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
 msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
 msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "Cola"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
@@ -4022,7 +3828,7 @@ msgstr "Cola '%1' no encontrada\\n"
 msgid "Queue Keyword Selections"
 msgstr "Selecciones de palabras clave de la cola"
 
-#: html/Admin/Queues/Modify.html:64
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "Nombre de la cola"
 
@@ -4030,19 +3836,19 @@ msgstr "Nombre de la cola"
 msgid "Queue Scrips"
 msgstr "Acciones de la cola"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "La cola ya existe"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr "La cola no se pudo crear"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr "La cola no se pudo cargar"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "Cola creada"
 
@@ -4050,32 +3856,32 @@ msgstr "Cola creada"
 msgid "Queue is not specified."
 msgstr "No se especifico ninguna cola"
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "Cola no encontrada"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "Colas"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr ""
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
 msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 para %2"
@@ -4088,7 +3894,7 @@ msgstr "RT %1 de <a href=\"http://bestpractical.com\">Best Practical Solutions,
 msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1. Derechos reservados 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "Administración del RT"
 
@@ -4108,7 +3914,7 @@ msgstr "Error de configuración del RT"
 msgid "RT Critical error. Message not recorded!"
 msgstr "Error crítico en RT. El mensaje no fue grabado!"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "Error del RT"
 
@@ -4121,14 +3927,18 @@ msgid "RT Recieved mail (%1) from itself."
 msgstr "RT recibió correo (%1) de sí mismo."
 
 #: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT Self Service / Closed Tickets"
 msgstr "RT AutoServicio / Tickets cerrados"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
 msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "RT en un vistazo"
 
@@ -4144,15 +3954,11 @@ msgstr "RT no pudo encontrar el solicitante a través de una busqueda a la base
 msgid "RT couldn't find the queue: %1"
 msgstr "RT no pudo encontrar la cola: %1"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "RT no pudo validar esta firma PGP. \\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "RT para %1"
@@ -4170,6 +3976,10 @@ msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&
 msgstr "RT es &copy; Copyright 1996-%1 de Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Es distrbuido bajo <a href=\"http://www.gnu.org/copyleft/gpl.html\">la version 2 de la licencia GNU GPL (General Public License)</a>."
 
 #: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT thinks this message may be a bounce"
 msgstr "RT cree que este mensaje puede ser un mensaje rebotado"
 
@@ -4181,7 +3991,11 @@ msgstr "RT procesará este mensaje como si fuera uno no firmado\\n"
 msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
 msgstr "El modo de comandos por correo de RT requiere autenticación PGP. Ya sea que no haya firmado su mensaje, o que su firma no pueda ser verificada."
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "Nombre real"
 
@@ -4189,31 +4003,31 @@ msgstr "Nombre real"
 msgid "RealName"
 msgstr "Nombre real"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "Referenciado por"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "Hace referencia a"
 
@@ -4229,44 +4043,44 @@ msgstr "Refinar"
 msgid "Refine search"
 msgstr "Refinar la búsqueda"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Refrescar esta página cada %1 minutos"
 
-#: html/Search/Bulk.html:116
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "Quitar AdminCc"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Quitar Cc"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "Quitar solicitante"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Responder"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
 msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "Responder a los tickets"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "ReplyToTicket"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "Solicitante"
 
@@ -4282,37 +4096,37 @@ msgstr "Solicitante(s)"
 msgid "RequestorAddresses"
 msgstr "RequestorAddresses"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "Solicitantes"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "Las solicitudes entran en vencimiento en"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
 msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Borrar"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Residencia"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "Resolver"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "Resolver ticket #%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "Resuelto"
 
@@ -4320,7 +4134,7 @@ msgstr "Resuelto"
 msgid "Response to requestors"
 msgstr "Responder a los solicitantes"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "Resultados"
 
@@ -4328,11 +4142,11 @@ msgstr "Resultados"
 msgid "Results per page"
 msgstr "Resultados por página"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "Confirmar contraseña"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
 msgstr ""
 
@@ -4340,49 +4154,49 @@ msgstr ""
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "Privilegio %1 no encontrado para %2 %3 referente a %4 (%5)\\n"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "Privilegio delegado"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "Privilegio otorgado"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "Privilegio cargado"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "Privilegio no pudo ser revocado"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "Privilegio no encontrado"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "Privilegio no cargado"
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "Privilegio revocado"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Privilegios"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "No se pudieron conceder los privilegios a %1"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "No se pudieron revocar los privilegios de %1"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "Roles"
 
@@ -4390,59 +4204,53 @@ msgstr "Roles"
 msgid "RootApproval"
 msgstr "RootApproval"
 
-#: html/Search/Elements/DisplayOptions:83
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
 msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "Sab."
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
 msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "Guardar Cambios"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
 msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr "Scrip #%1"
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "Acción creada"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "Acción borrada"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "Acciones"
 
@@ -4450,11 +4258,11 @@ msgstr "Acciones"
 msgid "Scrips for %1\\n"
 msgstr "Acciones para %1\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr "Acciones que se aplican a todas las colas"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "Búsqueda"
 
@@ -4462,139 +4270,98 @@ msgstr "Búsqueda"
 msgid "Search Criteria"
 msgstr "Criterios de búsqueda"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
-
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr "Buscar aprobaciones"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
 msgstr ""
 
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr "Seguridad:"
 
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "See custom fields"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "SeeCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
 msgstr "Ver cola"
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
-msgid "Select a Custom Field"
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
 msgstr ""
 
-#: html/Admin/Groups/index.html:78
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "Seleccione un grupo"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "Seleccione una cola"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr ""
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "Seleccione un usuario"
 
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr "Seleccionar un campo personalizable"
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr ""
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "Seleccionar un campo personalizable"
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "Seleccionar grupo"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr "Seleccionar valores múltiples"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr "Seleccionar un valor"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr "Seleccionar cola"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr "Seleccionar accion"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr "Selecionar plantilla"
 
-#: lib/RT/CustomField_Overlay.pm:61
-msgid "Select up to %1 values"
-msgstr ""
-
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr "Seleccionar usuario"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectMultiple"
 msgstr "SelectMultiple"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:34
 msgid "SelectSingle"
 msgstr "SelectSingle"
 
-#: html/Admin/Elements/EditCustomFields:58
-msgid "Selected Custom Fields"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:59
-msgid "Selected objects"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Self Service"
 msgstr "Autoservicio"
@@ -4643,51 +4410,59 @@ msgstr "Envia mail a los Ccs administrativos como comentario"
 msgid "Sends mail to the owner"
 msgstr "Enviar mail al propietario"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "Sep."
 
 #: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "September"
 msgstr "Septiembre"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "Mostrar resultados"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "Mostrar peticiones aprobadas"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "Mostrar lo básico"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "Mostrar solicitudes denegadas"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "Mostrar detalles"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "Mostrar solicitudes pendientes"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "Mostrar solicitudes esperando otras aprobaciones"
 
@@ -4699,47 +4474,43 @@ msgstr "Mostrar ticket en un comentario privado"
 msgid "Show ticket summaries"
 msgstr "Mostrar resumen del ticket"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
 msgstr "ShowACL"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr "ShowScrips"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr "ShowTemplate"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr "ShowTicket"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr "ShowTicketComments"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr "Validarse como solicitante de ticket o ticket o cola Cc"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "Validarse como ticket o cola AdminCc"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "Firma"
 
@@ -4747,24 +4518,20 @@ msgstr "Firma"
 msgid "Signed in as %1"
 msgstr "Validado como %1"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "Sencillo"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr "Saltar Menu"
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
 msgstr ""
 
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
-msgid "Sort"
+#: NOT FOUND IN SOURCE
+msgid "Sort Order"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -4779,7 +4546,11 @@ msgstr "Ordenar resultados por"
 msgid "SortOrder"
 msgstr "Ordenamiento"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr ""
 
@@ -4791,7 +4562,7 @@ msgstr "Pendiente"
 msgid "Start page"
 msgstr "Página de inicio"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "Empezado"
 
@@ -4799,7 +4570,7 @@ msgstr "Empezado"
 msgid "Started date '%1' could not be parsed"
 msgstr "La fecha de inicio '%1' no se pudo leer"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "Empieza"
 
@@ -4811,11 +4582,11 @@ msgstr "Empezado por"
 msgid "Starts date '%1' could not be parsed"
 msgstr "La fecha de inicio '%1' no se pudo ser leer"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Estado"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Estado"
 
@@ -4823,7 +4594,8 @@ msgstr "Estado"
 msgid "Status Change"
 msgstr "Cambio de status"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "Estado cambiado de %1 a %2"
 
@@ -4831,65 +4603,73 @@ msgstr "Estado cambiado de %1 a %2"
 msgid "StatusChange"
 msgstr "StatusChange"
 
-#: html/Ticket/Elements/Tabs:170
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "Robar"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
+msgid "Stolen from %1 "
 msgstr "Robado de %1"
 
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
-
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Asunto"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "Asunto cambiado a %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "Enviar"
 
 #: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Submit Workflow"
 msgstr "Submit Workflow"
 
-#: lib/RT/Group_Overlay.pm:782
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "Completado"
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "Dom."
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "Superusuario"
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "Sistema"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "Error del sistema"
 
@@ -4901,20 +4681,15 @@ msgstr "Error de sistema. Derecho no concedido"
 msgid "System Error. right not granted"
 msgstr "Error de sistema. Derecho no concedido"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr ""
-
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "Error del sistema. Privilegio no delegado."
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "Error del sistema. Privilegio no otorgado"
 
@@ -4922,7 +4697,7 @@ msgstr "Error del sistema. Privilegio no otorgado"
 msgid "System error. Unable to grant rights."
 msgstr "Error de sistema. Incapaz de conceder permisos"
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "Grupos del sistema"
 
@@ -4930,40 +4705,40 @@ msgstr "Grupos del sistema"
 msgid "SystemRolegroup for internal use"
 msgstr "SystemRolegroup for internal use"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "Coger"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "Cogido"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Plantilla"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "Plantilla #%1"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "Plantilla borrada"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Plantilla no encontrada"
 
@@ -4971,11 +4746,11 @@ msgstr "Plantilla no encontrada"
 msgid "Template not found\\n"
 msgstr "Plantilla no encontrada\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Plantilla procesada"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Plantillas"
 
@@ -4983,33 +4758,33 @@ msgstr "Plantillas"
 msgid "Templates for %1\\n"
 msgstr "Plantillas de %1\\n"
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "Ese es el valor actual"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "Ese no es un valor para este campo personalizable"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "Este es el mismo valor"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "Ese principal ya es un %1 para esta cola"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "Ese principal ya es un %1 para este ticket"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "Ese principal no es un %1 para esta cola"
@@ -5018,11 +4793,11 @@ msgstr "Ese principal no es un %1 para esta cola"
 msgid "That principal is not a %1 for this ticket"
 msgstr "Ese principal no es un %1 para este ticket"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr "Esa cola no existe"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "Ese ticket tiene dependencias sin resolver"
 
@@ -5030,27 +4805,27 @@ msgstr "Ese ticket tiene dependencias sin resolver"
 msgid "That user already has that right"
 msgstr "Ese usuario ya tiene ese privilegio"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr "Ese usuario ya posee ese ticket"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "Ese usuario no existe"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "Ese usuario ya tiene privilegios"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr "Ese usuario ya está sin privilegios"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "Ese usuario ahora tiene privilegios"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr "Ese usuario ya no tiene privilegios"
 
@@ -5058,23 +4833,23 @@ msgstr "Ese usuario ya no tiene privilegios"
 msgid "That user is now unprivilegedileged"
 msgstr "Este usuario ya no tiene privilegios"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr "Ese usuario puede no poseer tickets en esa cola"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "Ese no es un identificador numérico"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "Lo básico"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr "El CC de un ticket"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr "El CC administrativo de un ticket"
 
@@ -5082,7 +4857,7 @@ msgstr "El CC administrativo de un ticket"
 msgid "The comment has been recorded"
 msgstr "El comentario ha sido grabado"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr "El siguiente comando encontrará todos los tickets activos en la cola 'general' y pondra su prioridad a 99 si no han sido tocados en 4 horas:"
 
@@ -5090,31 +4865,27 @@ msgstr "El siguiente comando encontrará todos los tickets activos en la cola 'g
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "Los siguientes comandos no han sido procesados:\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "Ha sido establecido el nuevo valor"
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr "El propietario de un ticket"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "El solicitante de un ticket"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "Estos comentarios generalmente no están visibles para el usuario"
 
-#: lib/RT/CustomField_Overlay.pm:912
-msgid "This custom field does not apply to that object"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
 msgstr ""
 
@@ -5122,15 +4893,15 @@ msgstr ""
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "Este ticket %1 %2 (%3)"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "Esta herramiento permite al usuario ejectutar modulos perl arbitrarios desde dentro de RT"
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "Parece que esta transacción no tiene contenido"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
 msgstr "Los %1 tickets de mayor prioridad de este usuario"
@@ -5139,7 +4910,7 @@ msgstr "Los %1 tickets de mayor prioridad de este usuario"
 msgid "This user's 25 highest priority tickets"
 msgstr "Los 25 casos de mayor prioridad de este usuario"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "Jue."
 
@@ -5151,24 +4922,24 @@ msgstr "Ticket # %1  %2"
 msgid "Ticket # %1 Jumbo update: %2"
 msgstr "Actualizacion Jumbo para el ticket # %1: %2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "Actualización Jumbo para el ticket #%1: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "Ticket #%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "Ticket %1 creado en la cola '%2'"
@@ -5177,16 +4948,12 @@ msgstr "Ticket %1 creado en la cola '%2'"
 msgid "Ticket %1 loaded\\n"
 msgstr "Ticket %1 cargado\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "Ticket %1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
-msgid "Ticket Custom Fields"
-msgstr ""
-
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr "Historial del ticket # %1 %2"
@@ -5199,27 +4966,23 @@ msgstr "Id del ticket:"
 msgid "Ticket Resolved"
 msgstr "Ticket resuelto"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
-msgid "Ticket Transactions"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Ticket attachment"
 msgstr "Archivos adjuntos del ticket"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "Contenido del ticket"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "Tipo de contenido del ticket"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "No se pudo crear el ticket debido a un error interno"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "Ticket creado"
 
@@ -5227,7 +4990,7 @@ msgstr "Ticket creado"
 msgid "Ticket creation failed"
 msgstr "Creación del ticket fallida"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "Ticket borrado"
 
@@ -5239,7 +5002,7 @@ msgstr "Id de ticket no encontrada"
 msgid "Ticket killed"
 msgstr "Ticket matado"
 
-#: html/Ticket/Display.html:55
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
 msgstr ""
 
@@ -5255,20 +5018,17 @@ msgstr "Estado del ticket cambiado"
 msgid "Ticket watchers"
 msgstr "Observadores del ticket"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "Tickets"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "Tickets %1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "Tickets %1 por %2"
 
@@ -5276,31 +5036,31 @@ msgstr "Tickets %1 por %2"
 msgid "Tickets from %1"
 msgstr "Tickets de %1"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr "Tickets que dependen de esta aprobación:"
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "Tiempo Restante"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "Tiempo Trabajado"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "Tiempo restante"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "Tiempo para mostrar"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "Tiempo trabajado"
 
@@ -5308,14 +5068,10 @@ msgstr "Tiempo trabajado"
 msgid "TimeLeft"
 msgstr "TimeLeft"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
 msgstr "TimeWorked"
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:"
 msgstr "Para generar una comparación de este cometido:"
@@ -5324,16 +5080,16 @@ msgstr "Para generar una comparación de este cometido:"
 msgid "To generate a diff of this commit:\\n"
 msgstr "Para generar una comparación de este cometido:\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "Última actualización"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
 msgstr ""
 
@@ -5341,28 +5097,20 @@ msgstr ""
 msgid "Transaction"
 msgstr "Transacción"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "Transacción %1 limpiada"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "Transacción creada"
 
-#: html/Admin/Elements/QueueTabs:78
-msgid "Transaction Custom Fields"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:92
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "Transaction->Create no pudo, ya no no especificó un ID de ticket"
 
-#: lib/RT/Transaction_Overlay.pm:125
-msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr ""
-
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "Las transacciones son inmutables"
 
@@ -5370,19 +5118,23 @@ msgstr "Las transacciones son inmutables"
 msgid "Trying to delete a right: %1"
 msgstr "Intentando borrar el privilegio: %1"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "Mar."
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "Tipo"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "No implementado"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Usuario en Unix"
 
@@ -5390,21 +5142,16 @@ msgstr "Usuario en Unix"
 msgid "UnixUsername"
 msgstr "Usuario en Unix"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "Codificación de contenido desconocida: %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
 msgstr ""
 
@@ -5412,23 +5159,15 @@ msgstr ""
 msgid "Unprivileged"
 msgstr "No privilegiado"
 
-#: html/Admin/Elements/EditCustomFields:60
-msgid "Unselected Custom Fields"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:61
-msgid "Unselected objects"
-msgstr ""
-
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "No cogido"
 
-#: html/Search/Bulk.html:54
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Actualizar"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
 msgstr ""
 
@@ -5436,11 +5175,11 @@ msgstr ""
 msgid "Update ID"
 msgstr "Id de actualización"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
 msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "Tipo de actualización"
 
@@ -5452,7 +5191,7 @@ msgstr "Actualizar todos estos casos al mismo tiempo"
 msgid "Update email"
 msgstr "Actualizar correo"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
 msgstr ""
 
@@ -5460,11 +5199,11 @@ msgstr ""
 msgid "Update name"
 msgstr "Actualizar nombre"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "Actualización no grabada."
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "Actualizar tickets seleccionados"
 
@@ -5472,7 +5211,7 @@ msgstr "Actualizar tickets seleccionados"
 msgid "Update signature"
 msgstr "Actualizar firma"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "Actualizar ticket"
 
@@ -5480,58 +5219,34 @@ msgstr "Actualizar ticket"
 msgid "Update ticket # %1"
 msgstr "Actualización de ticket # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "Actualizar ticket #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "Actualizar ticket #%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "El tipo de actualización no fue ni respuesta ni comentario"
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "Actualizado"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:84
-msgid "Upload multiple files"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:79
-msgid "Upload multiple images"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:85
-msgid "Upload one file"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:80
-msgid "Upload one image"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:86
-msgid "Upload up to %1 files"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:81
-msgid "Upload up to %1 images"
-msgstr ""
-
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
 msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5542,7 +5257,7 @@ msgstr "Usuario %1 %2: %3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "Usuario %1 Contraseña: %2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
 msgstr ""
@@ -5559,7 +5274,7 @@ msgstr "Usuario '%1' no encontrado\\n"
 msgid "User Defined"
 msgstr "Definido por el usuario"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
 msgstr ""
 
@@ -5567,33 +5282,28 @@ msgstr ""
 msgid "User ID"
 msgstr "ID de usuario"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "Id de usuario"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "Privilegios de usuario"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
-msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "El usuario no pudo ser creado: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "Usuario creado"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Grupos definidos por el usuario"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
 msgstr ""
 
@@ -5605,23 +5315,19 @@ msgstr "Usuario notificado"
 msgid "User view"
 msgstr "Vista de usuario"
 
-#: html/Admin/Groups/index.html:99
-msgid "User-defined groups"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Usuarios"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "Usuarios que concuerdan con los criterios de búsqueda"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
 msgstr ""
 
@@ -5629,15 +5335,15 @@ msgstr ""
 msgid "ValueOfQueue"
 msgstr "Valor de la cola"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Valores"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr "Observar"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr "WatchAsAdminCc"
 
@@ -5645,7 +5351,7 @@ msgstr "WatchAsAdminCc"
 msgid "Watcher loaded"
 msgstr "Observador cargado"
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "Observadores"
 
@@ -5653,7 +5359,7 @@ msgstr "Observadores"
 msgid "WebEncoding"
 msgstr "Codificación de Web"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "Mie."
 
@@ -5709,11 +5415,19 @@ msgstr "Siempre que venga algun comentario"
 msgid "Whenever correspondence comes in"
 msgstr "Siempre que venga correspondencia"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Trabajo"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr ""
 
@@ -5721,19 +5435,31 @@ msgstr ""
 msgid "WorkPhone"
 msgstr "Tel Trabajo"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "Trabajado"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "Usted ya es propietario de este caso"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "Usted no es un usuario autorizado"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "Usted solo puede reasignar casos que posee o que no posee nadie³"
 
@@ -5741,24 +5467,24 @@ msgstr "Usted solo puede reasignar casos que posee o que no posee nadie³"
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "No tiene permiso para ver ese ticket.\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "Usted encontró %1 casos en la cola %2"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "Se ha desconectado del sistema RT"
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "No tiene permiso para crear tickets en esa cola."
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "No puede crear solicitudes en esa cola."
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "Es bienvenido a regresar en cualquier momento."
 
@@ -5786,11 +5512,11 @@ msgstr "Su petición ha sido rechazada"
 msgid "Your request was rejected."
 msgstr "Su petición ha sido rechazada"
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "Nombre o contraseña de usuario incorrectos"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "Zip"
 
@@ -5798,28 +5524,24 @@ msgstr "Zip"
 msgid "[no subject]"
 msgstr "[sin asunto]"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and is not"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and not"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "como priviligiado para %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "contiene"
 
@@ -5839,7 +5561,7 @@ msgstr "Respuesta (probablemente) no enviada"
 msgid "correspondence sent"
 msgstr "Correspondencia enviada"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "días"
 
@@ -5851,50 +5573,22 @@ msgstr "muerto"
 msgid "delete"
 msgstr "borrar"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "borrado"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "no coincide"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "no contiene"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "equal to"
 msgstr "igual a"
 
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr ""
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr ""
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "false"
 msgstr "falso"
@@ -5903,44 +5597,48 @@ msgstr "falso"
 msgid "filename"
 msgstr "nombre de archivo"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "mayor que"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "grupo '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "horas"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "id"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "es"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "no es"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "menor que"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "contiene"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "min"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "minutos"
 
@@ -5948,27 +5646,27 @@ msgstr "minutos"
 msgid "modifications\\n\\n"
 msgstr "modificaciones\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "meses"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "nuevo"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "sin valor"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "ninguno"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "no igual a"
 
@@ -5976,68 +5674,72 @@ msgstr "no igual a"
 msgid "notlike"
 msgstr "notlike"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "abierto"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "grupo personal '%1' para usuario '%2'"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "Cola %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "rechazado"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "resuelto"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "sec"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "pendiente"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "sistema %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "grupo del sistema '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "el componente que llama no especifica por qué"
 
-#: lib/RT/Group_Overlay.pm:238
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "ticket #%1 %2"
 
 #: NOT FOUND IN SOURCE
+msgid "till"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "true"
 msgstr "verdadero"
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "grupo sin descripción %1"
@@ -6046,12 +5748,12 @@ msgstr "grupo sin descripción %1"
 msgid "undescripbed group %1"
 msgstr "grupo sin descripción %1"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "usuario %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "semanas"
 
@@ -6059,7 +5761,7 @@ msgstr "semanas"
 msgid "with template %1"
 msgstr "con plantilla %1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "años"
 
diff --git a/rt/lib/RT/I18N/fi.po b/rt/lib/RT/I18N/fi.po
index eaac6bf..56c9636 100644
--- a/rt/lib/RT/I18N/fi.po
+++ b/rt/lib/RT/I18N/fi.po
@@ -11,60 +11,75 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: NOT FOUND IN SOURCE
+msgid "#"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr ""
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr ""
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr ""
+
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%1 %3.%2 %7 %4:%5:%6"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "%1 %2 lisätty"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "%1 %2 sitten"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1: %2 muutettu arvoon %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
 msgstr "%1 %2 poistettu"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "%1 %2 pohjalla %3"
@@ -73,16 +88,16 @@ msgstr "%1 %2 pohjalla %3"
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 tässä tapauksessa\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
 msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
 msgstr ""
 
@@ -90,29 +105,29 @@ msgstr ""
 msgid "%1 - %2 shown"
 msgstr "näkyvillä %1 - %2"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr ""
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr ""
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr ""
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr ""
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr ""
@@ -123,35 +138,20 @@ msgstr ""
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "ScriptAction %1 ladattu"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "%1 lisätty arvoksi %2lle"
@@ -168,31 +168,32 @@ msgstr "%1 aliakset vaativat tapauksen id:n "
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
 msgstr "%1 aliakset vaativat tapauksen id:n (osoite %2) %3"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr ""
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 - %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 muutettu arvosta %2 arvoon %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
 msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "Arvoa %1 ei voitu asettaa arvoksi %2"
 
@@ -200,22 +201,12 @@ msgstr "Arvoa %1 ei voitu asettaa arvoksi %2"
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 ei voinut suorittaa tapahtumaa (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 ei voinut asettaa tilaa päätetyksi. RT:n tietokanta saattaa olla vioittunut."
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
-msgid "%1 created"
-msgstr ""
-
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
-msgid "%1 deleted"
-msgstr ""
-
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
 msgstr ""
@@ -224,16 +215,17 @@ msgstr ""
 msgid "%1 highest priority tickets I own..."
 msgstr "%1 tärkeintä omistamaani tapausta..."
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "%1 tärkeintä tilaamaani tapausta..."
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 ei ole enää %2 tälle työjonolle"
@@ -242,7 +234,8 @@ msgstr "%1 ei ole enää %2 tälle työjonolle"
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 ei ole enää %2 tälle tapaukselle"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 ei ole enää kentän %2 arvo"
 
@@ -250,7 +243,11 @@ msgstr "%1 ei ole enää kentän %2 arvo"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 ei ole kelvollinen työjonon id"
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -259,7 +256,15 @@ msgstr "%1 ei ole kelvollinen työjonon id"
 msgid "%1 min"
 msgstr "%1 min"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
 msgstr ""
@@ -268,11 +273,7 @@ msgstr ""
 msgid "%1 not shown"
 msgstr "%1 ei näy"
 
-#: lib/RT/CustomField_Overlay.pm:827
-msgid "%1 objects"
-msgstr ""
-
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr ""
@@ -289,7 +290,11 @@ msgstr "%1 tyyppi tuntematon viestille $MessageId"
 msgid "%1 type unknown for %2"
 msgstr "%1 tyyppi tuntematon viestille %2"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 päättää kaikki päätetyn ryhmän jäsentapaukset."
@@ -298,36 +303,28 @@ msgstr "%1 päättää kaikki päätetyn ryhmän jäsentapaukset."
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "%1 jäädyttää [paikallisen] BASE jos se riippuu linkitetystä tapauksesta [tai on sen jäsen]."
 
-#: lib/RT/CustomField_Overlay.pm:828
-msgid "%1's %2 objects"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:829
-msgid "%1's %2's %3 objects"
-msgstr ""
-
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: liitetiedostoa ei ole määritelty"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' ei kelpaa tilan arvoksi"
@@ -344,7 +341,7 @@ msgstr "(Rastita laatikko poistaaksesi ryhmän jäsenen)"
 msgid "(Check box to delete scrip)"
 msgstr "(Rastita laatikko poistaaksesi toiminnon)"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(Rastita laatikko poistaaksesi)"
 
@@ -352,49 +349,49 @@ msgstr "(Rastita laatikko poistaaksesi)"
 msgid "(Check boxes to delete)"
 msgstr "(Rastita laatikko poistaaksesi)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr "(Syötä tapausten numerot tai www-osoitteet, välilyönneillä erotettuina)"
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
+msgid "(If left blank, will default to %1"
 msgstr "(Jos jätetään tyhjäksi, palaa arvoon %1)"
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
 msgstr "(Ei arvoa)"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(Ei kenttiä)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(Ei jäseniä)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "(Ei toimintoja)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr "(Ei pohjia)"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
-msgid "(None)"
-msgstr ""
-
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Lähettää piilokopion vain tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei lisää</b> pysyviksi vastaanottajiksi.)"
 
@@ -402,11 +399,11 @@ msgstr "(Lähettää piilokopion vain tästä päivityksestä pilkulla erotettui
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Lähettää piilokopion vain tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei lisää</b> pysyviksi vastaanottajiksi.)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Lähettää kopion tästä päivityksestä pilkulla erotettuihin hallinnollisiin sähköpostiosoitteisiin. <b>Lisää</b> pysyviksi vastaanottajiksi.)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Lähettää kopion vain tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei lisää</b> pysyviksi vastaanottajiksi.)"
 
@@ -414,43 +411,47 @@ msgstr "(Lähettää kopion vain tästä päivityksestä pilkulla erotettuihin s
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Lähettää kopion vain tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei lisää</b> pysyviksi vastaanottajiksi.)"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Lähettää kopion tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Lisää</b> pysyviksi vastaanottajiksi.)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
 msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(tyhjä)"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr "(ei nimiä listattuna)"
 
 #: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "(no subject)"
 msgstr "(ei otsikkoa)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(ei arvoa)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
-msgid "(no values)"
-msgstr ""
-
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(vain yksi tapaus)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(odottaa hyväksyntää)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
 msgstr ""
 
@@ -458,15 +459,19 @@ msgstr ""
 msgid "(pending other tickets)"
 msgstr "(odottaa toisia tapauksia)"
 
-#: html/Admin/Users/Modify.html:71
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(pakollinen)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(nimetön)"
 
 #: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I own..."
 msgstr "25 tärkeintä omistamaani tapausta..."
 
@@ -474,23 +479,23 @@ msgstr "25 tärkeintä omistamaani tapausta..."
 msgid "25 highest priority tickets I requested..."
 msgstr "25 tärkeintä tilaamaani tapausta..."
 
-#: html/Ticket/Elements/ShowBasics:53
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr ""
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr ""
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Uusi tapaus\">&nbsp;%1"
@@ -499,84 +504,92 @@ msgstr "<input type=\"submit\" value=\"Uusi tapaus\">&nbsp;%1"
 msgid "A blank template"
 msgstr "Tyhjä pohja"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE ei löytynyt"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "ACE:ja voi vain luoda ja poistaa."
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "Peruutetaan tarkoittamattomien tapausmuutosten välttämiseksi.\\n"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "Omat asetukset"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "Pääsynvalvonta"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Tapahtuma"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "Tapahtumaa %1 ei löydetty"
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
+#: bin/rt-crontool:119
+msgid "Action committed."
 msgstr ""
 
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr ""
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
 msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "Lisää kopio ylläpidolle"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "Lisää kopio"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
 msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "Lisää useampi tiedosto"
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "Lisää tilaaja"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Add a new a global scrip"
 msgstr "Lisää uusi yleinen toiminto"
 
@@ -584,49 +597,49 @@ msgstr "Lisää uusi yleinen toiminto"
 msgid "Add a scrip to this queue"
 msgstr "Lisää toiminto tähän työjonoon"
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr "Lisää kaikille työjonoille yhteinen toiminto"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
 msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "Lisää kommentteja tai vastauksia valituille tapauksille"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "Lisää jäseniä"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Lisää uusia tarkkailijoita"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "Lisätty toimeksiantaja %1:ksi tähän työjonoon"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "Lisätty toimeksiantaja %1:ksi tälle tapaukselle"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "Osoite1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "Osoite2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "Kopio ylläpidolle"
 
@@ -638,7 +651,7 @@ msgstr ""
 msgid "Admin Correspondence"
 msgstr ""
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "Työjonojen ylläpito"
 
@@ -646,7 +659,7 @@ msgstr "Työjonojen ylläpito"
 msgid "Admin users"
 msgstr "Käyttäjien ylläpito"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "Ylläpito/Yleiset asetukset"
 
@@ -658,39 +671,51 @@ msgstr "Ylläpito/Ryhmät"
 msgid "Admin/Queue/Basics"
 msgstr "Ylläpito/Työjono/Perustiedot"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "Kopio ylläpidolle"
 
-#: lib/RT/CustomField_Overlay.pm:101
-msgid "AdminCustomField"
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:73
+msgid "AdminCustomFields"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr ""
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr ""
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr ""
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "Kopio ylläpidolle"
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
 msgstr ""
 
@@ -698,7 +723,11 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Tarkennettu haku"
 
-#: html/Elements/SelectDateRelation:57
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "Jälkeen"
 
@@ -706,55 +735,51 @@ msgstr "Jälkeen"
 msgid "Age"
 msgstr "Ikä"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr ""
-
 #: etc/initialdata:363
 msgid "All Approvals Passed"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "Kaikki kentät"
 
-#: html/Admin/Queues/index.html:75
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "Kaikki työjonot"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr ""
-
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
-msgid "Applies to"
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
 msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "Hyväksyntä"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr ""
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr ""
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr ""
@@ -771,7 +796,11 @@ msgstr ""
 msgid "Approval Rejected"
 msgstr ""
 
-#: html/Approvals/Elements/Approve:65
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "Hyväksy"
 
@@ -779,7 +808,7 @@ msgstr "Hyväksy"
 msgid "Approver's notes: %1"
 msgstr "Hyväksyjän merkintöjä: %1"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "huhti"
 
@@ -787,52 +816,64 @@ msgstr "huhti"
 msgid "April"
 msgstr "huhtikuu"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
-msgid "Ascending"
-msgstr "Nouseva"
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
-msgid "Assign and remove custom fields"
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
-msgid "AssignCustomFields"
+#: NOT FOUND IN SOURCE
+msgid "Articles"
 msgstr ""
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
+msgid "Ascending"
+msgstr "Nouseva"
+
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "Liitä"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "Liitä tiedosto"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "Liitä tiedosto"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "Liitteen '%1' lataaminen ei onnistunut"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "Liitetiedosto luotu"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "Liitetiedoston nimi"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Liitetiedostot"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
 msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "elo"
 
@@ -840,6 +881,10 @@ msgstr "elo"
 msgid "August"
 msgstr "elokuu"
 
+#: NOT FOUND IN SOURCE
+msgid "AuthSystem"
+msgstr ""
+
 #: etc/initialdata:221
 msgid "Autoreply"
 msgstr ""
@@ -849,6 +894,14 @@ msgid "Autoreply To Requestors"
 msgstr "Automaattivastaus tilaajille"
 
 #: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr ""
+
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
 msgstr "Virheellinen PGP allekirjoitus: %1\\n"
 
@@ -864,133 +917,136 @@ msgstr "Virheellistä dataa kentässä %1"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "Virheellinen tapahtuman numero liitetiedostolle. %1 pitäisi olla %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "Perustiedot"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Piilokopio"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "Muista tallentaa muutokset"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "ennen"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
 msgstr ""
 
 #: etc/initialdata:217
 msgid "Blank"
 msgstr "Tyhjä"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
 msgstr "Osoite tähän kyselyyn (selaimen kirjanmerkkeihin)"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
 msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "Lyhyet otsikot"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "Tapausten ryhmäpäivitys"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "Järjestelmäkäyttäjien muokkaus ei ole sallittua"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr "Näkeekö toimeksiantaja tämän työjonon"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "Kentän lisääminen ilman nimeä ei onnistu"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
 msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "Tapausta ei voi linkittää itseensä"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "Et voi yhdistää jo yhdistettyyn tapaukseen. Sinun ei pitäisi saada tätä virhettä koskaan."
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
 msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "Sekä juuren ja kohteen määritteleminen samalla ei ole mahdollista"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "Käyttäjää ei voitu luoda: %1"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Kopio"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "Muuta salasana"
 
-#: html/Elements/Submit:100
-msgid "Check All"
-msgstr ""
-
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "Valitse laatikko poistaaksesi"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "Valitse laatikko peruaksesi oikeuden"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "Lapset"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "Kaupunki"
 
-#: html/Elements/Submit:102
-msgid "Clear All"
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
 msgstr ""
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "Suljettu"
 
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Closed requests"
 msgstr "Suljetut tapaukset"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr ""
 
@@ -998,11 +1054,11 @@ msgstr ""
 msgid "Command not understood!\\n"
 msgstr "Komentoa ei ymmärretty!\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Kommentoi"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "Kommenttien osoite"
 
@@ -1010,11 +1066,11 @@ msgstr "Kommenttien osoite"
 msgid "Comment not recorded"
 msgstr "Kommenttia ei tallennettu"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr "Kommentoi tapauksia"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr ""
 
@@ -1022,11 +1078,11 @@ msgstr ""
 msgid "Comments"
 msgstr "Kommentit"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "Kommentti (ei lähetetä tilaajille)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "Kommentti (ei lähetetä tilaajille)"
 
@@ -1034,15 +1090,15 @@ msgstr "Kommentti (ei lähetetä tilaajille)"
 msgid "Comments about %1"
 msgstr "Kommentit kohteesta %1"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "Kommentit tästä käyttäjästä"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "Kommentit lisätty"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr "Suorita tumppi"
 
@@ -1050,23 +1106,23 @@ msgstr "Suorita tumppi"
 msgid "Compile Restrictions"
 msgstr "Kokoa rajoitukset"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "Ehto"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "Ehtoa ei löydetty"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "Ylläpito"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "Vahvista"
 
@@ -1078,15 +1134,19 @@ msgstr "Yhteystietojärjestelmä"
 msgid "Contacted date '%1' could not be parsed"
 msgstr "Järjestelmä ei ymmärrä päivää '%1'"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "Sisältö"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:64
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr ""
+
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
 msgstr ""
 
@@ -1098,7 +1158,7 @@ msgstr ""
 msgid "Correspondence Address"
 msgstr "Kirjeenvaihdon osoite"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "Kirjeenvaihto lisätty"
 
@@ -1106,7 +1166,7 @@ msgstr "Kirjeenvaihto lisätty"
 msgid "Correspondence not recorded"
 msgstr "Vastausta ei tallennettu"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
 msgstr "Uuden tiedon lisääminen kenttään epäonnistui"
 
@@ -1114,47 +1174,37 @@ msgstr "Uuden tiedon lisääminen kenttään epäonnistui"
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "Uuden kentän lisäys tapaukselle epäonnistui. %1 "
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr ""
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "Omistajaa ei voitu vaihtaa."
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "Uuden kentän lisääminen epäonnistui"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "Ryhmän luominen epäonnistui"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "Pohjan luonti epäonnistui: %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "Tapauksen luonti epäonnistui. Työjonoa ei ole asetettu"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "Käyttäjän luonti epäonnistui"
 
 #: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Could not find a ticket with id %1"
 msgstr "Tapausta numerolla %1 ei löytynyt."
 
@@ -1162,11 +1212,11 @@ msgstr "Tapausta numerolla %1 ei löytynyt."
 msgid "Could not find group %1."
 msgstr "Ryhmää %1 ei löytynyt."
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "Käyttäjää ei löydetty eikä pystytty luomaan"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "Tätä toimeksiantajaa ei löytynyt"
 
@@ -1174,34 +1224,21 @@ msgstr "Tätä toimeksiantajaa ei löytynyt"
 msgid "Could not find user %1."
 msgstr "Käyttäjää %1 ei löytynyt."
 
-#: html/Admin/CustomFields/Objects.html:69
-msgid "Could not load CustomField %1"
-msgstr ""
-
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "Ryhmän lataaminen ei onnistunut"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "Ei voinut tehdä toimeksiantajaa %1:ksi tälle työjonolle"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "Ei voinut tehdä toimeksiantajaa tälle tapaukselle: %1"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "Toimeksiantajaa ei voitu poistaa tältä työjonolta: %1"
@@ -1210,15 +1247,15 @@ msgstr "Toimeksiantajaa ei voitu poistaa tältä työjonolta: %1"
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "Toimeksiantajaa ei voitu poistaa tältä tapaukselta: %1"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "Jäsenen lisääminen ryhmään ei onnistunut"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "Tapahtuman luominen ei onnistunut: %1"
@@ -1231,15 +1268,15 @@ msgstr "Järjestelmä ei gpg:n vastauksesta ymmärtänyt mitä tehdä\\n"
 msgid "Couldn't find group\\n"
 msgstr "Ryhmää ei löytynyt\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr "Riviä ei löytynyt"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "Toimeksiantajaa ei löytynyt"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "Arvoa ei löytynyt"
 
@@ -1251,22 +1288,24 @@ msgstr "Tarkkailijaa ei löytynyt"
 msgid "Couldn't find user\\n"
 msgstr "Käyttäjää ei löytynyt\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "Ei onnistuttu lataamaan käyttäjää %1 tietokannasta.\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load RT config file '%1' %2"
 msgstr "RT-asetustiedoston lataaminen ei onnistunut:'%1' %2"
 
@@ -1274,26 +1313,21 @@ msgstr "RT-asetustiedoston lataaminen ei onnistunut:'%1' %2"
 msgid "Couldn't load Scrips."
 msgstr "Toimintojen lataaminen ei onnistunut."
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "Ryhmän %1 lataaminen ei onnistunut"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "Linkin lataaminen ei onnistunut"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
-msgid "Couldn't load object %1"
-msgstr ""
-
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "Työjonon lataaminen ei onnistunut"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "Työjonon %1 lataaminen ei onnistunut"
@@ -1310,26 +1344,16 @@ msgstr "Pohjan lataaminen ei onnistunut"
 msgid "Couldn't load that user (%1)"
 msgstr "Tämän käyttäjän lataaminen ei onnistunut (%1)"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "Tapauksen '%1' lataaminen ei onnistunut"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "Maa"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "Luo"
 
@@ -1337,16 +1361,20 @@ msgstr "Luo"
 msgid "Create Tickets"
 msgstr "Luo tapauksia"
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "Luo kenttä"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr "Luo kenttä työjonolle %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:47
 msgid "Create a CustomField which applies to all queues"
 msgstr "Luo kenttä, jota sovelletaan kaikkiin työjonoihin"
 
@@ -1355,14 +1383,18 @@ msgid "Create a new Custom Field"
 msgstr "Luo uusi kenttä"
 
 #: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create a new global scrip"
 msgstr "Luo uusi yleinen toiminto"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "Luo uusi ryhmä"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "Luo uusi henkilökohtainen ryhmä"
 
@@ -1378,15 +1410,15 @@ msgstr "Luo uusi toiminto"
 msgid "Create a new template"
 msgstr "Luo uusi pohja"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "Luo uusi tapaus"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "Luo uusi käyttäjä"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "Luo uusi työjono"
 
@@ -1398,20 +1430,28 @@ msgstr "Luo työjono nimeltään"
 msgid "Create a request"
 msgstr "Luo tapaus"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr "Luo toiminto työjonolle %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "Luo pohja"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create failed: %1 / %2 / %3 "
 msgstr "Luonti epäonnistui %1 / %2 / %3 "
 
@@ -1423,19 +1463,19 @@ msgstr "Luonti epäonnistui: %1/%2/%3"
 msgid "Create new tickets based on this scrip's template"
 msgstr "Luo uusia tapauksia tämän toiminnon pohjalta"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "Luo tapaus"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr "Luo tapauksia tähän työjonoon"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "Luo, muokkaa ja poista kenttiä"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr "Luo, poista ja muokkaa työjonoja"
 
@@ -1443,52 +1483,56 @@ msgstr "Luo, poista ja muokkaa työjonoja"
 msgid "Create, delete and modify the members of any user's personal groups"
 msgstr "Luo, poista ja muokkaa kenen tahansa henkilökohtaisten ryhmien jäseniä"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "Luo, poista ja muokkaa henkilökohtaisten ryhmien jäseniä"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "Luo, poista ja muokkaa käyttäjiä"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr ""
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "Luotu"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "Luotu kenttä %1"
 
 #: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr "Luotu pohja %1"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
 msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "Tämänhetkiset suhteet"
 
-#: html/Admin/Elements/EditScrips:51
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "Tämänhetkinen toiminto"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "Tämänhetkiset jäsenet"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Tämänhetkiset oikeudet"
 
@@ -1496,59 +1540,60 @@ msgstr "Tämänhetkiset oikeudet"
 msgid "Current search criteria"
 msgstr "Tämänhetkiset hakumääritteet"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "Tämänhetkiset tarkkailijat"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "Kentät"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
-msgid "Custom Fields for %1"
-msgstr ""
-
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "Kenttä %1 %2 %3"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "Kentällä %1 on arvo"
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "Kentällä %1 ei ole arvoa"
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "Kenttää %1 ei löytynyt"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
 msgstr "Kenttä poistettu"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "Kenttää ei löytynyt"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "Kentän arvoa %1 ei löytynyt kentälle %2"
@@ -1557,27 +1602,31 @@ msgstr "Kentän arvoa %1 ei löytynyt kentälle %2"
 msgid "Custom field value changed from %1 to %2"
 msgstr "Kentän arvo muutettu arvosta %1 arvoon"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "Kentän arvoa ei pystytty poistamaan"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "Kentän arvoa ei löydetty"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "Kentän arvo poistettu"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr ""
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr ""
+
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Päivät"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "joulu"
 
@@ -1585,15 +1634,19 @@ msgstr "joulu"
 msgid "December"
 msgstr "joulukuu"
 
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr ""
+
 #: etc/initialdata:222
 msgid "Default Autoresponse template"
 msgstr ""
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
 msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
 msgstr ""
 
@@ -1613,72 +1666,76 @@ msgstr ""
 msgid "Default transaction template"
 msgstr "Oletustapahtumapohja"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "Oletus: %1/%2 muutettu arvosta %3 arvoon %4"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "Delegoi oikeuksia"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr ""
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr ""
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "Poista"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr "Poista tapaukset"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "Tämän objektin poistaminen saattaa rikkoa tietokannan viitteet"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "Tämän objektin poistaminen rikkoo tietokannan viitteet"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "Tämän objektin poistaminen rikkoo tietokannan viitteet"
 
-#: html/Approvals/Elements/Approve:66
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr ""
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "Tästä tapauksesta riippuu"
 
@@ -1686,39 +1743,43 @@ msgstr "Tästä tapauksesta riippuu"
 msgid "Dependencies: \\n"
 msgstr "Riippuvuudet: \\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "Riippuu tapauksesta"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "Laskeva"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "Kuvaa tapausta"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -1726,31 +1787,31 @@ msgstr "Kuvaus"
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "Näytä"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr "Näytä käyttöoikeuslista"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr "Näytä työjonon toimintopohjat"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr "Näytä työjonon toiminnot"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "Näkymä"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
 msgstr ""
 
@@ -1758,19 +1819,15 @@ msgstr ""
 msgid "Display ticket #%1"
 msgstr "Näytä tapaus #%1"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "Tee mitä tahansa ja kaikki"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "Älä päivitä tätä sivua"
 
@@ -1778,15 +1835,15 @@ msgstr "Älä päivitä tätä sivua"
 msgid "Don't show search results"
 msgstr "Älä näytä hakutuloksia"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "Lataa"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
-msgid "Download as a tab-delimited file"
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
 msgstr ""
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "Erääntyy"
 
@@ -1802,32 +1859,24 @@ msgstr "VIRHE: Tapauksen '%1' lataaminen ei onnistunut: %2.\\n"
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "Muokkaa työjonon %1 kenttiä"
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
 msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "Muokkaa suhteita"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
 msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr "Muokkaa työjonon %1 pohjia"
@@ -1836,7 +1885,7 @@ msgstr "Muokkaa työjonon %1 pohjia"
 msgid "Edit keywords"
 msgstr "Muokkaa avainsanoja"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr ""
 
@@ -1844,7 +1893,7 @@ msgstr ""
 msgid "Edit scrips"
 msgstr "Muokkaa toimintoja"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "Muokkaa järjestelmäpohjia"
 
@@ -1852,11 +1901,15 @@ msgstr "Muokkaa järjestelmäpohjia"
 msgid "Edit templates for %1"
 msgstr "Muokkaa työjonon %1 pohjia"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr "Muokataan työjonon %1 asetuksia"
@@ -1865,17 +1918,17 @@ msgstr "Muokataan työjonon %1 asetuksia"
 msgid "Editing Configuration for user %1"
 msgstr "Muokataan käyttäjän %1 asetuksia"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "Muokataan kenttää %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "Muokataan ryhmän %1 jäseniä"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "Muokataan henkilökohtaisen ryhmän %1 jäseniä"
@@ -1884,15 +1937,15 @@ msgstr "Muokataan henkilökohtaisen ryhmän %1 jäseniä"
 msgid "Editing template %1"
 msgstr "Muokataan pohjaa %1"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "Joko juuri tai kohde täytyy olla määritelty"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "Sähköposti"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "Sähköpostiosoite on jo käytössä"
 
@@ -1904,61 +1957,76 @@ msgstr "Sähköpostiosoite"
 msgid "EmailEncoding"
 msgstr "Sähköpostin koodaus"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr "Aktiivinen (rastin poistaminen passivoi kentän)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "Aktiivinen (rastin poistaminen passivoi ryhmän)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "Aktiivinen (rastin poistaminen passivoi työjonon)"
 
-#: html/Admin/Queues/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
+msgid "Enabled Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr "Aktiiviset työjonot"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "Aktivoitu tila %1"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
-msgid "Enabled status: %1"
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "Anna useampi arvo"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "Anna yksi arvo"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
 msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
-msgstr "Lisää tapausten numerot tai www-linkit. Erota useammat välilyönneillä."
-
-#: lib/RT/CustomField_Overlay.pm:66
-msgid "Enter up to %1 values"
 msgstr ""
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Lisää tapausten numerot tai www-linkit. Erota useammat välilyönneillä."
+
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Virhe"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "Virhe parametreissa: Queue->AddWatcher"
 
@@ -1966,11 +2034,11 @@ msgstr "Virhe parametreissa: Queue->AddWatcher"
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "Virhe parametreissa: Queue->DelWatcher"
 
-#: lib/RT/Queue_Overlay.pm:830
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "Virhe parametreissa: Ticket->AddWatcher"
 
@@ -1978,15 +2046,15 @@ msgstr "Virhe parametreissa: Ticket->AddWatcher"
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "Virhe parametreissa: Ticket->DelWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
 msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
 msgstr ""
 
@@ -1994,7 +2062,7 @@ msgstr ""
 msgid "Everyone"
 msgstr "Kaikki"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr ""
 
@@ -2006,33 +2074,32 @@ msgstr "Ulkoinen autentikointitunnus"
 msgid "ExternalContactInfoId"
 msgstr "Ulkoinen yhteystietotunnus"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "Lisätieto"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "'Erioikeutettu'-valeryhmää ei löytynyt"
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "'Erioikeudeton'-valeryhmää ei löytynyt"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "helmi"
 
@@ -2040,67 +2107,43 @@ msgstr "helmi"
 msgid "February"
 msgstr "helmikuu"
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:69
-msgid "Fill in multiple text areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
-msgid "Fill in one text area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
-msgid "Fill in up to %1 text areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Fin"
 msgstr "Fin"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "Loppuprioriteetti"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
 msgid "Find group whose"
 msgstr "Etsi ryhmä, jonka"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
-msgid "Find groups whose"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Find new/open tickets"
 msgstr "Etsi uudet/avoimet tapaukset"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "Etsi käyttäjät, joiden"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "Hae tapauksia"
 
-#: html/Ticket/Elements/Tabs:81
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "Ensimmäinen"
 
@@ -2108,28 +2151,24 @@ msgstr "Ensimmäinen"
 msgid "First page"
 msgstr "Viimeinen sivu"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr ""
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "Pakota muutos"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr ""
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr ""
 
@@ -2137,49 +2176,57 @@ msgstr ""
 msgid "FreeformContactInfo"
 msgstr "Vapaamuotoiset yhteystiedot"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "Pe"
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "Kokonaiset otsikot"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "Annettu käyttäjälle %1"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Yleiset"
 
-#: html/Admin/Elements/EditCustomFields:55
-msgid "Global Custom Fields"
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Global Scrips"
 msgstr "Yleiset toiminnot"
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr ""
-
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "Yleinen pohja: %1"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
 msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "Ok!"
 
@@ -2191,11 +2238,11 @@ msgstr "Hyvä PGP-allekirjoitus käyttäjältä %1\\n"
 msgid "Goto page"
 msgstr "Siirry sivulle"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "Siirry tapaukseen"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Ryhmä"
 
@@ -2203,11 +2250,11 @@ msgstr "Ryhmä"
 msgid "Group %1 %2: %3"
 msgstr "Ryhmä %1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "Ryhmän oikeudet"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "Ryhmässä on jo jäsen"
 
@@ -2215,20 +2262,20 @@ msgstr "Ryhmässä on jo jäsen"
 msgid "Group could not be created."
 msgstr "Ryhmää ei voitu luoda."
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "Ryhmää ei voitu luoda: %1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "Ryhmä luotu"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "Ryhmässä ei ole sellaista jäsentä"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Ryhmää ei löydetty"
 
@@ -2240,67 +2287,53 @@ msgstr "Ryhmää ei löydetty.\\n"
 msgid "Group not specified.\\n"
 msgstr "Ryhmää ei määritelty.\\n"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "Ryhmät eivät voi olla jäsentensä jäseniä"
 
-#: html/Admin/Groups/index.html:82
-msgid "Groups matching search criteria"
-msgstr ""
-
-#: html/Ticket/Elements/ShowRequestor:77
-msgid "Groups this user belongs to"
-msgstr ""
-
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "Hei!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "Hei, %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "Historia"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
-msgid "History of the group %1"
-msgstr ""
-
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
-msgid "History of the user %1"
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "HomePhone"
 msgstr "Kotipuhelin"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr ""
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "Numero"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Identiteetti"
 
@@ -2308,80 +2341,80 @@ msgstr "Identiteetti"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "Jos hyväksyntä hylätään, hylkää alkuperäinen ja poista siitä riippuvat hyväksynnät"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
 msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
 msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr ""
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "Jos olet muuttanut tietoja, muista tallentaa"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "Kelpaamaton arvo %1"
 
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "Muuttumaton kenttä"
 
 #: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "Sisällytä passiiviset kentät listaukseen"
 
-#: html/Admin/Groups/index.html:65
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
 msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
 msgstr "Sisällytä listaukseen myös passiiviset työjonot."
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "Sisällytä listaukseen myös passiiviset käyttäjät."
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "Alkuprioriteetti"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "Virhe syötteessä"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "Sisäinen virhe: %1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "Ryhmän tyyppi ei kelpaa"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "Kelpaamaton oikeus"
 
@@ -2389,7 +2422,7 @@ msgstr "Kelpaamaton oikeus"
 msgid "Invalid Type"
 msgstr "Kelpaamaton tyyppi"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "Kelpaamatonta dataa"
 
@@ -2397,44 +2430,44 @@ msgstr "Kelpaamatonta dataa"
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "Omistaja ei kelpaa. Asetetaan oletusasetusten mukaan 'ei kukaan'"
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "Kelpaamaton työjono"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "Kelpaamaton oikeus"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "Kelpaamaton arvo kohteelle %1"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "Kelpaamaton arvo kentälle"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "Kelpaamaton arvo tilalle"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr ""
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr ""
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
 msgstr ""
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "Tammi"
 
@@ -2442,11 +2475,11 @@ msgstr "Tammi"
 msgid "January"
 msgstr "tammikuu"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "Liity tai jätä ryhmä"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "Heinä"
 
@@ -2454,11 +2487,11 @@ msgstr "Heinä"
 msgid "July"
 msgstr "Heinäkuu"
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "Jätti"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "kesä"
 
@@ -2474,23 +2507,23 @@ msgstr "Avainsana"
 msgid "Lang"
 msgstr "Kieli"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr ""
-
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "Viimeinen"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "Viimeinen yhteydenotto"
 
-#: html/Elements/SelectDateType:50
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
+
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "Viimeksi otettu yhteyttä"
 
@@ -2498,23 +2531,27 @@ msgstr "Viimeksi otettu yhteyttä"
 msgid "Last Notified"
 msgstr "Viimeksi huomautettu"
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "Viimeksi päivitetty"
 
-#: html/Search/Elements/PickBasics:103
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr ""
+
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "Jäljellä"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "Päästä tämä käyttäjä sisään RT:iin"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "Tälle käyttäjälle voidaan antaa oikeuksia"
 
@@ -2526,33 +2563,29 @@ msgstr "Rajoitetaan omistajaa %1 %2"
 msgid "Limiting queue to %1 %2"
 msgstr "Rajoitetaan työjonoa %1 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "Linkki on jo olemassa"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "Linkkiä ei voitu luoda"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "Linkki luotu (%1)"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "Linkki poistettu (%1)"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Linkkiä ei löydetty"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "Linkitä tapaus #%1"
@@ -2561,122 +2594,105 @@ msgstr "Linkitä tapaus #%1"
 msgid "Link ticket %1"
 msgstr "Linkitä tapaus #%1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Linkit"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "Sijainti"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "Lokihakemistoa %1 ei löytynyt tai kirjoittaminen ei onnistunut.\\n RT ei voi toimia."
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "Olet kirjautunut sisään tunnuksella %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: lib/RT/CustomField_Overlay.pm:866
-msgid "Lookup type mismatch"
-msgstr ""
-
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "Aseta omistaja"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "Aseta tila"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "Aseta erääntymisaika"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "Aseta päätösaika"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "Aseta aloitusaika"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "Aseta alkuaika"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "Aseta oltu yhteydessä -aika"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "Aseta prioriteetti"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "Aseta työjono"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "Aseta otsikko"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
-msgstr ""
-
-#: html/Admin/index.html:78
-msgid "Manage custom fields and custom field values"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
 msgstr ""
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "Hallinnoi ryhmiä ja jäsenyyksiä"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "Hallinnoi yleisiä asetuksia, jotka vaikuttavat kaikkiin työjonoihin"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr "Hallinnoi työjonoja ja työjonokohtaisia asetuksia"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "Hallinnoi käyttäjiä ja salasanoja"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "Maalis"
 
@@ -2688,105 +2704,100 @@ msgstr "Maaliskuu"
 msgid "May"
 msgstr "Toukokuu"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "Touko"
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "Jäsen lisätty"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "Jäsen poistettu"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "Jäsentä ei poistettu"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "Jäsen:"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "Jäsenet"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:61
-msgid "Memberships"
-msgstr ""
-
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
-msgid "Memberships of the user %1"
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "Yhdistäminen onnistui"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "Yhdistäminen epäonnistui. EffectiveId:n arvoa ei pystytty asettamaan"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "Yhdistä"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
 msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "Viesti"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
-msgid "Message recorded"
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
-msgid "Messages about this ticket will not be sent to..."
+#: lib/RT/Ticket_Overlay.pm:2517
+msgid "Message recorded"
 msgstr ""
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
+#: html/Ticket/Elements/PreviewScrips:70
+msgid "Messages about this ticket will not be sent to..."
 msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "Kännykkä"
 
@@ -2794,7 +2805,15 @@ msgstr "Kännykkä"
 msgid "MobilePhone"
 msgstr "Kännykkä"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "Muokkaa käyttöoikeusluetteloa"
 
@@ -2802,37 +2821,27 @@ msgstr "Muokkaa käyttöoikeusluetteloa"
 msgid "Modify Custom Field %1"
 msgstr "Muokkaa kenttää %1"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr ""
-
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
-msgid "Modify Custom Fields which apply to all %1"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "Muokkaa kaikkia työjonoja koskevia kenttiä"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
 msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr "Muokkaa tämän työjonon toimintopohjia"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "Muokkaa tämän työjonon toimintoja"
 
@@ -2844,159 +2853,164 @@ msgstr "Muokkaa järjestelmän käyttöoikeusluetteloa"
 msgid "Modify Template %1"
 msgstr "Muokkaa pohjaa %1"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
 msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
 msgstr ""
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr ""
+
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr "Muokkaa työjonon %1 toimintoa"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "Muokkaa toimintoa, jota sovelletaan kaikkiin työjonoihin"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
-msgid "Modify associated objects for %1"
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
 msgstr ""
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "Muokkaa tapauksen #%1 päiviä"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "Muokkaa tapauksen #%1 päiviä"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "Muokkaa ryhmien yleisiä oikeuksia"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "Muokkaa ryhmien yleisiä oikeuksia."
 
 #: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify global scrips"
 msgstr "Muokkaa yleisiä toimintoja"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "Muokkaa yleisiä käyttäjien oikeuksia"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "Muokkaa käyttäjien yleisiä oikeuksia."
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "Muokkaa ryhmän metatietoja tai poista ryhmä"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "Muokkaa ryhmän %1 oikeuksia."
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "Muokkaa ryhmän oikeuksia työjonossa %1"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "Muokkaa tämän ryhmän jäsenlistaa"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr "Muokkaa omaa RT-tunnustasi"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr "Muokkaa työjonoon %1 liittyviä käyttäjiä"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "Muokkaa tapaukseen %1 liittyviä käyttäjiä"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "Muokkaa työjonoon %1 liittyviä toimintoja"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr "Muokkaa toimintoja, joita sovelletaan kaikkiin työjonoihin"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "Muokkaa pohjaa %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "Muokkaaa pohjia, joita sovelletaan kaikkiin työjonoihin"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "Muokkaa ryhmää %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "Muokkaa työjonon tarkkailjoita"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "Muokkaa käyttäjää %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "Muokkaa tapausta #%1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "Muokkaa tapausta #%1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "Muokkaa tapauksia"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
-msgid "Modify user rights for custom field %1"
-msgstr ""
-
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "Muokkaa ryhmän %1 käyttäjien oikeuksia"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr "Muokkaa työjonoon %1 liittyviä käyttäjien oikeuksia"
@@ -3005,64 +3019,60 @@ msgstr "Muokkaa työjonoon %1 liittyviä käyttäjien oikeuksia"
 msgid "Modify watchers for queue '%1'"
 msgstr "Muokkaa tapauksen %1 seuraajia"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr ""
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr ""
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "Ma"
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "Lisätietoa: %1"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr "Siirrä alas"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr "Siirrä ylös"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "Monta"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "'Nimi' täytyy määritellä"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr ""
@@ -3071,39 +3081,47 @@ msgstr ""
 msgid "My Approvals"
 msgstr "Hyväksyntäni"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "Hyväksyntäni"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Nimi"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "Nimi on käytössä"
 
 #: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Need approval from system administrator"
 msgstr "Tarvitsee järjestelmän ylläpitäjän hyväksynnän"
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "Ei ikinä"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "Uusi"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "Uusi linkki"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "Uusi salasana"
 
@@ -3111,7 +3129,7 @@ msgstr "Uusi salasana"
 msgid "New Pending Approval"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
 msgstr ""
 
@@ -3119,23 +3137,27 @@ msgstr ""
 msgid "New Search"
 msgstr "Uusi haku"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "Uusi ryhmä"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "Uusi salasana"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "Uusi työjono"
 
@@ -3143,11 +3165,11 @@ msgstr "Uusi työjono"
 msgid "New request"
 msgstr "Uusi tapaus"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "Uudet oikeudet"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "Uusi toiminto"
 
@@ -3155,27 +3177,27 @@ msgstr "Uusi toiminto"
 msgid "New search"
 msgstr "Uusi haku"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "Uusi pohja"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "Uutta tapausta ei löydy"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "Uusi käyttäjä"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "Uusi käyttäjä pyydetty"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "Uusi tarkkailija"
 
@@ -3183,11 +3205,11 @@ msgstr "Uusi tarkkailija"
 msgid "New window setting"
 msgstr "Uusi ikkunan asetus"
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "Seuraava"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
 msgstr ""
 
@@ -3199,39 +3221,43 @@ msgstr "Seuraava sivu"
 msgid "NickName"
 msgstr "Lempinimi"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "Lempinimi"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "Ei kenttiä"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "Ryhmää ei ole määritelty"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
 msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "Työjonoa ei ole määritelty"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr "Käyttäjää ei löydy. Ole hyvä ja ota yhteyttä RT:n ylläpitäjään.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "Ei pohjaa"
 
@@ -3243,11 +3269,11 @@ msgstr "Tapausta ei määritelty. Perutaan tapaus "
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
 msgstr "Tapausta ei määritelty. Poistutaan tapauksen muokkauksesta\\n\\n"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr ""
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr ""
 
@@ -3255,7 +3281,7 @@ msgstr ""
 msgid "No command found\\n"
 msgstr "Komentoa ei löytynyt\\n"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "Käyttäjälle ei ole annettu kommentteja"
 
@@ -3263,77 +3289,68 @@ msgstr "Käyttäjälle ei ole annettu kommentteja"
 msgid "No correspondence attached"
 msgstr "Ei kirjeenvaihtoa liitettynä"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "Ei kuvausta kohteelle %1"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "Ryhmää ei ole määritelty"
 
-#: html/Admin/Groups/index.html:52
-msgid "No groups matching search criteria found."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "Salasanaa ei ole asetettu"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr "Ei oikeutta luoda työjonoja"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "Ei oikeutta luoda tapauksia työjonoon '%1'"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "Ei oikeutta luoda käyttäjiä"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "Ei oikeutta tarkastella tätä tapausta"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "Ei oikeutta päivittää tätä tapausta"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "Toimeksiantajaa ei ole määritelty"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "Toimeksiantajia ei ole valittu."
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr "Yhtään hakukriteerit täyttävää tapausta ei löytynyt."
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "Oikeuksia ei löytynyt"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "Ei myönnettyjä oikeuksia."
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "Ei työstettävää hakua"
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
 msgstr ""
 
@@ -3341,7 +3358,7 @@ msgstr ""
 msgid "No ticket id specified"
 msgstr "Tapauksen numeroa ei ole määritelty"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "Tapahtuman tyyppiä ei ole määritelty"
 
@@ -3349,7 +3366,7 @@ msgstr "Tapahtuman tyyppiä ei ole määritelty"
 msgid "No user or email address specified"
 msgstr "Käyttäjää tai sähköpostiosoitetta ei ole määritelty"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "Yhtään hakukriteerit täyttävää käyttäjää ei löytynyt."
 
@@ -3357,15 +3374,15 @@ msgstr "Yhtään hakukriteerit täyttävää käyttäjää ei löytynyt."
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "Ei kelpaa RT-käyttäjäksi. RT:n cvs-käsittelijä irrottautuu. Ole hyvä ja ota yhteyttä RT:n ylläpitäjään.\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr ""
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "Ei kukaan"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr "Olematon kenttä?"
 
@@ -3373,15 +3390,15 @@ msgstr "Olematon kenttä?"
 msgid "Not logged in"
 msgstr "Sisäänkirjautumaton"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "Et ole kirjautunut järjestelmään"
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "Ei asetettu"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "Ei vielä toteutettu."
 
@@ -3389,11 +3406,11 @@ msgstr "Ei vielä toteutettu."
 msgid "Not yet implemented...."
 msgstr "Ei vielä toteutettu..."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "Merkintöjä"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "Ilmoitusta ei pystytty lähettämään"
 
@@ -3465,7 +3482,7 @@ msgstr ""
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr ""
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "Marras"
 
@@ -3473,37 +3490,15 @@ msgstr "Marras"
 msgid "November"
 msgstr "marraskuu"
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr ""
-
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr ""
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr ""
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
-msgid "Object of type %1 cannot take custom fields"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:901
-msgid "Object type mismatch"
-msgstr ""
-
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "Loka"
 
@@ -3511,19 +3506,19 @@ msgstr "Loka"
 msgid "October"
 msgstr "lokakuu"
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
 msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
 msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "-"
 
@@ -3563,21 +3558,21 @@ msgstr ""
 msgid "On Transaction"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "Näytä vain pyynnöt, jotka on luotu jälkeen %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "Näytä vain pyynnöt, jotka on luotu ennen %1"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Avoin"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Avaa"
 
@@ -3585,7 +3580,7 @@ msgstr "Avaa"
 msgid "Open requests"
 msgstr "Avoimet tapaukset"
 
-#: html/SelfService/Elements/Tabs:63
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr ""
 
@@ -3601,7 +3596,7 @@ msgstr "Avoimet tapaukset (listasta) toisessa ikkunassa"
 msgid "Open tickets on correspondence"
 msgstr "Avaa tapaukset, kun esiintyy kirjeenvaihtoa"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
 msgstr ""
 
@@ -3609,36 +3604,40 @@ msgstr ""
 msgid "Ordering and sorting"
 msgstr "Järjestäminen"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Laitos"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "Alkuperäinen tapaus: #%1"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "Ajan kuluessa prioriteetti muuttuu kohti"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr "Omat tapaukset"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr ""
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "Omistaja"
 
@@ -3646,11 +3645,11 @@ msgstr "Omistaja"
 msgid "Owner changed from %1 to %2"
 msgstr "Omistaja vaihdettu tunnuksesta %1 tunnukseen %2"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "Omistaja pakolla vaihdettu tunnuksesta %1 tunnukseen %2"
@@ -3659,12 +3658,12 @@ msgstr "Omistaja pakolla vaihdettu tunnuksesta %1 tunnukseen %2"
 msgid "Owner is"
 msgstr "Omistaja"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "Hakulaite"
 
@@ -3672,53 +3671,36 @@ msgstr "Hakulaite"
 msgid "PagerPhone"
 msgstr "Hakulaite-puhelin"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "Isät"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "Salasana"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "Salasanan muistutus"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "Salasana liian lyhyt"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "Salasana: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
 msgstr ""
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr ""
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "Käyttäjät"
 
@@ -3726,27 +3708,27 @@ msgstr "Käyttäjät"
 msgid "Perform a user-defined action"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "Pääsy kielletty"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "Omat ryhmät"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Omat ryhmät"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Omat ryhmät:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "Puhelinnumerot"
 
@@ -3754,7 +3736,7 @@ msgstr "Puhelinnumerot"
 msgid "Placeholder"
 msgstr "Paikanpitäjä"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -3762,15 +3744,15 @@ msgstr "Asetukset"
 msgid "Prefs"
 msgstr "Asetukset"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "Valmistele tumppi"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "Edellinen"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
 msgstr ""
 
@@ -3782,20 +3764,20 @@ msgstr "Edellinen sivu"
 msgid "Pri"
 msgstr "Pri"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "Toimeksiantajaa %1 ei löytynyt"
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "Prioriteetti alkaa arvosta"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
 msgstr ""
 
@@ -3803,32 +3785,36 @@ msgstr ""
 msgid "Privileged"
 msgstr "Erioikeutettu"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "Erioikeutuksen tila: &1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "Erioikeutetut käyttäjät"
 
+#: NOT FOUND IN SOURCE
+msgid "Projects"
+msgstr ""
+
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr "Valeryhmä sisäiseen käyttöön"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
 msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
 msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "Työjono"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
@@ -3838,7 +3824,11 @@ msgstr "Työjonoa %1 ei löytynyt"
 msgid "Queue '%1' not found\\n"
 msgstr "Työjonoa '%1' ei löytynyt"
 
-#: html/Admin/Queues/Modify.html:64
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "Työjonon nimi"
 
@@ -3846,19 +3836,19 @@ msgstr "Työjonon nimi"
 msgid "Queue Scrips"
 msgstr "Työjonon toiminnot"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "Työjono on jo olemassa"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr "Työjonoa ei voitu luoda"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr "Työjonoa ei voitu ladata."
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "Työjono luotu"
 
@@ -3866,32 +3856,32 @@ msgstr "Työjono luotu"
 msgid "Queue is not specified."
 msgstr "Työjonoa ei määritelty"
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "Työjonoa ei löytynyt"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "Työjonot"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr ""
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
 msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 - %2"
@@ -3904,7 +3894,7 @@ msgstr "RT %1, tekijä: <a href=\"http://bestpractical.com\">Best Practical Solu
 msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "RT Ylläpito"
 
@@ -3924,7 +3914,7 @@ msgstr "RT Konfiguraatiovirhe"
 msgid "RT Critical error. Message not recorded!"
 msgstr "RT Kriittinen virhe. Viestiä ei tallennettu!"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "RT Virhe"
 
@@ -3933,14 +3923,22 @@ msgid "RT Received mail (%1) from itself."
 msgstr "RT Sai sähköpostin (%1) itseltään."
 
 #: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT Self Service / Closed Tickets"
 msgstr "RT Itsepalvelu / Suljetut tapaukset"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
 msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "RT yhdellä silmäyksellä"
 
@@ -3956,20 +3954,20 @@ msgstr "RT ei löytänyt tilaajaa ulkopuolisesta tietokannasta"
 msgid "RT couldn't find the queue: %1"
 msgstr "RT ei löytänyt työjonoa: %1"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "RT ei pystynyt tarkistamaan tätä PGP allekirjoitusta.\\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "%1: RT"
 
 #: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT has proccessed your commands"
 msgstr "RT on prosessoinut antamasi komennot"
 
@@ -3978,6 +3976,10 @@ msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&
 msgstr "RT on tekijänoikeuslain alainen, &copy; 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Se on jakelussa seuraavalla lisenssillä: <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 
 #: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT thinks this message may be a bounce"
 msgstr "RT luulee että tämä viesti on palautus"
 
@@ -3989,7 +3991,11 @@ msgstr "RT prosessoi tämän viestin kuten se olisi allekirjoittamaton."
 msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
 msgstr "RT:n sähköpostiohjaustila vaatii PGP-tunnistamista. Et allekirjoittanut (PGP) viestiä tai allekirjoitustasi ei pystytty vahvistamaan."
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "Oikea nimi"
 
@@ -3997,35 +4003,39 @@ msgstr "Oikea nimi"
 msgid "RealName"
 msgstr "Oikea nimi"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "Viitattu jostakin"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "Viittaus johonkin"
 
 #: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Refine"
 msgstr "Päivitä"
 
@@ -4033,44 +4043,44 @@ msgstr "Päivitä"
 msgid "Refine search"
 msgstr "Päivitä haku"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Päivitä tämä sivu %1 minuutin välein"
 
-#: html/Search/Bulk.html:116
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "Poista kopio ylläpidolle"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Poista kopio"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "Poista tilaaja"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Vastaa"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
 msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "Vastaa tapauksiin"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr ""
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "Tilaaja"
 
@@ -4082,37 +4092,41 @@ msgstr "Tilaajan sähköpostiosoite"
 msgid "Requestor(s)"
 msgstr "Tilaajat"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr ""
+
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "Tilaajat"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "Tapaus tulisi suorittaa mennessä"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
 msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Palauta"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Koti"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "Päätä"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "Ratkaise tapaus #%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "Päätetty"
 
@@ -4120,7 +4134,7 @@ msgstr "Päätetty"
 msgid "Response to requestors"
 msgstr "Vastaus tilaajille"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "Tulokset"
 
@@ -4128,11 +4142,11 @@ msgstr "Tulokset"
 msgid "Results per page"
 msgstr "Tuloksia sivulle: "
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "Vahvista salasana"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
 msgstr ""
 
@@ -4140,105 +4154,103 @@ msgstr ""
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "Oikeutta %1 ei löydetty %2  %3 laajuudessa %4 (%5)\\n"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "Oikeus delegoitu"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "Oikeus myönnetty"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "Oikeus ladattu"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "Oikeutta ei voitu perua"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "Oikeutta ei löydetty"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "Oikeutta ei ladattu"
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "Oikeus peruttu"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Oikeudet"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "Oikeuksia ei voitu myöntää: %1"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "Oikeuksia ei voitu perua: %1"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "Roolit"
 
-#: html/Search/Elements/DisplayOptions:83
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
 msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "La"
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
 msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "Tallenna muutokset"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "Tallenna muutokset"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
 msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr "Toiminto #%1"
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "Toiminto luotu"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "Toiminto poistettu"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "Toiminnot"
 
@@ -4246,11 +4258,11 @@ msgstr "Toiminnot"
 msgid "Scrips for %1\\n"
 msgstr "Toiminnot työjonolle %1\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr "Toiminnot, joita sovelletaan kaikkiin työjonoihin"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "Hae"
 
@@ -4258,129 +4270,96 @@ msgstr "Hae"
 msgid "Search Criteria"
 msgstr "Hakukriteerit"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
-
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
 msgstr ""
 
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "See custom fields"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "SeeCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
+#: lib/RT/Queue_Overlay.pm:68
+msgid "SeeQueue"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:92
-msgid "SeeQueue"
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
 msgstr ""
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
-msgid "Select a Custom Field"
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
 msgstr ""
 
-#: html/Admin/Groups/index.html:78
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "Valitse ryhmä"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "Valitse työjono"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr ""
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "Valitse käyttäjä"
 
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "Valitse ryhmä"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr "Valitse useita arvoja"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr "Valitse yksi arvo"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr "Valitse työjono"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr "Valitse toiminto"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr "Valitse pohja"
 
-#: lib/RT/CustomField_Overlay.pm:61
-msgid "Select up to %1 values"
-msgstr ""
-
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr "Valitse käyttäjä"
 
-#: html/Admin/Elements/EditCustomFields:58
-msgid "Selected Custom Fields"
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:59
-msgid "Selected objects"
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -4431,51 +4410,59 @@ msgstr ""
 msgid "Sends mail to the owner"
 msgstr "Lähettää postia omistajalle"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "Syys"
 
 #: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "September"
 msgstr "syyskuu"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "Näytä tulokset"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr ""
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "Näytä perustiedot"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr ""
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "Näytä yksityiskohdat"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr ""
 
@@ -4487,68 +4474,64 @@ msgstr "Näytä tapauksen kommentointi"
 msgid "Show ticket summaries"
 msgstr "Näytä tapausten yhteenvedot"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
 msgstr ""
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "Allekirjoitus"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "Yksittäinen"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
 msgstr ""
 
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
-msgid "Sort"
+#: NOT FOUND IN SOURCE
+msgid "Sort Order"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -4563,7 +4546,11 @@ msgstr "Järjestä tulokset"
 msgid "SortOrder"
 msgstr "Lajittelujärjestys"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr ""
 
@@ -4575,7 +4562,7 @@ msgstr "Jäädytetty"
 msgid "Start page"
 msgstr "Etusivu"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "Aloitettu"
 
@@ -4583,7 +4570,7 @@ msgstr "Aloitettu"
 msgid "Started date '%1' could not be parsed"
 msgstr "Aloittamisaikaa '%1' ei pystytty tulkitsemaan"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "Alkaa"
 
@@ -4595,11 +4582,11 @@ msgstr "Alkaa mennessä"
 msgid "Starts date '%1' could not be parsed"
 msgstr "Alkamisaikaa '%1' ei pystytty tulkitsemaan"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Tila"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Tila"
 
@@ -4607,86 +4594,110 @@ msgstr "Tila"
 msgid "Status Change"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "Tila muutettu arvosta %1 arvoon %2"
 
-#: html/Ticket/Elements/Tabs:170
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "Kaappaa"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
+msgid "Stolen from %1 "
 msgstr "Kaapattu käyttäjältä %1"
 
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
-
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Otsikko"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "Otsikko vaihdettu: %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "Lähetä"
 
-#: lib/RT/Group_Overlay.pm:782
+#: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "Onnistui"
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "Su"
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "Järjestelmä"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "Järjestelmävirhe"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
 msgstr ""
 
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "Järjestelmävirhe. Oikeutta ei delegoitu."
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "Järjestelmävirhe. Oikeutta ei luovutettu."
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "Järjestelmäryhmät"
 
@@ -4694,40 +4705,40 @@ msgstr "Järjestelmäryhmät"
 msgid "SystemRolegroup for internal use"
 msgstr ""
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TESTIMERKKIJONO"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "Ota itselle"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "Otettu"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Pohja"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "Pohja #%1"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "Pohja poistettu"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Pohjaa ei löydetty"
 
@@ -4735,11 +4746,11 @@ msgstr "Pohjaa ei löydetty"
 msgid "Template not found\\n"
 msgstr "Pohjaa ei löydetty\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Pohja tulkittu"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Pohjat"
 
@@ -4747,33 +4758,33 @@ msgstr "Pohjat"
 msgid "Templates for %1\\n"
 msgstr "Pohjat työjonolle %1\\n"
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "Ei ole arvo tälle kentälle"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "Tämä on sama arvo"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "Toimeksiantaja on jo %1 tälle työjonolle"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "Toimeksiantaja on jo %1 tälle tapaukselle"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "Toimeksiantaja ei ole %1 tälle työjonolle"
@@ -4782,11 +4793,11 @@ msgstr "Toimeksiantaja ei ole %1 tälle työjonolle"
 msgid "That principal is not a %1 for this ticket"
 msgstr "Toimeksiantaja ei ole %1 tälle tapaukselle"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr "Työjonoa ei ole olemassa"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "Tapaus sisältää päättämättömiä riippuvuuksia"
 
@@ -4794,47 +4805,51 @@ msgstr "Tapaus sisältää päättämättömiä riippuvuuksia"
 msgid "That user already has that right"
 msgstr "Käyttäjällä on jo tuo oikeus"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr "Käyttäjä omistaa jo tämän tapauksen"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "Käyttäjää ei ole olemassa"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "Käyttäjä on jo erioikeutettu"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr "Käyttäjä on jo erioikeudeton"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "Käyttäjä on nyt erioikeutettu"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr "Käyttäjä on nyt erioikeudeton"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr "Käyttäjä ei voi omistaa tapauksia tuossa työjonossa"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "Ei ole numero"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "Perustiedot"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr ""
 
@@ -4842,7 +4857,7 @@ msgstr ""
 msgid "The comment has been recorded"
 msgstr "Kommentti on tallennettu"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr ""
 
@@ -4850,31 +4865,27 @@ msgstr ""
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "Seuraavia komentoja ei suoritettu:\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "Uusi arvo asetettu."
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr "Tapauksen omistaja"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "Tapauksen tilaaja"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "Nämä kommentit eivät ole yleisesti näkyvillä käyttäjälle"
 
-#: lib/RT/CustomField_Overlay.pm:912
-msgid "This custom field does not apply to that object"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
 msgstr ""
 
@@ -4882,15 +4893,15 @@ msgstr ""
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "Tämä tapaus %1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "Tämä tapahtuma ei näytä sisältävän mitään"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
 msgstr "Käyttäjän %1 tärkeintä tapausta"
@@ -4899,7 +4910,7 @@ msgstr "Käyttäjän %1 tärkeintä tapausta"
 msgid "This user's 25 highest priority tickets"
 msgstr "Käyttäjän 25 tärkeintä tapausta"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "To"
 
@@ -4907,24 +4918,28 @@ msgstr "To"
 msgid "Ticket # %1  %2"
 msgstr "Tapaus # %1  %2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "Tapauksen #%1 jättipäivitys: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "Tapaus #%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "Tapaus %1 luotu työjonoon '%2'"
@@ -4933,16 +4948,12 @@ msgstr "Tapaus %1 luotu työjonoon '%2'"
 msgid "Ticket %1 loaded\\n"
 msgstr "Tapaus %1 ladattu\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "Tapaus %1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
-msgid "Ticket Custom Fields"
-msgstr ""
-
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr "Tapauksen historia # %1 %2"
@@ -4955,27 +4966,23 @@ msgstr "Tapauksen numero"
 msgid "Ticket Resolved"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
-msgid "Ticket Transactions"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Ticket attachment"
 msgstr "Tapauksen liitteen"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "Tapauksen sisältö"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "Tapauksen sisällön tyyppi"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "Tapausta ei voitu luoda sisäisestä virheestä johtuen"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "Tapaus luotu"
 
@@ -4983,7 +4990,7 @@ msgstr "Tapaus luotu"
 msgid "Ticket creation failed"
 msgstr "Tapauksen luonti epäonnistui"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "Tapaus poistettu"
 
@@ -4991,7 +4998,11 @@ msgstr "Tapaus poistettu"
 msgid "Ticket id not found"
 msgstr "Tapauksen numeroa ei löytynyt"
 
-#: html/Ticket/Display.html:55
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr ""
+
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
 msgstr ""
 
@@ -5007,53 +5018,58 @@ msgstr "Tapauksen tila vaihdettu"
 msgid "Ticket watchers"
 msgstr "Tapauksen tarkkailijat"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "Tapaukset"
 
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Tickets from %1"
 msgstr "Tapaukset %1"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "Aikaa jäljellä"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "Aikaa käytetty"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "Aikaa jäljellä"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "Aika"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "Aikaa käytetty"
 
-#: lib/RT/Ticket_Overlay.pm:1143
-msgid "TimeWorked"
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
+#: lib/RT/Ticket_Overlay.pm:1277
+msgid "TimeWorked"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5064,16 +5080,16 @@ msgstr "Luodaksesi diffin tästä käskystä:"
 msgid "To generate a diff of this commit:\\n"
 msgstr "To generate a diff of this commit:\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "Oltu yhteydessä"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
 msgstr ""
 
@@ -5081,24 +5097,20 @@ msgstr ""
 msgid "Transaction"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "Tapahtuma %1 puhdistettu"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "Tapahtuma luotu"
 
-#: html/Admin/Elements/QueueTabs:78
-msgid "Transaction Custom Fields"
+#: lib/RT/Transaction_Overlay.pm:92
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:125
-msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr ""
-
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "Tapahtumat ovat muuttumattomia"
 
@@ -5106,19 +5118,23 @@ msgstr "Tapahtumat ovat muuttumattomia"
 msgid "Trying to delete a right: %1"
 msgstr "Yritetään poistaa oikeus: %1"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "Ti"
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "Tyyppi"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "Toteuttamaton"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Unix login"
 
@@ -5126,21 +5142,16 @@ msgstr "Unix login"
 msgid "UnixUsername"
 msgstr "Käyttäjän Unix-tunnus"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "Tuntematon sisällön koodaus %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "Rajoittamaton"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
 msgstr ""
 
@@ -5148,23 +5159,15 @@ msgstr ""
 msgid "Unprivileged"
 msgstr "Erioikeudeton"
 
-#: html/Admin/Elements/EditCustomFields:60
-msgid "Unselected Custom Fields"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:61
-msgid "Unselected objects"
-msgstr ""
-
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "Ottamaton"
 
-#: html/Search/Bulk.html:54
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Päivitä"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
 msgstr ""
 
@@ -5172,11 +5175,11 @@ msgstr ""
 msgid "Update ID"
 msgstr "Päivitä numero"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
 msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "Päivitä tyyppi"
 
@@ -5188,7 +5191,7 @@ msgstr "Päivitä kaikki nämä tapaukset kerralla"
 msgid "Update email"
 msgstr "Päivitä sähköposti"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
 msgstr ""
 
@@ -5196,11 +5199,11 @@ msgstr ""
 msgid "Update name"
 msgstr "Päivitä nimi"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "Päivitystä ei tallennettu"
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "Päivitä valitut tapaukset"
 
@@ -5208,7 +5211,7 @@ msgstr "Päivitä valitut tapaukset"
 msgid "Update signature"
 msgstr "Päivitä allekirjoitus"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "Päivitä tapaus"
 
@@ -5216,58 +5219,34 @@ msgstr "Päivitä tapaus"
 msgid "Update ticket # %1"
 msgstr "Päivitä tapaus # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "Päivitä tapaus #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "Päivitä tapaus #%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "Päivityksen tyyppi ei ollut kirjeenvaihto eikä kommentti."
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:84
-msgid "Upload multiple files"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:79
-msgid "Upload multiple images"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:85
-msgid "Upload one file"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:80
-msgid "Upload one image"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:86
-msgid "Upload up to %1 files"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:81
-msgid "Upload up to %1 images"
-msgstr ""
-
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
 msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5278,7 +5257,7 @@ msgstr "Käyttäjä %1 %2: %3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "Käyttäjä %1 Salasana: %2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
 msgstr ""
@@ -5295,7 +5274,7 @@ msgstr "Käyttäjää '%1' ei löydetty\\n"
 msgid "User Defined"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
 msgstr ""
 
@@ -5303,33 +5282,28 @@ msgstr ""
 msgid "User ID"
 msgstr "Käyttäjätunnus"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "Käyttäjätunnus"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "Käyttäjän oikeudet"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
-msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "Käyttäjää ei voitu luoda: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "Käyttäjä luotu"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Käyttäjän luomat ryhmät"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
 msgstr ""
 
@@ -5341,23 +5315,19 @@ msgstr "Käyttäjää informoitu"
 msgid "User view"
 msgstr "Käyttäjän näkymä"
 
-#: html/Admin/Groups/index.html:99
-msgid "User-defined groups"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "Hakua vastaavat käyttäjät"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
 msgstr ""
 
@@ -5365,19 +5335,23 @@ msgstr ""
 msgid "ValueOfQueue"
 msgstr "Tapauksen arvo"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Arvot"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:63
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "Tarkkailijat"
 
@@ -5385,7 +5359,7 @@ msgstr "Tarkkailijat"
 msgid "WebEncoding"
 msgstr "Web-koodaus"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "Ke"
 
@@ -5441,11 +5415,19 @@ msgstr ""
 msgid "Whenever correspondence comes in"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Työ"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr ""
 
@@ -5453,19 +5435,31 @@ msgstr ""
 msgid "WorkPhone"
 msgstr "Työpuhelin"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "Tehty"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "Omistat jo tämän tapauksen"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "Et ole valtuutettu käyttäjä"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "Voit palauttaa vain tapauksia, jotka omistat itse tai jotka ovat ilman omistajaa"
 
@@ -5473,24 +5467,24 @@ msgstr "Voit palauttaa vain tapauksia, jotka omistat itse tai jotka ovat ilman o
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "Sinulla ei ole valtuuksia tarkastella tätä tapausta.\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "Löysit %1 tapausta työjonosta %2"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "Olet kirjautunut ulos RT:stä"
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "Sinulla ei ole valtuuksia luoda tapauksia tähän työjonoon."
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "Et voi luoda tapauksia tuohon työjonoon."
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "Tervetuloa kirjautumaan järjestelmään uudelleen"
 
@@ -5510,40 +5504,44 @@ msgstr ""
 msgid "Your request has been approved."
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr ""
+
 #: etc/initialdata:445
 msgid "Your request was rejected."
 msgstr ""
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "Käyttäjätunnuksesi tai salasanasi on väärä"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "Postinumero"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "and is not"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and not"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "sallittu käyttäjälle %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "sisältää"
 
@@ -5563,100 +5561,84 @@ msgstr "kirjeenvaihtoa (luultavasti) ei ole lähetetty"
 msgid "correspondence sent"
 msgstr "kirjeenvaihto lähetetty"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "päivää"
 
 #: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "delete"
 msgstr "poista"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "poistettu"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "ei sisällä"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "ei sisällä"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "equal to"
 msgstr "on yhtäsuuri"
 
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr ""
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr ""
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
+#: NOT FOUND IN SOURCE
+msgid "false"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "filename"
 msgstr "tiedostonimi"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "on suurempi kuin"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "ryhmä %1"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "tuntia"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "numero"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "on"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "ei ole"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "on pienempi kuin"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "sisältää"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "min"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "minuuttia"
 
@@ -5664,92 +5646,100 @@ msgstr "minuuttia"
 msgid "modifications\\n\\n"
 msgstr "muokkaukset\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "kuukausia"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "uusi"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr ""
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "ei mitään"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "on erisuuri kuin"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr ""
+
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "avoin"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "oma ryhmä '%1' käyttäjälle '%2'"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "työjono %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "hylätty"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "päätetty"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "sec"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "jäädytetty"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "järjestelmä %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "järjestelmäryhmä '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "kutsuva komponentti ei eritellyt syytä"
 
-#: lib/RT/Group_Overlay.pm:238
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "tapaus #%1 %2"
 
 #: NOT FOUND IN SOURCE
+msgid "till"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "true"
 msgstr "tosi"
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "kuvailematon ryhmä %1"
@@ -5758,12 +5748,12 @@ msgstr "kuvailematon ryhmä %1"
 msgid "undescripbed group %1"
 msgstr "kuvailematon ryhmä %1"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "käyttäjä %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "viikkoa"
 
@@ -5771,7 +5761,7 @@ msgstr "viikkoa"
 msgid "with template %1"
 msgstr "pohjalla %1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "vuosia"
 
diff --git a/rt/lib/RT/I18N/fr.po b/rt/lib/RT/I18N/fr.po
index 8d1f3c3..26ce0cb 100644
--- a/rt/lib/RT/I18N/fr.po
+++ b/rt/lib/RT/I18N/fr.po
@@ -1,187 +1,262 @@
+# Copyright (c) 2002 Jesse Vincent <jesse@bestpractical.com>
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: fr\n"
+"Project-Id-Version: RT 3.2.0\n"
 "POT-Creation-Date: 2002-05-02 11:36+0800\n"
-"PO-Revision-Date: 2005-08-06 22:14+0200\n"
-"Last-Translator: jfenal <jfenal@free.fr>\n"
-"Language-Team:  <fr@li.org>\n"
+"PO-Revision-Date: 2004-07-05 02:00+0800\n"
+"Last-Translator: Sébastien Person <sebastien.person@easter-eggs.com>\n"
+"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: NOT FOUND IN SOURCE
+msgid "#"
+msgstr "n°"
+
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr "n°%1"
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
 #. ($ticket->Id, $ticket->Subject)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
 msgid "#%1: %2"
 msgstr "n°%1: %2"
 
-#: lib/RT/Record.pm:927
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
-msgstr "$prefix %1"
+msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr "%1 n°%2"
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr "%1 %2 %3"
+
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%1 %2 %3 %4:%5:%6 %7"
 
-#: lib/RT/Record.pm:1672 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "%1 %2 ajouté"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "il y a %1 %2"
 
-#: lib/RT/Record.pm:1679 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 %2 changé en %3"
 
-#: lib/RT/Record.pm:1676 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
 msgstr "%1 %2 supprimé"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr "%1 %2 du groupe %3"
+
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "%1 %2 avec modèle %3"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr "%1 (%2) %3 ce ticket\\n"
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
-msgstr "%1 (%2) par %3"
+msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
-msgstr "%1 (inchangé)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 - %2 shown"
+msgstr "Tickets %1 à %2"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr "%1 - Un paramètre à passer à %2"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr "%1 - Ecrit les mises à jour de statuts sur STDOUT"
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr "%1 - Précisez l'action que vous voulez utiliser"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr "%1 - Précisez la condition que vous voulez utiliser"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - Précisez la recherche que vous voulez utiliser"
 
-#: html/Elements/Footer:54
-#. ('&#187;&#124;&#171;', $RT::VERSION, '2005', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
+     $RT::VERSION, 
+     '2004', 
+    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
+#: html/Elements/Footer:36
+#. ('&#187;&#124;&#171;', 
+     $RT::VERSION, 
+     '2004', 
+    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
-msgstr "%1 RT %2 Copyright 1996-%3 %4."
+msgstr "%1 RT %2 Tout droits réservé 1996-%3 %4"
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
-msgstr "ScripAction %1 chargée"
+msgstr "%1 ScripAction chargée"
 
-#: lib/RT/Record.pm:1709
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "%1 ajouté(e) comme valeur de %2"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr "les alias %1 nécessitent un TicketId sur lequel travailler"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr "les alias %1 nécessitent un TicketId sur lequel travailler "
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr "les alias %1 nécessitent un TicketId pour fonctionner avec (depuis %2) %3"
+
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 semble être un objet local, mais est introuvable dans la base de données"
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 par %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 changé(e) de %2 à %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
-msgstr "%1 copie"
+msgstr ""
 
-#: lib/RT/Record.pm:931
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "%1 n'a pas pu être positionné à %2"
 
-#: lib/RT/Ticket_Overlay.pm:2751
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr "%1 n'a pas pu initialiser une transaction (%2)\\n"
+
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 ne peut pas mettre le statut à résolu. La base de données RT est peut être incohérente."
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
 msgstr "%1 créé(e)"
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
 msgstr "%1 supprimé(e)"
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
-msgstr "Mes %1 tickets de plus haute priorité"
+msgstr "Mes %1 tickets de plus hautes priorité"
 
-#: bin/rt-crontool:186
+#: NOT FOUND IN SOURCE
+msgid "%1 highest priority tickets I own..."
+msgstr "Mes %1 tickets à traiter en priorité..."
+
+#: html/Elements/MyTickets:26
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr "Mes %1 demandes les plus prioritaires..."
+
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
-msgstr "%1 est un outil agissant sur les tickets depuis un planificateur externe tel que cron."
+msgstr "%1 est un outil agissant sur les tickets depuis un planificateur externe tel que cron"
 
-#: lib/RT/Queue_Overlay.pm:864
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
-msgstr "%1 n'est plus un %2 pour cette file."
+msgstr "%1 n'est plus un %2 pour cette queue."
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 is no longer a %2 for this ticket."
+msgstr "%1 n'est plus un %2 pour ce ticket."
+
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr "%1 n'est plus une valeur pour le champ personnalisé %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr "%1 n'est pas un identifiant de queue valide"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -190,174 +265,270 @@ msgstr "%1 n'est plus un %2 pour cette file."
 msgid "%1 min"
 msgstr "%1 min"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
-msgstr "les %1 derniers tickets sans propriétaire"
+msgstr "les %1 derniers tickets sans propiétaire"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr "%1 non montré"
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
 msgstr "%1 objets"
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "Droits de %1"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr "%1 réussi\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr "Type %1 inconnu pour $MessageId"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr "type %1 inconnu pour %2"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr "%1 a été créé sans utilisateur courant\\n"
+
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 résoudra tous les membres d'un ticket groupé résolu."
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr "%1 va bloquer une base [locale] s'il dépend ou est membre d'une demande liée."
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
-msgstr "%1 de %2 objets"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
-msgstr "%1 de %2 de %3 objets"
+msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
-msgstr "Recherches sauvées de %1"
+msgstr "recherches sauvées de %1"
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: pas d'attachement spécifié"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1b"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1k"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' est un statut invalide"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr "'%1' n'est pas une action connue. "
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr "(Cocher la case pour supprimer un membre du groupe)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr "(Cocher la case pour supprimer un scrip)"
+
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(Cocher la case pour supprimer)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr "(Cocher la case pour supprimer)"
+
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
 msgstr "(Cocher les cases pour désactiver les notifications aux destinataires listés)"
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
 msgstr "(Cocher les cases pour activer les notifications aux destinataires listés)"
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
-msgstr "(Entrer le numéro du ticket ou son URL, séparés par des espaces)"
+msgstr "(Entrer les numéros de tickets ou les URLs, séparés par des espaces)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(sera par défaut %1 si laissé vide)"
+msgid "(If left blank, will default to %1"
+msgstr "Si laissé à blanc, valeur par défaut : %1"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr "(Non renseigné)"
+
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(Pas de champ personnalisé)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(Aucun membre)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "(Aucun Scrip)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
-msgstr "(Aucun modèle)"
+msgstr "Aucun modèle"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
 msgstr "(Aucun)"
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Envoie une copie cachée de cette mise à jour à une liste d'adresses email séparées par des virgules. Ceci <b>ne changera pas</b> les destinataires des mises à jour suivantes.)"
 
-#: html/Ticket/Create.html:100
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "(Envoie une copie cachée de cette mise à jour à une liste d'adresses email séparées par des virgules. Ceci <b>ne changera pas</b> les destinataires des mises à jour suivantes.)"
+
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Envoie une copie de cette mise à jour à une liste d'adresses email séparées par des virgules. Ces personnes <b>recevront</b> les mises à jour suivantes.)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Envoie une copie de cette mise à jour à une liste d'adresses email séparées par des virgules. Ceci <b>ne changera pas</b> les destinataires des mises à jour suivantes.)"
 
-#: html/Ticket/Create.html:90
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr "Envoie une copie de cette mise à jour à une liste d'adresses email séparées par des virgules. Ceci <b>ne changera pas</b> les destinataires des mises à jour suivantes.)"
+
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Transmettre une copie de cette mise à jour à une liste d'adresses email séparées par des virgules. Ces personnes <b>recevront</b> les mises à jour suivantes.)"
+msgstr "(Envoie une copie de cette mise à jour à une liste d'adresses email séparées par des virgules. Ces personnes <b>recevront</b> les mises à jour suivantes.)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
-msgstr "(Utilisez ces champs lorsque vous sélectionnez 'User Defined' pour une condition ou une action)"
+msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(vide)"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr "(aucun nom)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/I18N/fr.po.orig:146 lib/RT/Transaction_Overlay.pm:580
+#: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(no subject)"
+msgstr "(pas de sujet)"
+
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
-msgstr "(sans information)"
+msgstr "(non renseigné)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
 msgstr "(aucune valeur)"
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(un seul ticket)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(en attente d'approbation)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
 msgstr "(en attente d'autres Collection)"
 
-#: html/Admin/Users/Modify.html:71
+#: NOT FOUND IN SOURCE
+msgid "(pending other tickets)"
+msgstr "(en attente d'autres tickets)"
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr "(groupe du demandeur)"
+
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(exigé)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(sans titre)"
 
-#: html/Ticket/Elements/ShowBasics:53
+#: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr "Mes 25 tickets à traiter en priorité..."
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr "Mes 25 demandes les plus prioritaires..."
+
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr "<% $Ticket->Statut%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
-msgstr "<% $_ %>"
+msgstr ""
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
-msgstr "<%$_%>"
+msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
-msgstr "<%$field%>"
+msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Créer un ticket dans\">&nbsp;%1"
@@ -366,122 +537,146 @@ msgstr "<input type=\"submit\" value=\"Créer un ticket dans\">&nbsp;%1"
 msgid "A blank template"
 msgstr "Un modèle vide"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr "L'utilisateur ne pourra se connecter car aucun mot de passe n'a été défini."
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr "ACE Supprimé"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr "ACE Chargé"
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr "l'ACE n'a pu être supprimé"
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr "l'ACE n'a pu être trouvé"
+
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE non trouvé"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "Les ACE peuvent seulement être créés et effacés."
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr "ET"
+#: NOT FOUND IN SOURCE
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr "Interruption pour éviter des modifications de ticket involontaires"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "A propos"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "contrôle d'accès"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Action"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "Action %1 non trouvée"
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr "Action validée.\\n"
+#: bin/rt-crontool:119
+msgid "Action committed."
+msgstr "Action validée"
 
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "Action préparée..."
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
 msgstr "Ajouter"
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "Ajouter AdminCC"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "Ajouter CC"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr "Ajouter des colonnes"
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
 msgstr "Ajouter un critère"
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "Ajouter d'autres fichiers"
 
-#: html/Search/Bulk.html:106
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr "Ajouter étape suivant"
+
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "Ajouter Demandeur"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr "Ajouter une valeur"
 
-#: html/Admin/Global/Scrip.html:76
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr "Ajouter une sélection de mots clé à cette queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr "Ajouter un nouveau scrip global"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr "Ajouter un scrip à cette queue"
+
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
-msgstr "Ajouter un scrip qui s'applique à toutes les files"
+msgstr "Ajouter un scrip qui s'ajoute à toutes les queues"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
-msgstr "Ajouter un critère additionnel"
+msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "Ajouter des commentaires ou des réponses aux tickets sélectionnés"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "Ajouter des membres"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Ajouter de nouveaux observateurs"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr "Ajouter, retirer et modifier des champs personnalisés pour les objets"
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr "AjouterEtatSuivant"
 
-#: lib/RT/Queue_Overlay.pm:764
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
-msgstr "Ajout groupe/utilisateur comme %1 pour cette file"
+msgstr "Ajout groupe/utilisateur comme %1 pour cette queue"
 
-#: lib/RT/Ticket_Overlay.pm:1424
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "Ajout groupe/utilisateur comme %1 pour ce ticket"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "Adresse1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "Adresse2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "Admin Cc"
 
@@ -493,103 +688,159 @@ msgstr "Commentaire Admin"
 msgid "Admin Correspondence"
 msgstr "Correspondance Admin "
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
-msgstr "Administrateurs de files"
+msgstr "Administrateurs de queue"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr "Gérer les Utilisateurs"
+
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "configuration Gestion/Globale"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr "Gestion/Groupes"
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Queue/Basics"
+msgstr "Gestion/Queues/Essentiel"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr "GérerTousGroupesPersonnels"
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "AdminCc"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr "CommentaireAdministrateur"
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr "CorrespondanceAdministrateur"
+
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
 msgstr "GérerChampPersonnalisé"
 
-#: lib/RT/Group_Overlay.pm:163
+#: lib/RT/Queue_Overlay.pm:73
+msgid "AdminCustomFields"
+msgstr "GérerChampsPersonnalisés"
+
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "GérerGroupes"
 
-#: lib/RT/Group_Overlay.pm:165
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "GérerAppartenanceGroupes"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr "GérerGroupesPersonnelsPropres"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
-msgstr "GérerFile"
+msgstr "GérerQueues"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr "GérerUtilisateurs"
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "Cc Administratif"
 
-#: html/Ticket/Elements/Tabs:197
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr "Administrateurs"
+
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
 msgstr "Avancé"
 
-#: html/Elements/SelectDateRelation:57
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr "Recherche avancée"
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "Après"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr "Aggrégateur"
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr "Age"
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
+msgstr "Alias pour"
 
 #: etc/initialdata:363
 msgid "All Approvals Passed"
 msgstr "Toutes les approbations obtenues"
 
-#: html/Admin/Queues/index.html:75
+#: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
+msgid "All Custom Fields"
+msgstr "Tous les champs personnalisés"
+
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
-msgstr "Toutes les files"
+msgstr "Toutes les queues"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr "Et/Ou"
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr "Envoie toujours un message au demandeur indépendamment de l'expéditeur"
 
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
 msgstr "S'applique à"
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
 msgstr "Appliquer"
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
 msgstr "Appliquer vos changements"
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
-msgstr "Approbations"
+msgstr "Approbation"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "Approbation n°%1: %2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr "Approbation n°%1: Notes non enregistrées en raison d'une erreur système"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr "Approbation n°%1: Notes non enregistrées"
 
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr "Détails de l'approbation"
+
 #: etc/initialdata:351
 msgid "Approval Passed"
 msgstr "Approbations obtenues"
@@ -598,67 +849,103 @@ msgstr "Approbations obtenues"
 msgid "Approval Rejected"
 msgstr "Approbations refusées"
 
-#: html/Approvals/Elements/Approve:65
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr "Diagramme d'approbation"
+
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "Approuver"
 
 #: etc/initialdata:504
 msgid "Approver's notes: %1"
-msgstr "Notes de l'approbateur : %1"
+msgstr "Notes de l'approbateur: %1"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "Avr."
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr "Avril"
+
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "Croissant"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
 msgstr "Fixer et supprimer les champs personnalisés"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
 msgstr "FixerChampsPersonnalisés"
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "Attaché"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "Attacher un fichier"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "Fichier attaché"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "Attachement '%1' ne peut pas être chargé"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "Attachement créé"
 
-#: lib/RT/Tickets_Overlay.pm:1702
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "Nom de fichier de l'attachement"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Attachements"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
 msgstr "Attibut supprimé"
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "Aoû."
 
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr "Août"
+
+#: NOT FOUND IN SOURCE
+msgid "AuthSystem"
+msgstr "AuthSystem"
+
 #: etc/initialdata:221
 msgid "Autoreply"
 msgstr "RéponseAuto"
@@ -667,189 +954,272 @@ msgstr "RéponseAuto"
 msgid "Autoreply To Requestors"
 msgstr "Réponse automatique aux demandeurs"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr "RéponseAutomtiqueAuxDemandeurs"
+
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr "Colonnes disponibles"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr "Signature PGP invalide: %1\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr "Id d'attachement erroné. Impossible de trouver l'attachement '%1'\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad data in %1"
+msgstr "Données incorrectes dans %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr "Numéro de transaction incorrect pour l'attachement. %1 doit être %2\\n"
+
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "Essentiel"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "Assurez-vous de sauvegarder vos modifications"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "Avant"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
-msgstr "Logo d'entreprise de Best Practical Solutions, LLC"
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr "Débuter l'approbation"
+
+#: NOT FOUND IN SOURCE
+msgid "Binary"
+msgstr "Binaire"
 
 #: etc/initialdata:217
 msgid "Blank"
 msgstr "Vide"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr "Gras"
+#: NOT FOUND IN SOURCE
+msgid "Bookmarkable URL for this search"
+msgstr "URL prédéfinie pour cette recherche"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
-msgstr "Lien prédéfini"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "En-têtes courts"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "modification de tickets en masse"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "Les utilisateurs système ne peuvent être modifiés"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
-msgstr "Le groupe/utilisateur peut-il voir cette file"
+msgstr "Le groupe/utilisateur peut-il voir cette queue"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "Impossible d'ajouter une valeur de champ personnalisé sans un nom"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr "Impossible de trouver une collection pour la classe '%1'"
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
 msgstr "Impossible de trouver une recherche sauvée et de l'utiliser"
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "Un ticket ne peut être lié à lui même"
 
-#: html/Search/Build.html:766
+#: lib/RT/Ticket_Overlay.pm:2716
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr "Impossible de fusionner un ticket à un ticket fusionné. Vous ne devriez jamais obtenir cette erreur"
+
+#: html/Search/Build.html:699
 msgid "Can't save this search"
 msgstr "Impossible de sauver cette recherche"
 
-#: lib/RT/Record.pm:1267 lib/RT/Record.pm:1345
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "Impossible de spécifier à la fois la base et la cible"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "Impossible de créer l'utilisateur: %1"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Cc"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
-msgstr "Tout cocher"
+msgstr "Tout vérifier"
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "Cocher la case pour supprimer"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "Cocher la case pour retirer le droit"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "Fils"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "Ville"
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
 msgstr "Tout effacer"
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "Fermé"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr "Tickets fermés"
+
+#: NOT FOUND IN SOURCE
+msgid "Closed requests"
+msgstr "Demandes closes"
+
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr "Tickets fermés"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr "Commande incomprise! \\n"
+
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Commenter"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "Adresse de commentaire"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr "Commentaire non enregistré"
+
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr "Commentaire sur le ticket"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr "CommenterTicket"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: NOT FOUND IN SOURCE
+msgid "Comments"
+msgstr "Commentaires"
+
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "Commentaires (non envoyés aux demandeurs)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "Commentaires (non envoyés aux demandeurs)"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: NOT FOUND IN SOURCE
+msgid "Comments about %1"
+msgstr "Commentaires sur %1"
+
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "Commentaires sur cet utilisateur"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "Commentaires ajoutés"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr "tr(Commit Stubbed)"
 
-#: html/Admin/Elements/EditScrip:63
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr "Restrictions de compilation"
+
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "Condition"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr "La condition satisfait..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "Condition non trouvée"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "Configuration"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: NOT FOUND IN SOURCE
+msgid "ContactInfoSystem"
+msgstr "ContactInfoSystem"
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr "Date de contact ne peut pas être analysée"
+
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "Contenu"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr "Type de contenu"
 
-#: html/Search/Elements/EditSearches:64
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr "Le groupe n'a pas pu être créé"
+
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
 msgstr "Copier"
 
@@ -857,174 +1227,214 @@ msgstr "Copier"
 msgid "Correspondence"
 msgstr "Courrier"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: NOT FOUND IN SOURCE
+msgid "Correspondence Address"
+msgstr "Adresse de correspondance"
+
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "Courrier ajouté"
 
-#: lib/RT/Record.pm:1694
-msgid "Could not add new custom field value. "
-msgstr "Impossible d'ajouter une nouvelle valeur de champ personnalisé. "
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr "Courrier non enregistré"
 
-#: lib/RT/Record.pm:1647
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr "Impossible d'ajouter une nouvelle valeur de champ personnalisé. %1"
+#: lib/RT/Ticket_Overlay.pm:3471
+msgid "Could not add new custom field value for ticket. "
+msgstr "Impossible d'ajouter une nouvelle valeur de champ personnalisé pour ce ticket. "
 
-#: lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3020 lib/RT/Ticket_Overlay.pm:3037
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr "La valeur de champ personnalisé n'a pas pu être ajoutée. %1"
+
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "Impossible de changer l'intervenant. "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
-msgstr "Impossible de créer le champ personnalisé"
-
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr "Impossible de créer le champ personnalisé : %1"
+msgstr "Impossible de créer un champ personnalisé CustomField"
 
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:494 lib/RT/Group_Overlay.pm:501
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "Impossible de créer un groupe"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
-msgstr "Impossible de créer le modèle : %1"
+msgstr "Impossible de créer un modèle : %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
-msgstr "Impossible de créer un ticket. File non indiquée"
+msgstr "Impossible de créer un ticket. Queue non indiquée"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
-msgstr "Impossible de créer l'utilisateur"
+msgstr "Impossible de créer un utilisateur"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr "L'observateur n'a pas pu être crée pour le demandeur"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr "Impossible de trouver le ticket numéro %1"
 
-#: lib/RT/Queue_Overlay.pm:742 lib/RT/Ticket_Overlay.pm:1392
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr "Impossible de trouver le groupe %1."
+
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "Impossible de trouver ou créer cet utilisateur"
 
-#: lib/RT/Queue_Overlay.pm:803 lib/RT/Ticket_Overlay.pm:1473
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "Impossible de trouver ce groupe ou utilisateur"
 
-#: html/Admin/CustomFields/Objects.html:69
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr "Impossible de trouver l'utilisateur %1."
+
+#: NOT FOUND IN SOURCE
 msgid "Could not load CustomField %1"
 msgstr "Impossible de charger le champ personnalisé %1"
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "Impossible de charger ce groupe"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr "Impossible de charger l'objet pour %1"
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr "Impossible de charger l'attribut de recherche"
-
-#: lib/RT/Queue_Overlay.pm:762
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
-msgstr "Impossible de faire de ce groupe/utilisateur un %1 pour cette file"
+msgstr "Impossible de faire de ce groupe/utilisateur un %1 pour cette queue"
 
-#: lib/RT/Ticket_Overlay.pm:1413
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "Impossible de faire de ce groupe/utilisateur un %1 pour ce ticket"
 
-#: lib/RT/Queue_Overlay.pm:861
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
-msgstr "Impossible de supprimer ce groupe/utilisateur comme un %1 pour cette file"
+msgstr "Impossible de supprimer ce groupe/utilisateur comme un %1 pour cette queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr "Impossible de supprimer ce groupe/utilisateur comme un %1 pour ce ticket"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
 msgstr "Impossible de sauver les informations utilisateur"
 
-#: lib/RT/Group_Overlay.pm:1003
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "Impossible d'ajouter un membre à ce groupe"
 
-#: lib/RT/Record.pm:1706 lib/RT/Record.pm:1758
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "Impossible de créer une transaction : %1"
 
-#: lib/RT/Record.pm:940
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr "Impossible de comprendre ce qu'il faut faire avec cette réponse gpg\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr "Groupe introuvable\\n"
+
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr "Colonne introuvable"
 
-#: lib/RT/Group_Overlay.pm:977
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "groupe/utilisateur introuvable"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "Valeur introuvable"
 
-#: lib/RT/CurrentUser.pm:146
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr "L'observateur n'a pas pu être trouvé"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr "Utilisateur introuvable\\n"
+
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
-msgstr "Impossible de charger %1 depuis la base des utilisateurs.\\n"
+msgstr "Impossible de charger %1 depuis la base de données des utilisateurs.\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr "Impossible de charger la classe %1"
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr "Impossible de charger le champ personnalisé %1"
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr "KeywordSelects n'a pas pu être chargé"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr "Impossible de charger le fichier de configuration RT '%1' %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr "Les scrips n'ont pas pu être chargés"
+
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "Impossible de charger le groupe %1"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "Impossible de charger le lien"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
 msgstr "Impossible de charger l'objet %1"
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
-msgstr "Impossible de charger la file"
+msgstr "Impossible de charger la queue"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
-msgstr "Impossible de charger la file %1"
+msgstr "Impossible de charger la queue %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr "Impossible de charger le Scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
+msgstr "Impossible de charger le modèle"
 
-#: html/SelfService/Display.html:158
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load that user (%1)"
+msgstr "Impossible de charger cet utilisateur (%1)"
+
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "Impossible de charger le ticket '%1'"
 
-#: lib/RT/Ticket_Overlay.pm:2620
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr "Impossible de résoudre la base '%1' dans une URI."
-
-#: lib/RT/Ticket_Overlay.pm:2619
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr "Impossible de résoudre la cible '%1' dans une URI."
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "Pays"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "Ajouter"
 
@@ -1032,193 +1442,306 @@ msgstr "Ajouter"
 msgid "Create Tickets"
 msgstr "Ajouter des tickets"
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "Ajouter un Champ Personnalisé"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
-msgstr "Ajouter un champ personnalisé pour la file %1"
+msgstr "Ajouter un champ personnalisé à la queue %1"
+
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr "Ajouter un champ personnalisé à toutes les queues"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr "Ajouter un nouveaux champ personnalisé"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr "Ajouter un nouveau scrip global"
+
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "Ajouter un nouveau groupe"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "Ajouter un nouveau groupe personnel"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr "Ajouter une nouvelle queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr "Ajouter un nouveau scrip"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr "Ajouter un nouveau modèle"
+
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "Ajouter un nouveau ticket"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
-msgstr "Ajouter une file"
+msgstr "Ajouter une queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr "Ajouter une nouvelle queue appelée"
 
-#: html/Admin/Queues/Scrip.html:80
+#: NOT FOUND IN SOURCE
+msgid "Create a request"
+msgstr "Ajouter une demande"
+
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
-msgstr "Ajouter un scrip pour la file %1"
+msgstr "Ajouter un scrip pour la queue %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "Ajouter un modèle"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr "Ajouter un ticket"
 
+#: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr "Echec à la création de: %1 / %2 / %3"
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr "Echec à la création de: %1/%2/%3"
+
 #: etc/initialdata:137
 msgid "Create new tickets based on this scrip's template"
 msgstr "Ajouter de nouveaux tickets basés sur le modèle de ce scrip"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "Ajouter un ticket"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
-msgstr "Ajouter des tickets dans cette file"
+msgstr "Ajouter des tickets dans cette queue"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "Ajouter, supprimer et modifier des champs personnalisés"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
-msgstr "Ajouter, supprimer et modifier les files"
+msgstr "Ajouter, supprimer et modifier les queues"
 
-#: lib/RT/System.pm:81
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr "Ajouter, supprime et modifie les membres des groupe spersonnels de n'importe quel utilisateur"
+
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "Ajouter, supprimer et modifier les membres d'un groupe personnel"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "Ajouter, supprimer et modifier les utilisateurs"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr "CréerRechercheSauvée"
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr "CréerTicket"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "Créé"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
-msgstr "Champ Personnalisé %1 créé"
+msgstr "Champ Personnalisé %1 ajouté"
 
-#: html/Search/Elements/PickBasics:102
+#: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr "Modèle %1 créé"
+
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
 msgstr "Créateur"
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
-msgstr "Liens courants"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:51
+#: NOT FOUND IN SOURCE
+msgid "Current Relationships"
+msgstr "Relations actuelles"
+
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "Scrips actuels"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "Membres actuels"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Droits actuels"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: NOT FOUND IN SOURCE
+msgid "Current search criteria"
+msgstr "Critères de recherche courants"
+
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "Observateurs actuels"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr "Champ personnalisé n°%1"
+
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "Champs Personnalisés"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
 msgstr "Champs personnalisés pour %1"
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr "Programme de nettoyage d'action personnalisé"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "Programme de préparation d'action personnalisé "
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "Condition personnalisée"
 
-#: lib/RT/Tickets_Overlay.pm:2176
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr "Champs personnalisés %1 %2 %3"
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field %1 does not apply to this object"
+msgstr "Le champ personnalisé %1 ne s'applique pas à cet objet"
+
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
-msgstr "Le champ personnalisé %1 a une valeur."
+msgstr "Le champ personnalisé %1 a une valeur"
 
-#: lib/RT/Tickets_Overlay.pm:2172
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
-msgstr "Le champ personnalisé %1 n'a pas de valeur."
+msgstr "Le champ personnalisé %1 n'a pas de valeur"
 
-#: lib/RT/Record.pm:1580 lib/RT/Record.pm:1741
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "Le champ personnalisé %1 est introuvable"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: html/Admin/Elements/EditCustomFields:195
+msgid "Custom field deleted"
+msgstr "Champ personnalisé supprimé"
+
+#: lib/RT/Ticket_Overlay.pm:3523
+msgid "Custom field not found"
+msgstr "Le champ personnalisé est introuvable"
+
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "La valeur du champ personnalisé %1 ne peut pas être trouvée pour le champ personnalisé %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr "Valeur de champ personnalisé modifié de %1 à %2"
+
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "La valeur du champ personnalisé ne peut pas être effacée"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "La valeur du champ personnalisé ne peut par être trouvée"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "La valeur du champ personnalisé est effacée"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr "ChampPersonnalisé"
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr "Erreur de données"
+
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Dates"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "Déc."
 
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr "Décembre"
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr "Modèle de réponse automatique par défaut"
+
 #: etc/initialdata:222
 msgid "Default Autoresponse template"
 msgstr "Modèle de réponse automatique par défaut"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
-msgstr "File par défaut"
+msgstr "Queue par défaut"
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
-msgstr "Demandeur par défaut"
+msgstr ""
 
 #: etc/initialdata:296
 msgid "Default admin comment template"
@@ -1236,308 +1759,419 @@ msgstr "Modèle de courrier par défaut"
 msgid "Default transaction template"
 msgstr "Modèle de transaction par défaut"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr "Par défaut: %1/%2 modifié de %3 à %4"
+
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "Déléguer les droits"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
-msgstr "Déléguer des droits spécifiques qui vous ont été accordés."
+msgstr "Déléguer des droits spécifiques qui vous ont été accordés"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr "DéléguerDroits"
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "Délégation"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "Supprimer"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
-msgstr "Détruire le modèle"
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
-msgstr "Échec de la destruction : %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
 msgstr "Supprimer les scrips sélectionnés"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
-msgstr "Supprimer les tickets"
+msgstr "Supprimer des tickets"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr "SupprimerTicket"
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr "Recherche détruite"
+#: lib/RT/Transaction_Overlay.pm:162
+msgid "Deleting this object could break referential integrity"
+msgstr "Effacer cet objet pourrait briser l'intégrité référentielle"
 
-#: lib/RT/Queue_Overlay.pm:395
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "Effacer cet objet briserait l'intégrité référentielle"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "Effacer cet objet violerait l'intégrité référentielle"
 
-#: html/Approvals/Elements/Approve:66
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr "Effacer cet objet violerait l'intégrité référentielle"
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr "Effacer cet objet violerait l'intégrité référentielle, c'est serait facheux!"
+
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "Refuser"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "En dépend"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr "Dépendances : \\n"
+
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr "Ajout de la dépendance par %1"
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr "Suppression de la dépendance par %1"
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr "Ajout de la dépendance de %1"
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr "Suppression de la dépendance de %1"
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "Dépend de"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr "DépendDe"
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "Décroissant"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "Décrivez la situation ci-dessous"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Description"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: NOT FOUND IN SOURCE
+msgid "Details"
+msgstr "Détails"
+
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "Afficher"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr "Afficher la liste des droits"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
 msgstr "Afficher les colonnes"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
-msgstr "Afficher les modèles de Scrips pour cette file"
+msgstr "Afficher les modèles de Scrips pour cette queue"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
-msgstr "Afficher les Scrips pour cette file"
+msgstr "Afficher les Scrips pour cette queue"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "Mode d'affichage"
 
-#: lib/RT/Group_Overlay.pm:168
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
 msgstr "Afficher les recherches sauvegardées de ce groupe"
 
-#: html/Elements/Footer:56
+#: NOT FOUND IN SOURCE
+msgid "Display ticket #%1"
+msgstr "Afficher le ticket n°%1"
+
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
-msgstr "Distribué selon les termes de la version 2 de la <a href=\"http://www.gnu.org/copyleft/gpl.html\">licence GNU GPL.</a>"
+msgstr "Distribué sous la version 2 de la license GNU GPL <a href=\"http://www.gnu.org/copyleft/gpl.html\">."
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "Faire tout et n'importe quoi"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr "Lancer la recherche"
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "Ne pas rafraîchir cette page."
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: NOT FOUND IN SOURCE
+msgid "Don't show search results"
+msgstr "Ne pas afficher le résultat de la recherche"
+
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "Télécharger"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
 msgstr "Télécharger en tant que fichier délimité par tabulations"
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "Echéance"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
-msgid "Edit Custom Fields for %1"
-msgstr "Modifier les champs personnalisés pour %1"
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr "Date d'échéance '%1' n'est pas comprise"
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr "Modifier les champs personnalisés pour tous les groupes"
+#: NOT FOUND IN SOURCE
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
+msgstr "ERREUR: impossible de charger le ticket '%1' : %2.\\n"
 
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr "Modifier les champs personnalisés pour tous les utilisateurs"
+#: NOT FOUND IN SOURCE
+msgid "Edit"
+msgstr "Modifier"
 
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
-msgstr "Modifier les champs personnalisés pour les tickets de toutes les files"
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
+msgstr "Modifier les conditions"
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Modifier les champs personnalisés pour %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
+msgstr ""
+
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
-msgstr "Modifier les liens"
+msgstr ""
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
 msgstr "Modifier la requête"
 
-#: html/Admin/Queues/Templates.html:63
+#: NOT FOUND IN SOURCE
+msgid "Edit Relationships"
+msgstr "Modifier les relations"
+
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
-msgstr "Modifier les modèles pour la file %1"
+msgstr "Modifier les modèles pour la queue %1"
 
-#: lib/RT/Group_Overlay.pm:167
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr "Modifier les mots clÃ"
+
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
-msgstr "Modifier les recherches sauvées du groupe"
+msgstr "Modifier les recherches sauvegardées du groupe"
+
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr "Modifier les scrips"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "Modifier les modèles système"
 
-#: lib/RT/Group_Overlay.pm:167
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr "Modifier les modèles pour %1"
+
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
 msgstr "ModifierRecherchesSaugardées"
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
-msgstr "Modifier la configuration de la file %1"
+msgstr "Modifier la configuration de la queue %1"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for user %1"
+msgstr "Modifier la configuration de l'utilisateur %1"
+
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
-msgstr "Modifier le champ personnalisé %1"
+msgstr "Modifier le ChampPersonnalisé %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "Modifier les membres du groupe %1"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "Modifier les membres du groupe personnel %1"
 
-#: lib/RT/Record.pm:1282 lib/RT/Record.pm:1359
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr "Modifie le modèle %1"
+
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "La base ou la cible doivent être spécifiées"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "Email"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "Adresse email utilisée"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "EmailAddress"
+msgstr "EmailAddress"
+
+#: NOT FOUND IN SOURCE
+msgid "EmailEncoding"
+msgstr "EmailEncoding"
+
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr "Activé (Décocher cette case désactive ce champ personnalisé)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "Activé (Décocher cette case désactive ce groupe)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
-msgstr "Activé (Décocher cette case désactive cette file)"
+msgstr "Activé (Décocher cette case désactive cette queue)"
+
+#: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Elements/EditCustomFields:97
+msgid "Enabled Custom Fields"
+msgstr "Champs personnalisés actifs"
+
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
-msgstr "Files actives"
+msgstr "Queues actives"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
-msgstr "État %1 activé"
+msgstr "Statut actif %1"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
-msgstr "État actif : %1"
+msgstr "Statut actif: %1"
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "Saisir plusieurs valeurs"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
-msgstr "Saisir les objets ou les URI pour y lier les objets. Séparer les saisies par des espaces."
+msgstr "Saisir les objets ou les URIs pour y lier les objets. Séparer les saisies par des espaces."
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "Saisir une seule valeur"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
-msgstr "Saisir les files ou les URI pour y lier les files. Séparer les saisies avec des espaces."
+msgstr "Saisir les queues ou les URIs pour y lier les queues. Séparer les saisies avec des espaces."
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
-msgstr "Saisir les tickets ou URI pour y lier les tickets. Séparer les saisies par des espaces."
+msgstr "Saisir les tickets ou les URIs pour y lier les tickets. Séparer les saisies avec des espaces."
+
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr "Saisir les tickets ou URIs pour y lier les tickets. Séparer les saisies par des espaces."
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
-msgstr "Saisir au plus %1 valeurs"
+msgstr "Saisir %1 valeurs maximum"
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Erreur"
 
-#: lib/RT/Queue_Overlay.pm:673
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr "Erreur à l'ajout de l'observateur"
+
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "Erreur de paramètres pour Queue->AddWatcher"
 
-#: lib/RT/Queue_Overlay.pm:834
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr "Erreur de paramètres pour Queue->DelWatcher"
+
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
-msgstr "Erreur dans les paramètre de Queue->DeleteWatcher"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1341
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "Erreur de paramètres pour Ticket->AddWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1507
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr "Erreur de paramètres pour Ticket->DelWatcher"
+
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
-msgstr "Erreur dans les paramètres de Ticket->DeleteWatcher"
+msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr "Échelonner les tickets"
 
-#: html/Ticket/Elements/ShowBasics:57
+#: NOT FOUND IN SOURCE
+msgid "Estimate"
+msgstr "Estimer"
+
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
 msgstr "Estimé"
 
@@ -1545,249 +2179,322 @@ msgstr "Estimé"
 msgid "Everyone"
 msgstr "Tout le monde"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
-msgstr "Exemple :"
+msgstr "Exemple:"
+
+#: NOT FOUND IN SOURCE
+msgid "ExternalAuthId"
+msgstr "ExternalAuthId"
 
-#: html/Admin/Users/Modify.html:99
+#: NOT FOUND IN SOURCE
+msgid "ExternalContactInfoId"
+msgstr "ExternalContactInfoId"
+
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "Info supplémentaire"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
-msgstr "Impossible de créer l'attribut de recherche"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
-msgstr "Recherche du pseudo groupe d'utilisateurs 'Priviligiés' infructueuse."
+msgstr "Recherche du pseudo groupe d'utilisateurs 'Priviligiés' infructueuse"
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "Recherche du pseudo groupe d'utilisateurs 'non-privilégiés' infructueuse"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr "Echec de chargement du module %1. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr "Impossible de charger l'objet pour %1"
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "Fév."
 
-#: html/Elements/SelectAttachmentField:50
+#: NOT FOUND IN SOURCE
+msgid "February"
+msgstr "Février"
+
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
 msgstr "NomFichier"
 
-#: lib/RT/CustomField_Overlay.pm:69
+#: NOT FOUND IN SOURCE
 msgid "Fill in multiple text areas"
 msgstr "Saisir dans plusieurs champs de type texte"
 
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr "Saisir plusieurs champs de type wiki"
-
-#: lib/RT/CustomField_Overlay.pm:70
+#: NOT FOUND IN SOURCE
 msgid "Fill in one text area"
 msgstr "Saisir dans un champ de type texte"
 
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr "Saisir un champ de type wiki"
-
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
-msgstr "Saisir au plus %1 champs de type texte"
+msgstr "Saisir dans %1 champs de type texte maximum"
 
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr "Saisir au plus %1 champs de type wiki"
+#: NOT FOUND IN SOURCE
+msgid "Fin"
+msgstr "Fin"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1598
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "Priorité finale"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr "PrioritéFinale"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr "Trouver un groupe dont"
+
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
 msgstr "Trouver les groupes dont"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: NOT FOUND IN SOURCE
+msgid "Find new/open tickets"
+msgstr "Accéder aux tickets en cours"
+
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "Trouver les gens dont"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "Rechercher des tickets"
 
-#: html/Ticket/Elements/Tabs:81
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr "Terminer l'approbation"
+
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "Premier"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: NOT FOUND IN SOURCE
+msgid "First page"
+msgstr "Première page"
+
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "Foo Bar Baz"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
-msgstr "Foo !"
+msgstr "Foo!"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "Forcer la modification"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr "Format"
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "%quant(%1,ticket) trouvés"
 
-#: lib/RT/Record.pm:943
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "Objet trouvé"
 
-#: lib/RT/Date.pm:417
+#: NOT FOUND IN SOURCE
+msgid "Freeform"
+msgstr "FormulaireLibre"
+
+#: NOT FOUND IN SOURCE
+msgid "FreeformContactInfo"
+msgstr "SaisieLibreInfoContact"
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr "SaisieLibreMultiple"
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr "SaisieLibreSimple"
+
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "Ven."
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "En-têtes complets"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
 msgstr "Obtenir le modèle àpartir d'un fichier"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr "Obtention de l'utilisateur courant depuis une signature pgp\\n"
+
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "Donné à %1"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Global"
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
 msgstr "Champs personnalisés globaux"
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr "Configuration globale des champs personnalisés"
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr "Mots clé globaux"
+
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr "Scrips globaux"
 
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
-msgstr "Modèle global : %1"
+msgstr "Modèle global: %1"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
-msgstr "Lancer"
+msgstr "Go"
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
-msgstr "Lancer !"
+msgstr "Go!"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr "Signature pgp valide pour %1\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Goto page"
+msgstr "Aller à la page"
+
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "Aller au ticket"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr "Accorder"
+
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Groupe"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr "Groupe %1 %2 : %3"
+
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "Droits de groupe"
 
-#: lib/RT/Group_Overlay.pm:983
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "Le groupe a déjà un membre"
 
-#: html/Admin/Groups/Modify.html:109
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr "Le groupe n'a pas pu être créé"
+
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "Le groupe %1 n'a pu être créé"
 
-#: lib/RT/Group_Overlay.pm:521
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "Groupe ajouté"
 
-#: lib/RT/Group_Overlay.pm:1155
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "Un tel membre n'appartient pas au groupe"
 
-#: lib/RT/Group_Overlay.pm:963 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:809 lib/RT/Ticket_Overlay.pm:1399 lib/RT/Ticket_Overlay.pm:1479
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Groupe introuvable"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr "Groupe introuvable.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr "Groupe non spécifié.\\n"
+
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Groupes"
 
-#: lib/RT/Group_Overlay.pm:989
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "Les groupes ne peuvent pas être membres de leurs membres"
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
 msgstr "Groupes correspondant au critère de recherche"
 
-#: html/Ticket/Elements/ShowRequestor:77
+#: NOT FOUND IN SOURCE
 msgid "Groups this user belongs to"
 msgstr "Cette utilisateur appartient aux groupes"
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
-msgstr "Bonjour !"
+msgstr "Bonjour!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "Bonjour, %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "Historique"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
 msgstr "Historique du groupe %1"
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
 msgstr "Historique de l'utilisateur %1"
 
-#: html/Elements/Tabs:65
+#: NOT FOUND IN SOURCE
+msgid "HomePhone"
+msgstr "Téléphone domicile"
+
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: lib/RT/Base.pm:119
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
-msgstr "J'ai %quant(%1, toupie à béton)."
+msgstr "J'ai %quant (%1, toupie à béton)"
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr "Je suis perdu"
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
+msgstr "J'ai %quant (%1, toupie à béton)"
 
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1523
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "Identifiant"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Identité"
 
@@ -1795,710 +2502,823 @@ msgstr "Identité"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "Si une approbation est refusée, rejette l'original et supprime les approbations en attente"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "SI aucun demandeur n'est spécifié, créer les tickets pour ce demandeur."
+msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
-msgstr "Si aucune file n'est spécifée, créer les tickets dans cette file."
+msgstr "Si aucune queue n'est spécifée, créer les tickets dans cette queue."
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
-msgstr "Si cet outil était setgid, un utilisateur local mal intentionné pourrait l'utiliser pour obtenir un accès administrateur à RT."
+msgstr "Si cet outil était setgid, un utilisateur local mal intentionné pourrait l'utiliser pour obtenir un access administrateur à RT"
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "Si vous avez fait une modification, assurez vous de"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "Valeur incorrecte pour %1"
 
-#: lib/RT/Record.pm:937
+#: NOT FOUND IN SOURCE
+msgid "Image"
+msgstr "Image"
+
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "Champ non modifiable"
 
-#: html/Admin/Groups/index.html:65
+#: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
+msgid "Include disabled custom fields in listing."
+msgstr "Inclure les champs personnalisés désactivés dans la liste"
+
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
 msgstr "Inclure les groupes inactifs dans le listage."
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
-msgstr "Afficher les files inactives."
+msgstr "Afficher les queues inactives."
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
-msgstr "Inclure les utilisateurs désactivés dans le résultat."
-
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr "Requête incomplète"
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr "Requête incomplète"
+msgstr "Inclure les utilisateurs désactivés dans le résultat"
 
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1573
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "Priorité initiale"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr "PrioritéInitiale"
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "Erreur à l'entrée"
 
-#: lib/RT/Ticket_Overlay.pm:3467
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr "Votre intéret est noté"
+
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "Erreur interne"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
-msgstr "Erreur interne : %1"
+msgstr "Erreur interne: %1"
 
-#: lib/RT/Group_Overlay.pm:668
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "Type de groupe invalide"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "Droit invalide"
 
-#: lib/RT/Record.pm:939
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr "Type invalide"
+
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "Données invalides"
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: NOT FOUND IN SOURCE
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr "Intervenant invalide, affectation à 'personne'"
+
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
-msgstr "File invalide"
+msgstr "Queue invalide"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "Droit invalide"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
-msgstr "File invalide pour %1"
+msgstr "Queue invalide pour %1"
 
-#: lib/RT/Record.pm:1598
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "Valeur incorrecte pour le champ personnalisé"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "Valeur de statut invalide"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
-msgstr "Il est extrêmement important que les utilisateurs non autorisés n'aient pas accès à cet outil."
+msgstr "Il est extrêmement important que les utilisateurs non authorisés n'aient pas accès à cet outil"
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
-msgstr "Il est suggéré de créer un utilisateur Unix non privilégié appartenant au bon groupe et ayant accès à RT pour utiliser cet outil."
+msgstr "Il est suggéré de créer un utilisateur unix non privilégié appartenant au bon groupe et ayant accès à RT pour utiliser cet outil"
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
-msgstr "Il faut plusieurs paramètres :"
+msgstr "Il faut plusieurs paramètres:"
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr "Italique"
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
+msgstr "Eléments attendant mon approbation"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "Jan."
 
-#: lib/RT/Group_Overlay.pm:166
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr "Janvier"
+
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "Rejoignez ou quittez ce groupe"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "Jul."
 
-#: html/Ticket/Elements/Tabs:122
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr "Juillet"
+
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "Tout"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "Jun."
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr "Juin"
+
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr "Mot Clé"
+
+#: NOT FOUND IN SOURCE
+msgid "Lang"
+msgstr "Lang"
+
+#: html/User/Prefs.html:54
 msgid "Language"
 msgstr "Langue"
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr "Grande"
-
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "Dernier"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "Dernier contact"
 
-#: html/Elements/SelectDateType:50
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
+
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "Date dernier contact"
 
-#: html/Elements/SelectDateType:51
+#: NOT FOUND IN SOURCE
+msgid "Last Notified"
+msgstr "Dernière notification"
+
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "Date dernière MAJ"
 
-#: html/Search/Elements/PickBasics:103
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr "DernièreMAJ"
+
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
 msgstr "DernièreMAJPar"
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "Restant"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "Donner accès à RT à cet utilisateur"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "Autoriser cet utilisateur à recevoir des droits"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr "Relation"
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr "Limitation des intervenants à %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
+msgstr "Limitation de la queue à %1 %2"
 
-#: lib/RT/Record.pm:1293
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "Le lien existe déja"
 
-#: lib/RT/Record.pm:1307
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "Le lien ne peut être ajouté"
 
-#: lib/RT/Record.pm:1313
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "Le lien est ajouté (%1)"
 
-#: lib/RT/Record.pm:1374
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "Le lien est effacé (%1)"
 
-#: lib/RT/Record.pm:1380
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Lien introuvable"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "Lier le ticket n°%1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr "Lier au ticket %1"
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Relations"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
-msgstr "Charger"
+msgstr "Charge"
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
-msgstr "Charger les recherches sauvées :"
+msgstr "Charger les recherches sauvées:"
 
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr "ChargerRechercheSauvée"
-
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr "Modules perl chargés"
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr "Recherche %1 chargée"
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "Localisation"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
-msgstr "Le répertoire de journalisation %1 est introuvable ou inaccessible en écriture.\\n RT ne peut être lancé."
+msgstr "Le répertoire de log %1 est introuvable ou en lecture seule. \\n RT ne peut pas démarrer"
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "Connecté en tant que %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "Connexion"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
 msgstr "Faire attention aux types différents"
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "Attribuer"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "Appliquer Statut"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "Appliquer date d'échéance"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "Appliquer date de résolution"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "Appliquer date de début"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "Appliquer date d'ouverture"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "Appliquer Age"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "Appliquer priorité"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
-msgstr "Appliquer file"
+msgstr "Appliquer queue"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "Changer le sujet"
 
-#: lib/RT/Group_Overlay.pm:169
-msgid "Make this group visible to user"
-msgstr "Malkovich Malkovich Malkovich Malkovich"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
+msgstr ""
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
-msgstr "Gérer les champs personnalisés et leurs valeurs"
+msgstr "Gérer les champs personnalisés et leur valeurs"
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "Gérer les groupes et leurs membres"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
-msgstr "Gérer les propriétés et configurations générales des files"
+msgstr "Gérer les propriétés et configurations générales des queues"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
-msgstr "Gérer les files et leurs propriétés individuelles"
+msgstr "Gérer les queues et leurs propriétés individuelles"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "Gérer les utilisateurs et mots de passe"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "Mar."
 
-#: lib/RT/Date.pm:441
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr "Mars"
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr "Mai"
+
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "Mai."
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr "Membre %1 ajouté"
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr "Membre %1 supprimé"
 
-#: lib/RT/Group_Overlay.pm:1000
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "Membre ajouté"
 
-#: lib/RT/Group_Overlay.pm:1162
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "Membre supprimé"
 
-#: lib/RT/Group_Overlay.pm:1166
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "Membre non supprimé"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "Membre de"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr "MembreDe"
+
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "Membres"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr "Appartenance à %1 ajoutée"
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr "Appartenance à %1 supprimée"
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
 msgstr "Affiliations"
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
 msgstr "Affiliations de l'utilisateur %1"
 
-#: lib/RT/Ticket_Overlay.pm:2857
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "Fusion réussie"
 
-#: lib/RT/Ticket_Overlay.pm:2744
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
-msgstr "Échec de fusion. Ne peut appliquer EffectiveId"
+msgstr "Echec de fusion. Ne peut appliquer EffectiveId"
 
-#: lib/RT/Ticket_Overlay.pm:2752
-msgid "Merge failed. Couldn't set Status"
-msgstr "Échec de fusion. Ne peut appliquer Status"
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "Fusionner dans"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
 msgstr "Fusionné avec %1"
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "Message"
 
-#: lib/RT/Ticket_Overlay.pm:2414
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
 msgstr "Le message ne peut être sauvegardé"
 
-#: lib/RT/Ticket_Overlay.pm:2417
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2517
 msgid "Message recorded"
 msgstr "Message sauvegardé"
 
-#: html/Ticket/Elements/PreviewScrips:115
+#: html/Ticket/Elements/PreviewScrips:70
 msgid "Messages about this ticket will not be sent to..."
 msgstr "Les messages relatifs à ce ticket ne seront pas envoyés à..."
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
-msgstr "Parenthèses non correspondantes"
-
-#: lib/RT/Record.pm:941
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
-msgstr "Clé primaire manquante ? : %1"
+msgstr "Clé primaire manquante? : %1"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "Mobile"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "MobilePhone"
+msgstr "MobilePhone"
+
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "Modifier la liste de droits"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr "Modifier les champs personnalisés s'appliquant à %1 pour tous les %2"
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
+msgstr "Modifier champ personnalisé %1"
 
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
+#: NOT FOUND IN SOURCE
 msgid "Modify Custom Fields which apply to all %1"
 msgstr "Modifier les champs personnalisés qui s'appliquent à tous les %1"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
+msgstr "Modifier les champs personnalisés globaux"
+
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
-msgstr "Modifier les droits du groupe"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
-msgstr "Modifier les membres"
+msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
-msgstr "Modifier les droits"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
-msgstr "Modifier les modèles de Scrips pour cette file"
+msgstr "Modifier les modèles de Scrips pour cette queue"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
-msgstr "Modifier les Scrips pour cette file"
+msgstr "Modifier les Scrips pour cette queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr "Modifier ACLs système"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr "Modifier le modèle %1"
+
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
-msgstr "Modifier les droits des usagers"
+msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
-msgstr "Modifier un champ personnalisé pour la file %1"
+msgstr "Modifier un champ personnalisé pour la queue %1"
+
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr "Modifier un champ personnalisé global"
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
-msgstr "Modifier le scrip pour la file %1"
+msgstr "Modifier le scrip pour la queue %1"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
-msgstr "Modifier le scrip qui s'applique à toutes les files"
+msgstr "Modiier le scrip qui s'applique à toutes les queues"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
 msgstr "Modifier les objets associés à %1"
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr "Modifier les dates pur n°%1"
+
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "Modifier les dates pour n°%1"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "Modifier les dates du ticket n°%1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr "Modifier globalement les champs personnalisés"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "Modifier les droits de groupe globaux"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
-msgstr "Modifier les droits de groupe globaux."
+msgstr "Modifier les droits de groupe globaux"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr "Modifier les droits globaux des groupes"
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr "Modifier les droits globaux des utilisateurs"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr "Modifier les scrips globaux"
+
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "Modifier les droits utilisateurs globaux"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
-msgstr "Modifier les droits utilisateurs globaux."
+msgstr "Modifier les droits utilisateurs globaux"
 
-#: lib/RT/Group_Overlay.pm:163
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "Modifier les métadonnées ou supprimer le groupe"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
 msgstr "Modifier les droits de groupe pour le champ personnalisé %1"
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "Modifier les droits du groupe %1"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
-msgstr "Modifier les droits de groupe pour la file %1"
+msgstr "Modifier les droits de groupe pour la queue %1"
 
-#: lib/RT/Group_Overlay.pm:165
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
-msgstr "Modifier la liste des membres pour ce groupe"
+msgstr "Modifier le membership roster pour ce groupe"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
-msgstr "Modifier son propre profil RT"
+msgstr "Modifier son propre profile RT"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
-msgstr "Modifier les utilisateurs de la file %1"
+msgstr "Modifier les utilisateurs de la queue %1"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "Modifier les utilisateurs du ticket n°%1"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
-msgstr "Modifier les scrips de la file %1"
+msgstr "Modifier les scrips de la queue %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
-msgstr "Modifier les scrips s'appliquant à toutes les files"
+msgstr "Modifier les scrips s'appliquant à toutes les queues"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "Modifier le modèle %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "Modifier les modèles globaux"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "Modifier le groupe %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
-msgstr "Modifier les observateurs de la file"
+msgstr "Modifier les observateurs de la queue"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "Modifier l'utilisateur %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
-msgstr "Modifier le ticket n°%1"
+msgstr "Modifier le ticket # %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "Modifier le ticket n°%1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "Modifier les tickets"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
 msgstr "Modifier les droits utilisateurs pour le champ personnalisé %1"
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "Modifier les droits utilisateurs pour le groupe %1"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
-msgstr "Modifier les droits utilisateurs pour la file %1"
+msgstr "Modifier les droits utilisateurs pour la queue %1"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
+msgstr "Modifier les observateurs dela queue '%1'"
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr "ModifierACL"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr "ModifierChampPersonnalisé"
-
-#: lib/RT/Group_Overlay.pm:166
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "ModifierPropresAppartenances"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr "ModifierObservateurs"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr "ModifierScrips"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr "ModifierDonnéesPerso"
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr "ModifierModèle"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr "ModifierTicket"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "Lun."
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
-msgstr "Plus d'informations sur %1"
+msgstr "Plus d'info sur %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Move"
+msgstr "Déplacer"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr "Aller en bas"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr "Aller en haut"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "Multiple"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "Attribut 'Nom' obligatoire"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr "Mes tickets %1s"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr "Mes approbations"
+
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "Mes approbations"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
 msgstr "Mes recherches"
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Nom"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "Nom utilisé"
 
-#: html/Ticket/Elements/ShowDates:73
+#: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr "Approbation de l'administrateur système nécessaire"
+
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "Jamais"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "Nouveau"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
-msgstr "Nouveaux liens"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 
@@ -2506,229 +3326,296 @@ msgstr "Nouveau mot de passe"
 msgid "New Pending Approval"
 msgstr "Nouvelles approbations en attente"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
 msgstr "Nouvelle requête"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New Relationships"
+msgstr "Nouvelles relations"
+
+#: NOT FOUND IN SOURCE
+msgid "New Search"
+msgstr "Nouvelle recherche"
+
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "Nouveau champ personnalisé"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "Nouveau groupe"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "Notification de nouveau mot de passe envoyée"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
-msgstr "Nouvelle file"
+msgstr "Nouvelle queue"
 
-#: html/Admin/Elements/SelectRights:65
+#: NOT FOUND IN SOURCE
+msgid "New request"
+msgstr "Nouvelle demande"
+
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "Nouveaux droits"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "Nouveau scrip"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr "Nouvelle recherche"
+
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "Nouveau modèle"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr "Nouveau ticket"
 
-#: lib/RT/Ticket_Overlay.pm:2721
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "Nouveau ticket inconnu"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "Nouvel utilisateur"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "Nouvel utilisateur appelé"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "Nouveaux observateurs"
 
-#: html/Ticket/Elements/Tabs:92
+#: NOT FOUND IN SOURCE
+msgid "New window setting"
+msgstr "Nouveaux paramètres d'affichage"
+
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "Suivant"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: NOT FOUND IN SOURCE
+msgid "Next page"
+msgstr "Page suivante"
+
+#: NOT FOUND IN SOURCE
+msgid "NickName"
+msgstr "Surnom"
+
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "Surnom"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr "Aucune classe définie"
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "Aucun champ personnalisé"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
 msgstr "Aucun champ personnalisé défini"
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "Aucun groupe défini"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
 msgstr "Aucune requête"
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
-msgstr "Aucune file définie"
+msgstr "Aucune queue définie"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
-msgstr "Pas d'utilisateur RT trouvé. Merci de consulter votre administrateur RT.\\n"
+msgstr "Aucun utilisateur RT trouvé. Merci de consulter votre administrateur RT"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "Pas de modèle"
 
-#: html/Approvals/Elements/Approve:67
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket "
+msgstr "Aucun ticket spécifié. Annulation de ticket"
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr "Aucun ticket spécifié. Annulation des modifications de tickets\\n\\n"
+
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "Pas d'action"
 
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr "Aucune colonne spécifiée"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr "Commande introuvable\\n"
+
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "Pas de commentaires concernant cet utilisateur"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: NOT FOUND IN SOURCE
+msgid "No correspondence attached"
+msgstr "Pas de texte dans le courrier"
+
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "Aucune description disponible pour %1"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "Aucun groupe spécifié"
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
 msgstr "Aucun groupe trouvé d'après le critère de recherche."
 
-#: lib/RT/Ticket_Overlay.pm:2357
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr "Aucun messages attachés"
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "Pas de mot de passe configuré"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
-msgstr "Permission refusée pour la création de file"
+msgstr "Permission refusée pour la création de queue"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
-msgstr "Vous n'êtes pas autorisé à créer un ticket dans cette file '%1'"
+msgstr "Vous n'êtes pas autorisé à créer un ticket dans cette queue '%1'"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "Permission refusée pour la création d'utilisateurs"
 
-#: html/SelfService/Display.html:167
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "Pas de permission pour afficher ce ticket"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "Pas de permission pour afficher le ticket mis à jour"
 
-#: lib/RT/Queue_Overlay.pm:796 lib/RT/Ticket_Overlay.pm:1458
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "Aucun groupe/utilisateur spécifié"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
-msgstr "Aucun groupe/utilisateur sélectionné."
+msgstr "Aucun groupe/utilisateur sélectionné"
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
-msgstr "Pas de file correspondant aux critères de recherche."
+msgstr "Pas de queue correspondant aux critères de recherche"
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "Aucun droit trouvé"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
-msgstr "Aucun droit accordé."
+msgstr "Aucun droit accordé"
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr "Pas de recherche chargée"
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "Pas de critère de recherche."
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
 msgstr "Pas de sujet"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr "Aucun numéro de ticket spécifié."
+
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
-msgstr "Aucun type de transaction spécifié"
+msgstr "Aucun type de transaction spécifié."
 
-#: html/Admin/Users/index.html:55
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr "Aucun utilisateur ou adresse email spécifié"
+
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "Aucun utilisateur ne correspond aux critères de recherche."
 
-#: lib/RT/Record.pm:933
+#: NOT FOUND IN SOURCE
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr "Aucun utilisateur RT valide trouvé. Gestionnaire de cvs RT inaccessible. Merci de contacter votre administrateur RT.\\n"
+
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
-msgstr "Pas de valeur à positionner !\\n"
+msgstr "Aucune valeur envoyée à _Set!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "Personne"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
-msgstr "Champ inexistant ?"
+msgstr "Champ inexistant?"
+
+#: NOT FOUND IN SOURCE
+msgid "Not logged in"
+msgstr "Non loggé"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
-msgstr "Non connecté."
+msgstr "Non connecté"
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "Non renseigné"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
-msgstr "Fonction pas encore disponible."
+msgstr "Fonction pas encore disponible"
+
+#: NOT FOUND IN SOURCE
+msgid "Not yet implemented...."
+msgstr "Fonction pas encore disponible..."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "Notes"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "Impossible d'envoyer la notification"
 
@@ -2742,11 +3629,11 @@ msgstr "Avertir les AdminCCs par un commentaire"
 
 #: etc/initialdata:93 etc/upgrade/3.1.17/content:6
 msgid "Notify Ccs"
-msgstr "Aviser par cc"
+msgstr ""
 
 #: etc/initialdata:89 etc/upgrade/3.1.17/content:2
 msgid "Notify Ccs as Comment"
-msgstr "Aviser par cc pour commentaires"
+msgstr ""
 
 #: etc/initialdata:128
 msgid "Notify Other Recipients"
@@ -2800,57 +3687,51 @@ msgstr "Avertir les demandeurs, CCs et AdminCCs"
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "Avertir les demandeurs, CCs et AdminCCs par un commentaire"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "Nov."
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr "OU"
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr "Novembre"
 
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr "L'objet n'a pas pu être ajouté"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr "Impossible d'effacer l'objet"
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr "Objet ajouté"
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr "Objet effacé"
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
 msgstr "Les objets de type %1 ne peuvent avoir de champs personnalisés"
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
 msgstr "Le type d'objet ne correspond pas"
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "Oct."
 
-#: html/Tools/Elements/Tabs:53
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr "Octobre"
+
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
-msgstr "Édition hors ligne"
+msgstr "Édition hors ligne©"
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
-msgstr "Téléchargement hors ligne"
+msgstr "Upload hors ligne"
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "Le"
 
@@ -2872,11 +3753,11 @@ msgstr "Lors d'un changement d'intervenant"
 
 #: etc/initialdata:177 etc/upgrade/3.1.17/content:15
 msgid "On Priority Change"
-msgstr "Lors d'un changement de priorité"
+msgstr ""
 
 #: etc/initialdata:192
 msgid "On Queue Change"
-msgstr "Lors d'un changement de file"
+msgstr "Lors d'un changement de queue"
 
 #: etc/initialdata:198
 msgid "On Resolve"
@@ -2890,130 +3771,149 @@ msgstr "Lors d'un changement de statut"
 msgid "On Transaction"
 msgstr "Lors d'une transaction"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "Ne montrer que les approbations pour les demandes créées après %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "Ne montrer que les approbations pour les demandes créées avant %1"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Ouvert"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Ouvrir"
 
-#: html/SelfService/Elements/Tabs:63
+#: NOT FOUND IN SOURCE
+msgid "Open requests"
+msgstr "Ouvrir les demandes"
+
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr "Tickets ouverts"
 
+#: NOT FOUND IN SOURCE
+msgid "Open tickets (from listing) in a new window"
+msgstr "Ouvrir les tickets (depuis une liste) dans une nouvelle fenêtre."
+
+#: NOT FOUND IN SOURCE
+msgid "Open tickets (from listing) in another window"
+msgstr "Ouvrir les tickets (depuis une liste) dans une autre fenêtre."
+
 #: etc/initialdata:140
 msgid "Open tickets on correspondence"
 msgstr "Ouvrir les tickets lors d'une correspondance"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
 msgstr "Trier par"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: NOT FOUND IN SOURCE
+msgid "Ordering and sorting"
+msgstr "Ranger et classer"
+
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Organisation"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "Ticket source: n°%1"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr "Mail sortant suite à l'enregistrement d'un commentaire"
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr "Mail sortant enregistré"
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
-msgstr "Temps dépassé, priorité augmentée"
+msgstr "Temps dépassé, priorité déplacée"
+
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr "Tickets propres"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr "PrendreTicket"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1763
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "Intervenant"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: NOT FOUND IN SOURCE
+msgid "Owner changed from %1 to %2"
+msgstr "Intervenant changé de %1 en %2"
+
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
-msgstr "Le propriétaire ne peut être sauvé."
+msgstr "Le propriétaire ne peu être sauvé"
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "Intervenant forcé de %1 à %2"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: NOT FOUND IN SOURCE
+msgid "Owner is"
+msgstr "L'intervenant est"
+
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
 msgstr "Page %1 sur %2"
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "Bipeur"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: NOT FOUND IN SOURCE
+msgid "PagerPhone"
+msgstr "PagerPhone"
+
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "Parents"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "Mot de passe"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "Pense-bête pour votre mot de passe"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr "Mot de passe changé"
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
+msgid "Password too short"
+msgstr "Mot de passe trop court"
 
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr "Le mot de passe doit comporter au moins %1 caractères"
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr "Mot de passe défini"
-
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
-msgstr "Mot de passe : %1"
-
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr "Mot de passe : permission refusée"
+msgstr "Mot de passe: %1"
 
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
-msgstr "Les mots de passe sont différents."
+msgstr "Les mots de passes sont différents"
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr "Les mots de passe sont différents. Votre mot de passe n'a pas été modifié"
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "Personnes"
 
@@ -3021,60 +3921,76 @@ msgstr "Personnes"
 msgid "Perform a user-defined action"
 msgstr "Réaliser une action définie par l'utilisateur"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
 msgstr "Configuration de Perl"
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1117 lib/RT/Group_Overlay.pm:1121 lib/RT/Group_Overlay.pm:1130 lib/RT/Group_Overlay.pm:1240 lib/RT/Group_Overlay.pm:1244 lib/RT/Group_Overlay.pm:1250 lib/RT/Group_Overlay.pm:445 lib/RT/Group_Overlay.pm:542 lib/RT/Group_Overlay.pm:620 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:726 lib/RT/Group_Overlay.pm:730 lib/RT/Group_Overlay.pm:736 lib/RT/Group_Overlay.pm:922 lib/RT/Group_Overlay.pm:926 lib/RT/Group_Overlay.pm:939 lib/RT/Queue_Overlay.pm:1055 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:658 lib/RT/Queue_Overlay.pm:668 lib/RT/Queue_Overlay.pm:682 lib/RT/Queue_Overlay.pm:820 lib/RT/Queue_Overlay.pm:829 lib/RT/Queue_Overlay.pm:842 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1326 lib/RT/Ticket_Overlay.pm:1336 lib/RT/Ticket_Overlay.pm:1350 lib/RT/Ticket_Overlay.pm:1491 lib/RT/Ticket_Overlay.pm:1501 lib/RT/Ticket_Overlay.pm:1515 lib/RT/Ticket_Overlay.pm:1632 lib/RT/Ticket_Overlay.pm:1952 lib/RT/Ticket_Overlay.pm:2090 lib/RT/Ticket_Overlay.pm:2260 lib/RT/Ticket_Overlay.pm:2310 lib/RT/Ticket_Overlay.pm:2482 lib/RT/Ticket_Overlay.pm:2585 lib/RT/Ticket_Overlay.pm:2633 lib/RT/Ticket_Overlay.pm:2712 lib/RT/Ticket_Overlay.pm:2726 lib/RT/Ticket_Overlay.pm:2950 lib/RT/Ticket_Overlay.pm:2960 lib/RT/Ticket_Overlay.pm:2965 lib/RT/Ticket_Overlay.pm:3188 lib/RT/Ticket_Overlay.pm:3192 lib/RT/Ticket_Overlay.pm:3335 lib/RT/Ticket_Overlay.pm:3461 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "Accès refusé"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "Groupes personnels"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Groupes personnels"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Groupes personnels:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "Numéros de téléphone"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: NOT FOUND IN SOURCE
+msgid "Placeholder"
+msgstr "Paramètre fictif"
+
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "Préférences"
 
-#: lib/RT/Action/Generic.pm:196
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr "Préférences"
+
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "Préparation interrompue"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "Précédent"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: NOT FOUND IN SOURCE
+msgid "Previous page"
+msgstr "Page précédente"
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr "Pri."
+
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
-msgstr "Personne/groupe %1 non trouvé."
+msgstr "Principal %1 non trouvé"
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1547
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Priorité"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "La priorité débute à "
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
 msgstr "Privé:"
 
@@ -3082,473 +3998,638 @@ msgstr "Privé:"
 msgid "Privileged"
 msgstr "Privilégié"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
-msgstr "Statut privilégiés : %1"
+msgstr "Statuts privilégiés : %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "Utilisateurs privilégiés"
 
+#: NOT FOUND IN SOURCE
+msgid "Projects"
+msgstr "Projets"
+
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr "Pseudo groupe pour usage interne"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
 msgstr "Requête"
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
 msgstr "Constructeur de requête"
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1374
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
-msgstr "File"
+msgstr "Queue"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
-msgstr "File %1 non trouvée"
+msgstr "Queue %1 non trouvée"
 
-#: html/Admin/Queues/Modify.html:64
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr "Queue '%1' inconnue\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr "Sélection des mots clé de queue"
+
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
-msgstr "Nom de la file"
+msgstr "Nom de la queue"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr "Scrips de queue"
 
-#: lib/RT/Queue_Overlay.pm:366
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
-msgstr "File déjà créée"
+msgstr "Queue déjà créée"
 
-#: lib/RT/Queue_Overlay.pm:375 lib/RT/Queue_Overlay.pm:381
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
-msgstr "Impossible de créer la file"
+msgstr "Impossible de créer la queue"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
-msgstr "File ne pouvant être chargée."
+msgstr "Queue ne pouvant être chargée"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:385 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
-msgstr "File créée"
+msgstr "Queue créée"
+
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr "Queue non spécifié"
 
-#: html/SelfService/Display.html:126 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
-msgstr "File inconnue"
+msgstr "Queue inconnue"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
-msgstr "Files"
+msgstr "Queues"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr "Recherche rapide"
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
-msgstr "Création rapide de ticket"
+msgstr "Création de ticket rapide"
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr "RSS"
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 pour %2"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "Administration RT"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr "Erreur d'authentification RT."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr "Avis de rejet RT: %1"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr "Erreur de configuration RT"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr "Erreur critique RT. Courrier non enregistré !"
+
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "Erreur RT"
 
-#: html/Admin/Tools/Configuration.html:73
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr "RT a reçu un e-mail (%1) de lui-même."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr "RT a reçu du courrier (%1) de lui même"
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service / Closed Tickets"
+msgstr "RT Self Service / Tickets résolus"
+
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
 msgstr "Variables de RT"
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
-msgstr "RT en un coup d'Å“il"
+msgstr "RT en un coup d'oeil"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr "RT n'a pas réussi à vous identifier"
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr "RT n'a pas pu trouver de demandeur par sa recherche dans une base externe"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr "RT ne peut enregistrer votre session."
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr "RT n'a pas trouvé la queue"
 
-#: html/Elements/PageLayout:108
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr "RT n'a pas réussi à valider cette signature PGP. \\n"
+
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "RT pour %1"
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr "RT pour %1: %2"
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr "RT a exécuté vos commandes"
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT est &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Distribué sous <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 de la licence générale GNU.</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr "RT est &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Distribué sous <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 de la licence générale GNU.</a>"
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr "RT pense que ce courrier peut être un avis de non-distribution"
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr "RT va traiter ce courrier comme s'il n'était pas signé.\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr "L'interface d'utilisation de RT par email utilise une authentification PGP. Soit vous n'avez pas signé votre courrier, soit la signature est n'a pas pu être vérifiée"
+
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "Nom"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: NOT FOUND IN SOURCE
+msgid "RealName"
+msgstr "RealName"
+
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr "Ajout d'une référence par %1"
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr "Suppression de la référence par %1"
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
-msgstr "Ajout d'une référence à %1"
+msgstr "Ajout d'une reference à %1"
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
-msgstr "Suppression d'une référence à %1"
+msgstr "Suppression d'une reference à %1"
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "Mentionné par"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "Se rapporte à"
 
-#: html/Elements/Refresh:57
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr "SeRapporteA"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr "Affiner"
+
+#: NOT FOUND IN SOURCE
+msgid "Refine search"
+msgstr "Affiner la recherche"
+
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Rafraîchir cette page toutes les %1 minutes."
 
-#: html/Search/Bulk.html:116
+#: NOT FOUND IN SOURCE
+msgid "Relationships"
+msgstr "Relations"
+
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
-msgstr "Enlever AdminCc"
+msgstr "Enlever AdminCc "
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Enlever Cc"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "Enlever Demandeur"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Répondre"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
 msgstr "Adresse de réponse"
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
 msgstr "Répondre aux demandeurs"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "Répondre aux tickets"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "RépondreTicket"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "Demandeur"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: NOT FOUND IN SOURCE
+msgid "Requestor email address"
+msgstr "Adresse email du demandeur"
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr "Demandeur(s)"
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr "AdresseDuDemandeur"
+
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "Demandeurs"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "Le demande doit être résolue dans"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
-msgstr "Le paramètre requis '%1' n'est pas spécifié"
+msgstr "Le paramêtre requis '%1' n'est pas spécifié"
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Remise à zéro"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Domicile"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "Résoudre"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
-msgstr "Résoudre le ticket n°%1 (%2)"
+msgstr "Résoudre ticket n°%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "Résolu"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: NOT FOUND IN SOURCE
+msgid "Response to requestors"
+msgstr "Réponse aux demandeurs"
+
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "Résultats"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: NOT FOUND IN SOURCE
+msgid "Results per page"
+msgstr "Nb tickets par page"
+
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "Saisissez à nouveau votre mot de passe"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
 msgstr "Annuler"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr "Le droit %1 introuvable pour %2 %3 dans le périmètre %4 (%5)\\n"
+
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "Droit délégué"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "Droit accordé"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "Droit activé"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "Droit irrévocable"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "Droit inconnu"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
-msgstr "Droit non activé."
+msgstr "Droit non activé"
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "Droit révoqué"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Droits"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
-msgstr "Les droits n'ont pas pu être attribués à %1"
+msgstr "Les droits n'on pas pu être attribués à %1"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "Les droits n'ont pas pu être révoqués pour %1"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "Rôles"
 
-#: html/Search/Elements/DisplayOptions:83
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr "ApprobationDeRoot"
+
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
 msgstr "Lignes par pages"
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "Sam."
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
 msgstr "Sauver"
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "Enregistrer les modifications"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
-msgstr "Sauvegarder les préférences"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr "Recherche %1 sauvée"
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
 msgstr "Recherches sauvées"
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr "Scrip n°%1"
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "Scrip ajouté"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
-msgstr "Champs de scrip"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "Scrip supprimé"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "Scrips"
 
-#: html/Admin/Queues/Scrips.html:55
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr "Scrips pour %1\\n"
+
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
-msgstr "Scrips s'appliquant à toutes les files"
+msgstr "Scrips s'appliquant à toutes les queues"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "Rechercher"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr "Impossible de charger les attributs de recherche"
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
+msgstr "Critère de recherche"
 
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
-msgstr "Rechercher des approbations"
+msgstr "Chercher des approbations"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
-msgstr "Mise à jour de la recherche %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
+msgstr ""
 
-#: bin/rt-crontool:213
+#: NOT FOUND IN SOURCE
+msgid "Searches can't be associated with that kind of object"
+msgstr "Les recherches ne peuvent être associées à ce type d'objet"
+
+#: bin/rt-crontool:184
 msgid "Security:"
-msgstr "Sécurité :"
+msgstr "Sécurité:"
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
 msgstr "Voir les champs personnalisés"
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
-msgstr "Voir les mails sortant et leurs destinataires"
+msgstr "Voir les emails sortant et leurs destinataires"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr "Voir les commentaires privés du ticket"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
-msgstr "Vue récapitulative des tickets"
+msgstr "Vue récapilutative des tickets"
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
 msgstr "VoirChampPersonnalisé"
 
-#: lib/RT/Group_Overlay.pm:169
-msgid "SeeGroup"
-msgstr "VoirGroupe"
-
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
-msgstr "VoirFile"
+msgstr "VoirQueue"
+
+#: NOT FOUND IN SOURCE
+msgid "Select"
+msgstr "Selectionner"
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Select a Custom Field"
-msgstr "Choisissez un champ personnalisé"
+msgstr "Choisir un champ personnalisé"
 
-#: html/Admin/Groups/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
+msgstr ""
+
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "Choisir un groupe"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
-msgstr "Choisir une file"
-
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr "Choisir une file pour votre nouveau ticket"
+msgstr "Choisir une queue"
 
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "Choisir un utilisateur"
 
-#: html/Admin/Elements/CustomFieldTabs:90
+#: NOT FOUND IN SOURCE
+msgid "Select class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
 msgid "Select custom field"
 msgstr "Choisir le champ personnalisé"
 
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr "Choisir des champs personnalisés pour tous les groupes d'utilisateurs"
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr "Choisir des champs personnalisés pour tous les utilisateurs"
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
-msgstr "Choisir des champs personnalisés pour toutes les files"
-
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr "Choisir des champs personnalisés pour les opération sur les tickets de toutes les files"
-
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "Choisir le groupe"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr "Choisir plusieurs valeurs"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr "Choisir une valeur"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
-msgstr "Choisir la file"
+msgstr "Choisir la queue"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr "Choisir le scrip"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr "Choisir le modèle"
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
-msgstr "Choisir au plus %1 valeurs"
+msgstr "Choisir un maximum de %1 valeurs "
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr "Choisir l'utilisateur"
 
-#: html/Admin/Elements/EditCustomFields:58
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
+msgstr "ChoixMultiples"
+
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
+msgstr "ChoixSimple"
+
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
 msgstr "Champs personnalisés sélectionnés"
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
 msgstr "Objets sélectionnés"
 
+#: NOT FOUND IN SOURCE
+msgid "Self Service"
+msgstr "Self Service"
+
 #: etc/initialdata:121
 msgid "Send mail to all watchers"
 msgstr "Envoyer un courrier à tous les observateurs"
 
 #: etc/initialdata:117
 msgid "Send mail to all watchers as a \"comment\""
-msgstr "Envoyer un mail de commentaire à tous les observateurs"
+msgstr "Envoyer un courrier à tous les observateurs en tant que \"commentaire\""
 
 #: etc/initialdata:112
 msgid "Send mail to requestors and Ccs"
@@ -3568,11 +4649,11 @@ msgstr "Envoyer un courrier aux CCs et Bccs explicitement indiqués"
 
 #: etc/initialdata:94 etc/upgrade/3.1.17/content:7
 msgid "Sends mail to the Ccs"
-msgstr "Envoyer un courriel en cc"
+msgstr ""
 
 #: etc/initialdata:90 etc/upgrade/3.1.17/content:3
 msgid "Sends mail to the Ccs as a comment"
-msgstr "Envoyer un courriel en cc pour commentaires"
+msgstr ""
 
 #: etc/initialdata:102
 msgid "Sends mail to the administrative Ccs"
@@ -3586,131 +4667,183 @@ msgstr "Envoyer un mail aux AdminCCs en tant que commentaire"
 msgid "Sends mail to the owner"
 msgstr "Envoyer un courrier à l'intervenant"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "Sep."
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr "Septembre"
+
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr "Afficher"
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
-msgstr "Afficher les approbations"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
 msgstr "Afficher les colonnes"
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "Afficher les résultats"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "Afficher les requêtes approuvées"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "Affichage court"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "Afficher les requêtes refusées"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "Affichage long"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "Afficher les requêtes en attente"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "Afficher les requêtes attendant d'autres approbations"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: NOT FOUND IN SOURCE
+msgid "Show ticket private commentary"
+msgstr "Afficher les commentaires privés du ticket"
+
+#: NOT FOUND IN SOURCE
+msgid "Show ticket summaries"
+msgstr "Afficher les résumés de tickets"
+
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
 msgstr "AfficherACL"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr "VoirOngletConfiguration"
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
 msgstr "AfficherEmailSortant"
 
-#: lib/RT/Group_Overlay.pm:168
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
 msgstr "AfficherRecherchesSauvées"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr "AfficherScrips"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr "AfficherModèle"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr "AfficherTicket"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr "AfficherCommentairesTickets"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
-msgstr "S'identifier en tant que demandeur ou CC de file ou de ticket"
+msgstr "S'identifier en tant que demandeur ou CC de queue ou de ticket"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
-msgstr "S'identifier en tant qu'AdminCC de ticket ou de file"
+msgstr "S'identifier en tant qu'AdminCC de ticket ou de queue"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "Signature"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
+msgstr "Connecté en tant que %1"
+
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "Unique"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr "Taille"
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr "Passer le menu"
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr "Petite"
-
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
 msgstr "Trier"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Sort Order"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Sort key"
+msgstr "Ordre de tri"
+
+#: NOT FOUND IN SOURCE
+msgid "Sort results by"
+msgstr "Trier les résultats par"
+
+#: NOT FOUND IN SOURCE
+msgid "SortOrder"
+msgstr "SortOrder"
+
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr "Étape"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr "Bloqué"
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr "Page de début"
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "Ouvert le"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr "La date de démarrage '%1' n'a pas pu être analysée"
+
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "Débute"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr "Débute le"
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr "La date de début '%1' n'a pas pu être analysée"
+
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Etat"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1407
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Statut"
 
@@ -3718,385 +4851,522 @@ msgstr "Statut"
 msgid "Status Change"
 msgstr "Changement de statut"
 
-#: html/Ticket/Elements/Tabs:170
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr "Statut modifié de %1 à %2 "
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr "ChangementDeStatut"
+
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "Voler"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
 msgstr "Voler les tickets "
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr "VolerTicket"
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
+msgid "Stolen from %1 "
 msgstr "Volé à %1"
 
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr "Style"
-
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1489
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Sujet"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "Sujet modifié en %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "Valider"
 
-#: lib/RT/Group_Overlay.pm:774
+#: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr "Soumettre flux de travail"
+
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "Réussi"
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "Dim."
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "SuperUtilisateur"
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "Système"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
 msgstr "Configuration système"
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "Erreur système"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr "Erreur système : %1"
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr "Erreur Système. Droit non délégué."
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr "Erreur Système. Droit non délégué"
 
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
 msgstr "Outils système"
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "Erreur système. Droit non délégué."
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
-msgstr "Erreur système. Droit non accordé."
+msgstr "Erreur système. Droit non accordé"
+
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr "Erreur Système. Imposible de déléguer les droits"
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
-msgstr "Groupes systèmes"
+msgstr "Groupes système"
 
 #: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
 msgid "SystemRolegroup for internal use"
 msgstr "SystemRolegroup à usage interne"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "Chaîne_de_test"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "Prendre"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
 msgstr "Prendre les tickets"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr "PrendreTicket"
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "Pris"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: NOT FOUND IN SOURCE
+msgid "Task"
+msgstr "Tâche"
+
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Modèle"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "Modèle n°%1"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "Modèle supprimé"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Modèle inconnu"
 
-#: lib/RT/Template_Overlay.pm:376
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr "Modèle inconnu\\n"
+
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Modèle analysé"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Modèles"
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:932
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr "Modèles pour %1\\n "
+
+#: NOT FOUND IN SOURCE
+msgid "Text"
+msgstr "Texte"
+
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "Ceci est déjà la valeur actuelle"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
-msgstr "Valeur incorrecte pour ce champ personnalisé"
+msgstr "Valeur incorrecte pour ce champ personnalisé."
 
-#: lib/RT/Ticket_Overlay.pm:1963
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "Valeur identique"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
 msgstr "Ce groupe/utilisateur dispose déjà de ce droit"
 
-#: lib/RT/Queue_Overlay.pm:754
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
-msgstr "Ce groupe/utilisateur est déjà un %1 pour cette file"
+msgstr "Ce groupe/utilisateur est déjà un %1 pour cette queue"
 
-#: lib/RT/Ticket_Overlay.pm:1404
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "Ce groupe/utilisateur est déjà un %1 pour ce ticket"
 
-#: lib/RT/Queue_Overlay.pm:853
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
-msgstr "Ce groupe/utilisateur n'est pas un %1 pour cette file"
+msgstr "Ce groupe/utilisateur n'est pas un %1 pour cette queue"
+
+#: NOT FOUND IN SOURCE
+msgid "That principal is not a %1 for this ticket"
+msgstr "Ce groupe/utilisateur n'est pas un %1 pour ce ticket"
 
-#: lib/RT/Ticket_Overlay.pm:1959
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
-msgstr "File inconnue"
+msgstr "Queue inconnue"
 
-#: lib/RT/Ticket_Overlay.pm:3197
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "Ticket ayant des tickets fils ou dépendants non résolus"
 
-#: lib/RT/Ticket_Overlay.pm:3001
+#: NOT FOUND IN SOURCE
+msgid "That user already has that right"
+msgstr "Cet utilisateur possède déjà ce droit."
+
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
-msgstr "Cet utilisateur possède déjà ce ticket"
+msgstr "Cet utilisateur possède déjà ce ticket."
 
-#: lib/RT/Ticket_Overlay.pm:2973
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "Utilisateur inconnu"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
-msgstr "Utilisateur possédant déjà un statut privilégié"
+msgstr "Utilisateur possédant déjà un statut privilégié."
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
-msgstr "Utilisateur déjà sans privilèges"
+msgstr "Utilisateur déjà sans privilèges."
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "Utilisateur bénéficiant à présent du statut privilégié"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
-msgstr "Cet utilisateur est maintenant non privilégié"
+msgstr "Utilisateur à présent sans statut privilégié "
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr "Cet utilisateur a perdu ses droits"
 
-#: lib/RT/Ticket_Overlay.pm:2994
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
-msgstr "Cet utilisateur peut ne pas avoir de ticket dans cette file"
+msgstr "Cet utilisateur peut ne pas avoir de ticket dans cette queue."
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
-msgstr "Identifiant non numérique"
+msgstr "ID non numérique"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
-msgstr "Éléments de base"
+msgstr "Eléments de base"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr "Le CC d'un ticket"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr "L'AdminCC d'un ticket"
 
-#: bin/rt-crontool:223
+#: NOT FOUND IN SOURCE
+msgid "The comment has been recorded"
+msgstr "Commentaire enregistré"
+
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
-msgstr "Cette commande trouve tous les tickets actifs de la file 'general' et positionne leur priorité à 99 s'ils n'ont pas été touchés depuis quatre heures:"
+msgstr "Cette commande trouve tous les tickets actifs de la queue 'general' et positionne leur priorité à 99 s'ils n'ont pas été touchés depuis quatre heures:"
 
-#: lib/RT/Record.pm:935
+#: NOT FOUND IN SOURCE
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr "Les commandes suivantes n'ont pas été traitées :\\n\\n"
+
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
-msgstr "La nouvelle valeur est enregistrée."
+msgstr "La nouvelle valeur est enregistrée"
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr "L'intervenant d'un ticket"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "Le demandeur d'un ticket"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "Ces commentaires ne sont généralement pas accessibles par l'utilisateur"
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
 msgstr "Ce champ personnalisé ne s'applique pas à cet objet"
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
 msgstr "Cet possibilité n'est offerte qu'aux administrateurs systèmes"
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
 msgstr "Ce message va être envoyé à..."
 
-#: bin/rt-crontool:214
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr "Ce ticket %1 %2 (%3)\\n "
+
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
-msgstr "Cet outil permet à l'utilisateur de lancer un module perl quelconque depuis RT."
+msgstr "Cet outil permet à l'utilisateur de lancer un module perl quelconque depuis RT"
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "Cette opération semble ne pas avoir de contenu"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
-msgstr "Les %1 tickets prioritaires de cet utilisateur"
+msgstr "Les %1 tickets de plus haute priorité de cet utilisateur"
 
-#: lib/RT/Date.pm:416
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr "Les 25 tickets prioritaires de cet utilisateur"
+
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "Jeu."
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr "Ticket n°%1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr "Ticket n°%1 Jumbo update: %2"
+
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
-msgstr "Ticket n°%1 mise à jour globale : %2"
+msgstr "Ticket n°%1 mise à jour globale: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "Ticket n°%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
 msgstr "Ticket %1"
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
-msgstr "Ticket %1 créé dans la file '%2'"
+msgstr "Ticket %1 créé dans la queue '%2'"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket %1 loaded\\n"
+msgstr "Ticket %1 chargé\\n "
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
-msgstr "Ticket %1 : %2"
+msgstr "Ticket %1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
 msgstr "Champs personnalisés du ticket"
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
-msgstr "Historique du ticket n°%1 %2"
+msgstr "Historique ticket # %1 %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket Id"
+msgstr "N° ticket"
 
 #: etc/initialdata:324
 msgid "Ticket Resolved"
-msgstr "Ticket résolu"
+msgstr "Ticket résolu/clos"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
 msgstr "Transactions du ticket"
 
-#: lib/RT/Tickets_Overlay.pm:1677
+#: NOT FOUND IN SOURCE
+msgid "Ticket attachment"
+msgstr "Pièce jointe au ticket"
+
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
-msgstr "Contenu du ticket"
+msgstr "Contenu du ticket."
 
-#: lib/RT/Tickets_Overlay.pm:1726
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "Type du contenu du ticket"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "Une erreur interne a empêché l'ajout du ticket"
 
-#: html/Ticket/Display.html:55
+#: lib/RT/Transaction_Overlay.pm:497
+msgid "Ticket created"
+msgstr "Ticket ajouté"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr "Création de ticket échouée."
+
+#: lib/RT/Transaction_Overlay.pm:502
+msgid "Ticket deleted"
+msgstr "Ticket supprimé."
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket id not found"
+msgstr "Id de ticket non trouvée"
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr "Ticket effacé"
+
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
 msgstr "Méta-données du ticket"
 
+#: NOT FOUND IN SOURCE
+msgid "Ticket not found"
+msgstr "Ticket non trouvé"
+
 #: etc/initialdata:310
 msgid "Ticket status changed"
 msgstr "Statut de ticket modifié"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr "Module de recherche TicketSQL"
+#: NOT FOUND IN SOURCE
+msgid "Ticket watchers"
+msgstr "Observateurs du ticket"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "Tickets"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr "Tickets %1 %2"
+
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr "Tickets %1 par %2"
+
+#: NOT FOUND IN SOURCE
+msgid "Tickets from %1"
+msgstr "Tickets depuis %2"
+
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr "Tickets dépendant de cette approbation:"
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
 msgstr "Temps estimé"
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "Temps restant"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "Temps passé"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "Temps restant"
 
-#: html/Elements/Footer:67
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "Temps de calcul"
 
-#: lib/RT/Tickets_Overlay.pm:1623
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "Temps passé"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr "TempsRestant"
+
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
 msgstr "TempsPassé"
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr "Titre"
+#: NOT FOUND IN SOURCE
+msgid "To generate a diff of this commit:"
+msgstr "Pour conserver les modifications de cette transaction"
+
+#: NOT FOUND IN SOURCE
+msgid "To generate a diff of this commit:\\n"
+msgstr "Pour conserver les modifications de cette transaction :\\n"
 
-#: html/Elements/Footer:57
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
-msgstr "Pour vous renseigner au sujet du support, de la formation, des développements spécifiques ou au sujet de la licence, merci de contacter en anglais %1."
+msgstr "Pour du support, des stages, des développements ou au sujet de la license, veuillez contacter %1."
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "Annoncé"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
 msgstr "Outils"
 
@@ -4104,58 +5374,69 @@ msgstr "Outils"
 msgid "Transaction"
 msgstr "Transaction"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
-msgstr "La transaction %1 est supprimée"
+msgstr "La transaction%1 est supprimée"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "Transaction ajoutée"
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
 msgstr "Champs personnalisées de la transaction"
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: lib/RT/Transaction_Overlay.pm:92
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr "Transaction->Create n'a pas fonctionné car vous n'avez pas spécifié d'identifiant de ticket"
+
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
 msgstr "Transation->Create a échoué car vous n'avez pas spécifié de type d'objet et d'id"
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "Les transactions ne peuvent être transférées"
 
-#: lib/RT/Date.pm:414
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr "Tentative de délégation d'un droit : %1"
+
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "Mar."
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1461
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "Type"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "Fonction non disponible"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Identifiant Unix"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:848
+#: NOT FOUND IN SOURCE
+msgid "UnixUsername"
+msgstr "UnixUsername"
+
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "Type d'encodage de courrier inconnu: %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr "Champ inconnu : $key"
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "Illimité"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
 msgstr "Recherche non nommée"
 
@@ -4163,180 +5444,251 @@ msgstr "Recherche non nommée"
 msgid "Unprivileged"
 msgstr "Non privilégié"
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
 msgstr "Champs personnalisés non sélectionnés"
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
 msgstr "Objets non sélectionnés"
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "Non pris"
 
-#: html/Search/Bulk.html:54
+#: NOT FOUND IN SOURCE
+msgid "Untitled search"
+msgstr "Recherche sans titre"
+
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
-msgstr "Tout mettre à jour"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Update ID"
+msgstr "Mettre à jour l'ID"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
-msgstr "Mettre à jour le ticket"
+msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "Mettre à jour le type"
 
-#: html/Search/Results.html:80
+#: NOT FOUND IN SOURCE
+msgid "Update all these tickets at once"
+msgstr "Mise à jour des tickets en masse"
+
+#: NOT FOUND IN SOURCE
+msgid "Update email"
+msgstr "Mettre à jour l'email"
+
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
 msgstr "Mettre à jour plusieurs tickets"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: NOT FOUND IN SOURCE
+msgid "Update name"
+msgstr "Mettre à jour le nom"
+
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "Mise à jour non enregistrée"
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "Mettre à jour les tickets sélectionnés"
 
-#: html/Ticket/ModifyAll.html:84
+#: NOT FOUND IN SOURCE
+msgid "Update signature"
+msgstr "Mettre à jour la signature"
+
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "Mettre à jour le ticket"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: NOT FOUND IN SOURCE
+msgid "Update ticket # %1"
+msgstr "Mettre à jour le ticket n°%1"
+
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "Mettre à jour le ticket n°%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "Mettre à jour le ticket n°%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "Le type de mise à jour n'était ni un commentaire ni un courrier."
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "Mis(e) à jour"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
 msgstr "Uploader"
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
-msgstr "Télécharger plusieurs fichiers"
+msgstr "Uploader plusieurs fichiers"
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
-msgstr "Télécharger plusieurs images"
+msgstr "Uploader plusieurs images"
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
-msgstr "Télécharger un fichier"
+msgstr "Uploader un fichier"
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
-msgstr "Télécharger une image"
+msgstr "Uploader une image"
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
-msgstr "Télécharger un maximum de %1 fichiers"
+msgstr "Uploader un maximum de %1 fichiers"
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
-msgstr "Télécharger au plus %1 images"
+msgstr "Uploader un maximum de %1 images"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
-msgstr "Télécharger vos changements"
+msgstr "Uploader vos changements"
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
-msgstr "Utiliser les autres outils d'administration de RT"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr "Utilisateur %1 %2: %3\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr "Mot de passe de l'utilisateur %1 : %2\\n"
+
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
 msgstr "L'utilisateur %1 ne peut être trouvé"
 
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr "Utilisateur '%1' non trouvé"
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr "Utilisateur '%1' non trouvé\\n"
+
 #: etc/initialdata:132 etc/initialdata:206
 msgid "User Defined"
 msgstr "Utilisateur défini"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
-msgstr "Conditions et actions définies par l'usager"
+msgstr ""
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: NOT FOUND IN SOURCE
+msgid "User ID"
+msgstr "Id utilisateur"
+
+#: html/Elements/SelectUsers:25
+msgid "User Id"
+msgstr "Id utilisateur"
+
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "Droits utilisateurs"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr "L'utilisateur a demandé un type de mise à jour non connu pour le champ personnalisé %1 de l'objet %2 n°%3"
+msgstr "L'utilisateur a demandé un type de mise à jour non connu pour le champ personnalisé %1 de l'objet %2Â%3"
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "Utilisateur ne peut pas être créé : %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "Utilisateur créé"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Groupes utilisateur"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
 msgstr "Utilisateur chargé"
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr "Utilisateur informé"
+
+#: NOT FOUND IN SOURCE
+msgid "User view"
+msgstr "Vue utilisateur"
+
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
 msgstr "Groupe définis par l'utilisateur"
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "Utilisateurs correspondants aux critères de recherche"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
 msgstr "Valider la requête"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: NOT FOUND IN SOURCE
+msgid "ValueOfQueue"
+msgstr "ValueOfQueue"
+
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Valeurs"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr "Observer"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr "ObserverCommeAdminCC"
 
-#: html/Admin/Elements/QueueTabs:63
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr "Observateur chargé"
+
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "Observateurs"
 
-#: lib/RT/Date.pm:415
+#: NOT FOUND IN SOURCE
+msgid "WebEncoding"
+msgstr "WebEncoding"
+
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "Mer."
 
@@ -4370,11 +5722,11 @@ msgstr "Lorsqu'un ticket quelconque change d'intervenant"
 
 #: etc/initialdata:178 etc/upgrade/3.1.17/content:16
 msgid "Whenever a ticket's priority changes"
-msgstr "Lorsqu'un ticket change de priorité"
+msgstr ""
 
 #: etc/initialdata:193
 msgid "Whenever a ticket's queue changes"
-msgstr "Lorsqu'un ticket quelconque change de file"
+msgstr "Lorsqu'un ticket quelconque change de queue"
 
 #: etc/initialdata:170
 msgid "Whenever a ticket's status changes"
@@ -4392,281 +5744,357 @@ msgstr "Lorsque un commentaire arrive"
 msgid "Whenever correspondence comes in"
 msgstr "Lorsque un courrier arrive"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Travail"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr "Travail hors ligne"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: NOT FOUND IN SOURCE
+msgid "WorkPhone"
+msgstr "Tel. bureau"
+
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "Travaillé"
 
-#: lib/RT/Ticket_Overlay.pm:3104
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "Vous êtes déjà intervenant de ce ticket"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "Vous n'êtes pas un utilisateur autorisé"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "Vous pouvez seulement réaffecter vos ticket ou ceux qui ne sont pas affectés"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr "Vous n'êtes pas autorisé à voir ce ticket.\\n"
+
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
-msgstr "%1 tickets trouvés dans la file %2"
+msgstr "%1 tickets trouvés dans la queue %2"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "Vous avez été déconnecté de RT."
 
-#: html/SelfService/Display.html:133
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
-msgstr "Vous n'avez pas l'autorisation de créer des tickets dans cette file."
+msgstr "Vous n'avez pas l'autorisation de créer des tickets dans cette queue."
 
-#: lib/RT/Ticket_Overlay.pm:1972
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
-msgstr "Vous ne pouvez pas créer de demandes dans cette file."
+msgstr "Vous ne pouvez pas créer de demandes dans cette queue."
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "Vous êtes invité à vous identifier à nouveau"
 
+#: NOT FOUND IN SOURCE
+msgid "Your %1 requests"
+msgstr "Vos %1 requêtes"
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr "Votre administrateur RT a mal configuré l'alias de mail qui appelle RT"
+
 #: etc/initialdata:502
 msgid "Your request has been approved by %1. Other approvals may still be pending."
-msgstr "Votre demande a été approuvée par %1. D'autres approbations sont peut-être toujours en attente."
+msgstr "Votre demande a été approuvée par %1. D'autres approbations sont peut être toujours en attente"
 
 #: etc/initialdata:540
 msgid "Your request has been approved."
-msgstr "Votre demande a été approuvée."
+msgstr "Votre demande a été approuvée"
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr "Votre demande a été rejetée"
 
 #: etc/initialdata:445
 msgid "Your request was rejected."
 msgstr "Votre demande a été rejetée."
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "Votre nom d'utilisateur ou votre mot de passe est incorrect"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "Code Postal"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
-msgstr "autorise la création de recherches sauvées"
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr "[Pas de sujet]"
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
-msgstr "autorise le chargement de recherches sauvées"
+#: NOT FOUND IN SOURCE
+msgid "and is not"
+msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: NOT FOUND IN SOURCE
+msgid "and not"
+msgstr ""
+
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "comme accordé à %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr "appartient à"
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr "fermé"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "contient"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: NOT FOUND IN SOURCE
+msgid "content"
+msgstr "Contenu"
+
+#: NOT FOUND IN SOURCE
+msgid "content-type"
+msgstr "Type de contenu"
+
+#: NOT FOUND IN SOURCE
+msgid "correspondence (probably) not sent"
+msgstr "courrier (probablement) non envoyé"
+
+#: NOT FOUND IN SOURCE
+msgid "correspondence sent"
+msgstr "courrier envoyé"
+
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "jours"
 
-#: lib/RT/Queue_Overlay.pm:88
-msgid "deleted"
+#: NOT FOUND IN SOURCE
+msgid "dead"
 msgstr "effacé"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr "n'appartient pas à"
+#: NOT FOUND IN SOURCE
+msgid "delete"
+msgstr "effacer"
 
-#: html/Search/Elements/PickBasics:61
+#: lib/RT/Queue_Overlay.pm:64
+msgid "deleted"
+msgstr "effacé"
+
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "ne correspond pas"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "ne contient pas"
 
-#: html/Elements/SelectEqualityOperator:59
+#: NOT FOUND IN SOURCE
+msgid "email address"
+msgstr "adresse email"
+
+#: html/Elements/SelectEqualityOperator:37
 msgid "equal to"
 msgstr "égal à"
 
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr "erreur : ne peut aller plus bas"
+#: NOT FOUND IN SOURCE
+msgid "false"
+msgstr "faux"
 
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr "erreur : ne peut aller à gauche"
+#: NOT FOUND IN SOURCE
+msgid "filename"
+msgstr "Nom de fichier"
 
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr "erreur : ne peut aller plus haut"
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr "erreur : rien à effacer"
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr "erreur : rien à déplacer"
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr "erreur : rien à commuter"
-
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "supérieur à"
 
-#: lib/RT/Group_Overlay.pm:214
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "groupe '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "heures"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "n°"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "est"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "n'est pas"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "inférieur à"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "correspond"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "min"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "minutes"
 
-#: lib/RT/Date.pm:350
+#: NOT FOUND IN SOURCE
+msgid "modifications\\n\\n"
+msgstr "modifications\\n\\n"
+
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "mois"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "nouveau"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr "sans nom"
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "Non renseigné"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "aucun"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "différent de"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr "necontientpas"
+
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "ouvert"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "groupe personnel '%1' pour l'utilisateur '%2'"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
-msgstr "file %1 %2"
+msgstr "queue %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "rejeté"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "résolu"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "sec"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr "montrer l'onglet de configuration"
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr "feuille de calcul"
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "bloqué"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "système %1"
 
-#: lib/RT/Group_Overlay.pm:233
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "groupe système '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "le composant appelant n'a pas spécifié pourquoi"
 
-#: lib/RT/Group_Overlay.pm:230
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr "ticket n°%1"
+
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "ticket n°%1 %2"
 
-#: lib/RT/Group_Overlay.pm:236
+#: NOT FOUND IN SOURCE
+msgid "till"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr "vrai"
+
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "Groupe %1 non décrit"
 
-#: lib/RT/Group_Overlay.pm:211
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr "Groupe non décrit %1"
+
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "utilisateur %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "semaines"
 
-#: lib/RT/Date.pm:354
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr "Avec modèle %1"
+
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "années"
 
diff --git a/rt/lib/RT/I18N/he.po b/rt/lib/RT/I18N/he.po
index b3c5338..f9c525f 100644
--- a/rt/lib/RT/I18N/he.po
+++ b/rt/lib/RT/I18N/he.po
@@ -7,74 +7,121 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: NOT FOUND IN SOURCE
+msgid "#"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr ""
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr ""
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr ""
+
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr ""
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr ""
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr ""
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr ""
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr ""
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 הוסף"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 שונה ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
 msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
 msgstr ""
 
@@ -82,116 +129,120 @@ msgstr ""
 msgid "%1 - %2 shown"
 msgstr "%1 - %2 מוצגי�"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr ""
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr ""
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr ""
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr ""
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
+
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr ""
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr ""
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr ""
+
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr ""
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr ""
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
 msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
 msgstr ""
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
 msgstr ""
@@ -200,21 +251,39 @@ msgstr ""
 msgid "%1 highest priority tickets I own..."
 msgstr "%1 הפניות ע� העדיפות הגבוהה ביותר בטיפולי..."
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "%1 הפניות ע� העדיפות הגבוהה ביותר ש�ני פתחתי..."
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr ""
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 is no longer a %2 for this ticket."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -223,60 +292,132 @@ msgstr ""
 msgid "%1 min"
 msgstr ""
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "זכויות"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 על ידי %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
 msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "(Check box to delete group member)"
 msgstr "(סמן תיבה כדי למחוק חבר בקבוצה)"
 
@@ -284,7 +425,7 @@ msgstr "(סמן תיבה כדי למחוק חבר בקבוצה)"
 msgid "(Check box to delete scrip)"
 msgstr "(סמן תיבה כדי למחוק סקריפ)"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(סמן תיבה כדי למחוק)"
 
@@ -292,241 +433,325 @@ msgstr "(סמן תיבה כדי למחוק)"
 msgid "(Check boxes to delete)"
 msgstr "(סמן תיבות כדי למחוק)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
+msgid "(If left blank, will default to %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
 msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr ""
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
 msgstr ""
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr ""
 
-#: html/Ticket/Create.html:100
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr ""
+
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr ""
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr ""
 
-#: html/Ticket/Create.html:90
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr ""
+
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
 msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr ""
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr ""
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(no subject)"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr ""
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
 msgstr ""
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(רק פנייה �חת)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr ""
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:71
+#: NOT FOUND IN SOURCE
+msgid "(pending other tickets)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:53
+#: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr ""
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr ""
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"פנייה חדשה ב\">&nbsp;%1"
 
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
 #: etc/initialdata:218
 msgid "A blank template"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr ""
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
+#: NOT FOUND IN SOURCE
+msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr ""
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "מידע �ודותי"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr ""
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
+#: bin/rt-crontool:119
+msgid "Action committed."
 msgstr ""
 
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr ""
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
 msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "הוסף העתק ניהולי"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "הוסף העתק"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
 msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "הוסף עוד קבצי�"
 
-#: html/Search/Bulk.html:106
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr ""
+
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "הוסף מבקש"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr ""
 
-#: html/Admin/Global/Scrip.html:76
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr ""
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
 msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "הוסף הערות �ו תגובות לפניות הנבחרות"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr ""
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "הוסף צופי� חדשי�"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "כתובת1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "כתובת2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr ""
 
@@ -538,103 +763,163 @@ msgstr ""
 msgid "Admin Correspondence"
 msgstr ""
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr ""
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr ""
+
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr ""
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Queue/Basics"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "העתק ניהולי"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Queue_Overlay.pm:73
+msgid "AdminCustomFields"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr ""
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr ""
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr ""
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "העתק ניהולי"
 
-#: html/Ticket/Elements/Tabs:197
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
 msgstr ""
 
-#: html/Elements/SelectDateRelation:57
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "�חרי"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
 msgstr ""
 
 #: etc/initialdata:363
 msgid "All Approvals Passed"
 msgstr ""
 
-#: html/Admin/Queues/index.html:75
+#: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
+msgid "All Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr ""
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
 msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "�ישור"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr ""
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr ""
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr ""
+
 #: etc/initialdata:351
 msgid "Approval Passed"
 msgstr ""
@@ -643,7 +928,11 @@ msgstr ""
 msgid "Approval Rejected"
 msgstr ""
 
-#: html/Approvals/Elements/Approve:65
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr ""
 
@@ -651,7 +940,7 @@ msgstr ""
 msgid "Approver's notes: %1"
 msgstr ""
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "�פריל"
 
@@ -659,52 +948,72 @@ msgstr "�פריל"
 msgid "April"
 msgstr "�פריל"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "עולה"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
 msgstr ""
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "צרף"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr ""
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "קובץ מצורף"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "קובץ צורף"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "ש� קובץ מצורף"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "קבצי� מצורפי�"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
 msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "�וגוסט"
 
@@ -712,6 +1021,10 @@ msgstr "�וגוסט"
 msgid "August"
 msgstr "�וגוסט"
 
+#: NOT FOUND IN SOURCE
+msgid "AuthSystem"
+msgstr ""
+
 #: etc/initialdata:221
 msgid "Autoreply"
 msgstr ""
@@ -720,149 +1033,212 @@ msgstr ""
 msgid "Autoreply To Requestors"
 msgstr ""
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr ""
+
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad data in %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "בסיסי"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "�ל תשכח לשמור �ת השינויי�"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "לפני"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
 msgstr ""
 
-#: etc/initialdata:217
-msgid "Blank"
+#: NOT FOUND IN SOURCE
+msgid "Binary"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
+#: etc/initialdata:217
+msgid "Blank"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
 msgstr "הוסף כתובת זו לספר הכתובות כדי לחזור על �ותו חיפוש"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
 msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "תקציר כותרי�"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "עדכון פניות מרוכז"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
 msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr ""
 
-#: html/Search/Build.html:766
+#: lib/RT/Ticket_Overlay.pm:2716
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr ""
+
+#: html/Search/Build.html:699
 msgid "Can't save this search"
 msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr ""
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr ""
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "העתק"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr ""
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
 msgstr ""
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "סמן תיבה כדי למחוק"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "סמן תיבה כדי לבטל זכות"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "ילדי�"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "עיר"
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
 msgstr ""
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "נסגר"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Closed requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr ""
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "הערה"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:112
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr ""
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: NOT FOUND IN SOURCE
+msgid "Comments"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "הערות (ל� נשלחות �ל המבקשי�)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "הערות (ל� נשלחות �ל המבקשי�)"
 
@@ -870,47 +1246,63 @@ msgstr "הערות (ל� נשלחות �ל המבקשי�)"
 msgid "Comments about %1"
 msgstr "הערות לגבי %1"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "הערות לגבי משתמש זה"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "הערות נוספו"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:63
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr ""
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr ""
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "הגדרות"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr ""
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: NOT FOUND IN SOURCE
+msgid "ContactInfoSystem"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr ""
+
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "תוכן"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:64
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr ""
+
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
 msgstr ""
 
@@ -918,174 +1310,214 @@ msgstr ""
 msgid "Correspondence"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: NOT FOUND IN SOURCE
+msgid "Correspondence Address"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr ""
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
 msgstr ""
 
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
+#: lib/RT/Ticket_Overlay.pm:3471
+msgid "Could not add new custom field value for ticket. "
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
-msgid "Could not change owner. "
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:119
-#. ($msg)
-msgid "Could not create CustomField"
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
+msgid "Could not change owner. "
 msgstr ""
 
-#: html/Admin/Elements/EditCustomField:113
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
-msgid "Could not create CustomField: %1"
+msgid "Could not create CustomField"
 msgstr ""
 
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr ""
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
-msgid "Could not find or create that user"
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
-msgid "Could not find that principal"
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:69
-msgid "Could not load CustomField %1"
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
 msgstr ""
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
-msgid "Could not load group"
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
+msgid "Could not find or create that user"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
+msgid "Could not find that principal"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Could not load CustomField %1"
+msgstr ""
+
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
+msgid "Could not load group"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:192
+#: NOT FOUND IN SOURCE
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr ""
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr ""
 
-#: lib/RT/Record.pm:939
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr ""
+
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr ""
 
-#: lib/RT/CurrentUser.pm:146
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr ""
+
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr ""
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr ""
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
 msgstr ""
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr ""
 
-#: html/SelfService/Display.html:156
-#. ($id)
-msgid "Couldn't load ticket '%1'"
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load that user (%1)"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/SelfService/Display.html:116
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "�רץ"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "צור"
 
@@ -1093,20 +1525,44 @@ msgstr "צור"
 msgid "Create Tickets"
 msgstr "צור פניות"
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr ""
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr ""
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr ""
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "צור קבוצה פרטית חדשה"
 
@@ -1122,15 +1578,15 @@ msgstr "צור סקריפ חדש"
 msgid "Create a new template"
 msgstr "צור תבנית חדשה"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "צור פנייה חדשה"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "צור משתמש חדש"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "צור תור חדש"
 
@@ -1142,81 +1598,113 @@ msgstr "צור תור שנקר�"
 msgid "Create a request"
 msgstr "צור בקשה"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr ""
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr ""
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr ""
+
 #: etc/initialdata:137
 msgid "Create new tickets based on this scrip's template"
 msgstr ""
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr ""
 
-#: lib/RT/System.pm:81
-msgid "Create, delete and modify the members of personal groups"
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
 msgstr ""
 
-#: lib/RT/System.pm:82
-msgid "Create, delete and modify users"
+#: lib/RT/System.pm:58
+msgid "Create, delete and modify the members of personal groups"
 msgstr ""
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify users"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr ""
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "נוצר"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:102
+#: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr ""
+
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
 msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "יחסי� נוכחיי�"
 
-#: html/Admin/Elements/EditScrips:51
+#: NOT FOUND IN SOURCE
+msgid "Current Relationships"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr ""
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr ""
 
@@ -1224,72 +1712,101 @@ msgstr ""
 msgid "Current search criteria"
 msgstr "קריטריוני החיפוש הנוכחיי�"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "צופי� נוכחיי�"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
+msgid "Custom field %1 %2 %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field %1 does not apply to this object"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr ""
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: html/Admin/Elements/EditCustomFields:195
+msgid "Custom field deleted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3523
+msgid "Custom field not found"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr ""
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr ""
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr ""
+
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "ת�ריכי�"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "דצמבר"
 
@@ -1297,15 +1814,19 @@ msgstr "דצמבר"
 msgid "December"
 msgstr "דצמבר"
 
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr ""
+
 #: etc/initialdata:222
 msgid "Default Autoresponse template"
 msgstr ""
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
 msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
 msgstr ""
 
@@ -1325,100 +1846,120 @@ msgstr ""
 msgid "Default transaction template"
 msgstr ""
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr ""
+
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr ""
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr ""
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr ""
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "דלגציות"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "מחק"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
+#: lib/RT/Transaction_Overlay.pm:162
+msgid "Deleting this object could break referential integrity"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr ""
 
-#: html/Approvals/Elements/Approve:66
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr ""
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "תלויי� בו"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "תלוי ב"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "יורד"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "תי�ור"
 
@@ -1426,31 +1967,31 @@ msgstr "תי�ור"
 msgid "Details"
 msgstr "פרטי�"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "הצג"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "מצב תצוגה"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
 msgstr ""
 
@@ -1458,19 +1999,15 @@ msgstr ""
 msgid "Display ticket #%1"
 msgstr "הצג פנייה #%1"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr ""
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "�ל תרענן דף זה."
 
@@ -1478,167 +2015,250 @@ msgstr "�ל תרענן דף זה."
 msgid "Don't show search results"
 msgstr "�ל תר�ה �ת תוצ�ות החיפוש"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "הורד"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
 msgstr ""
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "ת�ריך יעד"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
-msgid "Edit Custom Fields for %1"
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
+#: NOT FOUND IN SOURCE
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
+#: NOT FOUND IN SOURCE
+msgid "Edit"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
 msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
+msgstr ""
+
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr ""
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
 msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: NOT FOUND IN SOURCE
+msgid "Edit Relationships"
+msgstr ""
+
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:175
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr ""
+
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:175
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for user %1"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr ""
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr ""
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr ""
+
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "�י-מייל"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "EmailAddress"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "EmailEncoding"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr ""
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "מופעל (מחיקת סימון תיבה זו מבטלת �ת קבוצה זו)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr ""
 
-#: html/Admin/Queues/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
+msgid "Enabled Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr ""
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr ""
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr ""
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
 msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
+msgstr ""
+
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "הכנס פניות �ו כתובות כדי לקשר פניות �ליהן. הפרד ערכי� רבי� ב�מצעות רווחי�."
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
 msgstr ""
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:669
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:830
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
 msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: NOT FOUND IN SOURCE
+msgid "Estimate"
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
 msgstr ""
 
@@ -1646,37 +2266,44 @@ msgstr ""
 msgid "Everyone"
 msgstr ""
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:99
+#: NOT FOUND IN SOURCE
+msgid "ExternalAuthId"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ExternalContactInfoId"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr ""
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "פברו�ר"
 
@@ -1684,55 +2311,59 @@ msgstr "פברו�ר"
 msgid "February"
 msgstr "פברו�ר"
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:69
+#: NOT FOUND IN SOURCE
 msgid "Fill in multiple text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
+#: NOT FOUND IN SOURCE
 msgid "Fill in one text area"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
+#: NOT FOUND IN SOURCE
+msgid "Fin"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "עדיפות סופית"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr ""
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
 msgstr ""
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: NOT FOUND IN SOURCE
+msgid "Find new/open tickets"
+msgstr ""
+
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "מצ� �נשי� ש"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "מצ� פניות"
 
-#: html/Ticket/Elements/Tabs:81
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr ""
 
@@ -1740,78 +2371,110 @@ msgstr ""
 msgid "First page"
 msgstr "עמוד ר�שון"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr ""
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "הכרח שינוי"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "נמצ�ו %1 פניות"
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr ""
 
-#: lib/RT/Date.pm:417
+#: NOT FOUND IN SOURCE
+msgid "Freeform"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "FreeformContactInfo"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "שישי"
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "כותרי� מל�י�"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr ""
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "גלוב�לי"
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
 msgstr ""
 
-#: html/Admin/Elements/SelectTemplate:59
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr ""
+
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr ""
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
 msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "חפש"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Goto page"
+msgstr ""
+
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr ""
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "קבוצה"
 
@@ -1819,88 +2482,106 @@ msgstr "קבוצה"
 msgid "Group %1 %2: %3"
 msgstr "קבוצה %1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "זכויות קבוצה"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr ""
 
-#: html/Admin/Groups/Modify.html:109
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr ""
+
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "קבוצות"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr ""
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
 msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:77
+#: NOT FOUND IN SOURCE
 msgid "Groups this user belongs to"
 msgstr ""
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "הסטוריה"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
 msgstr ""
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
 msgstr ""
 
-#: html/Elements/Tabs:65
+#: NOT FOUND IN SOURCE
+msgid "HomePhone"
+msgstr ""
+
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "דף הבית"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr ""
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "זהות"
 
@@ -1908,121 +2589,137 @@ msgstr "זהות"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr ""
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
 msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
 msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr ""
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "�� עדכנת משהו לעיל, �ל תשכח ל"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr ""
 
-#: lib/RT/Record.pm:936
+#: NOT FOUND IN SOURCE
+msgid "Image"
+msgstr ""
+
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr ""
 
-#: html/Admin/Groups/index.html:65
-msgid "Include disabled groups in listing."
+#: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
 msgstr ""
 
-#: html/Admin/Queues/index.html:65
-msgid "Include disabled queues in listing."
+#: html/Admin/Elements/EditCustomFields:72
+msgid "Include disabled custom fields in listing."
 msgstr ""
 
-#: html/Admin/Users/index.html:71
-msgid "Include disabled users in search."
+#: html/Admin/Groups/index.html:37
+msgid "Include disabled groups in listing."
 msgstr ""
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
+#: html/Admin/Queues/index.html:42
+msgid "Include disabled queues in listing."
 msgstr ""
 
-#: html/Search/Build.html:660
-msgid "Incomplete query"
+#: html/Admin/Users/index.html:46
+msgid "Include disabled users in search."
 msgstr ""
 
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr ""
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr ""
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr ""
 
-#: lib/RT/Record.pm:938
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr ""
+
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: NOT FOUND IN SOURCE
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr ""
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr ""
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr ""
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr ""
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr ""
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
 msgstr ""
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "ינו�ר"
 
@@ -2030,11 +2727,11 @@ msgstr "ינו�ר"
 msgid "January"
 msgstr "ינו�ר"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr ""
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "יולי"
 
@@ -2042,11 +2739,11 @@ msgstr "יולי"
 msgid "July"
 msgstr "יולי"
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "ג'מבו"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "יוני"
 
@@ -2054,23 +2751,31 @@ msgstr "יוני"
 msgid "June"
 msgstr "יוני"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
-msgid "Language"
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
+#: NOT FOUND IN SOURCE
+msgid "Lang"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:96
+#: html/User/Prefs.html:54
+msgid "Language"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr ""
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "מגע �חרון"
 
-#: html/Elements/SelectDateType:50
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
+
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "קשר �חרון"
 
@@ -2078,173 +2783,176 @@ msgstr "קשר �חרון"
 msgid "Last Notified"
 msgstr "נודע ל�חרונה"
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "עדכון �חרון"
 
-#: html/Search/Elements/PickBasics:103
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr ""
+
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "נותרה"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "תן למשתמש זה לגשת ל R"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "תן �פשרות להעניק זכויות למשתמש זה"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
 msgstr ""
 
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr ""
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr ""
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr ""
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr ""
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr ""
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr ""
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr ""
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "קישורי�"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "מיקו�"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr ""
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "מחובר כ %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "כניסה"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "יצי�ה"
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
 msgstr ""
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "שנה בעלות ל"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "שנה סטטוס"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "שנה ת�ריך יעד"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "שנה ת�ריך פתרון"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "שנה ת�ריך 'הותחל'"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "שנה ת�ריך התחלה"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "שנע ת�ריך מגע �חרון"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "שנה עדיפות"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "שנה תור"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "שנה נוש�"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
 msgstr ""
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
 msgstr ""
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "נהל קבוצות וחברות בקבוצות"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "נהל מ�פייני� והגדרות שתקפי� לכל התורות"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr "נהל תורות ומ�פייני� ספציפיי� לתורות"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "נהל משתמשי� וספריות"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "מרץ"
 
@@ -2256,105 +2964,108 @@ msgstr "מרץ"
 msgid "May"
 msgstr "מ�י"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "מ�י"
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "חבר הוסף"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "חבר נמחק"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "חבר ל� נמחק"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "חבר ב"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "חברי�"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
 msgstr ""
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "מיזוג הצליח"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "מיזוג נכשל. ל� יכולתי להגדיר מזהה �פקטיבי"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "מזג לתוך"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
 msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "הודעה"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
-msgid "Message recorded"
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
-msgid "Messages about this ticket will not be sent to..."
+#: lib/RT/Ticket_Overlay.pm:2517
+msgid "Message recorded"
 msgstr ""
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
+#: html/Ticket/Elements/PreviewScrips:70
+msgid "Messages about this ticket will not be sent to..."
 msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "חסר מפתח ר�שי?: %1"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "נייד"
 
@@ -2362,251 +3073,290 @@ msgstr "נייד"
 msgid "MobilePhone"
 msgstr "טלפון נייד"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "שנה רשימת בקרת גישה"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
 msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
+#: NOT FOUND IN SOURCE
 msgid "Modify Custom Fields which apply to all %1"
 msgstr ""
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
 msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr ""
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
 msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
 msgstr ""
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr ""
+
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr ""
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
 msgstr ""
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr ""
+
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr ""
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr ""
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr ""
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr ""
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr ""
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr ""
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr ""
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr ""
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr ""
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr ""
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr ""
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr ""
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "שנה פנייה מספר %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "שינוי פנוייה מספר %1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "שינוי פניות"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr ""
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:95
-msgid "ModifyACL"
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyACL"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr ""
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr ""
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "שני"
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "עוד לגבי %1"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: NOT FOUND IN SOURCE
+msgid "Move"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr ""
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr ""
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr ""
@@ -2615,35 +3365,47 @@ msgstr ""
 msgid "My Approvals"
 msgstr "ה�ישורי� שלי"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "ה�ישורי� שלי"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "ש�"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "ש� בשימוש"
 
-#: html/Ticket/Elements/ShowDates:73
+#: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr ""
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "חדש"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "יחסי� חדשי�"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "סיסמ� חדשה"
 
@@ -2651,31 +3413,39 @@ msgstr "סיסמ� חדשה"
 msgid "New Pending Approval"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "New Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "New Search"
 msgstr "חיפוש חדש"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "קבוצה חדשה"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "סיסמ� חדשה"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "תור חדש"
 
@@ -2683,11 +3453,11 @@ msgstr "תור חדש"
 msgid "New request"
 msgstr "בקשה חדשה"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "זכויות חדשות"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "סקריפ חדש"
 
@@ -2695,35 +3465,39 @@ msgstr "סקריפ חדש"
 msgid "New search"
 msgstr "חיפוש חדש"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "תבנית חדשה"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr "פנייה חדשה"
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "פנייה חדשה ל� קיימת"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "משתמש חדש"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "משתמש חדש שנקר�"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "צופי� חדשי�"
 
-#: html/Ticket/Elements/Tabs:92
+#: NOT FOUND IN SOURCE
+msgid "New window setting"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "הב�"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
 msgstr ""
 
@@ -2735,145 +3509,172 @@ msgstr "דף הב�"
 msgid "NickName"
 msgstr "כינוי"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "כינוי"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr ""
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
 msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr ""
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr ""
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr ""
 
-#: html/Approvals/Elements/Approve:67
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr ""
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr ""
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: NOT FOUND IN SOURCE
+msgid "No correspondence attached"
+msgstr ""
+
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr ""
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr ""
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr ""
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr ""
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr ""
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr ""
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr ""
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr ""
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr ""
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr ""
 
-#: html/Admin/Users/index.html:55
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr ""
+
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr ""
 
-#: lib/RT/Record.pm:932
+#: NOT FOUND IN SOURCE
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr ""
+
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr ""
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "�ף �חד"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr ""
 
@@ -2881,23 +3682,27 @@ msgstr ""
 msgid "Not logged in"
 msgstr "ל� בתוך המערכת"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "ל� בתוך המערכת."
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "ל� הוזן"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr ""
 
-#: html/Approvals/Elements/Approve:70
+#: NOT FOUND IN SOURCE
+msgid "Not yet implemented...."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr ""
 
@@ -2969,7 +3774,7 @@ msgstr ""
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr ""
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "נובמבר"
 
@@ -2977,37 +3782,23 @@ msgstr "נובמבר"
 msgid "November"
 msgstr "נובמבר"
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr ""
-
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr ""
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr ""
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
 msgstr ""
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "�וקטובר"
 
@@ -3015,19 +3806,19 @@ msgstr "�וקטובר"
 msgid "October"
 msgstr "�וקטובר"
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
 msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
 msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "ב"
 
@@ -3067,33 +3858,45 @@ msgstr ""
 msgid "On Transaction"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "הצג רק �ישורי� עבור בקשות שנוצרו �חרי %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "הצג רק �ישורי� עבור בקשות שנוצרו לפני %1"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "פתוח"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "פתח"
 
-#: html/SelfService/Elements/Tabs:63
+#: NOT FOUND IN SOURCE
+msgid "Open requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Open tickets (from listing) in a new window"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Open tickets (from listing) in another window"
+msgstr ""
+
 #: etc/initialdata:140
 msgid "Open tickets on correspondence"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
 msgstr ""
 
@@ -3101,44 +3904,52 @@ msgstr ""
 msgid "Ordering and sorting"
 msgstr "סידור ומיון"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "�רגון"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:113
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr ""
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "בעלי�"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: NOT FOUND IN SOURCE
+msgid "Owner changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr ""
@@ -3147,62 +3958,53 @@ msgstr ""
 msgid "Owner is"
 msgstr "הבעלי�"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "ביפר"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: NOT FOUND IN SOURCE
+msgid "PagerPhone"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr ""
+
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "הורי�"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "סיסמ�"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "מזכיר סיסמ�"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "סיסמ� קצרה מדי"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "סיסמ�: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
 msgstr "הסיסמ�ות �ינן תו�מות"
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr ""
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "�נשי�"
 
@@ -3210,43 +4012,55 @@ msgstr "�נשי�"
 msgid "Perform a user-defined action"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr ""
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "קבוצות �ישיות"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "קבוצות �ישיות"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "קבוצות �ישיות"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "מספרי טלפון"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: NOT FOUND IN SOURCE
+msgid "Placeholder"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr ""
+
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "מ�פייני�"
 
-#: lib/RT/Action/Generic.pm:196
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr ""
+
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "הקוד�"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
 msgstr ""
 
@@ -3254,20 +4068,24 @@ msgstr ""
 msgid "Previous page"
 msgstr "דף קוד�"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr ""
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "עדיפות"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
 msgstr ""
 
@@ -3275,113 +4093,225 @@ msgstr ""
 msgid "Privileged"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr ""
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Projects"
+msgstr ""
+
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr ""
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
 msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
 msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "תור"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:64
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:362
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr ""
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr ""
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr ""
+
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr ""
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "תורי�"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr "חיפוש מהיר"
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
 msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr ""
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "ניהול RT"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr ""
+
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:73
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service / Closed Tickets"
+msgstr ""
+
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
 msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "RT ממבט כולל"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
 msgstr ""
 
-#: html/Elements/PageLayout:108
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr ""
+
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "RT / %1"
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "ש� �מיתי"
 
@@ -3389,76 +4319,88 @@ msgstr "ש� �מיתי"
 msgid "RealName"
 msgstr "ש� �מיתי"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "מתייחסי� �ליו"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "מתייחס ל"
 
 #: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Refine search"
 msgstr "חדד �ת החיפוש"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "רענן דף זה כל %1 דקות."
 
-#: html/Search/Bulk.html:116
+#: NOT FOUND IN SOURCE
+msgid "Relationships"
+msgstr ""
+
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "הסר העתק ניהולי"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "הסר העתק"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "הסר מבקש"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "הגב"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
 msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "מענה לפנייה"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "מבקש"
 
@@ -3474,37 +4416,37 @@ msgstr "מבקש(י�)"
 msgid "RequestorAddresses"
 msgstr "כתובת הפונה"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "מבקשי�"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr ""
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
 msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "�פס נתוני�"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "בית"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "פתור"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "פתור פנייה #%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "נפתר"
 
@@ -3512,7 +4454,7 @@ msgstr "נפתר"
 msgid "Response to requestors"
 msgstr "תגובה למבקשי�"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "תוצ�ות"
 
@@ -3520,249 +4462,262 @@ msgstr "תוצ�ות"
 msgid "Results per page"
 msgstr "תוצ�ות לעמוד"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "הקלד שנית:"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:631
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr ""
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr ""
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:83
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
 msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "שבת"
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
 msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "שמור שינויי�"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "שמור שינויי�"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
 msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr ""
 
-#: html/Admin/Queues/Scrips.html:55
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr ""
+
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr ""
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "חיפוש"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Searches can't be associated with that kind of object"
 msgstr ""
 
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
 msgstr ""
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
-msgid "Select a Custom Field"
-msgstr ""
-
-#: html/Admin/Groups/index.html:78
-msgid "Select a group"
+#: NOT FOUND IN SOURCE
+msgid "Select"
 msgstr ""
 
-#: html/Admin/Queues/index.html:54
-msgid "Select a queue"
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
 msgstr ""
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Field"
 msgstr ""
 
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
-msgid "Select a user"
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
 msgstr ""
 
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
+#: html/Admin/Groups/index.html:50
+msgid "Select a group"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
+msgid "Select a user"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "בחר קבוצה"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr ""
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr ""
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:58
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Self Service"
+msgstr ""
+
 #: etc/initialdata:121
 msgid "Send mail to all watchers"
 msgstr ""
@@ -3807,123 +4762,147 @@ msgstr ""
 msgid "Sends mail to the owner"
 msgstr ""
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "ספטמבר"
 
 #: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "September"
 msgstr "ספטמבר"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "הצג בקשות ש�ושרו"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "הצג בקשות שנדחו"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "הצג בקשות ממתינות"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "הצג בקשות שממתינות ל�ישורי� �חרי�"
 
-#: lib/RT/Queue_Overlay.pm:94
-msgid "ShowACL"
+#: NOT FOUND IN SOURCE
+msgid "Show ticket private commentary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Show ticket summaries"
 msgstr ""
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ShowACL"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "חתימה"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
-msgid "Single"
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
+#: html/Admin/Elements/SelectSingleOrMultiple:25
+msgid "Single"
 msgstr ""
 
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
 msgstr ""
 
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
-msgid "Sort"
+#: NOT FOUND IN SOURCE
+msgid "Sort Order"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Sort key"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Sort results by"
 msgstr "סדר תוצ�ות על פי"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "SortOrder"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr ""
 
@@ -3931,19 +4910,35 @@ msgstr ""
 msgid "Stalled"
 msgstr "מושהה"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr ""
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "התחיל"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr ""
+
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "מתחיל ב"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "מדינה"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "מצב"
 
@@ -3951,86 +4946,110 @@ msgstr "מצב"
 msgid "Status Change"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:170
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
+msgid "Status changed from %1 to %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "גנוב"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "נגנב מ %1"
-
-#: NOT FOUND IN SOURCE
 msgid "Stolen from %1 "
-msgstr "נגנב מ %1 "
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
+msgstr "נגנב מ %1"
 
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "נוש�"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "נוש� שונה ל %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "שלח"
 
-#: lib/RT/Group_Overlay.pm:782
+#: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "הצליח"
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "ר�שון"
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "סופר-משתמש"
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "מערכת"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
 msgstr ""
 
-#: html/Admin/Tools/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr ""
+
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr ""
 
@@ -4038,180 +5057,224 @@ msgstr ""
 msgid "SystemRolegroup for internal use"
 msgstr ""
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr ""
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "קח"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "נלקחה"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: NOT FOUND IN SOURCE
+msgid "Task"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr ""
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr ""
 
-#: lib/RT/Template_Overlay.pm:376
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr ""
+
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Text"
+msgstr ""
+
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: NOT FOUND IN SOURCE
+msgid "That principal is not a %1 for this ticket"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: NOT FOUND IN SOURCE
+msgid "That user already has that right"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr ""
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr ""
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "מידע בסיסי"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr ""
 
-#: bin/rt-crontool:223
+#: NOT FOUND IN SOURCE
+msgid "The comment has been recorded"
+msgstr ""
+
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr ""
 
-#: lib/RT/Record.pm:934
+#: NOT FOUND IN SOURCE
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr ""
+
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr ""
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
 msgstr ""
 
-#: bin/rt-crontool:214
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr ""
+
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
 msgstr ""
 
-#: lib/RT/Date.pm:416
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr ""
+
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "חמישי"
 
@@ -4220,50 +5283,62 @@ msgid "Ticket"
 msgstr "פנייה"
 
 #: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Ticket # %1 Jumbo update: %2"
 msgstr "פנייה מספר %1 עדכון ג'מבו: %2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "פנייה מספר %1 עדכון ג'מבו: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr ""
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr ""
 
-#: html/Search/Bulk.html:269
+#: NOT FOUND IN SOURCE
+msgid "Ticket %1 loaded\\n"
+msgstr ""
+
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
 msgstr ""
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Ticket Id"
+msgstr ""
+
 #: etc/initialdata:324
 msgid "Ticket Resolved"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
 msgstr ""
 
@@ -4271,23 +5346,27 @@ msgstr ""
 msgid "Ticket attachment"
 msgstr "מצורף לפנייה"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "פנייה נוצרה"
 
 #: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "פנייה נמחקה"
 
@@ -4299,7 +5378,7 @@ msgstr "מזהה פנייה ל� נמצ�"
 msgid "Ticket killed"
 msgstr "פנייה נמחקה"
 
-#: html/Ticket/Display.html:55
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
 msgstr ""
 
@@ -4315,61 +5394,78 @@ msgstr "סטטוס פנייה שונה"
 msgid "Ticket watchers"
 msgstr "צופי הפנייה"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "פניות"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Tickets from %1"
+msgstr ""
+
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "זמן נותר"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "זמן עבודה"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "זמן נותר"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "זמן להציג"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "זמן עבודה"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
+#: NOT FOUND IN SOURCE
+msgid "To generate a diff of this commit:"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "To generate a diff of this commit:\\n"
 msgstr ""
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr ""
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
 msgstr ""
 
@@ -4377,58 +5473,69 @@ msgstr ""
 msgid "Transaction"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: lib/RT/Transaction_Overlay.pm:92
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr ""
 
-#: lib/RT/Date.pm:414
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr ""
+
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "שלישי"
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "סוג"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "ל� מייוש�"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr ""
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
-#. ($self->ContentEncoding)
-#. ($ContentEncoding)
-msgid "Unknown ContentEncoding %1"
+#: NOT FOUND IN SOURCE
+msgid "UnixUsername"
 msgstr ""
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
 msgstr ""
 
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "ל� מוגבל"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
 msgstr ""
 
@@ -4436,31 +5543,39 @@ msgstr ""
 msgid "Unprivileged"
 msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr ""
 
-#: html/Search/Bulk.html:54
+#: NOT FOUND IN SOURCE
+msgid "Untitled search"
+msgstr ""
+
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "עדכן"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
 msgstr ""
 
-#: html/Ticket/Update.html:133
+#: NOT FOUND IN SOURCE
+msgid "Update ID"
+msgstr ""
+
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
 msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "סוג עדכון"
 
@@ -4472,7 +5587,7 @@ msgstr "עדכן �ת כל הפניות לעיל בבת �חת"
 msgid "Update email"
 msgstr "עדכן �י-מייל"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
 msgstr ""
 
@@ -4480,11 +5595,11 @@ msgstr ""
 msgid "Update name"
 msgstr "עדכן ש�"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr ""
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "עדכן פניות נבחרות"
 
@@ -4492,74 +5607,94 @@ msgstr "עדכן פניות נבחרות"
 msgid "Update signature"
 msgstr "עדכן חתימה"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "עדכן פנייה"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: NOT FOUND IN SOURCE
+msgid "Update ticket # %1"
+msgstr ""
+
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr ""
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr ""
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr ""
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "עודכן"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
 msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
 msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr ""
+
 #: etc/initialdata:132 etc/initialdata:206
 msgid "User Defined"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
 msgstr ""
 
@@ -4567,73 +5702,96 @@ msgstr ""
 msgid "User ID"
 msgstr "מזהה המשתמש"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "מזהה המשתמש"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "זכויות המשתמש"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
 msgstr ""
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User view"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "ש� משתמש"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "משתמשי�"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr ""
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: NOT FOUND IN SOURCE
+msgid "ValueOfQueue"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:108
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:63
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr ""
 
-#: lib/RT/Date.pm:415
+#: NOT FOUND IN SOURCE
+msgid "WebEncoding"
+msgstr ""
+
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "רביעי"
 
@@ -4689,11 +5847,19 @@ msgstr "בכל פע� שהערה מגיעה ב"
 msgid "Whenever correspondence comes in"
 msgstr "בכל פע� שתכתובת מגיעה ב"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "עבודה"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr ""
 
@@ -4701,19 +5867,31 @@ msgstr ""
 msgid "WorkPhone"
 msgstr "טלפון בעבודה"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "זמן טיפול"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "�תה כבר הבעלי� של פנייה זו"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "�ינך משתמש מורשה"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "�תה יכול להציב פניה רק �� �תה הבעלי� שלה, �ו ש�ין לה בעלי�"
 
@@ -4721,24 +5899,24 @@ msgstr "�תה יכול להציב פניה רק �� �תה הבעלי� שלה
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "�ין לך הרש�ה כדי לר�ות �ת פנייה זו.\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "מצ�ת %1 פניות בתור %2"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "התנתקת מהמערכת."
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "�ין לך הרש�ות ליצור פניות בתור זה."
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "�ינך מורשה ליצור פניות בתור זה."
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "הנך מוזמן להיכנס שנית"
 
@@ -4766,11 +5944,11 @@ msgstr "בקשתך נדחתה"
 msgid "Your request was rejected."
 msgstr "בקשתך נדחתה."
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "ש� המשתמש ו/�ו הסיסמ� �ינ� נכוני�"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "מיקוד"
 
@@ -4778,28 +5956,24 @@ msgstr "מיקוד"
 msgid "[no subject]"
 msgstr "[לל� נוש�]"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and is not"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and not"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "שהוענק ל%1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr "סגור"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "מכיל"
 
@@ -4819,199 +5993,211 @@ msgstr "התכתבות (כנר�ה) ל� נשלחה"
 msgid "correspondence sent"
 msgstr "התכתבות נשלחה"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "ימי�"
 
 #: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "delete"
 msgstr "מחק"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "מחוק"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "ל� מכיל"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "ל� מכיל"
 
-#: html/Elements/SelectEqualityOperator:59
-msgid "equal to"
-msgstr "שווה ל"
-
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
+#: NOT FOUND IN SOURCE
+msgid "email address"
 msgstr ""
 
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr ""
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr "שווה ל"
 
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
+#: NOT FOUND IN SOURCE
+msgid "false"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "filename"
 msgstr "ש� קובץ"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "גדול מ"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "קבוצה %1"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "שעות"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "מזהה"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "הו�"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "הו� ל�"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "פחות מ"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "מכיל"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "דקות"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "דקות"
 
-#: lib/RT/Date.pm:350
+#: NOT FOUND IN SOURCE
+msgid "modifications\\n\\n"
+msgstr ""
+
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "חודשי�"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "חדש"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "�ין ערך"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "�ין"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "ל� שווה ל"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr ""
+
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "פתוח"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "נדחה"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "פתור"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr ""
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "מושהה"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr ""
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:238
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:244
+#: NOT FOUND IN SOURCE
+msgid "till"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:219
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr ""
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr ""
 
-#: lib/RT/Date.pm:354
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr ""
+
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr ""
 
diff --git a/rt/lib/RT/I18N/hu.po b/rt/lib/RT/I18N/hu.po
index 8573508..e0a2e19 100644
--- a/rt/lib/RT/I18N/hu.po
+++ b/rt/lib/RT/I18N/hu.po
@@ -1,1247 +1,1828 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: RT 3.0.7\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2002-06-22 06:06+0200\n"
-"PO-Revision-Date: 2003-12-01 11:26+0100\n"
-"Last-Translator: Attila K. Mergl <mergl@astron.hu>\n"
-"Language-Team: Hungarian <hu@gnome.hu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
-
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+
+#: NOT FOUND IN SOURCE
+msgid "#"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
-msgstr "#%1: %2"
+msgstr ""
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
-msgstr "%1 %2"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
-msgstr "%1 %2 %3"
+msgstr ""
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
-msgstr "%1 %7. %2 %3 %4:%5:%6"
+msgstr ""
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
-msgstr "[%1] mezõbe '%2' érték felvétele"
+msgstr ""
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
-msgstr "%1 %2"
+msgstr ""
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
-msgstr "%1 változtatása: '%2' --> '%3'"
+msgstr ""
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
-msgstr "%1 %2 törölve"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
-msgstr "%1 %2 a %3 sablonnal"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 הוסף"
+msgstr ""
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 שונה ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 this ticket\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
 msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
-msgstr "%1 (változatlan)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 - %2 shown"
+msgstr ""
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
-msgstr "%1 - %2-nek átadandó argumentum"
+msgstr ""
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
-msgstr "%1 - Státuszfrissítés kiíratása a STDOUT-ra"
+msgstr ""
 
-# msgstr "%1 - Schreibe Statusupdates nach STDOUT"
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
-msgstr "%1 - Adja meg a használandó akciómodult!"
+msgstr ""
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
-msgstr "%1 - Adja meg a használandó kondiciómodult!"
+msgstr ""
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
-msgstr "%1 - Adja meg a használandó keres?modult!"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+     $RT::VERSION, 
+     '2004', 
+    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
-msgstr "ScripAction %1 betöltve"
+msgstr ""
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
-msgstr "%1 értéke hozzáadva %2 höz"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 aliases require a TicketId to work on (from %2) %3"
+msgstr ""
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
-msgstr "%1 nem találhato az adatbázisban, pedig helyi objektumnak látszik"
+msgstr ""
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
-msgstr "%1  (%2)"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
-msgstr "%1 változtatása: '%2' --> '%3'"
+msgstr ""
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
 msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
-msgstr "%1 nem állítható %2 re."
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: NOT FOUND IN SOURCE
+msgid "%1 couldn't init a transaction (%2)\\n"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr ""
-"%1 nem tudta a státuszt lezártra állítani. Az RT adatbázisa talán "
-"inkonzisztens."
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
-msgstr "%1 létrehozva"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
-msgstr "%1 törölve"
+msgstr ""
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
-msgstr "A %1 nekem kiosztott, legsürgõsebb probléma..."
+msgstr ""
 
-#: bin/rt-crontool:186
+#: NOT FOUND IN SOURCE
+msgid "%1 highest priority tickets I own..."
+msgstr ""
+
+#: html/Elements/MyTickets:26
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr ""
+
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
-msgstr "Ennek a sornak %1 már nem %2-je."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 is no longer a %2 for this ticket."
+msgstr ""
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
+msgid "%1 is no longer a value for custom field %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 isn't a valid Queue id."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
 #. ($Ticket->TimeWorked)
 #. ($Ticket->TimeLeft)
 msgid "%1 min"
-msgstr "%1 perc"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
-msgstr "%1 legújabb gazdátlan probléma"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
+msgid "%1 not shown"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
-msgstr "%1 jogok"
+msgstr ""
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: NOT FOUND IN SOURCE
+msgid "%1 succeeded\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for $MessageId"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 type unknown for %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 על ידי %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
 msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
-msgstr "%1: Nincs melléklet megadva!"
+msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
-msgstr "%1b"
+msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
-msgstr "%1k"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
-msgstr "'%1' nem lehet státusz érték"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "'%1' not a recognized action. "
+msgstr ""
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
-msgstr "(Törléshez kiválasztandó!)"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr ""
+
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
-msgstr "(Szóközökkel elválasztva adható meg a problémák sorszáma vagy URL-je.)"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(Ha üresen marad: %1)"
+msgid "(If left blank, will default to %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
+msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
-msgstr "(Nincs egyéni mezõ)"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
-msgstr "(Nincsenek tagok)"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
-msgstr "(Nincs Scrip)"
+msgstr ""
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
-msgstr "(Nincs sablon)"
+msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
-msgstr "(nincs név)"
+msgstr ""
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr ""
 
-#: html/Ticket/Create.html:100
+#: NOT FOUND IN SOURCE
+msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr ""
+
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr ""
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr ""
 
-#: html/Ticket/Create.html:90
+#: NOT FOUND IN SOURCE
+msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
+msgstr ""
+
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
 msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
-msgstr "(üres)"
+msgstr ""
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
-msgstr "(Nincs név a listában)"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(no subject)"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
-msgstr "(nincs adat)"
+msgstr ""
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
-msgstr "(nincs adat)"
+msgstr ""
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
-msgstr "<br>(Csak egy probléma adható meg!)"
+msgstr ""
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr ""
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:71
+#: NOT FOUND IN SOURCE
+msgid "(pending other tickets)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
-msgstr "(szükséges)"
+msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
-msgstr "(névtelen)"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:53
+#: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr ""
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr ""
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
-msgstr "<input type=\"submit\" value=\"Új probléma\">&nbsp;%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
 
 #: etc/initialdata:218
 msgid "A blank template"
-msgstr "Ãœres sablon"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
-msgstr "ACE nem található"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
-msgstr "ACE-k csak létrehozhatók és törölhetõk."
+msgstr ""
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr "ÉS"
+#: NOT FOUND IN SOURCE
+msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgstr ""
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
-msgstr "Magamról"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
-msgstr "Hozzáférés ellenõrzése"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
-msgstr "Akció"
+msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
-msgstr "%1 akció nem található"
+msgstr ""
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr "Akció végrehajtva.\\n"
+#: bin/rt-crontool:119
+msgid "Action committed."
+msgstr ""
 
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
-msgstr "Akció elõkészítve..."
+msgstr ""
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
-msgstr "Hozzáad"
+msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
-msgstr "Adminisztratív tájékotatást kapó hozzáadása"
+msgstr ""
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
-msgstr "Tájékotatást kapó hozzáadása"
-
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr "Mezõk hozzáadása"
+msgstr ""
 
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
-msgstr "Bõvített keresési feltételek"
+msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
-msgstr "További fájlok csatolása"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr ""
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
-msgstr "Beküldõ hozáadása"
+msgstr ""
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
-msgstr "Értékek hozzáadása"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr ""
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
-msgstr "Minden sorra vonatkozó Scrip hozzáadása"
+msgstr ""
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
-msgstr "További feltételek hozzáadása"
+msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
-msgstr "A kiválasztott problémákhoz válasz vagy kiegészítés hozzáadása"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
-msgstr "Tagfelvétel"
+msgstr ""
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
-msgstr "Új résztvevõk hozzáadása"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr "Egyéni mezõk lehetséges értékeinek létrehozása, módosítása, törlése"
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
-msgstr "Hozzendelt egy vezetõt mint %1 ehhez a sorhoz"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
-msgstr "Hozzárendelt egy vezetõt mint %1 ehhez a problémához"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
-msgstr "Utca, házszám"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
-msgstr "Postafiók"
+msgstr ""
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
-msgstr "Adminisztratív tájékoztatást kap"
+msgstr ""
 
 #: etc/initialdata:295
 msgid "Admin Comment"
-msgstr "Adminisztratív megjegyzés"
+msgstr ""
 
 #: etc/initialdata:274
 msgid "Admin Correspondence"
 msgstr ""
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
-msgstr "Válasszon sort!"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Admin users"
+msgstr ""
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
-msgstr "Konfiguráció / �ltalános beállítások"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Admin/Queue/Basics"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
-msgstr "Adminisztratív tájékoztatást kap"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Queue_Overlay.pm:73
+msgid "AdminCustomFields"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr ""
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr ""
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr ""
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
-msgstr "Adminisztratív tájékoztatást kap"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:197
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
-msgstr "Kézi lekérdezés"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search"
+msgstr ""
 
-#: html/Elements/SelectDateRelation:57
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
 msgid "After"
-msgstr "után"
+msgstr ""
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
 msgstr ""
 
 #: etc/initialdata:363
 msgid "All Approvals Passed"
 msgstr ""
 
-#: html/Admin/Queues/index.html:75
+#: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
+msgid "All Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
-msgstr "Minden sor"
+msgstr ""
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr "ÉS/VAGY"
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
-msgstr "Mentés"
+msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
-msgstr "A változtatás mentése"
+msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
-msgstr "Lezárás"
+msgstr ""
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
-msgstr "Engedélyezés #%1: %2"
+msgstr ""
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
-msgstr "Engedélyezés #%1: A megjegyzés rendszerhiba miatt nem rögzíthetõ"
+msgstr ""
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
-msgstr "Engedélyezés #%1: Megjegyzés rögzítve"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr ""
 
 #: etc/initialdata:351
 msgid "Approval Passed"
-msgstr "Lezárás rendben"
+msgstr ""
 
 #: etc/initialdata:374
 msgid "Approval Rejected"
-msgstr "Lezárás visszautasítva"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr ""
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
-msgstr "Lezár"
+msgstr ""
 
 #: etc/initialdata:504
 msgid "Approver's notes: %1"
-msgstr "Az engedélyezõ megjegyzése: %1"
+msgstr ""
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
-msgstr "ápr."
+msgstr ""
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
-msgstr "növekvõ"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
-msgstr "Egyéni mezõ hozzárendelése vagy törlése"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
 msgstr ""
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
-msgstr "Csatol"
+msgstr ""
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
-msgstr "Fájl csatolása"
+msgstr ""
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
-msgstr "Csatolt fájl"
+msgstr ""
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
-msgstr "A csatolt '%1' nem betölthetõ"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
-msgstr "Csatolt fájl létrehozva"
+msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
-msgstr "Csatolt fájl neve"
+msgstr ""
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
-msgstr "Csatolt fájlok"
+msgstr ""
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
 msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
-msgstr "aug."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "August"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AuthSystem"
+msgstr ""
 
 #: etc/initialdata:221
 msgid "Autoreply"
-msgstr "Automatikus válasz"
+msgstr ""
 
 #: etc/initialdata:72
 msgid "Autoreply To Requestors"
-msgstr "Automatikus válasz a beküldõnek"
+msgstr ""
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr ""
+
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad PGP Signature: %1\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad data in %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Bad transaction number for attachment. %1 should be %2\\n"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
-msgstr "Alapadatok módosítása"
+msgstr ""
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
-msgstr "BCC"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr ""
-"Ha valamit módosított ne felejtsen el ide kattintani, hogy megtörténjen a"
 
-# ## wieder - Duzen???
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
-msgstr "elõtt"
+msgstr ""
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Binary"
 msgstr ""
 
 #: etc/initialdata:217
 msgid "Blank"
-msgstr "Ãœres"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr "Félkövér"
+#: NOT FOUND IN SOURCE
+msgid "Bookmarkable URL for this search"
+msgstr ""
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
 msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
-msgstr "Tömör fejléc"
+msgstr ""
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
-msgstr "Tömeges problémafrissítés"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
-msgstr "Rendszerfelhasználó nem módosítható"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
-msgstr "Ez a vezetõ nem láthatja ezt a sort"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
-msgstr "Egyéni mehzõ név nélkül nem hozzáadható"
-
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
 msgstr ""
 
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
 msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
-msgstr "A problémát nem lehet önmagához kapcsolni!"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2716
+msgid "Can't merge into a merged ticket. You should never get this error"
+msgstr ""
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
-msgstr "Ezt a lekérdezést nem lehet lementeni"
+msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
-msgstr "Nem adhat meg egyszerre bázist és célt"
+msgstr ""
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
-msgstr "A felhasználó nem hozható létre: %1"
+msgstr ""
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
-msgstr "Tájékoztatást kap"
+msgstr ""
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
-msgstr "Jelszó-változtatás"
+msgstr ""
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
 msgstr ""
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
-msgstr "Törléshez bejelölni"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
-msgstr "Jog megvonásához megjelölni"
+msgstr ""
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
-msgstr "Leszármazottak"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
-msgstr "Város"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
 msgstr ""
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
-msgstr "Lezárva"
+msgstr ""
+
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr ""
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: NOT FOUND IN SOURCE
+msgid "Closed requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
-msgstr "Lezárt problémák"
+msgstr ""
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Command not understood!\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
-msgstr "Kiegészít"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
-msgstr "Kiegészitõcím"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:112
+#: NOT FOUND IN SOURCE
+msgid "Comment not recorded"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr ""
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: NOT FOUND IN SOURCE
+msgid "Comments"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
-msgstr "Kiegészítés (a beküldõ nem kapja meg!))"
+msgstr ""
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
-msgstr "Kiegészítés (a beküldõ nem kapja meg!)"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: NOT FOUND IN SOURCE
+msgid "Comments about %1"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
-msgstr "Kiegészítés ehhez a felhasználóhoz"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
-msgstr "Kiegészítés hozzáfûzése"
+msgstr ""
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:63
+#: NOT FOUND IN SOURCE
+msgid "Compile Restrictions"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
-msgstr "Feltétel"
+msgstr ""
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
-msgstr "A feltétel nem található"
+msgstr ""
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
-msgstr "Konfiguráció"
+msgstr ""
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
-msgstr "Igazolás"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ContactInfoSystem"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Contacted date '%1' could not be parsed"
+msgstr ""
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
-msgstr "Tartalom"
+msgstr ""
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:64
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr ""
+
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
-msgstr "Másol"
+msgstr ""
 
 #: etc/initialdata:286
 msgid "Correspondence"
-msgstr "Válasz"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Correspondence Address"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
-msgstr "Válasz hozzáfûzése"
+msgstr ""
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr "Az egyéni mezõt nem sikerült hozzáadni."
+#: NOT FOUND IN SOURCE
+msgid "Correspondence not recorded"
+msgstr ""
 
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr "Az egyéni mezõértéket nem sikerült hozzáadni a #%1 problémához"
+#: lib/RT/Ticket_Overlay.pm:3471
+msgid "Could not add new custom field value for ticket. "
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
-msgstr "Nem sikerült a tulajdonost megváltoztatni! "
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
-msgstr "Nem sikerült létrehozni az egyéni mezõt"
-
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr "Nem sikerült létrehozni a(z) %1 egyéni mezõt"
+msgstr ""
 
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
-msgstr "Nem sikerült létrehozni a csoportot"
+msgstr ""
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
-msgstr "A sablom nem jött létre: %1"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
-msgstr "Nem jött létre a probléma. A sor nincs meghatározva"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
-msgstr "A felhasználó nem jött létre"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Could not find a ticket with id %1"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: NOT FOUND IN SOURCE
+msgid "Could not find group %1."
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
-msgstr "A felhasználót nem sikerült megtalálni vagy létrehozni"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
-msgstr "A vezetõ nem található"
-
-#: html/Admin/CustomFields/Objects.html:69
-msgid "Could not load CustomField %1"
-msgstr "A(z) %1 egyéni mezõ nem betölthetõ"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
-msgid "Could not load group"
-msgstr "A csoport nem betölthetõ"
+#: NOT FOUND IN SOURCE
+msgid "Could not find user %1."
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
+#: NOT FOUND IN SOURCE
+msgid "Could not load CustomField %1"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
+msgid "Could not load group"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
-msgstr "A vezetõ nem lehet  %1-e a sornak"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
-msgstr "A vezetõ nem lehet %1-e a problémának"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
-msgstr "A vezetõt nem lehet mint a sor %1-ét eltávolítani"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:192
+#: NOT FOUND IN SOURCE
+msgid "Could not remove that principal as a %1 for this ticket"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
-msgstr "A felhasználó adatait nem sikerült elmenteni"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
-msgstr "A tagot nem lehet a csoporthoz adni"
+msgstr ""
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
-msgstr "A tanzakció nem létrehozható: %1"
+msgstr ""
 
-#: lib/RT/Record.pm:939
+#: NOT FOUND IN SOURCE
+msgid "Couldn't figure out what to do from gpg's reply\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find group\\n"
+msgstr ""
+
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
-msgstr "A sor nem található"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
-msgstr "A csoport/felhasználó nem található"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
-msgstr "Az érték nem található"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't find user\\n"
+msgstr ""
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr ""
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
-msgstr "A(z) %1 egyéni mezõ nem betölthetõ"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load RT config file '%1' %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load Scrips."
+msgstr ""
+
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
-msgstr "%1 csoport nem betölthetõ"
+msgstr ""
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
-msgstr "%1 objektum nem betölthetõ"
+msgstr ""
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
-msgstr "A sor nem betölthetõ"
+msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
-msgstr "%1 sor nem betölthetõ"
+msgstr ""
 
-#: html/SelfService/Display.html:156
-#. ($id)
-msgid "Couldn't load ticket '%1'"
-msgstr "A(z) '%1' nem betölthetõ"
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load scrip"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load template"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load that user (%1)"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/SelfService/Display.html:116
+#. ($id)
+msgid "Couldn't load ticket '%1'"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
-msgstr "Ország"
+msgstr ""
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
-msgstr "Felvesz"
+msgstr ""
 
 #: etc/initialdata:135
 msgid "Create Tickets"
-msgstr "Probléma megadása"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
-msgstr "Hozzon létre egy új egyéni mezõt!"
+msgstr ""
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
-msgstr "Hozzon létre egy egyéni mezõt a(z) %1 sorhoz"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr ""
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: NOT FOUND IN SOURCE
+msgid "Create a new Custom Field"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
-msgstr "Hozzon létre új csoportot!"
+msgstr ""
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
-msgstr "Hozzon létre egy új saját csoportot!"
+msgstr ""
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: NOT FOUND IN SOURCE
+msgid "Create a new queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new template"
+msgstr ""
+
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
-msgstr "Új probléma felvétele"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
-msgstr "Hozzon létre egy új felhasználót!"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
-msgstr "Hozzon létre egy sort!"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a queue called"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a request"
+msgstr ""
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
-msgstr "Hozzon létre egy scrip-et a(z) %1 sorhoz!"
+msgstr ""
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
-msgstr "Hozzon létre egy sablont!"
+msgstr ""
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
-msgstr "Új probléma"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr ""
 
 #: etc/initialdata:137
 msgid "Create new tickets based on this scrip's template"
-msgstr "Hozzon létre egy új problémát ennek a sablonnak scripjeire alapozva"
+msgstr ""
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
-msgstr "Létrehozás"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
-msgstr "Hozzon létre problémákat ebben a sorban!"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
-msgstr "Egyéni mezõk létrehozása, módosítása, törlése"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
-msgstr "Sor létrehozása, módosítása, törlése"
+msgstr ""
 
-#: lib/RT/System.pm:81
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr ""
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
-msgstr "Felhasználók létrehozása, módosítása, törlése"
-
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr ""
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
-msgstr "Felvéve"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:102
+#: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created template %1"
+msgstr ""
+
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
-msgstr "Létrehozó"
+msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
-msgstr "Jelenlegi kapcsolatok"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:51
+#: NOT FOUND IN SOURCE
+msgid "Current Relationships"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
-msgstr "Jelenlegi  Scripek"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
-msgstr "Jelenlegi tagok"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
-msgstr "Jelenlegi jogok"
+msgstr ""
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: NOT FOUND IN SOURCE
+msgid "Current search criteria"
+msgstr ""
+
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
-msgstr "Jelenlegi résztvevõk"
+msgstr ""
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
-msgstr "Egyéni mezõk"
+msgstr ""
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
-msgstr "%1 egyéni mezõi"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
-msgstr "Az akcióhoz rendelt egyéni lezáró kód"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
-msgstr "Az akcióhoz rendelt egyéni elõkészítõ kód"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
-msgstr "Egyéni feltétel"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
-msgstr "Egyéni mezõ %1 %2 %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Custom field %1 does not apply to this object"
+msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
-msgstr "[%1] egyéni mezõnek van értéke."
+msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
-msgstr "[%1] egyéni mezõnek nincs értéke."
+msgstr ""
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
-msgstr "[%1] egyéni mezõ nem található"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
+msgid "Custom field deleted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
-msgstr "Egyéni mezõ nem található"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
-msgstr "A(z) %2 egyéni mezõ %1értéke nem található"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: NOT FOUND IN SOURCE
+msgid "Custom field value changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
-msgstr "Az egyéni mezõ értéke nem található"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
-msgstr "Az egyéni mezõ értéke nem található"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
-msgstr "Az egyéni mezõ értéke törölve"
+msgstr ""
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr ""
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr ""
+
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
-msgstr "Idõpontok"
+msgstr ""
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
-msgstr "dec."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr ""
 
 #: etc/initialdata:222
 msgid "Default Autoresponse template"
 msgstr ""
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
-msgstr "Alapértlemezett sor"
+msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
-msgstr "Alapértelmezett beküldõ"
+msgstr ""
 
 #: etc/initialdata:296
 msgid "Default admin comment template"
@@ -1259,1518 +1840,1873 @@ msgstr ""
 msgid "Default transaction template"
 msgstr ""
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr ""
+
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
-msgstr "Jogok továbbadása"
+msgstr ""
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr ""
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr ""
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
-msgstr "Jogok továbbadása"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
-msgstr "Töröl"
+msgstr ""
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
-msgstr "Sablon törlése"
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
-msgstr "Kiválasztott Scrip törlése"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
-msgstr "Problémák törlése"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
+#: lib/RT/Transaction_Overlay.pm:162
+msgid "Deleting this object could break referential integrity"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr ""
 
-#: html/Approvals/Elements/Approve:66
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
-msgstr "Elutasítva"
+msgstr ""
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
-msgstr "Ettõl függnek"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: NOT FOUND IN SOURCE
+msgid "Dependencies: \\n"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
-msgstr "A következõktõl függ"
+msgstr ""
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
-msgstr "csökkenõ"
+msgstr ""
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
-msgstr "A probléma szabatos leírása"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
-msgstr "Leírás"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: NOT FOUND IN SOURCE
+msgid "Details"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
-msgstr "Mutat"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
-msgstr "Mezõk kiválasztása"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
-msgstr "Láthatóak legyenek az ehhez a sorhoz tartozó scrip sablonok"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
-msgstr "Láthatóak legyen a sorhoz tartozó scripek"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
-msgstr "Megjelenítési mód"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
 msgstr ""
 
-#: html/Elements/Footer:60
+#: NOT FOUND IN SOURCE
+msgid "Display ticket #%1"
+msgstr ""
+
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr ""
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr "Keresés indítása"
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
-msgstr "Ne frissítse ezt az oldalt."
+msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: NOT FOUND IN SOURCE
+msgid "Don't show search results"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
-msgstr "Letölt"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr ""
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
 msgstr ""
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
-msgstr "Határidõ"
+msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
-msgid "Edit Custom Fields for %1"
-msgstr "Módosítsa %1 egyéni mezõit!"
+#: NOT FOUND IN SOURCE
+msgid "Due date '%1' could not be parsed"
+msgstr ""
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
+#: NOT FOUND IN SOURCE
+msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
+#: NOT FOUND IN SOURCE
+msgid "Edit"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
+msgstr ""
+
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
 msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
+msgstr ""
+
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
-msgstr "Kapcsolatok módosítása"
+msgstr ""
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
-msgstr "Lekérdezés szerkesztése kézzel"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Relationships"
+msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
-msgstr "Módosítsa a(z) %1 sor sablonjait!"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr ""
+
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
-msgstr "Módosítsa a rendszersablonokat!"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:175
+#: NOT FOUND IN SOURCE
+msgid "Edit templates for %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for user %1"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
-msgstr "Módosítsa a(z) %1 csoport tagságát!"
+msgstr ""
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr ""
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: NOT FOUND IN SOURCE
+msgid "Editing template %1"
+msgstr ""
+
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
-msgstr "Meg kell adni a bázist vagy a célt"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
-msgstr "E-mail cím"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
-msgstr "E-Mail-cím már foglalt"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "EmailAddress"
+msgstr ""
 
-# ## muss das überhaupt übersetzt werden???
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "EmailEncoding"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
-msgstr "Aktivált (kiválasztása letiltja ezt az egyéni mezõt)"
+msgstr ""
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
-msgstr "Aktivált (Kiválasztása letiltja ezt a csoportot)"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
-msgstr "Aktivált (Kiválasztása letiltja ezt a sort)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Elements/EditCustomFields:97
+msgid "Enabled Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
-msgstr "Aktív sorok"
+msgstr ""
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
-msgstr "Status %1 aktiviert"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
-msgstr "Adjon meg több értéket!"
+msgstr ""
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
-msgstr "Objektum vagy URI. Szóközzel elválasztva több is megadható"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
-msgstr "Adjon meg egy értéket!"
+msgstr ""
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
-msgstr "Sor vagy URI. Szóközzel elválasztva több is megadható"
+msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
-msgstr "Probléma szám vagy URI. Szóközzel elválasztva több is megadható"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
-msgstr "Adjon meg egy értéket!"
+msgstr ""
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
-msgstr "Hiba"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:669
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
-msgstr "Hiba a sor paraméterezésében ->AddWatcher"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:830
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Queue->DelWatcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
-msgstr "Hiba a sor paraméterezésében->DelWatcher"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
-msgstr "Hiba a probléma paraméterezésében -> AddWatcher"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Ticket->DelWatcher"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
-msgstr "Hiba a probléma paraméterezésében->DelWatcher"
+msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: NOT FOUND IN SOURCE
+msgid "Estimate"
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
-msgstr "Becsült"
+msgstr ""
 
 #: etc/initialdata:20
 msgid "Everyone"
-msgstr "Mindenki"
+msgstr ""
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
-msgstr "Például:"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ExternalAuthId"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:99
+#: NOT FOUND IN SOURCE
+msgid "ExternalContactInfoId"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
-msgstr "Kiegészítõ információk"
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr ""
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
-msgstr "A %1 Modul nem betölthetõ. (%2)"
-
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
 msgstr ""
 
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
-msgstr "feb."
-
-#: html/Elements/SelectAttachmentField:50
-msgid "Filename"
-msgstr "fájlnév"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:69
-msgid "Fill in multiple text areas"
+#: NOT FOUND IN SOURCE
+msgid "February"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
+#: html/Elements/SelectAttachmentField:28
+msgid "Filename"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:70
-msgid "Fill in one text area"
+#: NOT FOUND IN SOURCE
+msgid "Fill in multiple text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
+#: NOT FOUND IN SOURCE
+msgid "Fill in one text area"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
+#: NOT FOUND IN SOURCE
+msgid "Fin"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
-msgstr "Végsõ prioritás"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr ""
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
-msgstr "Találjon olyan csoportot, amelyiknél a"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Find new/open tickets"
+msgstr ""
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
-msgstr "Találj olyan embereket, akiknél a"
+msgstr ""
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
-msgstr "Problémák keresése"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
-msgstr "Elsõ"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "First page"
+msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr ""
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
-msgstr "A változtatás kikényszerítése"
-
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
 msgstr ""
 
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
-msgstr "%quant(%1) problémát találtam"
+msgstr ""
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr ""
 
-#: lib/RT/Date.pm:417
+#: NOT FOUND IN SOURCE
+msgid "Freeform"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "FreeformContactInfo"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
 msgid "Fri."
-msgstr "P"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
-msgstr "Teljes fejléc"
+msgstr ""
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: NOT FOUND IN SOURCE
+msgid "Getting the current user from a pgp sig\\n"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
-msgstr "%1 felhasználónak adva"
+msgstr ""
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
-msgstr "�ltalános"
+msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
-msgstr "Globális egyéni mezõ"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr "Egyéni mezõk általános beállításai"
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
+msgstr ""
 
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
-msgstr "�ltalános probléma: %1"
+msgstr ""
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
-msgstr "Hajrá!"
+msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
-msgstr "Hajrá!"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Good pgp sig from %1\\n"
+msgstr ""
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: NOT FOUND IN SOURCE
+msgid "Goto page"
+msgstr ""
+
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
-msgstr "Mutassa a problémát"
+msgstr ""
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
-msgstr "Csoport"
+msgstr ""
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: NOT FOUND IN SOURCE
+msgid "Group %1 %2: %3"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
-msgstr "Csoportjogok"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
-msgstr "Csoportnak már vannak tagjai"
+msgstr ""
 
-#: html/Admin/Groups/Modify.html:109
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
-msgstr "A csoportot nem lehetett létrehozni: %1"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
-msgstr "Csoport létrehozva"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
-msgstr "A csoportnak már van ilyen tagja"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
-msgstr "Csoport nem található"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group not found.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Group not specified.\\n"
+msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
-msgstr "Csoportok"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
-msgstr "Csoportok nem lehetnek a saját tagjaik tagjai!"
+msgstr ""
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
-msgstr "A keresési feltételeknek megfeleõ csoportok"
+msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:77
+#: NOT FOUND IN SOURCE
 msgid "Groups this user belongs to"
 msgstr ""
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
-msgstr "Hallo!"
+msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
-msgstr "Hallo %1"
+msgstr ""
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
-msgstr "Részletes történet"
+msgstr ""
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
-msgstr "A %1 csoport története"
+msgstr ""
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
-msgstr "%1 felhasználó története"
+msgstr ""
 
-#: html/Elements/Tabs:65
+#: NOT FOUND IN SOURCE
+msgid "HomePhone"
+msgstr ""
+
+#: html/Elements/Tabs:43
 msgid "Homepage"
-msgstr "Kezdõlap"
+msgstr ""
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr ""
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
-msgstr "Sorszám"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
-msgstr "Személy"
+msgstr ""
 
 #: etc/initialdata:429
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr ""
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "Ha a beküldõ ismeretlen, ezzel legyen az új probléma beküldõje"
+msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
-msgstr "Ha nincs megadva sor, ebbe a sorba kerüljenek az új problémák"
+msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr ""
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr ""
-"Ha valamit módosított, ne felejtsen el ide kattintani, hogy megtörténjen a"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
-msgstr "Érvénytelen érték %1-nek"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Image"
-msgstr "Kép"
+msgstr ""
 
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
-msgstr "Nem változtatható mezõ"
+msgstr ""
 
-#: html/Admin/Groups/index.html:65
-msgid "Include disabled groups in listing."
-msgstr "Láthatóak legyenek a letiltott sorok is."
+#: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
 
-#: html/Admin/Queues/index.html:65
-msgid "Include disabled queues in listing."
-msgstr "Láthatóak legyenek a letiltott sorok is."
+#: html/Admin/Elements/EditCustomFields:72
+msgid "Include disabled custom fields in listing."
+msgstr ""
 
-#: html/Admin/Users/index.html:71
-msgid "Include disabled users in search."
-msgstr "Keresés a letiltott felhasználók között is."
+#: html/Admin/Groups/index.html:37
+msgid "Include disabled groups in listing."
+msgstr ""
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
+#: html/Admin/Queues/index.html:42
+msgid "Include disabled queues in listing."
 msgstr ""
 
-#: html/Search/Build.html:660
-msgid "Incomplete query"
+#: html/Admin/Users/index.html:46
+msgid "Include disabled users in search."
 msgstr ""
 
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
-msgstr "Kezdõ prioritás"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
-msgstr "Input hiba"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
-msgstr "Belsõ hiba"
+msgstr ""
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
-msgstr "Belsõ hiba: %1"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
-msgstr "Érvénytelen csoportfajta"
+msgstr ""
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
-msgstr "Érvénytelen jog"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr ""
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
-msgstr "Érvénytelen dátum"
+msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: NOT FOUND IN SOURCE
+msgid "Invalid owner. Defaulting to 'nobody'."
+msgstr ""
+
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
-msgstr "Érvénytelen sor"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
-msgstr "Érvénytelen jog"
+msgstr ""
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
-msgstr "Érvénytelen érték %1-nek"
+msgstr ""
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
-msgstr "Érvénytelen érték az egyéni mezõhöz"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
-msgstr "Érvénytelen státuszérték"
+msgstr ""
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr ""
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr ""
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
 msgstr ""
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
-msgstr "jan."
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:174
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr ""
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
-msgstr "júl."
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:122
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
-msgstr "Minden módosítása"
+msgstr ""
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
-msgstr "jún."
+msgstr ""
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
-msgid "Language"
-msgstr "Nyelv"
+#: NOT FOUND IN SOURCE
+msgid "June"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr "Nagy"
+#: NOT FOUND IN SOURCE
+msgid "Keyword"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Lang"
+msgstr ""
+
+#: html/User/Prefs.html:54
+msgid "Language"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
-msgstr "Utolsó"
+msgstr ""
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
-msgstr "Utolsó kapcsolat"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
 
-#: html/Elements/SelectDateType:50
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
-msgstr "Utoljára foglalkoztak vele"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Last Notified"
+msgstr ""
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
-msgstr "Utoljára aktualizálva"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
-msgstr "Utoljára aktualizálta"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
-msgstr "Felhasználónak RT-hozzáférés engedélyezése"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
-msgstr "Felhasználónak több jog engedélyezése"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Limiting owner to %1 %2"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
+#: NOT FOUND IN SOURCE
+msgid "Limiting queue to %1 %2"
 msgstr ""
 
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
-msgstr "Kapcsolat már létezik"
+msgstr ""
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
-msgstr "Kapcsolat nem hozható létre"
+msgstr ""
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
-msgstr "Kapcsolat létrehozva (%1)"
+msgstr ""
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
-msgstr "Kapcsolat törölve (%1)"
+msgstr ""
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
-msgstr "Kapcsolat nem található"
+msgstr ""
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
-msgstr "%1. számú probléma kapcsolatainak módosítása"
+msgstr ""
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr ""
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
-msgstr "Kapcsolatok módosítása"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
-msgstr "Lekérdezés betöltése"
-
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
-msgstr "Cím"
+msgstr ""
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr ""
-"Log-könyvtár %1 nem található, vagy nincs írási joga.\\n Az RT tud elindulni."
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
-msgstr "%1-ként van bejelentkezve"
+msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
-msgstr "Bejelentkezés"
+msgstr ""
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
-msgstr "Kijelentkezés"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
 msgstr ""
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
-msgstr "Legyen a tulajdonos"
+msgstr ""
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
-msgstr "Státusz változtatása"
+msgstr ""
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
-msgstr "Határidõ változtatása"
+msgstr ""
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
-msgstr "Megoldási dátum változtatása"
+msgstr ""
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
-msgstr "Hozzáfogás dátumának változtatása"
+msgstr ""
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
-msgstr "Kiosztás dátumának változtatása"
+msgstr ""
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
-msgstr "Bejelentés dátumának változtatása"
+msgstr ""
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
-msgstr "Prioritás állítása"
+msgstr ""
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
-msgstr "Sor változtatása"
+msgstr ""
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
-msgstr "Tárgy változtatása"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
 msgstr ""
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
 msgstr ""
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
-msgstr "Csoportok és tagjaik kezelése"
+msgstr ""
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
-msgstr "Minden sorra vonatkozó tulajdonságok és beállítások kezelése"
+msgstr ""
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
-msgstr "Sorok és a sorokra jellemzõ beállítások kezelése"
+msgstr ""
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
-msgstr "Felhasználók és jelszavaik kezelése"
+msgstr ""
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
-msgstr "már."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr ""
 
-#: lib/RT/Date.pm:441
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr ""
+
+#: lib/RT/Date.pm:415
 msgid "May."
-msgstr "máj."
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
-msgstr "Tag hozzáadva"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
-msgstr "Tag törölve"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
-msgstr "Tag hozzáadva"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
-msgstr "Tag törölve"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
-msgstr "Tag nincs törölve"
+msgstr ""
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
-msgstr "Tagja a"
+msgstr ""
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
-msgstr "Tagok"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
-msgstr "%1 tag hozzáadva"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
-msgstr "%1-beli tagság törölve"
+msgstr ""
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
-msgstr "Tagságok"
+msgstr ""
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
-msgstr "%1 felhasználó tagságai"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
-msgstr "Beolvasztás sikeres"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
-msgstr "Beolvasztás sikertelen Konnte EffectiveId nicht setztn"
-
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr "Beolvasztás sikertelen Konnte EffectiveId nicht setztn"
+msgstr ""
 
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
-msgstr "Beolvasztani ebbe"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
-msgstr "Beolvasztva %1-be"
+msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
-msgstr "Üzenet szövege"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
-msgstr "A sor nem hozható létre"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
-msgid "Message recorded"
-msgstr "Üzenet rögzítve"
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
-msgid "Messages about this ticket will not be sent to..."
+#: lib/RT/Ticket_Overlay.pm:2517
+msgid "Message recorded"
 msgstr ""
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
+#: html/Ticket/Elements/PreviewScrips:70
+msgid "Messages about this ticket will not be sent to..."
 msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
-msgstr "Mobil"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "MobilePhone"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
 msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
+#: NOT FOUND IN SOURCE
 msgid "Modify Custom Fields which apply to all %1"
-msgstr "Változtassa meg a %1-re vonatkozó egyéni mezõket!"
+msgstr ""
+
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
+msgstr ""
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
-msgstr "Csoportjogok módosítása"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
-msgstr "Tagok módosítása"
+msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
-msgstr "Jogok módosítása"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr ""
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
-msgstr "Felhasználói jogok módosítása"
+msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
-msgstr "Változtassa meg a(z) %1 sor egyéni mezõjét!"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr ""
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr ""
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
 msgstr ""
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr ""
+
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
-msgstr "%1. számú probléma idõadatainak módosítása"
+msgstr ""
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
-msgstr "%1. számú probléma idõadatainak módosítása"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
-msgstr "Változtassa meg az általános csoportjogokat!"
+msgstr ""
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
-msgstr "Változtassa meg az általános csoportjogokat!"
+msgstr ""
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
-msgstr "Változtassa meg az általános felhasználói jogokat!"
+msgstr ""
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
-msgstr "Változtassa meg az általános felhasználói jogokat!"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
-msgstr "Változztassa meg a(z) %1 sor csoportjogait!"
+msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
-msgstr "Módosítsa a(z) %1 csoport jogait"
+msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
-msgstr "Változtassa meg a %1 sor csoportjogait!"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr ""
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr ""
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
-msgstr "Változtassa meg a %1 sorhoz tarozó részvevõket!"
+msgstr ""
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
-msgstr "A %1. számú problémában érintett személyek változtatása"
+msgstr ""
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
-msgstr "Változtassa meg a(z) %1 sor Scripjeit"
+msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
-msgstr "Változtassa meg a minden sorra vonatkozó scripeket!"
+msgstr ""
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
-msgstr "Hozzon létre egy sablont!"
+msgstr ""
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
-msgstr "Változtassa meg az általános sablonokat!"
+msgstr ""
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
-msgstr "A %1 csoport módosítása"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
-msgstr "%1 felhasználó módosítása"
+msgstr ""
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
-msgstr "%1. számú probléma adatainak módosítása"
+msgstr ""
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
-msgstr "%1. számú probléma alapadatainak módosítása"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr ""
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
-msgstr "Változtassa meg a(z) %1 csoport jogait!"
+msgstr ""
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
-msgstr "Változtassa meg a(z) %1 sor felhasználói jogait!"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:95
-msgid "ModifyACL"
+#: NOT FOUND IN SOURCE
+msgid "Modify watchers for queue '%1'"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
+#: lib/RT/Queue_Overlay.pm:71
+msgid "ModifyACL"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr ""
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr ""
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
-msgstr "H"
+msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
-msgstr "További részletek %1 felhasználóról"
+msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:83
+#: NOT FOUND IN SOURCE
+msgid "Move"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
-msgstr "Lefelé mozgatni"
+msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
-msgstr "Felfelé mozgatni"
+msgstr ""
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr ""
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
-msgstr "%1 problémáim"
+msgstr ""
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr ""
+
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
-msgstr "Lezárás"
+msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
-msgstr "Saját lekérdezések"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
-msgstr "A felhasználói név már foglalt"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr ""
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
-msgstr "Soha"
+msgstr ""
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
-msgstr "Új"
+msgstr ""
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
-msgstr "Új kapcsolatok"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
-msgstr "Új jelszó"
+msgstr ""
 
 #: etc/initialdata:332
 msgid "New Pending Approval"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
-msgstr "Új lekérdezés"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New Search"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
-msgstr "Új egyéni mezõ"
+msgstr ""
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
-msgstr "Új csoport"
+msgstr ""
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
-msgstr "Új jelszó"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
-msgstr "Új sor"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:65
+#: NOT FOUND IN SOURCE
+msgid "New request"
+msgstr ""
+
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
-msgstr "Új jogok"
+msgstr ""
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
-msgstr "Új Scrip"
+msgstr ""
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: NOT FOUND IN SOURCE
+msgid "New search"
+msgstr ""
+
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
-msgstr "Új sablon"
+msgstr ""
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
-msgstr "Új probléma"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
-msgstr "Az új probléma nem létezik"
+msgstr ""
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
-msgstr "Új felhasználó"
+msgstr ""
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr ""
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
-msgstr "Új résztvevõk"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:92
+#: NOT FOUND IN SOURCE
+msgid "New window setting"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
-msgstr "Következõ"
+msgstr ""
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
-msgstr "Következõ oldal"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Next page"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "NickName"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
-msgstr "Becenév"
+msgstr ""
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
-msgstr "Nincs egyéni mezõ"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
-msgstr "Nincs egyéni mezõ meghatározva"
+msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
-msgstr "Nincs csoport meghatározva"
+msgstr ""
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
 msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
-msgstr "Nincs sor meghatározva"
+msgstr ""
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr ""
-"RT-felhasználó nem található. Vegyew fel a kapcsolatot az RT-"
-"adminisztrátorral.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
-msgstr "Nincs sablon"
+msgstr ""
 
-#: html/Approvals/Elements/Approve:67
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr ""
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
-msgstr "Nincs <b>sor</b> megadva!"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "No command found\\n"
+msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
-msgstr "Nincs kiegészítés tárolva"
+msgstr ""
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: NOT FOUND IN SOURCE
+msgid "No correspondence attached"
+msgstr ""
+
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
-msgstr "Nincs leírás a(z) %1-hez"
+msgstr ""
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
-msgstr "Nincs <b>csoport</b> megadva!"
+msgstr ""
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
-msgstr "Nincs a keresési feltételeknek megfeleõ csoport."
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
-msgstr "Nincs jelszó megadva"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
-msgstr "Nincs joga sort létrehozni"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
-msgstr "Nincs joga a(z) '%1' sorban problémát létrehozni"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
-msgstr "Nincs joga felhasználót létrehozni"
+msgstr ""
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr ""
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
-msgstr "Nincs joga ezt a problémát aktualizálni"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
-msgstr "Nincs <b>felelõs</b> megadva!"
+msgstr ""
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
-msgstr "Nincs vezetõ kiválasztva."
+msgstr ""
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
-msgstr "Nem található a keresési fletételeknek megfelelõ sor"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
-msgstr "Nem találhatók jogok"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
-msgstr "Nincsenek jogok engedélyezve."
-
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
 msgstr ""
 
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
-msgstr "Nincs feldolgozható keresési lista."
+msgstr ""
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
-msgstr "(nincs tárgy)"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: NOT FOUND IN SOURCE
+msgid "No ticket id specified"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
-msgstr "Nincs <b>értesítési típus</b> megadva!"
+msgstr ""
 
-#: html/Admin/Users/index.html:55
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr ""
+
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
-msgstr "Nincs a keresési feltételeknek megfeleõ felhasználó."
+msgstr ""
 
-#: lib/RT/Record.pm:932
+#: NOT FOUND IN SOURCE
+msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
+msgstr ""
+
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr ""
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
-msgstr "Senki"
+msgstr ""
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
-msgstr "Nem létezõ mezõ?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Not logged in"
+msgstr ""
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
-msgstr "Nincs bejelentkezve."
+msgstr ""
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
-msgstr "Nincs megadva"
+msgstr ""
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr ""
 
-#: html/Approvals/Elements/Approve:70
+#: NOT FOUND IN SOURCE
+msgid "Not yet implemented...."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
-msgstr "Megjegyzések"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
-msgstr "Értesítést nem sikerült elküldeni."
+msgstr ""
 
 #: etc/initialdata:101
 msgid "Notify AdminCcs"
-msgstr "AdminCCs értesítése"
+msgstr ""
 
 #: etc/initialdata:97
 msgid "Notify AdminCcs as Comment"
-msgstr "AdminCCs értesítése kiegészítésként"
+msgstr ""
 
 #: etc/initialdata:93 etc/upgrade/3.1.17/content:6
 msgid "Notify Ccs"
@@ -2782,19 +3718,19 @@ msgstr ""
 
 #: etc/initialdata:128
 msgid "Notify Other Recipients"
-msgstr "Más címzettek értesítése"
+msgstr ""
 
 #: etc/initialdata:124
 msgid "Notify Other Recipients as Comment"
-msgstr "Más címzettek értesítése kiegészítésként"
+msgstr ""
 
 #: etc/initialdata:85
 msgid "Notify Owner"
-msgstr "A tulajdonos értesítése"
+msgstr ""
 
 #: etc/initialdata:81
 msgid "Notify Owner as Comment"
-msgstr "A tulajdonos értesítése kiegészítésként"
+msgstr ""
 
 #: etc/initialdata:376
 msgid "Notify Owner of their rejected ticket"
@@ -2814,770 +3750,967 @@ msgstr ""
 
 #: etc/initialdata:77
 msgid "Notify Requestors"
-msgstr "Beküldõ értesítése"
+msgstr ""
 
 #: etc/initialdata:111
 msgid "Notify Requestors and Ccs"
-msgstr "A beküldõ és a tájékoztatást kapó értesítése"
+msgstr ""
 
 #: etc/initialdata:106
 msgid "Notify Requestors and Ccs as Comment"
-msgstr "A beküldõ és a tájékoztatást kapó értesítése kiegészítésként"
+msgstr ""
 
 #: etc/initialdata:120
 msgid "Notify Requestors, Ccs and AdminCcs"
-msgstr "Minden résztvevõ tájékozatatása"
+msgstr ""
 
 #: etc/initialdata:116
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
-msgstr "Minden résztvevõ értesítése kiegészítésként"
+msgstr ""
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
-msgstr "nov."
+msgstr ""
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr "VAGY"
+#: NOT FOUND IN SOURCE
+msgid "November"
+msgstr ""
 
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
-msgstr "Objekum nem hozható létre"
-
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr "Az objekumot nem sikerült törölni"
+msgstr ""
 
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
-msgstr "Objektum létehozva"
-
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr "Objektum törölve"
+msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
 msgstr ""
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
-msgstr "okt."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr ""
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
 msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
 msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
-msgstr "e napon"
+msgstr ""
 
 #: etc/initialdata:163
 msgid "On Comment"
-msgstr "Kiegészítéskor"
+msgstr ""
 
 #: etc/initialdata:156
 msgid "On Correspond"
-msgstr "Válaszoláskor"
+msgstr ""
 
 #: etc/initialdata:145
 msgid "On Create"
-msgstr "Létrehozáskor"
+msgstr ""
 
 #: etc/initialdata:184
 msgid "On Owner Change"
-msgstr "Tulajdonos változásakor"
+msgstr ""
 
 #: etc/initialdata:177 etc/upgrade/3.1.17/content:15
 msgid "On Priority Change"
-msgstr "Prioritás változásakor"
+msgstr ""
 
 #: etc/initialdata:192
 msgid "On Queue Change"
-msgstr "Sor megváltozásakor"
+msgstr ""
 
 #: etc/initialdata:198
 msgid "On Resolve"
-msgstr "Megoldáskor"
+msgstr ""
 
 #: etc/initialdata:169
 msgid "On Status Change"
-msgstr "Státusz megváltozásakor"
+msgstr ""
 
 #: etc/initialdata:150
 msgid "On Transaction"
-msgstr "Tranzakciónál"
+msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
-msgstr "Csak a(z) %1 után létrejött poblémák engedélyezései legyenek láthatóak"
+msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr ""
-"Csak a(z) %1 elõtt létrejött problémák engedélyezései legyenek láthatóak"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
-msgstr "Nyitott"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
-msgstr "Megnyit"
+msgstr ""
 
-#: html/SelfService/Elements/Tabs:63
+#: NOT FOUND IN SOURCE
+msgid "Open requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
-msgstr "Nyitott problémák"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Open tickets (from listing) in a new window"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Open tickets (from listing) in another window"
+msgstr ""
 
 #: etc/initialdata:140
 msgid "Open tickets on correspondence"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
-msgstr "Rendezés"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: NOT FOUND IN SOURCE
+msgid "Ordering and sorting"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
-msgstr "Cég, szervezet"
+msgstr ""
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
-msgstr "Prioritás idõvel emelkedik"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
-msgstr "Saját problémák"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr ""
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
-msgstr "Tulajdonos"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: NOT FOUND IN SOURCE
+msgid "Owner changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
-msgstr "Erõszakos tulajdonosváltás: %1 --> %2"
+msgstr ""
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: NOT FOUND IN SOURCE
+msgid "Owner is"
+msgstr ""
+
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
-msgstr "%1/%2 oldal"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr ""
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
-msgid "Parents"
-msgstr "Felmenõk"
-
-#: html/Elements/Login:74 html/User/Prefs.html:105
-msgid "Password"
-msgstr "Jelszó"
+#: NOT FOUND IN SOURCE
+msgid "PagerPhone"
+msgstr ""
 
-#: html/NoAuth/Reminder.html:46
-msgid "Password Reminder"
-msgstr "Jelszó-emlékeztetõ"
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr "Jelszó megváltoztatva"
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
+msgid "Parents"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
+#: html/Elements/Login:52 html/User/Prefs.html:83
+msgid "Password"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
+#: html/NoAuth/Reminder.html:24
+msgid "Password Reminder"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
-msgstr "A jelszó túl rövid!"
+msgstr ""
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
-msgstr "Jelszó: %1"
-
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
-msgstr "A jelszavak nem egyeznek."
+msgstr ""
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr ""
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
-msgstr "Résztvevõk"
+msgstr ""
 
 #: etc/initialdata:133
 msgid "Perform a user-defined action"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
-msgstr "Perl konfiguráció"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
-msgstr "Hozzáférés visszautasítva"
+msgstr ""
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
-msgstr "Saját Csoportok"
+msgstr ""
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
-msgstr "Saját csoportok"
+msgstr ""
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
-msgstr "Saját csoportok:"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
-msgstr "Telefonszámok"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Placeholder"
+msgstr ""
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr ""
+
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
-msgstr "Beállításaim"
+msgstr ""
 
-#: lib/RT/Action/Generic.pm:196
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr ""
+
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
-msgstr "Elõzõ"
+msgstr ""
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
-msgstr "Elõzõ oldal"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Previous page"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Pri"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
-msgstr "%1 vezetõ nem található."
+msgstr ""
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
-msgstr "Prioritás"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
-msgstr "Prioritás kezdõ értéke"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
 msgstr ""
 
 #: etc/initialdata:25
 msgid "Privileged"
-msgstr "Kiemelt"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr ""
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
-msgstr "Kiemelt felhasználók:"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Projects"
+msgstr ""
 
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr ""
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
-msgstr "Lekérdezés"
+msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
-msgstr "Lekérdezésszerkesztõ"
+msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
-msgstr "Sor"
+msgstr ""
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
-msgstr "%2 sor nem található"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:64
+#: NOT FOUND IN SOURCE
+msgid "Queue '%1' not found\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
-msgstr "A sor neve"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Queue Scrips"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
-msgstr "Sor már létezik"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
-msgstr "A sor nem hozható létre"
+msgstr ""
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
-msgstr "a sor nem tölthetõ be."
+msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
-msgstr "A sor létrehozva"
+msgstr ""
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr ""
+
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
-msgstr "A sor nem található"
+msgstr ""
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
-msgstr "Sorok"
+msgstr ""
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
-msgstr "Gyors lekérdezés"
+msgstr ""
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
-msgstr "Probléma felvétele (gyors)"
+msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
-msgstr "RT %1"
+msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
-msgstr "RT %1 %2-nek"
+msgstr ""
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
-msgstr "Konfiguráció"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Authentication error."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Bounce: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Configuration error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Critical error. Message not recorded!"
+msgstr ""
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
-msgstr "RT Hiba"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Received mail (%1) from itself."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
 
-#: html/Admin/Tools/Configuration.html:73
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service / Closed Tickets"
+msgstr ""
+
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
 msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
-msgstr "�ttekintés"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't authenticate you"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find requestor via its external database lookup"
+msgstr ""
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't find the queue: %1"
 msgstr ""
 
-#: html/Elements/PageLayout:108
+#: NOT FOUND IN SOURCE
+msgid "RT couldn't validate this PGP signature. \\n"
+msgstr ""
+
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
-msgstr " %1  --  Request Tracker "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RT has proccessed your commands"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT thinks this message may be a bounce"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT will process this message as if it were unsigned.\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
-msgstr "Valódi név"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: NOT FOUND IN SOURCE
+msgid "RealName"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
-msgstr "%1 hivatkozás törölve"
+msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
-msgstr "A következõk kapcsolódnak hozzá"
+msgstr ""
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
-msgstr "A következõkhöz kapcsolódik"
+msgstr ""
 
-#: html/Elements/Refresh:57
+#: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Refine"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Refine search"
+msgstr ""
+
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
-msgstr "%1 percenként frissítse ezt az oldalt."
+msgstr ""
 
-#: html/Search/Bulk.html:116
+#: NOT FOUND IN SOURCE
+msgid "Relationships"
+msgstr ""
+
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
-msgstr "Adminisztratív tájékoztatást kapó eltávolítása"
+msgstr ""
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
-msgstr "Tájékoztatást kapó eltávolítása"
+msgstr ""
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
-msgstr "Beküldõ eltávolítása"
+msgstr ""
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
-msgstr "Válaszol"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
-msgstr "Válaszcím"
+msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
-msgstr "Válasz a beküldõknek"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
-msgstr "Válasz a problémákra"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr ""
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
-msgstr "Beküldõ"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Requestor email address"
+msgstr ""
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr ""
+
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
-msgstr "Beküldõ"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
-msgstr "A problémát meg kell oldani"
+msgstr ""
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
 msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
-msgstr "Visszaállít"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
-msgstr "Otthoni"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
-msgstr "Megold"
+msgstr ""
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
-msgstr "%1. (%2) probléma lezárása"
+msgstr ""
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
-msgstr "Megoldva"
+msgstr ""
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: NOT FOUND IN SOURCE
+msgid "Response to requestors"
+msgstr ""
+
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
-msgstr "Változtatások eredménye"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: NOT FOUND IN SOURCE
+msgid "Results per page"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
-msgstr "Jelszó megismételve"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:631
+#: NOT FOUND IN SOURCE
+msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
-msgstr "A jog megosztva"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
-msgstr "A jog betöltve"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
-msgstr "A jog nem vonnható vissza"
+msgstr ""
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
-msgstr "A jog nem található"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
-msgstr "A jog nem található."
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
-msgstr "Jog visszavonva"
+msgstr ""
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
-msgstr "Jogok"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
-msgstr " %1 jogai nem vonhatók vissza"
+msgstr ""
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
-msgstr "Szerepek"
+msgstr ""
 
-#: html/Search/Elements/DisplayOptions:83
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
-msgstr "Sorok száma oldalanként"
+msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
-msgstr "Szo"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
-msgstr "Mentés"
+msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
-msgstr "Változtatások mentése"
+msgstr ""
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
-msgstr "Beállítások mentése"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
-msgstr "Változtatások mentése"
-
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
-msgstr "Elmentett lekérdezés"
+msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
-msgstr "Scrip létrehozva"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
-msgstr "Scrip mezök"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
-msgstr "Scrip törölve"
+msgstr ""
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
-msgstr "Scrips"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Scrips for %1\\n"
+msgstr ""
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
-msgstr "Minden sorhoz érvényes Scripek"
+msgstr ""
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
-msgstr "Keresés"
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
+#: NOT FOUND IN SOURCE
+msgid "Search Criteria"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
-msgstr "Engedélyezések keresése"
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
 msgstr ""
 
-#: bin/rt-crontool:213
+#: NOT FOUND IN SOURCE
+msgid "Searches can't be associated with that kind of object"
+msgstr ""
+
+#: bin/rt-crontool:184
 msgid "Security:"
-msgstr "Biztonság:"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
-msgstr "Eyéni mezõk"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
+#: lib/RT/Queue_Overlay.pm:68
+msgid "SeeQueue"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:92
-msgid "SeeQueue"
+#: NOT FOUND IN SOURCE
+msgid "Select"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
 msgstr ""
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
+#: NOT FOUND IN SOURCE
 msgid "Select a Custom Field"
-msgstr "Válasszon egy egyéni mezõt!"
+msgstr ""
 
-#: html/Admin/Groups/index.html:78
-msgid "Select a group"
-msgstr "Válasszon csoportot!"
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
+msgstr ""
 
-#: html/Admin/Queues/index.html:54
-msgid "Select a queue"
+#: html/Admin/Groups/index.html:50
+msgid "Select a group"
 msgstr ""
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
+#: NOT FOUND IN SOURCE
+msgid "Select a queue"
 msgstr ""
 
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
-msgstr "Válasszon felhasználót!"
-
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr "Válasszon egy egyéni mezõt!"
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr "Válasszon egy egyéni mezõt!"
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
-msgstr "Válasszon csoportot!"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
-msgstr "Válasszon több értéket!"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
-msgstr "Válasszon értéket!"
+msgstr ""
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
-msgstr "Válasszon sort!"
+msgstr ""
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
-msgstr "Válasszon Scripet!"
+msgstr ""
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
-msgstr "Válasszon sablont!"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
-msgstr "Válasszon (legfeljebb %1) értéket!"
+msgstr ""
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
-msgstr "Válasszon felhasználót"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
+msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:58
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
-msgstr "Kiválasztott egy egyéni mezõk"
+msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
-msgstr "Kiválasztott problémák"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Self Service"
+msgstr ""
 
 #: etc/initialdata:121
 msgid "Send mail to all watchers"
@@ -3623,771 +4756,1038 @@ msgstr ""
 msgid "Sends mail to the owner"
 msgstr ""
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
-msgstr "szep."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
-msgstr "Lezárások"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
-msgstr "Látható mezõk"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
-msgstr "Lekérdezés eredménye"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
-msgstr "Láthatóak legyenek a felszabadított problémák"
+msgstr ""
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
-msgstr "Problémaleírás"
+msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
-msgstr "láthatóak legyenek az elutasított problémák"
+msgstr ""
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
-msgstr "Attribútumok"
+msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
-msgstr "Láthatóak legyenek a folyamatban levõ problémák"
+msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
-msgstr "Láthatóak legyenek a mások engedélyezésére váró problémák"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:94
-msgid "ShowACL"
+#: NOT FOUND IN SOURCE
+msgid "Show ticket private commentary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Show ticket summaries"
 msgstr ""
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ShowACL"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
-msgstr "Aláírás (e-mail-hez)"
+msgstr ""
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
-msgid "Single"
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
+#: html/Admin/Elements/SelectSingleOrMultiple:25
+msgid "Single"
 msgstr ""
 
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr "Kicsi"
-
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
-msgstr "Rendezés"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Sort Order"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Sort key"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Sort results by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "SortOrder"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr ""
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: NOT FOUND IN SOURCE
+msgid "Stalled"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Start page"
+msgstr ""
+
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
-msgstr "Elkezdve"
+msgstr ""
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: NOT FOUND IN SOURCE
+msgid "Started date '%1' could not be parsed"
+msgstr ""
+
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
-msgstr "Kiosztva"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: NOT FOUND IN SOURCE
+msgid "Starts By"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Starts date '%1' could not be parsed"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
-msgstr "�llam"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
-msgstr "Státusz"
+msgstr ""
 
 #: etc/initialdata:309
 msgid "Status Change"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
-msgstr "Státusz változtatása: '%1' --> '%2'"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:170
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
-msgstr "Elcsen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
-msgstr "Problémák elcsenése"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "Probléma elcsenése %1 tulajdonostól"
-
-#: NOT FOUND IN SOURCE
 msgid "Stolen from %1 "
-msgstr "Probléma elcsenése %1 tulajdonostól "
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
 msgstr ""
 
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
-msgstr "Tárgy"
+msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr ""
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
-msgstr "Mentés"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:782
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
-msgstr "Sikerült"
+msgstr ""
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
-msgstr "V"
+msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
-msgstr "Rendszer"
+msgstr ""
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
-msgstr "Rendszerkonfiguráció"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
-msgstr "Rendszerhiba"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
 msgstr ""
 
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
-msgstr "Rendszerkonfiguráció"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
-msgstr "Rendszerhiba. Jog nem delegálható ."
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
-msgstr "Rendszerhiba. Jog nem adható."
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
-msgstr "Rendszercsoportok"
+msgstr ""
 
 #: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
 msgid "SystemRolegroup for internal use"
 msgstr ""
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr ""
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
-msgstr "Atvesz"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
-msgstr "Problémák átvétele"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
-msgstr "�tvéve"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: NOT FOUND IN SOURCE
+msgid "Task"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
-msgstr "Sablon"
+msgstr ""
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
-msgstr "Sablon #%1"
+msgstr ""
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
-msgstr "Sablon törölve"
+msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
-msgstr "Sablon nem található"
+msgstr ""
 
-#: lib/RT/Template_Overlay.pm:376
+#: NOT FOUND IN SOURCE
+msgid "Template not found\\n"
+msgstr ""
+
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
-msgstr "Sablon beolvasva"
+msgstr ""
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
-msgstr "Sablonok"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Templates for %1\\n"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Text"
-msgstr "Szöveg"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
-msgstr "Már ez az aktuális érték"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
-msgstr "Egyéni mezõhöz érvénytelen értek"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
-msgstr "Ez ugyanaz az érték"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
-msgstr "A felhasználónak/csoportnak mát van ilyen joga"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
-msgstr "A vezetõ már %1-a a sornak"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
-msgstr "A vezetõ már %1-a a problémának"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
-msgstr "A vezetõ már nem %1-a a sornak"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: NOT FOUND IN SOURCE
+msgid "That principal is not a %1 for this ticket"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
-msgstr "Ez a sor nem létezik"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: NOT FOUND IN SOURCE
+msgid "That user already has that right"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
-msgstr "Már ez a felhasználó a tulajdonos!"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
-msgstr "Ilyen felhasználó nem létezik"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
-msgstr "A felhasználó már kiemelt"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
-msgstr "A felhasználó már nem kiemelt"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
-msgstr "A felhasználó mostantól kiemelt"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
-msgstr "A felhasználó mostantól nem kiemelt"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
-msgstr "a felhasználóhoz nem tartozhatnak problémák ebbõl a sorból"
+msgstr ""
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr ""
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
-msgstr "Alapadatok"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr ""
 
-#: bin/rt-crontool:223
+#: NOT FOUND IN SOURCE
+msgid "The comment has been recorded"
+msgstr ""
+
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr ""
 
-#: lib/RT/Record.pm:934
+#: NOT FOUND IN SOURCE
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr ""
+
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr ""
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
 msgstr ""
 
-#: bin/rt-crontool:214
+#: NOT FOUND IN SOURCE
+msgid "This ticket %1 %2 (%3)\\n"
+msgstr ""
+
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
-msgstr "Diese Transaktion scheint keinen Inhalt zu haben"
+msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
-msgstr "A felhasználó által felvetett %1 legsürgõsebb probléma"
+msgstr ""
 
-#: lib/RT/Date.pm:416
+#: NOT FOUND IN SOURCE
+msgid "This user's 25 highest priority tickets"
+msgstr ""
+
+#: lib/RT/Date.pm:391
 msgid "Thu."
-msgstr "Cs"
+msgstr ""
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
-msgstr "%1. számú (%2) probléma jellemzõinek módosítása"
+msgstr ""
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
-msgstr "Probléma. %1: %2"
+msgstr ""
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
-msgstr "%1. probléma"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr ""
 
-#: html/Search/Bulk.html:269
+#: NOT FOUND IN SOURCE
+msgid "Ticket %1 loaded\\n"
+msgstr ""
+
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
-msgstr "Probléma %1: %2"
+msgstr ""
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
-msgstr "Probléma egyéni mezõi"
+msgstr ""
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Ticket Id"
+msgstr ""
+
 #: etc/initialdata:324
 msgid "Ticket Resolved"
-msgstr "Pobléma megoldva"
+msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
-msgstr "Probléma tranzakciói"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket attachment"
+msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
-msgstr "A probléma tartalma"
+msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr ""
 
-#: html/Ticket/Display.html:55
+#: lib/RT/Transaction_Overlay.pm:497
+msgid "Ticket created"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket creation failed"
+msgstr ""
+
+#: lib/RT/Transaction_Overlay.pm:502
+msgid "Ticket deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket id not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr ""
+
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
-msgstr "Probléma metadata"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket not found"
+msgstr ""
 
 #: etc/initialdata:310
 msgid "Ticket status changed"
 msgstr ""
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
+#: NOT FOUND IN SOURCE
+msgid "Ticket watchers"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
-msgstr "Problémák"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr ""
 
-#: html/Approvals/Elements/ShowDependency:48
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Tickets from %1"
+msgstr ""
+
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
-msgstr "Maradék idõ"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
-msgstr "Ráfordított munkaidõ"
+msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
-msgstr "Maradék idõ"
+msgstr ""
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
-msgstr "Munkaidõ"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
-msgstr "Ráfordított munkaidõ"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
+#: NOT FOUND IN SOURCE
+msgid "To generate a diff of this commit:"
 msgstr ""
 
-#: html/Elements/Footer:61
+#: NOT FOUND IN SOURCE
+msgid "To generate a diff of this commit:\\n"
+msgstr ""
+
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
-msgstr "Beérkezett"
+msgstr ""
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
-msgstr "Eszközök"
+msgstr ""
 
 #: etc/initialdata:252
 msgid "Transaction"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
-msgstr "Tranzakció egyéni mezõi"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: lib/RT/Transaction_Overlay.pm:92
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr ""
 
-#: lib/RT/Date.pm:414
+#: NOT FOUND IN SOURCE
+msgid "Trying to delete a right: %1"
+msgstr ""
+
+#: lib/RT/Date.pm:389
 msgid "Tue."
-msgstr "K"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
-msgstr "Típus"
+msgstr ""
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr ""
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
-#. ($self->ContentEncoding)
-#. ($ContentEncoding)
-msgid "Unknown ContentEncoding %1"
+#: NOT FOUND IN SOURCE
+msgid "UnixUsername"
 msgstr ""
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
+#. ($self->ContentEncoding)
+msgid "Unknown ContentEncoding %1"
 msgstr ""
 
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
-msgstr "korlátlan"
+msgstr ""
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
-msgstr "Névtelen lekérdezés"
+msgstr ""
 
 #: etc/initialdata:32
 msgid "Unprivileged"
-msgstr "Nem kiemelt"
+msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
-msgstr "Inaktív egyéni mezõk"
+msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
-msgstr "Inaktív objektumok"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
-msgstr "Probléma visszaadása"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Untitled search"
+msgstr ""
 
-#: html/Search/Bulk.html:54
+#: html/Search/Bulk.html:32
 msgid "Update"
-msgstr "Frissít"
+msgstr ""
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
-msgstr "Mindet frissíti"
+msgstr ""
 
-#: html/Ticket/Update.html:133
+#: NOT FOUND IN SOURCE
+msgid "Update ID"
+msgstr ""
+
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
-msgstr "Probléma frissítése"
+msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
-msgstr "Frissítés típusa"
+msgstr ""
 
-#: html/Search/Results.html:80
+#: NOT FOUND IN SOURCE
+msgid "Update all these tickets at once"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Update email"
+msgstr ""
+
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
-msgstr "A kiválasztott problémák frissítése"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Update name"
+msgstr ""
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr ""
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
-msgstr "A kiválasztott problémák frissítése"
+msgstr ""
 
-#: html/Ticket/ModifyAll.html:84
+#: NOT FOUND IN SOURCE
+msgid "Update signature"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr ""
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: NOT FOUND IN SOURCE
+msgid "Update ticket # %1"
+msgstr ""
+
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr ""
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
-msgstr "%1. számú (%2) probléma aktualizálása"
+msgstr ""
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr ""
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
-msgstr "Frissítve"
+msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
-msgstr "Feltöltés"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
-msgstr "Több fájl feltöltése egyszerre"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
-msgstr "Több kép feltöltése egyszerre"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
-msgstr "Egy fájl feltöltése"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
-msgstr "Egy kép feltöltése"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
 msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
-msgstr "Módosítások feltöltése"
+msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: NOT FOUND IN SOURCE
+msgid "User %1 %2: %3\\n"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User %1 Password: %2\\n"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
-msgstr "'%1' felhasználó nem található"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User '%1' not found\\n"
+msgstr ""
 
 #: etc/initialdata:132 etc/initialdata:206
 msgid "User Defined"
-msgstr "Felhasználó által meghatározott"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
 msgstr ""
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: NOT FOUND IN SOURCE
+msgid "User ID"
+msgstr ""
+
+#: html/Elements/SelectUsers:25
+msgid "User Id"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
-msgstr "Felhasználói jogok"
+msgstr ""
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
-msgstr "Felhasználó létrehozva"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
-msgstr "Felhasználó által definiált csoport"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
-msgstr "Felhasználó betöltve"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User notified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "User view"
+msgstr ""
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
-msgstr "Felhasználó által definiált csoportok"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
-msgstr "Felhasználó"
+msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
-msgstr "Felhasználók"
+msgstr ""
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr ""
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: NOT FOUND IN SOURCE
+msgid "ValueOfQueue"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
-msgstr "Értékek"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:108
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:63
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
-msgstr "Résztvevõk"
+msgstr ""
 
-#: lib/RT/Date.pm:415
+#: NOT FOUND IN SOURCE
+msgid "WebEncoding"
+msgstr ""
+
+#: lib/RT/Date.pm:390
 msgid "Wed."
-msgstr "Sze"
+msgstr ""
 
 #: etc/initialdata:521
 msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
@@ -4441,50 +5841,86 @@ msgstr ""
 msgid "Whenever correspondence comes in"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
-msgstr "Munkahelyi"
+msgstr ""
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: NOT FOUND IN SOURCE
+msgid "WorkPhone"
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
-msgstr "Munkaidõ"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
-msgstr "Már az öné ez a probléma"
+msgstr ""
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: NOT FOUND IN SOURCE
+msgid "You don't have permission to view that ticket.\\n"
+msgstr ""
+
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
-msgstr "%1 Problémát talált a %2 sorban"
+msgstr ""
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
-msgstr "Kilépett a Request Tracker programból."
+msgstr ""
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
-msgstr "Nincs joga létrehozni problémákat ebben a sorban"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
-msgstr "Nem hozhat létre problémákat ebben a sorban"
+msgstr ""
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
-msgstr "Itt ismét bejelentkezhetsz!"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Your %1 requests"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
+msgstr ""
 
 #: etc/initialdata:502
 msgid "Your request has been approved by %1. Other approvals may still be pending."
@@ -4492,230 +5928,270 @@ msgstr ""
 
 #: etc/initialdata:540
 msgid "Your request has been approved."
-msgstr "A problémája engedélyezve."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr ""
 
 #: etc/initialdata:445
 msgid "Your request was rejected."
-msgstr "A problémája elutasítva."
+msgstr ""
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
-msgstr "A begépelt felhasználói név vagy jelszó hibás!"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
-msgstr "Irányítószám"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr ""
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
-msgstr "létrehozhat saját lekérdezéseket"
+#: NOT FOUND IN SOURCE
+msgid "and is not"
+msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
-msgstr "betölthet saját lekérdezéseket"
+#: NOT FOUND IN SOURCE
+msgid "and not"
+msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
-msgstr "%1nak engedélyezve"
-
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
 msgstr ""
 
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
-msgstr "Lezárt"
+msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
-msgstr "tartalmazza"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
-msgid "days"
-msgstr "napja"
+#: NOT FOUND IN SOURCE
+msgid "content"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:88
-msgid "deleted"
-msgstr "törölve"
+#: NOT FOUND IN SOURCE
+msgid "content-type"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
+#: NOT FOUND IN SOURCE
+msgid "correspondence (probably) not sent"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:61
-msgid "does not match"
-msgstr "nem"
+#: NOT FOUND IN SOURCE
+msgid "correspondence sent"
+msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
-msgid "doesn't contain"
-msgstr "nem tartalmazza"
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
+msgid "days"
+msgstr ""
 
-#: html/Elements/SelectEqualityOperator:59
-msgid "equal to"
-msgstr "egyenlõ"
+#: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "delete"
+msgstr ""
 
-#: html/Search/Build.html:387
-msgid "error: can't move down"
+#: lib/RT/Queue_Overlay.pm:64
+msgid "deleted"
 msgstr ""
 
-#: html/Search/Build.html:409
-msgid "error: can't move left"
+#: html/Search/Elements/PickBasics:33
+msgid "does not match"
 msgstr ""
 
-#: html/Search/Build.html:368
-msgid "error: can't move up"
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
+msgid "doesn't contain"
 msgstr ""
 
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr "hiba: nincs mit törölni"
+#: NOT FOUND IN SOURCE
+msgid "email address"
+msgstr ""
+
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr ""
 
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
+#: NOT FOUND IN SOURCE
+msgid "false"
 msgstr ""
 
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
+#: NOT FOUND IN SOURCE
+msgid "filename"
 msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
-msgstr "nagyobb mint"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
-msgstr " '%1' csopot"
+msgstr ""
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
-msgstr "órája"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
-msgstr "Sorszám"
+msgstr ""
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
-msgstr " == "
+msgstr ""
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
-msgstr " nem "
+msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
-msgstr "kisebb mint"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
-msgstr "=="
+msgstr ""
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
-msgstr "perce"
+msgstr ""
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
-msgstr "perc"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "modifications\\n\\n"
+msgstr ""
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
-msgstr "hónapja"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
-msgstr "új"
+msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
-msgstr "(nincs név)"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
-msgstr "Nincs érték"
+msgstr ""
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
-msgstr "senki"
+msgstr ""
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
-msgstr "nem egyenlõ"
+msgstr ""
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr ""
+
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
-msgstr "Nyitott"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
-msgstr "Stapel %1 %2"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
-msgstr "elutasítva"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
-msgstr "megoldva"
+msgstr ""
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
-msgstr "sec"
-
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
 msgstr ""
 
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
-msgstr "várakozik"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
-msgstr "rendszer %1"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr ""
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:238
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
-msgstr "probléma #%1 %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "till"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:244
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:219
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
-msgstr "felhasználó %1"
+msgstr ""
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
-msgstr "hete"
+msgstr ""
 
-#: lib/RT/Date.pm:354
+#: NOT FOUND IN SOURCE
+msgid "with template %1"
+msgstr ""
+
+#: lib/RT/Date.pm:331
 msgid "years"
-msgstr "éve"
+msgstr ""
 
diff --git a/rt/lib/RT/I18N/i_default.pm b/rt/lib/RT/I18N/i_default.pm
index 28082af..10827c1 100644
--- a/rt/lib/RT/I18N/i_default.pm
+++ b/rt/lib/RT/I18N/i_default.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::I18N::i_default;
 
 use strict;
diff --git a/rt/lib/RT/I18N/id.po b/rt/lib/RT/I18N/id.po
deleted file mode 100644
index f532848..0000000
--- a/rt/lib/RT/I18N/id.po
+++ /dev/null
@@ -1,5047 +0,0 @@
-# Copyright (c) 2002 Jesse Vincent <jesse@bestpractical.com>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2005-06-03\n"
-"Last-Translator: James <james@actionmessage.com>\n"
-"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=US-ASCII\n"
-"Content-Transfer-Encoding: 7bit\n"
-
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
-#. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
-#. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
-msgid "#%1: %2"
-msgstr "#%1: %2"
-
-#: lib/RT/Record.pm:926
-#. ($label)
-msgid "$prefix %1"
-msgstr "$Awalan %1"
-
-#: lib/RT/URI/fsck_com_rt.pm:257
-#. ($self->ObjectType, $self->Object->Id)
-msgid "%1 #%2"
-msgstr "%1 #%2"
-
-#: lib/RT/Date.pm:361
-#. ($s, $time_unit)
-msgid "%1 %2"
-msgstr "%1 %2"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 %2 %3"
-msgstr "%1 %2 %3"
-
-#: lib/RT/Date.pm:397
-#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
-msgid "%1 %2 %3 %4:%5:%6 %7"
-msgstr "%1 %2 %3 %4:%5:%6 %7"
-
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
-#. ($cf->Name, $new_value->Content)
-#. ($field, $self->NewValue)
-#. ($self->Field, $principal->Object->Name)
-msgid "%1 %2 added"
-msgstr "%1 %2 sudah ditambah"
-
-#: lib/RT/Date.pm:358
-#. ($s, $time_unit)
-msgid "%1 %2 ago"
-msgstr "%1 %2 yang lalu"
-
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
-#. ($field, $self->OldValue, $self->NewValue)
-msgid "%1 %2 changed to %3"
-msgstr "%1 %2 diganti menjadi %3"
-
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
-#. ($field, $self->OldValue)
-#. ($self->Field, $principal->Object->Name)
-msgid "%1 %2 deleted"
-msgstr "%1 %2 sudah dihapus"
-
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
-#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
-msgid "%1 %2 with template %3"
-msgstr "%1 %2 gunakan template %3"
-
-#: html/Ticket/Elements/ShowAttachments:72
-#. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
-msgid "%1 (%2) by %3"
-msgstr "%1 (%2) oleh %3"
-
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
-#. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
-msgid "%1 (Unchanged)"
-msgstr "(Belum diubah)"
-
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
-#. ("--search-argument", "--search")
-#. ("--condition-argument", "--condition")
-#. ("--action-argument", "--action")
-msgid "%1 - An argument to pass to %2"
-msgstr "%1 - Sebuah penjelasan untuk dilewati ke %2"
-
-#: bin/rt-crontool:210
-#. ("--verbose")
-msgid "%1 - Output status updates to STDOUT"
-msgstr "%1 - status Output diperbaharui menjadi STDOUT"
-
-#: bin/rt-crontool:204
-#. ("--action")
-msgid "%1 - Specify the action module you want to use"
-msgstr "%1 - menetapkan modul aksi yang ingin digunakan oleh anda"
-
-#: bin/rt-crontool:198
-#. ("--condition")
-msgid "%1 - Specify the condition module you want to use"
-msgstr "%1 - menetapkan moduk kondisi yang ingin digunakan oleh anda"
-
-#: bin/rt-crontool:191
-#. ("--search")
-msgid "%1 - Specify the search module you want to use"
-msgstr "%1 - menetapkan modul pencarian yang ingin digunakan oleh anda"
-
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
-#. ('&#187;&#124;&#171;', 
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-msgid "%1 RT %2 Copyright 1996-%3 %4."
-msgstr "%1 RT %2 Hak Cipta 1996-%3 %4."
-
-#: lib/RT/ScripAction_Overlay.pm:151
-#. ($self->Id)
-msgid "%1 ScripAction loaded"
-msgstr "%1 Memanggil AksiScrip"
-
-#: lib/RT/Record.pm:1708
-#. ($args{'Value'}, $cf->Name)
-msgid "%1 added as a value for %2"
-msgstr "%1 ditambahkan sebagai nilai untuk %2"
-
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
-#. ($args{'Base'})
-#. ($args{'Target'})
-msgid "%1 appears to be a local object, but can't be found in the database"
-msgstr "%1 ditampilkan sebagai objek lokal, tetapi tidak dapat ditemukan di dalam database"
-
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
-#. ($self->BriefDescription , $self->CreatorObj->Name)
-#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
-msgid "%1 by %2"
-msgstr "%1 oleh %2"
-
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
-#. ($self->Field , $q1->Name , $q2->Name)
-#. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
-msgid "%1 changed from %2 to %3"
-msgstr "%1 sudah diganti dari %2 ke %3"
-
-#: html/Search/Build.html:212
-#. ($Description)
-msgid "%1 copy"
-msgstr "%1 ditiru"
-
-#: lib/RT/Record.pm:930
-msgid "%1 could not be set to %2."
-msgstr "%1 tidak bisa diatur ke %2."
-
-#: lib/RT/Ticket_Overlay.pm:2743
-#. ($self)
-msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
-msgstr "%1 tidak dapat mengatur status untuk diselesaikan. Database RT's mungkin tidak konsisten."
-
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
-msgid "%1 created"
-msgstr "%1 sudah dibuat"
-
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
-msgid "%1 deleted"
-msgstr "%1 sudah dihapus"
-
-#: html/Elements/MyTickets:47
-#. ($rows)
-msgid "%1 highest priority tickets I own"
-msgstr "%1 Tiket dengan prioritas paling tinggi yang saya miliki"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 highest priority tickets I requested..."
-msgstr "%1 Tiket dengan prioritas paling tinggi yang saya minta..."
-
-#: bin/rt-crontool:186
-#. ($0)
-msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
-msgstr "%1 adalah sebuah alat yang berfungsi pada tiket dari alat penjadwalan eksternal, seperti Cron."
-
-#: lib/RT/Queue_Overlay.pm:860
-#. ($principal->Object->Name, $args{'Type'})
-msgid "%1 is no longer a %2 for this queue."
-msgstr "%1 tidak lagi menjadi %2 untuk antrian ini."
-
-#: NOT FOUND IN SOURCE
-msgid "%1 is no longer a value for custom field %2"
-msgstr "%1 tidak lagi menjadi nilai untuk kolom kustom %2"
-
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
-#. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
-#. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
-#. ($Ticket->TimeEstimated)
-#. ($Ticket->TimeWorked)
-#. ($Ticket->TimeLeft)
-msgid "%1 min"
-msgstr "%1 menit"
-
-#: html/Elements/MyRequests:47
-#. ($rows)
-msgid "%1 newest unowned tickets"
-msgstr "%1 tiket terbaru yang belum dimiliki"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 newest unowned tickets..."
-msgstr "%1 tiket terbaru yang belum dimiliki..."
-
-#: lib/RT/CustomField_Overlay.pm:827
-msgid "%1 objects"
-msgstr "%1 objek"
-
-#: html/User/Elements/DelegateRights:97
-#. (loc($ObjectType =~ /^RT::(.*)$/))
-msgid "%1 rights"
-msgstr "hak-hak %1"
-
-#: lib/RT/Action/ResolveMembers.pm:63
-#. (ref $self)
-msgid "%1 will resolve all members of a resolved group ticket."
-msgstr "%1 akan memecahkan semua anggota dari grup tiket yang dipecahkan."
-
-#: lib/RT/CustomField_Overlay.pm:828
-msgid "%1's %2 objects"
-msgstr "%1's %2 objek"
-
-#: lib/RT/CustomField_Overlay.pm:829
-msgid "%1's %2's %3 objects"
-msgstr "%1's %2's %3 objek"
-
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
-#. ($Object->Name)
-msgid "%1's saved searches"
-msgstr "%1's pencarian disimpan"
-
-#: lib/RT/Transaction_Overlay.pm:470
-#. ($self)
-msgid "%1: no attachment specified"
-msgstr "%1: tidak ada lampiran yang ditentukan"
-
-#: html/Ticket/Elements/ShowTransactionAttachments:78
-#. ($size)
-msgid "%1b"
-msgstr "%1b"
-
-#: html/Ticket/Elements/ShowTransactionAttachments:75
-#. (int( $size / 102.4 ) / 10)
-msgid "%1k"
-msgstr "%1k"
-
-#: lib/RT/Ticket_Overlay.pm:1118
-#. ($args{'Status'})
-msgid "'%1' is an invalid value for status"
-msgstr "'%1' adalah nilai yang tidak valid untuk status"
-
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
-msgid "(Check box to delete)"
-msgstr "(Klik kotak ini untuk hapus)"
-
-#: html/Ticket/Elements/PreviewScrips:94
-msgid "(Check boxes to disable notifications to the listed recipients)"
-msgstr "(Klik kotak ini untuk menon-aktifkan pemberitahuan kepada penerima yang sudah terdaftar)"
-
-#: html/Ticket/Elements/PreviewScrips:116
-msgid "(Check boxes to enable notifications to the listed recipients)"
-msgstr "(Klik kotak ini untuk mengaktifkan pemberitahuan kepada penerima yang sudah terdaftar)"
-
-#: html/Ticket/Create.html:209
-msgid "(Enter ticket ids or URLs, separated with spaces)"
-msgstr "(Masukkan ID Tiket atau URL, dipisahkan dengan spasi)"
-
-#: NOT FOUND IN SOURCE
-msgid "(If left blank, will default to %1"
-msgstr "(Jika ditinggalkan kosong, default akan diatur menjadi %1"
-
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
-#. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(Jika ditinggalkan kosong, default akan menjadi %1)"
-
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
-msgid "(No custom fields)"
-msgstr "(Tidak ada kolom kustom)"
-
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
-msgid "(No members)"
-msgstr "(Tidak ada anggota)"
-
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
-msgid "(No scrips)"
-msgstr "(Tidak ada scrip)"
-
-#: html/Admin/Elements/EditTemplates:52
-msgid "(No templates)"
-msgstr "(Tidak ada template)"
-
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
-msgid "(None)"
-msgstr "(Tidak satu pun)"
-
-#: html/Ticket/Update.html:88
-msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(Kirim salinan tembusan untuk memperbaharui daftar alamat email yang dibatasi dengan koma. <b>Tidak</b> akan mengubah siapakah yang akan menerima pembaharuan di masa datang.)"
-
-#: html/Ticket/Create.html:100
-msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Kirim salinan tembusan untuk memperbaharui daftar alamat administrasi email. Orang-orang ini <b>akan</b> menerima pembaharuan di masa datang.)"
-
-#: html/Ticket/Update.html:84
-msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(Kirim salinan tembusan untuk memperbaharui daftar alamat email. <b>Tidak</b> akan mengubah siapakah yang akan menerima pembaharuan di masa datang.)"
-
-#: html/Ticket/Create.html:90
-msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Kirim salinan tembusan untuk memperbaharui daftar alamat email. Orang-orang ini <b>akan</b> menerima pembaharuan di masa datang.)"
-
-#: html/Admin/Elements/EditScrip:102
-msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
-msgstr "Gunakan kolom ini ketika anda memilih 'Definisikan Pengguna' untuk sebuah kondisi atau aksi"
-
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
-msgid "(empty)"
-msgstr "(kosong)"
-
-#: html/Admin/Users/index.html:60
-msgid "(no name listed)"
-msgstr "(tidak ada nama yang terdaftar)"
-
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
-msgid "(no value)"
-msgstr "(Tidak ada nilai)"
-
-#: html/Admin/Elements/EditCustomFieldValues:47
-msgid "(no values)"
-msgstr "(Tidak ada nilai-nilai)"
-
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
-msgid "(only one ticket)"
-msgstr "(hanya satu Tiket)"
-
-#: html/Elements/RT__Ticket/ColumnMap:146
-msgid "(pending approval)"
-msgstr "(izin ditunda)"
-
-#: html/Elements/RT__Ticket/ColumnMap:149
-msgid "(pending other Collection)"
-msgstr "(Koleksi yang lain ditunda)"
-
-#: html/Admin/Users/Modify.html:71
-msgid "(required)"
-msgstr "(diperlukan)"
-
-#: html/Ticket/Elements/ShowTransactionAttachments:82
-msgid "(untitled)"
-msgstr "(tidak ada judul)"
-
-#: html/Ticket/Elements/ShowBasics:53
-msgid "<% $Ticket->Status%>"
-msgstr "<% $Tiket->Status%>"
-
-#: html/Elements/SelectTicketTypes:48
-msgid "<% $_ %>"
-msgstr "<% $_ %>"
-
-#: html/Search/Elements/SelectLinks:48
-msgid "<%$_%>"
-msgstr "<%$_%>"
-
-#: html/Search/Elements/DisplayOptions:65
-msgid "<%$field%>"
-msgstr "<%$kolom%>"
-
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
-#. ($m->scomp('/Elements/SelectNewTicketQueue'))
-msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
-msgstr "<Tipe input=\"submit\" nilai=\"Tiket Baru di dalam \">&nbsp;%1"
-
-#: etc/initialdata:218
-msgid "A blank template"
-msgstr "Template kosong"
-
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
-msgid "ACE not found"
-msgstr "ACE tidak ditemukan"
-
-#: lib/RT/ACE_Overlay.pm:854
-msgid "ACEs can only be created and deleted."
-msgstr "ACE hanya dapat dibuat dan dihapus."
-
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr "DAN"
-
-#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
-msgstr "Dibatalkan untuk menghindari modifikasi tiket yang tidak diharapkan.\\n"
-
-#: html/User/Elements/Tabs:53
-msgid "About me"
-msgstr "Tentang Aku"
-
-#: html/Admin/Users/Modify.html:106
-msgid "Access control"
-msgstr "Kontrol Akses"
-
-#: html/Admin/Elements/EditScrip:71
-msgid "Action"
-msgstr "Aksi"
-
-#: lib/RT/Scrip_Overlay.pm:173
-#. ($args{'ScripAction'})
-msgid "Action %1 not found"
-msgstr "Aksi %1 tidak ditemukan"
-
-#: NOT FOUND IN SOURCE
-msgid "Action committed."
-msgstr "Aksi dijalankan."
-
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr "Aksi dijalankan."
-
-#: bin/rt-crontool:144
-msgid "Action prepared..."
-msgstr "Aksi disiapkan..."
-
-#: html/Search/Build.html:85
-msgid "Add"
-msgstr "Tambah"
-
-#: html/Search/Bulk.html:114
-msgid "Add AdminCc"
-msgstr "Tambah AdminCc"
-
-#: html/Search/Bulk.html:110
-msgid "Add Cc"
-msgstr "Tambah Cc"
-
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr "Tambah Kolom"
-
-#: html/Search/Elements/PickCriteria:46
-msgid "Add Criteria"
-msgstr "Tambah Kriteria"
-
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
-msgid "Add More Files"
-msgstr "Tambah File Lagi"
-
-#: html/Search/Bulk.html:106
-msgid "Add Requestor"
-msgstr "Tambah Pemohon"
-
-#: html/Admin/Elements/AddCustomFieldValue:46
-msgid "Add Value"
-msgstr "Tambah Nilai"
-
-#: html/Admin/Global/Scrip.html:76
-msgid "Add a scrip which will apply to all queues"
-msgstr "Tambah scrip yang akan digunakan di semua antrian"
-
-#: html/Search/Build.html:85
-msgid "Add additional criteria"
-msgstr "Tambahkan kriteria tambahan"
-
-#: html/Search/Bulk.html:146
-msgid "Add comments or replies to selected tickets"
-msgstr "Tambah Komentar atau balas ke tiket yang sudah dipilih"
-
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
-msgid "Add members"
-msgstr "Tambah Anggota"
-
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
-msgid "Add new watchers"
-msgstr "Tambah Pengamat Baru"
-
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr "Tambah, hapus dan ubah nilai kolom kustom untuk objek"
-
-#: lib/RT/Queue_Overlay.pm:760
-#. ($args{'Type'})
-msgid "Added principal as a %1 for this queue"
-msgstr "Tambahkan prinsipal sebagai %1 untuk antrian ini"
-
-#: lib/RT/Ticket_Overlay.pm:1416
-#. ($self->loc($args{'Type'}))
-msgid "Added principal as a %1 for this ticket"
-msgstr "Tambahkan prinsipal sebagai %1 untuk Tiket ini"
-
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
-msgid "Address1"
-msgstr "Alamat1"
-
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
-msgid "Address2"
-msgstr "Alamat2"
-
-#: html/Ticket/Create.html:95
-msgid "Admin Cc"
-msgstr "Admin Cc"
-
-#: etc/initialdata:295
-msgid "Admin Comment"
-msgstr "Komentar Admin"
-
-#: etc/initialdata:274
-msgid "Admin Correspondence"
-msgstr "Korespondensi Admin"
-
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
-msgid "Admin queues"
-msgstr "Antrian Admin"
-
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
-msgid "Admin/Global configuration"
-msgstr "Konfigurasi Admin/Global"
-
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
-msgid "AdminCc"
-msgstr "AdminCc"
-
-#: lib/RT/CustomField_Overlay.pm:101
-msgid "AdminCustomField"
-msgstr "Kolom Kustom Admin"
-
-#: lib/RT/Group_Overlay.pm:171
-msgid "AdminGroup"
-msgstr "Grup Admin"
-
-#: lib/RT/Group_Overlay.pm:173
-msgid "AdminGroupMembership"
-msgstr "Keanggotaan Grup Admin"
-
-#: lib/RT/System.pm:81
-msgid "AdminOwnPersonalGroups"
-msgstr "Milik Grup Pribadi Admin"
-
-#: lib/RT/Queue_Overlay.pm:93
-msgid "AdminQueue"
-msgstr "Antrian Admin"
-
-#: lib/RT/System.pm:82
-msgid "AdminUsers"
-msgstr "Pengguna Admin"
-
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
-msgid "Administrative Cc"
-msgstr "Cc Administrasi"
-
-#: html/Ticket/Elements/Tabs:197
-msgid "Advanced"
-msgstr "Lanjutan"
-
-#: html/Elements/SelectDateRelation:57
-msgid "After"
-msgstr "Setelah"
-
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr "Kumpulan"
-
-#: etc/initialdata:363
-msgid "All Approvals Passed"
-msgstr "Semua Izin terlewati"
-
-#: html/Admin/Queues/index.html:75
-msgid "All Queues"
-msgstr "Semua Antrian"
-
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr "Dan/Atau"
-
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
-msgid "Applies to"
-msgstr "Digunakan untuk"
-
-#: html/Search/Edit.html:64
-msgid "Apply"
-msgstr "Digunakan"
-
-#: html/Search/Edit.html:64
-msgid "Apply your changes"
-msgstr "Digunakan untuk perubahan anda"
-
-#: html/Elements/Tabs:74
-msgid "Approval"
-msgstr "Izin"
-
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
-#. ($Ticket->Id, $Ticket->Subject)
-#. ($ticket->id, $msg)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
-msgid "Approval #%1: %2"
-msgstr "Izin #%1: %2"
-
-#: html/Approvals/index.html:75
-#. ($ticket->Id)
-msgid "Approval #%1: Notes not recorded due to a system error"
-msgstr "Izin #%1: Catatan yang tidak dicatat karena kesalahan sistem"
-
-#: html/Approvals/index.html:73
-#. ($ticket->Id)
-msgid "Approval #%1: Notes recorded"
-msgstr "Izin #%1: Catatan yang dicatat"
-
-#: etc/initialdata:351
-msgid "Approval Passed"
-msgstr "Izin dilewati"
-
-#: etc/initialdata:374
-msgid "Approval Rejected"
-msgstr "Izin ditolak"
-
-#: html/Approvals/Elements/Approve:65
-msgid "Approve"
-msgstr "Disetujui"
-
-#: etc/initialdata:504
-msgid "Approver's notes: %1"
-msgstr "Catatan Pemberi Persetujuan: %1"
-
-#: lib/RT/Date.pm:440
-msgid "Apr."
-msgstr "Apr."
-
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
-msgid "Ascending"
-msgstr "Naik"
-
-#: lib/RT/Queue_Overlay.pm:97
-msgid "Assign and remove custom fields"
-msgstr "Menentukan dan memindahkan kolom kustom"
-
-#: lib/RT/Queue_Overlay.pm:97
-msgid "AssignCustomFields"
-msgstr "Menentukan Kolom Kustom"
-
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
-msgid "Attach"
-msgstr "Melampirkan"
-
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
-msgid "Attach file"
-msgstr "Melampirkan file"
-
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
-msgid "Attached file"
-msgstr "File dilampirkan"
-
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
-#. ($Attachment)
-msgid "Attachment '%1' could not be loaded"
-msgstr "Lampiran '%1' tidak dapat dipanggil"
-
-#: lib/RT/Transaction_Overlay.pm:478
-msgid "Attachment created"
-msgstr "Lampiran dibuat"
-
-#: lib/RT/Tickets_Overlay.pm:1673
-msgid "Attachment filename"
-msgstr "Nama File Lampiran"
-
-#: html/Ticket/Elements/ShowAttachments:47
-msgid "Attachments"
-msgstr "Lampiran-lampiran"
-
-#: lib/RT/Attributes_Overlay.pm:172
-msgid "Attribute Deleted"
-msgstr "Attribut sudah dihapus"
-
-#: lib/RT/Date.pm:444
-msgid "Aug."
-msgstr "Agst."
-
-#: NOT FOUND IN SOURCE
-msgid "AuthSystem"
-msgstr "Sistem Otorisasi"
-
-#: etc/initialdata:221
-msgid "Autoreply"
-msgstr "Balas Otomatis"
-
-#: etc/initialdata:72
-msgid "Autoreply To Requestors"
-msgstr "Balas Otomatis ke Pemohon"
-
-#: NOT FOUND IN SOURCE
-msgid "Available Columns"
-msgstr "Kolom Tersedia "
-
-#: NOT FOUND IN SOURCE
-msgid "Bad data in %1"
-msgstr "Data buruk di dalam %1"
-
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
-msgid "Basics"
-msgstr "Dasar-dasar"
-
-#: html/Ticket/Update.html:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
-msgid "Be sure to save your changes"
-msgstr "Pastikanlah untuk menyimpan setiap perubahan anda"
-
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
-msgid "Before"
-msgstr "Sebelum"
-
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
-msgstr "Pemecahan Praktis yang terbaik, Logo bisnis LLC"
-
-#: NOT FOUND IN SOURCE
-msgid "Binary"
-msgstr "Binary"
-
-#: etc/initialdata:217
-msgid "Blank"
-msgstr "Kosong"
-
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr "Diberi huruf tebal"
-
-#: html/Search/Results.html:81
-msgid "Bookmarkable link"
-msgstr "Menyimpan penunjuk link"
-
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
-msgid "Brief headers"
-msgstr "Catatan Atas Singkat"
-
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
-msgid "Bulk ticket update"
-msgstr "Memperbaharui tiket dengan jumlah banyak pada waktu yang sama"
-
-#: lib/RT/User_Overlay.pm:1722
-msgid "Can not modify system users"
-msgstr "Tidak dapat mengubah sistem pengguna"
-
-#: lib/RT/Queue_Overlay.pm:92
-msgid "Can this principal see this queue"
-msgstr "Dapatkah prinsipal melihat antrian ini"
-
-#: lib/RT/CustomField_Overlay.pm:370
-msgid "Can't add a custom field value without a name"
-msgstr "Tidak dapat menambah nilai kolom kustom tanpa nama"
-
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr "Tidak dapat menemukan kelas koleksi untuk '%'"
-
-#: html/Search/Build.html:761
-msgid "Can't find a saved search to work with"
-msgstr "Tidak dapat menemukan pencarian yang disimpan untuk bekerja dengan"
-
-#: lib/RT/Link_Overlay.pm:160
-msgid "Can't link a ticket to itself"
-msgstr "Tidak dapat menghubungkan tiket tersebut dengan dirinya sendiri"
-
-#: NOT FOUND IN SOURCE
-msgid "Can't merge into a merged ticket. You should never get this error"
-msgstr "Tidak dapat digabungkan ke dalam tiket gabungan. Anda seharusnya tidak pernah mendapatkan kesalahan ini."
-
-#: html/Search/Build.html:766
-msgid "Can't save this search"
-msgstr "Tidak dapat menyimpan pencarian ini"
-
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
-msgid "Can't specifiy both base and target"
-msgstr "Tidak dapat menentukan baik dasar dan sasaran"
-
-#: html/autohandler:148
-#. ($msg)
-msgid "Cannot create user: %1"
-msgstr "Tidak dapat membuat pengguna: %1"
-
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
-msgid "Cc"
-msgstr "Cc"
-
-#: html/SelfService/Prefs.html:52
-msgid "Change password"
-msgstr "Ubah Sandi"
-
-#: html/Elements/Submit:100
-msgid "Check All"
-msgstr "Periksa Semua"
-
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
-msgid "Check box to delete"
-msgstr "Klik kotak ini untuk hapus"
-
-#: html/Admin/Elements/SelectRights:55
-msgid "Check box to revoke right"
-msgstr "Klik kotak ini untuk menghilangkan hak-hak"
-
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
-msgid "Children"
-msgstr "Anak"
-
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
-msgid "City"
-msgstr "Kota"
-
-#: html/Elements/Submit:102
-msgid "Clear All"
-msgstr "Hapus Semua"
-
-#: html/Ticket/Elements/ShowDates:68
-msgid "Closed"
-msgstr "Ditutup"
-
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
-msgid "Closed tickets"
-msgstr "Tiket sudah ditutup"
-
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
-msgid "Comment"
-msgstr "Komentar"
-
-#: html/Admin/Queues/Modify.html:79
-msgid "Comment Address"
-msgstr "Alamat Komentar"
-
-#: lib/RT/Queue_Overlay.pm:112
-msgid "Comment on tickets"
-msgstr "Komentar pada Tiket"
-
-#: lib/RT/Queue_Overlay.pm:112
-msgid "CommentOnTicket"
-msgstr "Komentar Pada Tiket"
-
-#: NOT FOUND IN SOURCE
-msgid "Comments"
-msgstr "Komentar"
-
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
-msgid "Comments (Not sent to requestors)"
-msgstr "Komentar (Tidak dikirim ke pemohon)"
-
-#: html/Search/Bulk.html:150
-msgid "Comments (not sent to requestors)"
-msgstr "Komentar (tidak dikirim ke pemohon)"
-
-#: NOT FOUND IN SOURCE
-msgid "Comments about %1"
-msgstr "Komentar mengenai %1"
-
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
-msgid "Comments about this user"
-msgstr "Komentar tentang pengguna ini"
-
-#: lib/RT/Transaction_Overlay.pm:623
-msgid "Comments added"
-msgstr "Komentar sudah ditambahkan"
-
-#: lib/RT/Action/Generic.pm:176
-msgid "Commit Stubbed"
-msgstr "Potongan Tiket Dijalankan"
-
-#: html/Admin/Elements/EditScrip:63
-msgid "Condition"
-msgstr "Kondisi"
-
-#: bin/rt-crontool:131
-msgid "Condition matches..."
-msgstr "Kondisi sesuai dengan ..."
-
-#: lib/RT/Scrip_Overlay.pm:189
-msgid "Condition not found"
-msgstr "Kondisi tidak ditemukan"
-
-#: html/Elements/Tabs:81
-msgid "Configuration"
-msgstr "Konfigurasi"
-
-#: html/SelfService/Prefs.html:54
-msgid "Confirm"
-msgstr "Konfirmasi"
-
-#: NOT FOUND IN SOURCE
-msgid "ContactInfoSystem"
-msgstr "Hubungi Sistem Info"
-
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
-msgid "Content"
-msgstr "Isi"
-
-#: html/Elements/SelectAttachmentField:49
-msgid "Content-Type"
-msgstr "Tipe - Isi"
-
-#: html/Search/Elements/EditSearches:64
-msgid "Copy"
-msgstr "Tiru"
-
-#: etc/initialdata:286
-msgid "Correspondence"
-msgstr "Korespondensi"
-
-#: lib/RT/Transaction_Overlay.pm:619
-msgid "Correspondence added"
-msgstr "Korespondensi sudah ditambah"
-
-#: NOT FOUND IN SOURCE
-msgid "Could not add new custom field value for ticket. "
-msgstr "Tidak dapat menambah nilai kolom kustom baru untuk tiket."
-
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr "Tidak dapat menambah nilai kolom kustom baru"
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr "Tidak dapat menambah nilai kolom kustom baru"
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
-msgid "Could not change owner. "
-msgstr "Tidak dapat mengubah pemilik tiket. "
-
-#: html/Admin/CustomFields/Modify.html:119
-#. ($msg)
-msgid "Could not create CustomField"
-msgstr "Tidak dapat membuat Kolom Kustom"
-
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr "Tidak dapat membuat Kolom Kustom:%1 "
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
-msgid "Could not create group"
-msgstr "Tidak dapat membuat grup"
-
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
-#. ($msg)
-msgid "Could not create template: %1"
-msgstr "Tidak dapat membuat template: %1"
-
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
-msgid "Could not create ticket. Queue not set"
-msgstr "Tidak dapat membuat tiket. Antrian tidak dapat diatur"
-
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
-msgid "Could not create user"
-msgstr "Tidak dapat membuat pengguna"
-
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
-msgid "Could not find or create that user"
-msgstr "Tidak dapat menemukan atau membuat pengguna tersebut"
-
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
-msgid "Could not find that principal"
-msgstr "Tidak dapat menemukan prinsipal tersebut"
-
-#: html/Admin/CustomFields/Objects.html:69
-msgid "Could not load CustomField %1"
-msgstr "Tidak dapat memanggil KolomKustom %1"
-
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
-msgid "Could not load group"
-msgstr "Tidak dapat memanggil grup"
-
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr "Tidak dapat memanggil objek untuk %1"
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr "Tidak dapat memanggil attribut pencarian"
-
-#: lib/RT/Queue_Overlay.pm:758
-#. ($args{'Type'})
-msgid "Could not make that principal a %1 for this queue"
-msgstr "Tidak dapat membuat prinsipal tersebut %1 untuk antrian ini"
-
-#: lib/RT/Ticket_Overlay.pm:1405
-#. ($self->loc($args{'Type'}))
-msgid "Could not make that principal a %1 for this ticket"
-msgstr "Tidak dapat membuat prinsipal tersebut %1 untuk Tiket ini"
-
-#: lib/RT/Queue_Overlay.pm:857
-#. ($args{'Type'})
-msgid "Could not remove that principal as a %1 for this queue"
-msgstr "Tidak dapat menghapus prinsipal tersebut sebagai  %1 untuk antrian ini"
-
-#: lib/RT/User_Overlay.pm:192
-msgid "Could not set user info"
-msgstr "Tidak dapat mengatur informasi pengguna"
-
-#: lib/RT/Group_Overlay.pm:1011
-msgid "Couldn't add member to group"
-msgstr "Tidak dapat menambah anggota ke grup"
-
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
-#. ($Msg)
-msgid "Couldn't create a transaction: %1"
-msgstr "Tidak dapat membuat transaksi: %1"
-
-#: lib/RT/Record.pm:939
-msgid "Couldn't find row"
-msgstr "Tidak dapat menemukan baris"
-
-#: lib/RT/Group_Overlay.pm:985
-msgid "Couldn't find that principal"
-msgstr "Tidak dapat menemukan prinsipal tersebut"
-
-#: lib/RT/CustomField_Overlay.pm:404
-msgid "Couldn't find that value"
-msgstr "Tidak dapat menemukan nilai tersebut"
-
-#: lib/RT/CurrentUser.pm:146
-#. ($self->Id)
-msgid "Couldn't load %1 from the users database.\\n"
-msgstr "Tidak dapat memanggil %1 dari database pengguna.\\n"
-
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
-msgid "Couldn't load Class %1"
-msgstr "Tidak dapat memanggil Kelas %1"
-
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
-msgid "Couldn't load CustomField %1"
-msgstr "Tidak dapat memanggil Kolom Kustom %1"
-
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
-#. ($id)
-msgid "Couldn't load group %1"
-msgstr "Tidak dapat memanggil grup %1"
-
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
-msgid "Couldn't load link"
-msgstr "Tidak dapat memanggil link"
-
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
-msgid "Couldn't load object %1"
-msgstr "Tidak dapat memanggil objek %1"
-
-#: html/Admin/Queues/People.html:142
-#. ($id)
-msgid "Couldn't load queue"
-msgstr "Tidak dapat memanggil antrian"
-
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
-#. ($id)
-msgid "Couldn't load queue %1"
-msgstr "Tidak dapat memanggil antrian %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't load that user (%1)"
-msgstr "Tidak dapat memanggil pengguna tersebut (%1)"
-
-#: html/SelfService/Display.html:156
-#. ($id)
-msgid "Couldn't load ticket '%1'"
-msgstr "Tidak dapat memanggil Tiket '%1'"
-
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
-msgid "Country"
-msgstr "Negara"
-
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
-msgid "Create"
-msgstr "Dibuat"
-
-#: etc/initialdata:135
-msgid "Create Tickets"
-msgstr "Buat Tiket"
-
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
-msgid "Create a CustomField"
-msgstr "Buat Kolom Kustom"
-
-#: html/Admin/Queues/CustomField.html:69
-#. ($QueueObj->Name())
-msgid "Create a CustomField for queue %1"
-msgstr "Buat Kolom Kustom untuk antrian %1"
-
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
-msgid "Create a new group"
-msgstr "Buat grup baru"
-
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
-msgid "Create a new personal group"
-msgstr "Buat grup pribadi baru"
-
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
-msgid "Create a new ticket"
-msgstr "Buat tiket baru"
-
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
-msgid "Create a new user"
-msgstr "Buat pengguna baru"
-
-#: html/Admin/Queues/Modify.html:125
-msgid "Create a queue"
-msgstr "Buat antrian"
-
-#: html/Admin/Queues/Scrip.html:80
-#. ($QueueObj->Name)
-msgid "Create a scrip for queue %1"
-msgstr "Buat scrip untuk antrian %1"
-
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
-msgid "Create a template"
-msgstr "Buat template"
-
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
-msgid "Create a ticket"
-msgstr "Buat Tiket"
-
-#: etc/initialdata:137
-msgid "Create new tickets based on this scrip's template"
-msgstr "Buat Tiket baru berdasarkan pada template scrip ini"
-
-#: html/SelfService/Create.html:105
-msgid "Create ticket"
-msgstr "Buat Tiket"
-
-#: lib/RT/Queue_Overlay.pm:110
-msgid "Create tickets in this queue"
-msgstr "Buat tiket untuk antrian ini"
-
-#: lib/RT/CustomField_Overlay.pm:101
-msgid "Create, delete and modify custom fields"
-msgstr "Buat, hapus dan ubah kolom kustom"
-
-#: lib/RT/Queue_Overlay.pm:93
-msgid "Create, delete and modify queues"
-msgstr "Buat, hapus dan ubah antrian"
-
-#: lib/RT/System.pm:81
-msgid "Create, delete and modify the members of personal groups"
-msgstr "Buat, hapus dan ubah anggota dari grup pribadi"
-
-#: lib/RT/System.pm:82
-msgid "Create, delete and modify users"
-msgstr "Buat, hapus dan ubah pengguna"
-
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr "Buat Pencarian yang Disimpan"
-
-#: lib/RT/Queue_Overlay.pm:110
-msgid "CreateTicket"
-msgstr "Buat Tiket"
-
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
-msgid "Created"
-msgstr "sudah Dibuat"
-
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
-#. ($CustomFieldObj->Name())
-msgid "Created CustomField %1"
-msgstr "Kolom Kustom sudah dibuat %1"
-
-#: html/Search/Elements/PickBasics:102
-msgid "Creator"
-msgstr "Pencipta"
-
-#: html/Elements/EditLinks:49
-msgid "Current Links"
-msgstr "Link yang sekarang"
-
-#: NOT FOUND IN SOURCE
-msgid "Current Relationships"
-msgstr "Hubungan Sekarang"
-
-#: html/Admin/Elements/EditScrips:51
-msgid "Current Scrips"
-msgstr "Scrips Sekarang "
-
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
-msgid "Current members"
-msgstr "Anggota Sekarang"
-
-#: html/Admin/Elements/SelectRights:51
-msgid "Current rights"
-msgstr "Hak-hak Sekarang"
-
-#: NOT FOUND IN SOURCE
-msgid "Current search criteria"
-msgstr "Kriteria pencarian sekarang"
-
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
-msgid "Current watchers"
-msgstr "Pengamat sekarang"
-
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
-msgid "Custom Fields"
-msgstr "Kolom Kustom"
-
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
-msgid "Custom Fields for %1"
-msgstr "Kolom Kustom untuk %1"
-
-#: html/Admin/Elements/EditScrip:123
-msgid "Custom action cleanup code"
-msgstr "Aksi kustom membersihkan kode"
-
-#: html/Admin/Elements/EditScrip:115
-msgid "Custom action preparation code"
-msgstr "Aksi kustom menyiapkan kode"
-
-#: html/Admin/Elements/EditScrip:107
-msgid "Custom condition"
-msgstr "Kondisi kustom"
-
-#: NOT FOUND IN SOURCE
-msgid "Custom field %1 %2 %3"
-msgstr "Kolom kustom %1 %2 %3"
-
-#: NOT FOUND IN SOURCE
-msgid "Custom field %1 does not apply to this object"
-msgstr "Kolom kustom %1 tidak dapat digunakan untuk objek ini"
-
-#: lib/RT/Tickets_Overlay.pm:2147
-#. ($CF->Name)
-msgid "Custom field %1 has a value."
-msgstr "Kolom kustom %1 memiliki nilai."
-
-#: lib/RT/Tickets_Overlay.pm:2143
-#. ($CF->Name)
-msgid "Custom field %1 has no value."
-msgstr "Kolom kustom %1 tidak memiliki nilai."
-
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
-#. ($args{'Field'})
-msgid "Custom field %1 not found"
-msgstr "Kolom kustom %1 tidak ditemukan"
-
-#: NOT FOUND IN SOURCE
-msgid "Custom field not found"
-msgstr "Kolom kustom tidak ditemukan"
-
-#: lib/RT/CustomField_Overlay.pm:1041
-#. ($args{'Content'}, $self->Name)
-msgid "Custom field value %1 could not be found for custom field %2"
-msgstr "Nilai kolom kustom %1 tidak dapat ditemukan untuk kolom kustom %2"
-
-#: lib/RT/CustomField_Overlay.pm:414
-msgid "Custom field value could not be deleted"
-msgstr "Nilai kolom kustom tidak dapat dihapus"
-
-#: lib/RT/CustomField_Overlay.pm:1047
-msgid "Custom field value could not be found"
-msgstr "Nilai kolom kustom tidak dapat ditemukan"
-
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
-msgid "Custom field value deleted"
-msgstr "Nilai kolom kustom sudah dihapus"
-
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
-msgid "CustomField"
-msgstr "Kolom kustom"
-
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
-msgid "Dates"
-msgstr "Tanggal"
-
-#: lib/RT/Date.pm:448
-msgid "Dec."
-msgstr "Des."
-
-#: etc/initialdata:222
-msgid "Default Autoresponse template"
-msgstr "Default template Balas Otomatis"
-
-#: html/Tools/Offline.html:61
-msgid "Default Queue"
-msgstr "Default Antrian"
-
-#: html/Tools/Offline.html:70
-msgid "Default Requestor"
-msgstr "Default Pemohon"
-
-#: etc/initialdata:296
-msgid "Default admin comment template"
-msgstr "Default template komentar admin"
-
-#: etc/initialdata:275
-msgid "Default admin correspondence template"
-msgstr "Default template korespondensi admin"
-
-#: etc/initialdata:287
-msgid "Default correspondence template"
-msgstr "Default template korespondensi"
-
-#: etc/initialdata:253
-msgid "Default transaction template"
-msgstr "Default template transaksi"
-
-#: NOT FOUND IN SOURCE
-msgid "Default: %1/%2 changed from %3 to %4"
-msgstr "Default: %1/%2 diganti dari %3 ke %4"
-
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
-msgid "Delegate rights"
-msgstr "Hak-hak Utusan"
-
-#: lib/RT/System.pm:85
-msgid "Delegate specific rights which have been granted to you."
-msgstr "Hak-hak spesifik utusan yang sudah diberikan kepada anda."
-
-#: lib/RT/System.pm:85
-msgid "DelegateRights"
-msgstr "Hak-hak Utusan"
-
-#: html/User/Elements/Tabs:59
-msgid "Delegation"
-msgstr "Delegasi"
-
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
-msgid "Delete"
-msgstr "Hapus"
-
-#: html/Admin/Elements/EditTemplates:79
-msgid "Delete Template"
-msgstr "Hapus Template"
-
-#: NOT FOUND IN SOURCE
-msgid "Delete article #%1"
-msgstr "Hapus artikel #%1"
-
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
-msgstr "Gagal dihapus: %1"
-
-#: html/Admin/Elements/EditScrips:74
-msgid "Delete selected scrips"
-msgstr "Hapus scrip yang sudah dipilih"
-
-#: lib/RT/Queue_Overlay.pm:115
-msgid "Delete tickets"
-msgstr "Hapus tiket"
-
-#: lib/RT/Queue_Overlay.pm:115
-msgid "DeleteTicket"
-msgstr "Hapus tiket"
-
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr "Pencarian dihapus"
-
-#: NOT FOUND IN SOURCE
-msgid "Deleting this object could break referential integrity"
-msgstr "Menghapuskan objek ini dapat memutuskan integrasi referensial"
-
-#: lib/RT/Queue_Overlay.pm:391
-msgid "Deleting this object would break referential integrity"
-msgstr "Menghapuskan objek ini dapat memutuskan integrasi referensial"
-
-#: lib/RT/User_Overlay.pm:513
-msgid "Deleting this object would violate referential integrity"
-msgstr "Menghapuskan objek ini dapat melanggar integrasi referensial"
-
-#: html/Approvals/Elements/Approve:66
-msgid "Deny"
-msgstr "Ditolak"
-
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
-msgid "Depended on by"
-msgstr "Bergantung oleh"
-
-#: lib/RT/Transaction_Overlay.pm:707
-#. ($value)
-msgid "Dependency by %1 added"
-msgstr "Ketergantungan oleh %1 sudah ditambah"
-
-#: lib/RT/Transaction_Overlay.pm:747
-#. ($value)
-msgid "Dependency by %1 deleted"
-msgstr "Ketergantungan oleh %1 sudah dihapus"
-
-#: lib/RT/Transaction_Overlay.pm:704
-#. ($value)
-msgid "Dependency on %1 added"
-msgstr "Ketergantungan oleh %1 sudah dihapus"
-
-#: lib/RT/Transaction_Overlay.pm:744
-#. ($value)
-msgid "Dependency on %1 deleted"
-msgstr "Ketergantungan oleh %1 sudah dihapus"
-
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
-msgid "Depends on"
-msgstr "Bergantung pada"
-
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
-msgid "Descending"
-msgstr "Turun"
-
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
-msgid "Describe the issue below"
-msgstr "Gambarkan persoalan dibawah ini"
-
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
-msgid "Description"
-msgstr "Deskripsi"
-
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
-msgid "Display"
-msgstr "Tampilkan"
-
-#: lib/RT/Queue_Overlay.pm:94
-msgid "Display Access Control List"
-msgstr "Tampilkan Daftar Kontrol Akses"
-
-#: html/Search/Elements/DisplayOptions:46
-msgid "Display Columns"
-msgstr "Tampilkan Kolom"
-
-#: lib/RT/Queue_Overlay.pm:100
-msgid "Display Scrip templates for this queue"
-msgstr "Tampilkan template Scrip untuk antrian ini"
-
-#: lib/RT/Queue_Overlay.pm:103
-msgid "Display Scrips for this queue"
-msgstr "Tampilkan Scrip untuk antrian ini"
-
-#: html/Ticket/Elements/ShowHistory:56
-msgid "Display mode"
-msgstr "Tampilkan mode"
-
-#: lib/RT/Group_Overlay.pm:176
-msgid "Display saved searches for this group"
-msgstr "Tampilkan pencarian yang disimpan untuk grup ini"
-
-#: html/Elements/Footer:60
-msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
-msgstr "Didistribusikan dibawah versi 2 dari <a href=\"http://www.gnu.org/copyleft/gpl.html\"> GNU GPL.</a>"
-
-#: lib/RT/System.pm:76
-msgid "Do anything and everything"
-msgstr "Lakukan apa saja dan semuanya"
-
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr "Lakukan Pencarian"
-
-#: html/Elements/Refresh:51
-msgid "Don't refresh this page."
-msgstr "Jangan refresh halaman ini."
-
-#: NOT FOUND IN SOURCE
-msgid "Don't show search results"
-msgstr "Jangan tampilkan hasil pencarian"
-
-#: html/Ticket/Elements/ShowTransactionAttachments:82
-msgid "Download"
-msgstr "Download"
-
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
-msgid "Download as a tab-delimited file"
-msgstr "Download sebagai file yang dibatasi dengan tab"
-
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
-msgid "Due"
-msgstr "Batas Waktu"
-
-#: NOT FOUND IN SOURCE
-msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
-msgstr "KESALAHAN: Tidak dapat memanggil Tiket '%1': %2.\\n"
-
-#: NOT FOUND IN SOURCE
-msgid "Edit"
-msgstr "Ubah"
-
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
-msgid "Edit Custom Fields for %1"
-msgstr "Ubah Kolom Kustom untuk %1"
-
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr "Ubah Kolom Kustom untuk semua grup"
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr "Ubah Kolom Kustom untuk semua pengguna"
-
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
-msgstr "Ubah Kolom Kustom untuk tiket di dalam semua antrian"
-
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
-msgid "Edit Links"
-msgstr "Ubah Link"
-
-#: html/Search/Edit.html:68
-msgid "Edit Query"
-msgstr "Ubah Query"
-
-#: NOT FOUND IN SOURCE
-msgid "Edit Relationships"
-msgstr "Ubah Hubungan"
-
-#: html/Admin/Queues/Templates.html:63
-#. ($QueueObj->Name)
-msgid "Edit Templates for queue %1"
-msgstr "Ubah Templates untuk antrian %1"
-
-#: lib/RT/Group_Overlay.pm:175
-msgid "Edit saved searches for this group"
-msgstr "Ubah pencarian yang disimpan untuk grup ini"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
-msgid "Edit system templates"
-msgstr "Ubah template sistem"
-
-#: lib/RT/Group_Overlay.pm:175
-msgid "EditSavedSearches"
-msgstr "Ubah Pencarian yang Disimpan"
-
-#: html/Admin/Queues/Modify.html:140
-#. ($QueueObj->Name)
-msgid "Editing Configuration for queue %1"
-msgstr "Mengubah Konfigurasi untuk antrian %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Editing Configuration for user %1"
-msgstr "Mengubah Konfigurasi untuk pengguna %1"
-
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
-#. ($CustomFieldObj->Name())
-msgid "Editing CustomField %1"
-msgstr "Mengubah Kolom Kustom %1"
-
-#: html/Admin/Groups/Members.html:53
-#. ($Group->Name)
-msgid "Editing membership for group %1"
-msgstr "Mengubah keanggotaan untuk grup ini %1"
-
-#: html/User/Groups/Members.html:150
-#. ($Group->Name)
-msgid "Editing membership for personal group %1"
-msgstr "Mengubah keanggotaan untuk grup pribadi %1"
-
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
-msgid "Either base or target must be specified"
-msgstr "Baik dasar ataupun sasaran harus ditentukan"
-
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
-msgid "Email"
-msgstr "Email"
-
-#: lib/RT/User_Overlay.pm:236
-msgid "Email address in use"
-msgstr "Alamat Email yang digunakan"
-
-#: NOT FOUND IN SOURCE
-msgid "EmailAddress"
-msgstr "Alamat Email"
-
-#: NOT FOUND IN SOURCE
-msgid "EmailEncoding"
-msgstr "Set Karakter Email"
-
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
-msgid "Enabled (Unchecking this box disables this custom field)"
-msgstr "Mengaktifkan (Klik kotak ini untuk menon-aktifkan kolom kustom)"
-
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
-msgid "Enabled (Unchecking this box disables this group)"
-msgstr "Mengaktifkan (Klik kotak ini untuk menon-aktifkan grup ini)"
-
-#: html/Admin/Queues/Modify.html:105
-msgid "Enabled (Unchecking this box disables this queue)"
-msgstr "Mengaktifkan (Klik kotak ini untuk menon-aktifkan antrian ini)"
-
-#: html/Admin/Queues/index.html:78
-msgid "Enabled Queues"
-msgstr "Mengaktifkan Antrian"
-
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
-#. (loc_fuzzy($msg))
-msgid "Enabled status %1"
-msgstr "Mengaktifkan status %1"
-
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
-msgid "Enabled status: %1"
-msgstr "Mengaktifkan status: %1"
-
-#: lib/RT/CustomField_Overlay.pm:64
-msgid "Enter multiple values"
-msgstr "Masukkan beberapa nilai"
-
-#: html/Elements/EditLinks:124
-msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
-msgstr "Masukan objek atau URI untuk menghubungkan object tersebut. Pisahkan beberapa input tersebut dengan spasi."
-
-#: lib/RT/CustomField_Overlay.pm:65
-msgid "Enter one value"
-msgstr "Masukkan satu nilai"
-
-#: html/Elements/EditLinks:121
-msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
-msgstr "Masukkan antrian atau URIs untuk menghubungkan antrian tersebut. Pisahkan beberapa input dengan spasi."
-
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
-msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
-msgstr "Masukkan tiket atau URIs untuk menghubungkan Tiket tersebut. Pisahkan beberapa input dengan spasi."
-
-#: NOT FOUND IN SOURCE
-msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
-msgstr "Masukkan tiket atau URIs  untuk menghubungkan Tiket tersebut. Pisahkan beberapa input dengan spasi."
-
-#: lib/RT/CustomField_Overlay.pm:66
-msgid "Enter up to %1 values"
-msgstr "Masukkan sampai %1 nilai"
-
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
-msgid "Error"
-msgstr "Kesalahan"
-
-#: lib/RT/Queue_Overlay.pm:669
-msgid "Error in parameters to Queue->AddWatcher"
-msgstr "Kesalahan di dalam parameter ke Antrian->Tambah Pengamat"
-
-#: NOT FOUND IN SOURCE
-msgid "Error in parameters to Queue->DelWatcher"
-msgstr "Kesalahan di dalam parameter Ke Antrian->Hapus Pengamat"
-
-#: lib/RT/Queue_Overlay.pm:830
-msgid "Error in parameters to Queue->DeleteWatcher"
-msgstr "Kesalahan di dalam parameter ke Antrian->Hapus Pengamat"
-
-#: lib/RT/Ticket_Overlay.pm:1333
-msgid "Error in parameters to Ticket->AddWatcher"
-msgstr "Kesalahan di dalam parameter ke Tiket->Tambah Pengamat"
-
-#: NOT FOUND IN SOURCE
-msgid "Error in parameters to Ticket->DelWatcher"
-msgstr "Kesalahan di dalam parameter ke Tiket->Hapus Pengamat"
-
-#: lib/RT/Ticket_Overlay.pm:1499
-msgid "Error in parameters to Ticket->DeleteWatcher"
-msgstr "Kesalahan di dalam parameter ke Ticket->Hapus Pengamat"
-
-#: bin/rt-crontool:233
-msgid "Escalate tickets"
-msgstr "Meningkatkan Prioritas Tiket"
-
-#: NOT FOUND IN SOURCE
-msgid "Estimate"
-msgstr "Perkiraan"
-
-#: html/Ticket/Elements/ShowBasics:57
-msgid "Estimated"
-msgstr "Diperkirakan"
-
-#: etc/initialdata:20
-msgid "Everyone"
-msgstr "Setiap Orang"
-
-#: bin/rt-crontool:219
-msgid "Example:"
-msgstr "Contoh:"
-
-#: NOT FOUND IN SOURCE
-msgid "ExternalAuthId"
-msgstr "AuthID Eksternal"
-
-#: NOT FOUND IN SOURCE
-msgid "ExternalContactInfoId"
-msgstr " Kontak Info ID Eksternal"
-
-#: html/Admin/Users/Modify.html:99
-msgid "Extra info"
-msgstr "Info Tambahan"
-
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
-msgstr "Gagal untuk membuat atribut pencarian"
-
-#: lib/RT/User_Overlay.pm:377
-msgid "Failed to find 'Privileged' users pseudogroup."
-msgstr "Gagal untuk menemukan pengguna pseudogroup yang memiliki 'Hak-hak Istimewa'."
-
-#: lib/RT/User_Overlay.pm:384
-msgid "Failed to find 'Unprivileged' users pseudogroup"
-msgstr "Gagal untuk menemukan pengguna pseudogroup yang tidak memiliki  'Hak-Hak Istimewa.'"
-
-#: bin/rt-crontool:163
-#. ($modname, $@)
-msgid "Failed to load module %1. (%2)"
-msgstr "Gagal untuk memanggil modul %1. (%2)"
-
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr "Gagal memanggil objek untuk %1"
-
-#: lib/RT/Date.pm:438
-msgid "Feb."
-msgstr "Feb."
-
-#: html/Elements/SelectAttachmentField:50
-msgid "Filename"
-msgstr "Nama File"
-
-#: lib/RT/CustomField_Overlay.pm:69
-msgid "Fill in multiple text areas"
-msgstr "Isilah di dalam beberapa area teks"
-
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr "Isilah di dalam beberapa area wikiteks"
-
-#: lib/RT/CustomField_Overlay.pm:70
-msgid "Fill in one text area"
-msgstr "Isilah di dalam satu area teks"
-
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr "Isilah di dalam satu area wikiteks"
-
-#: lib/RT/CustomField_Overlay.pm:71
-msgid "Fill in up to %1 text areas"
-msgstr "Isilah sampai %1 area teks"
-
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr "Isilah sampai %1 area wikiteks"
-
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
-msgid "Final Priority"
-msgstr "Prioritas Akhir"
-
-#: lib/RT/Ticket_Overlay.pm:1140
-msgid "FinalPriority"
-msgstr "Prioritas Akhir"
-
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
-msgid "Find groups whose"
-msgstr "Cari grup yang"
-
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
-msgid "Find people whose"
-msgstr "Cari orang yang"
-
-#: html/Search/Results.html:109
-msgid "Find tickets"
-msgstr "Cari tiket"
-
-#: html/Ticket/Elements/Tabs:81
-msgid "First"
-msgstr "Pertama"
-
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
-msgid "Foo Bar Baz"
-msgstr "Foo Bar Baz"
-
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
-msgid "Foo!"
-msgstr "Foo!"
-
-#: html/Search/Bulk.html:105
-msgid "Force change"
-msgstr "Diubah dengan paksa"
-
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr "Format"
-
-#: html/Search/Results.html:107
-#. ($ticketcount)
-msgid "Found %quant(%1,ticket)"
-msgstr "Ditemukan % quant(%1,tiket)"
-
-#: lib/RT/Record.pm:942
-msgid "Found Object"
-msgstr "Objek ditemukan"
-
-#: NOT FOUND IN SOURCE
-msgid "Freeform"
-msgstr "Freeform"
-
-#: NOT FOUND IN SOURCE
-msgid "FreeformContactInfo"
-msgstr "FreeformContactInfo"
-
-#: lib/RT/Date.pm:417
-msgid "Fri."
-msgstr "Jum."
-
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
-msgid "Full headers"
-msgstr "Catatan Atas Lengkap"
-
-#: html/Tools/Offline.html:87
-msgid "Get template from file"
-msgstr "Ambil template dari file"
-
-#: lib/RT/Transaction_Overlay.pm:673
-#. ($New->Name)
-msgid "Given to %1"
-msgstr "Berikan ke %1"
-
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
-msgid "Global"
-msgstr "Global"
-
-#: html/Admin/Elements/EditCustomFields:55
-msgid "Global Custom Fields"
-msgstr "Kolom Kustom Global"
-
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr "Konfigurasi kolom kustom global"
-
-#: html/Admin/Elements/SelectTemplate:59
-#. (loc($Template->Name))
-msgid "Global template: %1"
-msgstr "Template Global: %1"
-
-#: html/Tools/Offline.html:91
-msgid "Go"
-msgstr "Ambil"
-
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
-msgid "Go!"
-msgstr "Ambil!"
-
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
-msgid "Goto ticket"
-msgstr "Ambil tiket"
-
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
-msgid "Group"
-msgstr "Grup"
-
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
-msgid "Group Rights"
-msgstr "Hak Grup"
-
-#: lib/RT/Group_Overlay.pm:991
-msgid "Group already has member"
-msgstr "Grup sudah memiliki anggota"
-
-#: html/Admin/Groups/Modify.html:109
-#. ($create_msg)
-msgid "Group could not be created: %1"
-msgstr "Grup tidak dapat dibuat: %1"
-
-#: lib/RT/Group_Overlay.pm:529
-msgid "Group created"
-msgstr "Grup sudah dibuat"
-
-#: lib/RT/Group_Overlay.pm:1163
-msgid "Group has no such member"
-msgstr "Grup tidak memiliki anggota terseperti ini"
-
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
-msgid "Group not found"
-msgstr "Grup tidak ditemukan"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
-msgid "Groups"
-msgstr "Grup"
-
-#: lib/RT/Group_Overlay.pm:997
-msgid "Groups can't be members of their members"
-msgstr "Grup tidak bisa menjadi anggota dari mereka"
-
-#: html/Admin/Groups/index.html:82
-msgid "Groups matching search criteria"
-msgstr "Grup sesuai dengan kriteria pencarian"
-
-#: html/Ticket/Elements/ShowRequestor:77
-msgid "Groups this user belongs to"
-msgstr "Pengguna ini milik grup"
-
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
-msgid "Hello!"
-msgstr "Halo!"
-
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
-#. ($name)
-msgid "Hello, %1"
-msgstr "Halo, %1"
-
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
-msgid "History"
-msgstr "Historis"
-
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
-msgid "History of the group %1"
-msgstr "Historis grup %1"
-
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
-msgid "History of the user %1"
-msgstr "Historis pengguna %1"
-
-#: NOT FOUND IN SOURCE
-msgid "HomePhone"
-msgstr "Telepon Rumah"
-
-#: html/Elements/Tabs:65
-msgid "Homepage"
-msgstr "Homepage"
-
-#: lib/RT/Base.pm:110
-#. (6)
-msgid "I have %quant(%1,concrete mixer)."
-msgstr "Saya memiliki %quant (%1,concrete mixer)."
-
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr "Saya tersesat"
-
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
-msgid "Id"
-msgstr "Id"
-
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
-msgid "Identity"
-msgstr "Identitas"
-
-#: etc/initialdata:429
-msgid "If an approval is rejected, reject the original and delete pending approvals"
-msgstr "Jika izin ditolak, tolak izin yang asli dan hapus izin yang masih ditunda"
-
-#: html/Tools/Offline.html:74
-msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "Jika tidak ada pemohon yang ditentukan, buat tiket dengan pemohon ini."
-
-#: html/Tools/Offline.html:65
-msgid "If no queue is specified, create tickets in this queue."
-msgstr "Jika tidak ada antrian yang ditentukan, buat tiket untuk antrian ini."
-
-#: bin/rt-crontool:215
-msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
-msgstr "Jika alat ini adalah setgid, hostile local user dapat menggunakan alat ini untuk mendapatkan akses administrasi ke RT."
-
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
-msgid "If you've updated anything above, be sure to"
-msgstr "Jika anda memperbaharui apapun diatas, pastikanlah untuk"
-
-#: lib/RT/Record.pm:933
-msgid "Illegal value for %1"
-msgstr "Nilai Ilegal untuk %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Image"
-msgstr "Gambar"
-
-#: lib/RT/Record.pm:936
-msgid "Immutable field"
-msgstr "Kolom yang tetap"
-
-#: html/Admin/Groups/index.html:65
-msgid "Include disabled groups in listing."
-msgstr "Termasuk menon-aktifkan grup di dalam daftar."
-
-#: html/Admin/Queues/index.html:65
-msgid "Include disabled queues in listing."
-msgstr "Termasuk menon-aktifkan antrian di dalam daftar."
-
-#: html/Admin/Users/index.html:71
-msgid "Include disabled users in search."
-msgstr "Termasuk menon-aktifkan pengguna di dalam pencarian."
-
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr "Query tidak lengkap"
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr "query tidak lengkap"
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
-msgid "Initial Priority"
-msgstr "Prioritas Awal"
-
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
-msgid "InitialPriority"
-msgstr "Prioritas Awal"
-
-#: lib/RT/ScripAction_Overlay.pm:134
-msgid "Input error"
-msgstr "Kesalahan Input"
-
-#: lib/RT/Ticket_Overlay.pm:3454
-msgid "Internal Error"
-msgstr "Kesalahan Internal"
-
-#: lib/RT/Record.pm:305
-#. ($id->{error_message})
-msgid "Internal Error: %1"
-msgstr "Kesalahan Internal: %1"
-
-#: lib/RT/Group_Overlay.pm:676
-msgid "Invalid Group Type"
-msgstr "Tipe Grup tidak valid"
-
-#: lib/RT/Principal_Overlay.pm:161
-msgid "Invalid Right"
-msgstr "Hak-hak tidak valid"
-
-#: lib/RT/Record.pm:938
-msgid "Invalid data"
-msgstr "Data tidak valid"
-
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
-msgid "Invalid queue"
-msgstr "Antrian tidak valid"
-
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
-msgid "Invalid right"
-msgstr "Hak tidak valid"
-
-#: lib/RT/Record.pm:280
-#. ($key)
-msgid "Invalid value for %1"
-msgstr "Nilai tidak valid untuk %1"
-
-#: lib/RT/Record.pm:1597
-msgid "Invalid value for custom field"
-msgstr "Nilai tidak valid untuk kolom kustom"
-
-#: lib/RT/Ticket_Overlay.pm:413
-msgid "Invalid value for status"
-msgstr "Nilai tidak valid untuk status"
-
-#: bin/rt-crontool:216
-msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
-msgstr "Hal ini sangat penting bahwa pengguna yang tidak memiliki hak-hak istimewa tidak dapat diizinkan untuk menjalankan program ini."
-
-#: bin/rt-crontool:217
-msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
-msgstr "Sangat disarankan bahwa anda membuat pengguna unix yang tidak memiliki hak-hak istimewa dengan keanggotaan grup yang benar dan akses RT untuk menjalankan alat ini."
-
-#: bin/rt-crontool:188
-msgid "It takes several arguments:"
-msgstr "Hal ini memerlukan beberapa penjelasan:"
-
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr "Diberi huruf miring"
-
-#: lib/RT/Date.pm:437
-msgid "Jan."
-msgstr "Jan."
-
-#: lib/RT/Group_Overlay.pm:174
-msgid "Join or leave this group"
-msgstr "Bergabung atau tinggalkan grup ini"
-
-#: lib/RT/Date.pm:443
-msgid "Jul."
-msgstr "Jul."
-
-#: html/Ticket/Elements/Tabs:122
-msgid "Jumbo"
-msgstr "Jumbo"
-
-#: lib/RT/Date.pm:442
-msgid "Jun."
-msgstr "Jun."
-
-#: NOT FOUND IN SOURCE
-msgid "Lang"
-msgstr "Bhs"
-
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
-msgid "Language"
-msgstr "Bahasa"
-
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr "Besar"
-
-#: html/Ticket/Elements/Tabs:96
-msgid "Last"
-msgstr "Akhir"
-
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
-msgid "Last Contact"
-msgstr "Kontak Terakhir"
-
-#: html/Elements/SelectDateType:50
-msgid "Last Contacted"
-msgstr "Kontak Terakhir"
-
-#: NOT FOUND IN SOURCE
-msgid "Last Notified"
-msgstr "Pemberitahuan Terakhir"
-
-#: html/Elements/SelectDateType:51
-msgid "Last Updated"
-msgstr "Pembaharuan Terakhir"
-
-#: html/Search/Elements/PickBasics:103
-msgid "LastUpdatedBy"
-msgstr "Pembaharuan Terakhir Oleh"
-
-#: html/Ticket/Elements/ShowBasics:68
-msgid "Left"
-msgstr "Kirim"
-
-#: html/Admin/Users/Modify.html:109
-msgid "Let this user access RT"
-msgstr "Biarkan pengguna ini mengakses RT"
-
-#: html/Admin/Users/Modify.html:113
-msgid "Let this user be granted rights"
-msgstr "Biarlah pengguna ini diberi hak-hak"
-
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr "Link"
-
-#: lib/RT/Record.pm:1292
-msgid "Link already exists"
-msgstr "Link sudah ada"
-
-#: lib/RT/Record.pm:1306
-msgid "Link could not be created"
-msgstr "Link tidak dapat dibuat"
-
-#: lib/RT/Record.pm:1312
-#. ($TransString)
-msgid "Link created (%1)"
-msgstr "Link sudah dibuat (%1)"
-
-#: lib/RT/Record.pm:1373
-#. ($TransString)
-msgid "Link deleted (%1)"
-msgstr "Link sudah dihapus (%1)"
-
-#: lib/RT/Record.pm:1379
-msgid "Link not found"
-msgstr "Link tidak ditemukan"
-
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
-#. ($Ticket->Id)
-msgid "Link ticket #%1"
-msgstr "Link tiket #%1"
-
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
-msgid "Links"
-msgstr "Link-link"
-
-#: html/Search/Elements/EditSearches:76
-msgid "Load"
-msgstr "Memanggil"
-
-#: html/Search/Elements/EditSearches:74
-msgid "Load saved search:"
-msgstr "Memanggil pencarian yang disimpan:"
-
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr "Memanggil pencarian yang disimpan"
-
-#: html/Admin/Tools/Configuration.html:64
-msgid "Loaded perl modules"
-msgstr "Memanggil modul perl"
-
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr "Memanggil pencarian %1"
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
-msgid "Location"
-msgstr "Lokasi"
-
-#: lib/RT.pm:212
-#. ($RT::LogDir)
-msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
-msgstr "Direktori Log %1 tidak ditemukan atau tidak dapat ditulis.\\n RT tidak dapat dijalankan."
-
-#: html/Elements/Header:94
-#. ("<b>".$session{'CurrentUser'}->Name."</b>")
-msgid "Logged in as %1"
-msgstr "Masuk sebagai %1"
-
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
-msgid "Login"
-msgstr "Login"
-
-#: html/Elements/Header:91
-msgid "Logout"
-msgstr "Logout"
-
-#: lib/RT/CustomField_Overlay.pm:866
-msgid "Lookup type mismatch"
-msgstr "Mencari tipe yang tidak sesuai (mismatch)"
-
-#: html/Search/Bulk.html:104
-msgid "Make Owner"
-msgstr "Buat Pemilik"
-
-#: html/Search/Bulk.html:128
-msgid "Make Status"
-msgstr "Buat Status"
-
-#: html/Search/Bulk.html:136
-msgid "Make date Due"
-msgstr "Buat Tanggal Batas Waktu"
-
-#: html/Search/Bulk.html:138
-msgid "Make date Resolved"
-msgstr "Buat Tanggal Penyelesaian"
-
-#: html/Search/Bulk.html:132
-msgid "Make date Started"
-msgstr "Buat Tanggal Mulai"
-
-#: html/Search/Bulk.html:130
-msgid "Make date Starts"
-msgstr "Buat Tanggal Mulai"
-
-#: html/Search/Bulk.html:134
-msgid "Make date Told"
-msgstr "Buat Tanggal Pemberitahuan"
-
-#: html/Search/Bulk.html:124
-msgid "Make priority"
-msgstr "Buat prioritas"
-
-#: html/Search/Bulk.html:126
-msgid "Make queue"
-msgstr "Buat antrian"
-
-#: html/Search/Bulk.html:122
-msgid "Make subject"
-msgstr "Buat subjek"
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
-msgstr "Buat agar grup ini terlihat pada sisi pengguna"
-
-#: html/Admin/index.html:78
-msgid "Manage custom fields and custom field values"
-msgstr "Mengatur kolom kustom dan nilai kolom kustom"
-
-#: html/Admin/index.html:69
-msgid "Manage groups and group membership"
-msgstr "Mengatur grup dan keanggotaan grup"
-
-#: html/Admin/index.html:85
-msgid "Manage properties and configuration which apply to all queues"
-msgstr "Mengatur propertis dan konfigurasi yang akan digunakan di setiap antrian"
-
-#: html/Admin/index.html:74
-msgid "Manage queues and queue-specific properties"
-msgstr "Mengatur antrian dan propertis antrian tertentu"
-
-#: html/Admin/index.html:64
-msgid "Manage users and passwords"
-msgstr "Mengatur pengguna dan sandi"
-
-#: lib/RT/Date.pm:439
-msgid "Mar."
-msgstr "Mar."
-
-#: lib/RT/Date.pm:441
-msgid "May."
-msgstr "Mei."
-
-#: lib/RT/Transaction_Overlay.pm:720
-#. ($value)
-msgid "Member %1 added"
-msgstr "Anggota %1 sudah ditambah"
-
-#: lib/RT/Transaction_Overlay.pm:760
-#. ($value)
-msgid "Member %1 deleted"
-msgstr "Anggota %1 sudah dihapus"
-
-#: lib/RT/Group_Overlay.pm:1008
-msgid "Member added"
-msgstr "Anggota sudah ditambah"
-
-#: lib/RT/Group_Overlay.pm:1170
-msgid "Member deleted"
-msgstr "Anggota sudah dihapus"
-
-#: lib/RT/Group_Overlay.pm:1174
-msgid "Member not deleted"
-msgstr "Anggota tidak dihapus"
-
-#: html/Elements/SelectLinkType:47
-msgid "Member of"
-msgstr "Anggota dari"
-
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
-msgid "Members"
-msgstr "Anggota-anggota"
-
-#: lib/RT/Transaction_Overlay.pm:717
-#. ($value)
-msgid "Membership in %1 added"
-msgstr "Keanggotaan di dalam %1 sudah ditambah"
-
-#: lib/RT/Transaction_Overlay.pm:757
-#. ($value)
-msgid "Membership in %1 deleted"
-msgstr "Keanggotaan di dalam %1 sudah dihapus"
-
-#: html/Admin/Elements/UserTabs:61
-msgid "Memberships"
-msgstr "Keanggotaan"
-
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
-msgid "Memberships of the user %1"
-msgstr "Keanggotaan dari pengguna %1"
-
-#: lib/RT/Ticket_Overlay.pm:2849
-msgid "Merge Successful"
-msgstr "Penggabungan Berhasil"
-
-#: lib/RT/Ticket_Overlay.pm:2736
-msgid "Merge failed. Couldn't set EffectiveId"
-msgstr "Penggabungan gagal. Tidak dapat mengatur EffectiveId"
-
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr "Penggabungan gagal. Tidak dapat mengatur Status"
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
-msgid "Merge into"
-msgstr "Bergabung ke dalam"
-
-#: lib/RT/Transaction_Overlay.pm:723
-#. ($value)
-msgid "Merged into %1"
-msgstr "Bergabung ke dalam %1"
-
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
-msgid "Message"
-msgstr "Pesan"
-
-#: lib/RT/Ticket_Overlay.pm:2406
-msgid "Message could not be recorded"
-msgstr "Pesan tidak dapat dicatat"
-
-#: lib/RT/Ticket_Overlay.pm:2409
-msgid "Message recorded"
-msgstr "Pesan sudah dicatat"
-
-#: html/Ticket/Elements/PreviewScrips:115
-msgid "Messages about this ticket will not be sent to..."
-msgstr "Pesan mengenai Tiket ini tidak akan dikirim ke..."
-
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
-msgstr "tanda kurung tidak sama"
-
-#: lib/RT/Record.pm:940
-msgid "Missing a primary key?: %1"
-msgstr "Kunci utama tidak ditemukan?: %1"
-
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
-msgid "Mobile"
-msgstr "Hp"
-
-#: NOT FOUND IN SOURCE
-msgid "MobilePhone"
-msgstr "Handphone"
-
-#: lib/RT/Queue_Overlay.pm:95
-msgid "Modify Access Control List"
-msgstr "Mengubah Daftar Kontrol Akses"
-
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr "Ubah Kolom Kustom yang digunakan untuk %1 untuk semua %2"
-
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
-msgid "Modify Custom Fields which apply to all %1"
-msgstr "Mengatur Kolom Kustom yang dapat digunakan untuk seluruh %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify Custom Fields which apply to all queues"
-msgstr "Mengatur Kolom Kustom yang dapat digunakan di seluruh antrian"
-
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
-msgid "Modify Group Rights"
-msgstr "Ubah Hak Grup"
-
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
-msgid "Modify Members"
-msgstr "Ubah Anggota"
-
-#: html/User/Delegation.html:58
-msgid "Modify Rights"
-msgstr "Ubah Hak-hak"
-
-#: lib/RT/Queue_Overlay.pm:98
-msgid "Modify Scrip templates for this queue"
-msgstr "Mengubah template Scrip untuk antrian ini"
-
-#: lib/RT/Queue_Overlay.pm:101
-msgid "Modify Scrips for this queue"
-msgstr "Mengubah Scrip untuk antrian ini"
-
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
-msgid "Modify User Rights"
-msgstr "Ubah Hak Pengguna"
-
-#: html/Admin/Queues/CustomField.html:66
-#. ($QueueObj->Name())
-msgid "Modify a CustomField for queue %1"
-msgstr "Mengubah Kolom Kustom untuk antrian %1"
-
-#: html/Admin/Queues/Scrip.html:75
-#. ($QueueObj->Name)
-msgid "Modify a scrip for queue %1"
-msgstr "Mengubah scrip untuk antrian %1"
-
-#: html/Admin/Global/Scrip.html:69
-msgid "Modify a scrip which applies to all queues"
-msgstr "Mengubah scrip  yang dapat digunakan di seluruh antrian"
-
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
-msgid "Modify associated objects for %1"
-msgstr "Mengubah objek-objek yang berhubungan untuk %1"
-
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
-#. ($TicketObj->Id)
-msgid "Modify dates for #%1"
-msgstr "Mengubah tanggal untuk #%1"
-
-#: html/Ticket/ModifyDates.html:56
-#. ($TicketObj->Id)
-msgid "Modify dates for ticket # %1"
-msgstr "Mengubah tanggal untuk tiket # %1"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr "Mengubah kolom kustom global"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
-msgid "Modify global group rights"
-msgstr "Mengubah hak grup global"
-
-#: html/Admin/Global/GroupRights.html:54
-msgid "Modify global group rights."
-msgstr "Mengubah hak grup global."
-
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
-msgid "Modify global user rights"
-msgstr "Mengubah hak pengguna global"
-
-#: html/Admin/Global/UserRights.html:54
-msgid "Modify global user rights."
-msgstr "Mengubah hak pengguna global."
-
-#: lib/RT/Group_Overlay.pm:171
-msgid "Modify group metadata or delete group"
-msgstr "Mengubah grup metadata atau menghapus grup"
-
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
-msgid "Modify group rights for custom field %1"
-msgstr "Mengubah hak grup untuk kolom kustom %1"
-
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
-#. ($GroupObj->Name)
-msgid "Modify group rights for group %1"
-msgstr "Mengubah hak grup untuk grup %1"
-
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
-#. ($QueueObj->Name)
-msgid "Modify group rights for queue %1"
-msgstr "Mengubah hak grup untuk antrian %1"
-
-#: lib/RT/Group_Overlay.pm:173
-msgid "Modify membership roster for this group"
-msgstr "Mengubah daftar nama keanggotaan untuk grup ini"
-
-#: lib/RT/System.pm:83
-msgid "Modify one's own RT account"
-msgstr "Mengubah pemilik account RT"
-
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
-#. ($QueueObj->Name)
-msgid "Modify people related to queue %1"
-msgstr "Mengubah orang-orang yang berhubungan dengan antrian %1"
-
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
-#. ($Ticket->id)
-#. ($Ticket->Id)
-msgid "Modify people related to ticket #%1"
-msgstr "Mengubah orang-orang yang berhubungan dengan tiket #%1"
-
-#: html/Admin/Queues/Scrips.html:67
-#. ($QueueObj->Name)
-msgid "Modify scrips for queue %1"
-msgstr "Mengubah scrip untuk antrian %1"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
-msgid "Modify scrips which apply to all queues"
-msgstr "Mengubah scrip yang dapat digunakan di seluruh antrian"
-
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
-#. (loc($TemplateObj->Name()))
-#. ($TemplateObj->id)
-msgid "Modify template %1"
-msgstr "Mengubah template %1"
-
-#: html/Admin/Global/Templates.html:65
-msgid "Modify templates which apply to all queues"
-msgstr "Mengubah template yang dapat digunakan di seluruh antrian"
-
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
-#. ($Group->Name)
-msgid "Modify the group %1"
-msgstr "Mengubah grup %1"
-
-#: lib/RT/Queue_Overlay.pm:96
-msgid "Modify the queue watchers"
-msgstr "Mengubah pengamat antrian"
-
-#: html/Admin/Users/Modify.html:301
-#. ($UserObj->Name)
-msgid "Modify the user %1"
-msgstr "Mengubah pengguna %1"
-
-#: html/Ticket/ModifyAll.html:58
-#. ($Ticket->Id)
-msgid "Modify ticket # %1"
-msgstr "Mengubah tiket # %1"
-
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
-#. ($TicketObj->Id)
-msgid "Modify ticket #%1"
-msgstr "Mengubah tiket #%1"
-
-#: lib/RT/Queue_Overlay.pm:114
-msgid "Modify tickets"
-msgstr "Mengubah tiket-tiket"
-
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
-msgid "Modify user rights for custom field %1"
-msgstr "Mengubah hak pengguna untuk kolom kustom %1"
-
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
-#. ($GroupObj->Name)
-msgid "Modify user rights for group %1"
-msgstr "Mengubah hak pengguna untuk grup %1"
-
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
-#. ($QueueObj->Name)
-msgid "Modify user rights for queue %1"
-msgstr "Mengubah hak pengguna untuk antrian %1"
-
-#: lib/RT/Queue_Overlay.pm:95
-msgid "ModifyACL"
-msgstr "Mengubah ACL"
-
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr "Mengubah Kolom Kustom"
-
-#: lib/RT/Group_Overlay.pm:174
-msgid "ModifyOwnMembership"
-msgstr "Mengubah Milik Keanggotaan"
-
-#: lib/RT/Queue_Overlay.pm:96
-msgid "ModifyQueueWatchers"
-msgstr "Mengubah Pengamat Antrian"
-
-#: lib/RT/Queue_Overlay.pm:101
-msgid "ModifyScrips"
-msgstr "Mengubah Scrip"
-
-#: lib/RT/System.pm:83
-msgid "ModifySelf"
-msgstr "Mengubah Sendiri"
-
-#: lib/RT/Queue_Overlay.pm:98
-msgid "ModifyTemplate"
-msgstr "Mengubah Template"
-
-#: lib/RT/Queue_Overlay.pm:114
-msgid "ModifyTicket"
-msgstr "Mengubah Tiket"
-
-#: lib/RT/Date.pm:413
-msgid "Mon."
-msgstr "Sen."
-
-#: html/Ticket/Elements/ShowRequestor:62
-#. ($name)
-msgid "More about %1"
-msgstr "Lebih mengenai %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Move"
-msgstr "Pindah"
-
-#: html/Admin/Elements/PickCustomFields:83
-msgid "Move down"
-msgstr "Pindah ke bawah"
-
-#: html/Admin/Elements/PickCustomFields:75
-msgid "Move up"
-msgstr "Pindah ke atas"
-
-#: html/Admin/Elements/SelectSingleOrMultiple:48
-msgid "Multiple"
-msgstr "Beberapa"
-
-#: lib/RT/User_Overlay.pm:227
-msgid "Must specify 'Name' attribute"
-msgstr "Harus menentukan 'Nama' attribut"
-
-#: html/SelfService/Elements/MyRequests:70
-#. ($friendly_status)
-msgid "My %1 tickets"
-msgstr "%1 tiketku"
-
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
-msgid "My approvals"
-msgstr "Izinku"
-
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
-msgid "My saved searches"
-msgstr "Pencarian yang kusimpan"
-
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
-msgid "Name"
-msgstr "Nama"
-
-#: lib/RT/User_Overlay.pm:234
-msgid "Name in use"
-msgstr "Nama yang digunakan"
-
-#: html/Ticket/Elements/ShowDates:73
-msgid "Never"
-msgstr "Tidak pernah"
-
-#: html/Elements/Quicksearch:51
-msgid "New"
-msgstr "Baru"
-
-#: html/Elements/EditLinks:115
-msgid "New Links"
-msgstr "Link Baru"
-
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
-msgid "New Password"
-msgstr "Sandi Baru"
-
-#: etc/initialdata:332
-msgid "New Pending Approval"
-msgstr "Izin Baru yang Ditunda"
-
-#: html/Ticket/Elements/Tabs:193
-msgid "New Query"
-msgstr "Query Baru"
-
-#: NOT FOUND IN SOURCE
-msgid "New Relationships"
-msgstr "Hubungan Baru"
-
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
-msgid "New custom field"
-msgstr "Kolom Kustom Baru"
-
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
-msgid "New group"
-msgstr "Grup Baru"
-
-#: html/SelfService/Prefs.html:53
-msgid "New password"
-msgstr "Sandi Baru"
-
-#: lib/RT/User_Overlay.pm:817
-msgid "New password notification sent"
-msgstr "Kirim Pemberitahuan Sandi Baru"
-
-#: html/Admin/Elements/QueueTabs:95
-msgid "New queue"
-msgstr "Antrian Baru"
-
-#: html/Admin/Elements/SelectRights:65
-msgid "New rights"
-msgstr "Hak-hak Baru"
-
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
-msgid "New scrip"
-msgstr "Scrip Baru"
-
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
-msgid "New template"
-msgstr "Template Baru"
-
-#: html/SelfService/Elements/Tabs:69
-msgid "New ticket"
-msgstr "Tiket Baru"
-
-#: lib/RT/Ticket_Overlay.pm:2713
-msgid "New ticket doesn't exist"
-msgstr "Tidak ada Tiket baru"
-
-#: html/Admin/Elements/UserTabs:78
-msgid "New user"
-msgstr "Pengguna Baru"
-
-#: html/Admin/Elements/CreateUserCalled:47
-msgid "New user called"
-msgstr "Pengguna Baru disebut"
-
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
-msgid "New watchers"
-msgstr "Pengamat Baru"
-
-#: NOT FOUND IN SOURCE
-msgid "New window setting"
-msgstr "Setting Window Baru"
-
-#: html/Ticket/Elements/Tabs:92
-msgid "Next"
-msgstr "Berikutnya"
-
-#: html/Elements/TicketList:104
-msgid "Next Page"
-msgstr "Halaman Berikutnya"
-
-#: NOT FOUND IN SOURCE
-msgid "NickName"
-msgstr "Nama Panggilan"
-
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
-msgid "Nickname"
-msgstr "Nama Panggilan"
-
-#: html/Admin/CustomFields/UserRights.html:145
-msgid "No Class defined"
-msgstr "Tidak ada Kelas yang didefinisikan"
-
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
-msgid "No CustomField"
-msgstr "Tidak ada Kolom Kustom"
-
-#: html/Admin/CustomFields/GroupRights.html:103
-msgid "No CustomField defined"
-msgstr "Tidak ada Kolom Kustom yang didefinisikan"
-
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
-msgid "No Group defined"
-msgstr "Tidak ada Grup yang didefinisikan"
-
-#: lib/RT/Tickets_Overlay_SQL.pm:477
-msgid "No Query"
-msgstr "Tidak ada Query"
-
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
-msgid "No Queue defined"
-msgstr "Tidak ada Antrian yang didefinisikan"
-
-#: bin/rt-crontool:73
-msgid "No RT user found. Please consult your RT administrator.\\n"
-msgstr "Tidak ada pengguna RT yang ditemukan. Silakan berkonsultasi dengan administrator RT anda.\\n"
-
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
-msgid "No Template"
-msgstr "Tidak ada Template"
-
-#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
-msgstr "Tidak ada Tiket yang ditentukan. Batalkan tiket "
-
-#: html/Approvals/Elements/Approve:67
-msgid "No action"
-msgstr "Tidak ada aksi"
-
-#: lib/RT/Record.pm:935
-msgid "No column specified"
-msgstr "Tidak ada kolom yang ditentukan"
-
-#: html/Ticket/Elements/ShowRequestor:68
-msgid "No comment entered about this user"
-msgstr "Tidak ada komentar yang dimasukkan mengenai pengguna ini"
-
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
-#. (ref $self)
-msgid "No description for %1"
-msgstr "Tidak ada deskripsi untuk %1"
-
-#: lib/RT/Users_Overlay.pm:185
-msgid "No group specified"
-msgstr "Tidak ada grup yang ditentukan"
-
-#: html/Admin/Groups/index.html:52
-msgid "No groups matching search criteria found."
-msgstr "Grup yang sesuai dengan kriteria pencarian tidak ditemukan."
-
-#: lib/RT/Ticket_Overlay.pm:2349
-msgid "No message attached"
-msgstr "Tidak ada pesan yang dilampirkan"
-
-#: lib/RT/User_Overlay.pm:1035
-msgid "No password set"
-msgstr "Tidak ada pengaturan Sandi"
-
-#: lib/RT/Queue_Overlay.pm:358
-msgid "No permission to create queues"
-msgstr "Tidak ada izin untuk membuat antrian"
-
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
-msgid "No permission to create tickets in the queue '%1'"
-msgstr "Tidak ada izin untuk membuat tiket ini di dalam antrian '%1'"
-
-#: lib/RT/User_Overlay.pm:187
-msgid "No permission to create users"
-msgstr "Tidak ada izin untuk membuat pengguna"
-
-#: html/SelfService/Display.html:165
-msgid "No permission to display that ticket"
-msgstr "Tidak ada izin untuk menampilkan tiket tersebut"
-
-#: html/SelfService/Update.html:117
-msgid "No permission to view update ticket"
-msgstr "Tidak ada izin untuk menampilkan tiket yang sudah diperbaharui"
-
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
-msgid "No principal specified"
-msgstr "Tidak ada prinsipal yang ditentukan"
-
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
-msgid "No principals selected."
-msgstr "Tidak ada prinsipal yang dipilih."
-
-#: html/Admin/Queues/index.html:57
-msgid "No queues matching search criteria found."
-msgstr "Antrian yang sesuai dengan kriteria pencarian tidak ditemukan."
-
-#: html/Admin/Elements/SelectRights:106
-msgid "No rights found"
-msgstr "Tidak ada hak-hak yang ditemukan"
-
-#: html/Admin/Elements/SelectRights:53
-msgid "No rights granted."
-msgstr "Tidak ada hak-hak yang diberikan."
-
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr "Tidak ada pencarian yang dipanggil"
-
-#: html/Search/Bulk.html:194
-msgid "No search to operate on."
-msgstr "Tidak ada pencarian untuk dijalankan di."
-
-#: html/Elements/RT__Ticket/ColumnMap:134
-msgid "No subject"
-msgstr "Tidak ada subjek"
-
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
-msgid "No transaction type specified"
-msgstr "Tidak ada tipe transaksi yang ditentukan"
-
-#: html/Admin/Users/index.html:55
-msgid "No users matching search criteria found."
-msgstr "Pengguna yang sesuai dengan kriteria pencarian tidak ditemukan."
-
-#: NOT FOUND IN SOURCE
-msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
-msgstr "Tidak ada pengguna RT yang valid ditemukan. RT cvs handler dilepaskan. Silakan berkonsultasi dengan administrator RT anda.\\n"
-
-#: lib/RT/Record.pm:932
-msgid "No value sent to _Set!\\n"
-msgstr "Tidak ada nilai yang dikirim ke _Set!\\n"
-
-#: html/Elements/QuickCreate:61
-msgid "Nobody"
-msgstr "Tidak seorangpun"
-
-#: lib/RT/Record.pm:937
-msgid "Nonexistant field?"
-msgstr "Kolom kosong?"
-
-#: html/Elements/Header:96
-msgid "Not logged in."
-msgstr "Belum log in"
-
-#: lib/RT/Date.pm:393
-msgid "Not set"
-msgstr "Belum diatur"
-
-#: html/NoAuth/Reminder.html:48
-msgid "Not yet implemented."
-msgstr "Belum diimplementasikan."
-
-#: html/Approvals/Elements/Approve:70
-msgid "Notes"
-msgstr "Catatan"
-
-#: lib/RT/User_Overlay.pm:820
-msgid "Notification could not be sent"
-msgstr "Pemberitahuan tidak dapat dikirimkan"
-
-#: etc/initialdata:101
-msgid "Notify AdminCcs"
-msgstr "Beritahu AdminCcs"
-
-#: etc/initialdata:97
-msgid "Notify AdminCcs as Comment"
-msgstr "Beritahu AdminCcs dengan komentar"
-
-#: etc/initialdata:93 etc/upgrade/3.1.17/content:6
-msgid "Notify Ccs"
-msgstr "Beritahu Ccs"
-
-#: etc/initialdata:89 etc/upgrade/3.1.17/content:2
-msgid "Notify Ccs as Comment"
-msgstr "Beritahu Ccs dengan komentar"
-
-#: etc/initialdata:128
-msgid "Notify Other Recipients"
-msgstr "Beritahu Penerima Lain"
-
-#: etc/initialdata:124
-msgid "Notify Other Recipients as Comment"
-msgstr "Beritahu Penerima Lain dengan komentar"
-
-#: etc/initialdata:85
-msgid "Notify Owner"
-msgstr "Beritahu Pemilik"
-
-#: etc/initialdata:81
-msgid "Notify Owner as Comment"
-msgstr "Beritahu Pemilik dengan komentar"
-
-#: etc/initialdata:376
-msgid "Notify Owner of their rejected ticket"
-msgstr "Beritahu pemilik bahwa tiketnya ditolak"
-
-#: etc/initialdata:365
-msgid "Notify Owner of their ticket has been approved by all approvers"
-msgstr "Beritahu Pemilik bahwa tiketnya sudah disetujui oleh seluruh pemberi persetujuan"
-
-#: etc/initialdata:353
-msgid "Notify Owner of their ticket has been approved by some approver"
-msgstr "Beritahu Pemilik bahwa tiketnya sudah disetujui oleh beberapa pemberi persetujuan"
-
-#: etc/initialdata:334
-msgid "Notify Owners and AdminCcs of new items pending their approval"
-msgstr "Beritahu Pemilik dan AdminCcs mengenai izin item baru yang ditunda"
-
-#: etc/initialdata:77
-msgid "Notify Requestors"
-msgstr "Beritahu Pemohon"
-
-#: etc/initialdata:111
-msgid "Notify Requestors and Ccs"
-msgstr "Beritahu Pemohon dan Ccs"
-
-#: etc/initialdata:106
-msgid "Notify Requestors and Ccs as Comment"
-msgstr "Beritahu Pemohon dan Ccs dengan komentar"
-
-#: etc/initialdata:120
-msgid "Notify Requestors, Ccs and AdminCcs"
-msgstr "Beritahu Pemohon, Ccs dan AdminCcs"
-
-#: etc/initialdata:116
-msgid "Notify Requestors, Ccs and AdminCcs as Comment"
-msgstr "Beritahu Pemohon, Ccs dan AdminCcs dengan komentar"
-
-#: lib/RT/Date.pm:447
-msgid "Nov."
-msgstr "Nop."
-
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr "ATAU"
-
-#: lib/RT/Record.pm:319
-msgid "Object could not be created"
-msgstr "Objek tidak dapat dibuat"
-
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr "Objek tidak dapat dihapus"
-
-#: lib/RT/Record.pm:338
-msgid "Object created"
-msgstr "Object sudah dibuat"
-
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr "Objek sudah dihapus"
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
-msgid "Object of type %1 cannot take custom fields"
-msgstr "Tipe Objek %1 tidak dapat mengambil kolom kustom"
-
-#: lib/RT/CustomField_Overlay.pm:901
-msgid "Object type mismatch"
-msgstr "Tipe Objek tidak sesuai (mismatch)"
-
-#: lib/RT/Date.pm:446
-msgid "Oct."
-msgstr "Okt."
-
-#: html/Tools/Elements/Tabs:53
-msgid "Offline"
-msgstr "Offline"
-
-#: html/Tools/Offline.html:49
-msgid "Offline edits"
-msgstr "Ubah Offline"
-
-#: html/Tools/Offline.html:46
-msgid "Offline upload"
-msgstr "Upload Offline"
-
-#: html/Elements/SelectDateRelation:56
-msgid "On"
-msgstr "Pada"
-
-#: etc/initialdata:163
-msgid "On Comment"
-msgstr "Pada Komentar"
-
-#: etc/initialdata:156
-msgid "On Correspond"
-msgstr "Pada Hubungan"
-
-#: etc/initialdata:145
-msgid "On Create"
-msgstr "Pada Pembuatan"
-
-#: etc/initialdata:184
-msgid "On Owner Change"
-msgstr "Pada Perubahan Pemilik"
-
-#: etc/initialdata:177 etc/upgrade/3.1.17/content:15
-msgid "On Priority Change"
-msgstr "Pada Perubahan Prioritas"
-
-#: etc/initialdata:192
-msgid "On Queue Change"
-msgstr "Pada Perubahan Antrian"
-
-#: etc/initialdata:198
-msgid "On Resolve"
-msgstr "Pada Penyelesaian"
-
-#: etc/initialdata:169
-msgid "On Status Change"
-msgstr "Pada Perubahan Status"
-
-#: etc/initialdata:150
-msgid "On Transaction"
-msgstr "Pada Transaksi"
-
-#: html/Approvals/Elements/PendingMyApproval:71
-#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
-msgid "Only show approvals for requests created after %1"
-msgstr "Hanya menampilkan izin untuk permintaan yang dibuat sesudah %1"
-
-#: html/Approvals/Elements/PendingMyApproval:69
-#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
-msgid "Only show approvals for requests created before %1"
-msgstr "Hanya menampilkan izin untuk permintaan yang dibuat sebelum %1"
-
-#: html/Elements/Quicksearch:52
-msgid "Open"
-msgstr "Buka"
-
-#: html/Ticket/Elements/Tabs:159
-msgid "Open it"
-msgstr "Buka ini"
-
-#: html/SelfService/Elements/Tabs:63
-msgid "Open tickets"
-msgstr "Buka tiket"
-
-#: NOT FOUND IN SOURCE
-msgid "Open tickets (from listing) in a new window"
-msgstr "Buka tiket (dari daftar) di window yang baru"
-
-#: NOT FOUND IN SOURCE
-msgid "Open tickets (from listing) in another window"
-msgstr "Buka tiket (dari daftar)  di window yang lain"
-
-#: etc/initialdata:140
-msgid "Open tickets on correspondence"
-msgstr "Buka tiket pada korespondensi"
-
-#: html/Search/Elements/DisplayOptions:56
-msgid "Order by"
-msgstr "Diurutkan sesuai"
-
-#: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
-msgstr "Diurutkan dan disortir"
-
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
-msgid "Organization"
-msgstr "Organisasi"
-
-#: html/Approvals/Elements/Approve:54
-#. ($approving->Id, $approving->Subject)
-msgid "Originating ticket: #%1"
-msgstr "Tiket Awal: #%1"
-
-#: lib/RT/Transaction_Overlay.pm:611
-msgid "Outgoing email about a comment recorded"
-msgstr "Email yang keluar mengenai komentar yang dicatat"
-
-#: lib/RT/Transaction_Overlay.pm:615
-msgid "Outgoing email recorded"
-msgstr "Email keluar yang dicatat"
-
-#: html/Admin/Queues/Modify.html:90
-msgid "Over time, priority moves toward"
-msgstr "Lewat Batas waktu, prioritas pindah ke arah"
-
-#: lib/RT/Queue_Overlay.pm:113
-msgid "Own tickets"
-msgstr "Memiliki tiket-tiket"
-
-#: lib/RT/Queue_Overlay.pm:113
-msgid "OwnTicket"
-msgstr "Memiliki tiket"
-
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
-msgid "Owner"
-msgstr "Pemilik"
-
-#: lib/RT/Ticket_Overlay.pm:495
-msgid "Owner could not be set."
-msgstr "Pemilik tidak dapat diatur."
-
-#: lib/RT/Transaction_Overlay.pm:661
-#. ($Old->Name , $New->Name)
-msgid "Owner forcibly changed from %1 to %2"
-msgstr "Pemilik secara paksa digantikan dari %1 ke %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Owner is"
-msgstr "Pemilik adalah"
-
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
-msgid "Page %1 of %2"
-msgstr "Halaman %1 dari %2"
-
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
-msgid "Pager"
-msgstr "Pager"
-
-#: NOT FOUND IN SOURCE
-msgid "PagerPhone"
-msgstr "Pager"
-
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
-msgid "Parents"
-msgstr "Induk "
-
-#: html/Elements/Login:74 html/User/Prefs.html:105
-msgid "Password"
-msgstr "Sandi"
-
-#: html/NoAuth/Reminder.html:46
-msgid "Password Reminder"
-msgstr "Pengingat Sandi"
-
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr "Sandi sudah diubah"
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr "Minimal sandi memerlukan paling sedikit %1 karakter"
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Password too short"
-msgstr "Sandi terlalu singkat"
-
-#: html/User/Prefs.html:232
-#. (loc_fuzzy($msg))
-msgid "Password: %1"
-msgstr "Sandi: %1"
-
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
-msgid "Passwords do not match."
-msgstr "Sandi tidak sesuai."
-
-#: html/User/Prefs.html:234
-msgid "Passwords do not match. Your password has not been changed"
-msgstr "Sandi tidak sesuai. Sandi anda belum diganti"
-
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
-msgid "People"
-msgstr "Orang-Orang"
-
-#: etc/initialdata:133
-msgid "Perform a user-defined action"
-msgstr "Menampilkan aksi pengguna yang belum didefinisikan"
-
-#: html/Admin/Tools/Configuration.html:94
-msgid "Perl configuration"
-msgstr "Konfigurasi Perl"
-
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
-msgid "Permission Denied"
-msgstr "Izin ditolak"
-
-#: html/User/Elements/Tabs:56
-msgid "Personal Groups"
-msgstr "Grup Pribadi"
-
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
-msgid "Personal groups"
-msgstr "Grup pribadi"
-
-#: html/User/Elements/DelegateRights:58
-msgid "Personal groups:"
-msgstr "Grup pribadi:"
-
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
-msgid "Phone numbers"
-msgstr "Nomor Telepon"
-
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
-msgid "Preferences"
-msgstr "Pilihan"
-
-#: lib/RT/Action/Generic.pm:196
-msgid "Prepare Stubbed"
-msgstr "Siapkan Potongan Tiket"
-
-#: html/Ticket/Elements/Tabs:84
-msgid "Prev"
-msgstr "Sebelumnya"
-
-#: html/Elements/TicketList:101
-msgid "Previous Page"
-msgstr "Halaman Sebelumnya"
-
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
-#. ($args{'PrincipalId'})
-msgid "Principal %1 not found."
-msgstr "Prinsipal %1 tidak ditemukan."
-
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
-msgid "Priority"
-msgstr "Prioritas"
-
-#: html/Admin/Queues/Modify.html:86
-msgid "Priority starts at"
-msgstr "Prioritas dimulai pada"
-
-#: html/Search/Elements/EditSearches:50
-msgid "Privacy:"
-msgstr "Pribadi:"
-
-#: etc/initialdata:25
-msgid "Privileged"
-msgstr "Hak-hak Istimewa"
-
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
-#. (loc_fuzzy($msg))
-msgid "Privileged status: %1"
-msgstr "Status Hak-hak Istimewa: %1"
-
-#: html/Admin/Users/index.html:102
-msgid "Privileged users"
-msgstr "Pengguna Hak-hak Istimewa"
-
-#: NOT FOUND IN SOURCE
-msgid "Projects"
-msgstr "Proyek-Proyek"
-
-#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
-msgid "Pseudogroup for internal use"
-msgstr "Pseudogroup digunakan untuk internal"
-
-#: html/Search/Elements/EditQuery:47
-msgid "Query"
-msgstr "Query"
-
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
-msgid "Query Builder"
-msgstr "Pembuat Query"
-
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
-msgid "Queue"
-msgstr "Antrian"
-
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
-#. ($Queue)
-#. ($id)
-msgid "Queue %1 not found"
-msgstr "Antrian %1 tidak ditemukan"
-
-#: html/Admin/Queues/Modify.html:64
-msgid "Queue Name"
-msgstr "Nama Antrian"
-
-#: lib/RT/Queue_Overlay.pm:362
-msgid "Queue already exists"
-msgstr "Antrian sudah ada"
-
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
-msgid "Queue could not be created"
-msgstr "Antrian tidak dapat dibuat"
-
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
-msgid "Queue could not be loaded."
-msgstr "Antrian tidak dapat dipanggil."
-
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
-msgid "Queue created"
-msgstr "Antrian sudah dibuat"
-
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
-msgid "Queue not found"
-msgstr "Antrian tidak dapat ditemukan"
-
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
-msgid "Queues"
-msgstr "Antrian-antrian"
-
-#: html/Elements/Quicksearch:46
-msgid "Quick search"
-msgstr "Pencarian Cepat"
-
-#: html/Elements/QuickCreate:46
-msgid "Quick ticket creation"
-msgstr "Pembuatan Tiket Cepat"
-
-#: html/Search/Results.html:83
-msgid "RSS"
-msgstr "RSS"
-
-#: html/Elements/Login:66
-#. ($RT::VERSION)
-msgid "RT %1"
-msgstr "RT %1"
-
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
-#. ($RT::VERSION, $RT::rtname)
-msgid "RT %1 for %2"
-msgstr "RT %1 untuk %2"
-
-#: html/Admin/index.html:46 html/Admin/index.html:47
-msgid "RT Administration"
-msgstr "Administrasi RT"
-
-#: html/Elements/Error:65 html/SelfService/Error.html:62
-msgid "RT Error"
-msgstr "Kesalahan RT"
-
-#: html/Admin/Tools/Configuration.html:73
-msgid "RT Variables"
-msgstr "Variable RT "
-
-#: html/index.html:72 html/index.html:75
-msgid "RT at a glance"
-msgstr "Sekilas RT"
-
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr "RT tidak dapat menyimpan sesi anda"
-
-#: html/Elements/PageLayout:108
-#. ($RT::rtname)
-msgid "RT for %1"
-msgstr "RT untuk %1"
-
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
-msgid "Real Name"
-msgstr "Nama Asli"
-
-#: NOT FOUND IN SOURCE
-msgid "RealName"
-msgstr "Nama Asli"
-
-#: lib/RT/Transaction_Overlay.pm:714
-#. ($value)
-msgid "Reference by %1 added"
-msgstr "Referensi oleh %1 sudah ditambah"
-
-#: lib/RT/Transaction_Overlay.pm:754
-#. ($value)
-msgid "Reference by %1 deleted"
-msgstr "Referensi oleh %1 sudah dihapus"
-
-#: lib/RT/Transaction_Overlay.pm:711
-#. ($value)
-msgid "Reference to %1 added"
-msgstr "Referensi ke %1 sudah ditambah"
-
-#: lib/RT/Transaction_Overlay.pm:751
-#. ($value)
-msgid "Reference to %1 deleted"
-msgstr "Referensi ke %1 sudah dihapus"
-
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
-msgid "Referred to by"
-msgstr "Diserahkan oleh"
-
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
-msgid "Refers to"
-msgstr "Diserahkan ke"
-
-#: NOT FOUND IN SOURCE
-msgid "Refine search"
-msgstr "Membersihkan pencarian"
-
-#: html/Elements/Refresh:57
-#. ($value/60)
-msgid "Refresh this page every %1 minutes."
-msgstr "Refresh halaman ini setiap %1 menit."
-
-#: NOT FOUND IN SOURCE
-msgid "Relationships"
-msgstr "Hubungan"
-
-#: html/Search/Bulk.html:116
-msgid "Remove AdminCc"
-msgstr "Hapus AdminCc"
-
-#: html/Search/Bulk.html:112
-msgid "Remove Cc"
-msgstr "Hapus Cc"
-
-#: html/Search/Bulk.html:108
-msgid "Remove Requestor"
-msgstr "Hapus Pemohon"
-
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
-msgid "Reply"
-msgstr "Balas"
-
-#: html/Admin/Queues/Modify.html:72
-msgid "Reply Address"
-msgstr "Balas ke Alamat"
-
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
-msgid "Reply to requestors"
-msgstr "Balas ke Pemohon"
-
-#: lib/RT/Queue_Overlay.pm:111
-msgid "Reply to tickets"
-msgstr "Balas ke tiket"
-
-#: lib/RT/Queue_Overlay.pm:111
-msgid "ReplyToTicket"
-msgstr "Balas ke Tiket"
-
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
-msgid "Requestor"
-msgstr "Pemohon"
-
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
-msgid "Requestors"
-msgstr "Pemohon"
-
-#: html/Admin/Queues/Modify.html:96
-msgid "Requests should be due in"
-msgstr "permintaan akan melewati batas waktu dalam"
-
-#: lib/RT/Attribute_Overlay.pm:146
-#. ('Object')
-msgid "Required parameter '%1' not specified"
-msgstr "Parameter yang diperlukan '%1' tidak didefinisikan"
-
-#: html/Elements/Submit:104
-msgid "Reset"
-msgstr "Ulangi"
-
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
-msgid "Residence"
-msgstr "Tempat Tinggal"
-
-#: html/Ticket/Elements/Tabs:155
-msgid "Resolve"
-msgstr "Penyelesaian"
-
-#: html/Ticket/Update.html:154
-#. ($TicketObj->id, $TicketObj->Subject)
-msgid "Resolve ticket #%1 (%2)"
-msgstr "Penyelesaian tiket #%1 (%2)"
-
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
-msgid "Resolved"
-msgstr "Sudah Diselesaikan"
-
-#: NOT FOUND IN SOURCE
-msgid "Response to requestors"
-msgstr "Balas ke pemohon"
-
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
-msgid "Results"
-msgstr "Hasil"
-
-#: NOT FOUND IN SOURCE
-msgid "Results per page"
-msgstr "Hasil per halaman"
-
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
-msgid "Retype Password"
-msgstr "Ketik Ulang Sandi"
-
-#: html/Search/Elements/EditSearches:61
-msgid "Revert"
-msgstr "Kembali pada"
-
-#: lib/RT/ACE_Overlay.pm:631
-msgid "Right Delegated"
-msgstr "Hak-hak Utusan"
-
-#: lib/RT/ACE_Overlay.pm:321
-msgid "Right Granted"
-msgstr "Memberikan Hak-hak"
-
-#: lib/RT/ACE_Overlay.pm:179
-msgid "Right Loaded"
-msgstr "Memanggil Hak-hak"
-
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
-msgid "Right could not be revoked"
-msgstr "Hak-hak tidak dapat dihilangkan"
-
-#: html/User/Delegation.html:85
-msgid "Right not found"
-msgstr "Hak-hak tidak ditemukan"
-
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
-msgid "Right not loaded."
-msgstr "Hak-hak tidak dapat dipanggil."
-
-#: lib/RT/ACE_Overlay.pm:713
-msgid "Right revoked"
-msgstr "Hak-hak tidak dapat dihilangkan"
-
-#: html/Admin/Elements/UserTabs:67
-msgid "Rights"
-msgstr "Hak-hak"
-
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
-#. ($object_type)
-msgid "Rights could not be granted for %1"
-msgstr "Hak-hak tidak dapat diberikan untuk %1"
-
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
-#. ($object_type)
-msgid "Rights could not be revoked for %1"
-msgstr "Hak-hak tidak dapat dihilangkan untuk %1"
-
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
-msgid "Roles"
-msgstr "Aturan"
-
-#: html/Search/Elements/DisplayOptions:83
-msgid "Rows per page"
-msgstr "Baris per halaman"
-
-#: lib/RT/Date.pm:418
-msgid "Sat."
-msgstr "Sab."
-
-#: html/Search/Elements/EditSearches:70
-msgid "Save"
-msgstr "Simpan"
-
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
-msgid "Save Changes"
-msgstr "Simpan Perubahan"
-
-#: html/User/Prefs.html:179
-msgid "Save Preferences"
-msgstr "Simpan Pilihan"
-
-#: html/Ticket/Elements/PreviewScrips:124
-msgid "Save changes"
-msgstr "Simpan perubahaan"
-
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr "Simpan pencarian %1"
-
-#: html/Search/Elements/EditSearches:46
-msgid "Saved searches"
-msgstr "Simpan pencarian"
-
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
-#. ($id)
-#. ($ARGS{'id'})
-msgid "Scrip #%1"
-msgstr "Scrip #%1"
-
-#: lib/RT/Scrip_Overlay.pm:205
-msgid "Scrip Created"
-msgstr "Scrip sudah dibuat"
-
-#: html/Admin/Elements/EditScrip:52
-msgid "Scrip Fields"
-msgstr "Kolom Scrip"
-
-#: html/Admin/Elements/EditScrips:107
-msgid "Scrip deleted"
-msgstr "Scrip sudah dihapus"
-
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
-msgid "Scrips"
-msgstr "Scrip"
-
-#: html/Admin/Queues/Scrips.html:55
-msgid "Scrips which apply to all queues"
-msgstr "Scrip yang digunakan di seluruh antrian"
-
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
-msgid "Search"
-msgstr "Pencarian"
-
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr "Gagal memanggil atribut pencarian"
-
-#: html/Approvals/Elements/PendingMyApproval:60
-msgid "Search for approvals"
-msgstr "Pencarian untuk izin"
-
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
-msgstr "Perbaharui Pencarian: %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Searches can't be associated with that kind of object"
-msgstr "Pencarian tidak dapat dihubungkan dengan objek yang seperti ini"
-
-#: bin/rt-crontool:213
-msgid "Security:"
-msgstr "Keamanan:"
-
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "See custom fields"
-msgstr "Lihat kolom kustom"
-
-#: lib/RT/Queue_Overlay.pm:107
-msgid "See exact outgoing email messages and their recipeients"
-msgstr "Lihat pesan email yang keluar dan semua penerimanya dengan tepat"
-
-#: lib/RT/Queue_Overlay.pm:105
-msgid "See ticket private commentary"
-msgstr "Lihat Penjelasan Tiket Pribadi"
-
-#: lib/RT/Queue_Overlay.pm:104
-msgid "See ticket summaries"
-msgstr "Lihat Ringkasan Tiket"
-
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "SeeCustomField"
-msgstr "Lihat Kolom Kustom"
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr "Lihat Grup"
-
-#: lib/RT/Queue_Overlay.pm:92
-msgid "SeeQueue"
-msgstr "Lihat Antrian"
-
-#: NOT FOUND IN SOURCE
-msgid "Select"
-msgstr "Pilih"
-
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
-msgid "Select a Custom Field"
-msgstr "Pilih Kolom Kustom"
-
-#: html/Admin/Groups/index.html:78
-msgid "Select a group"
-msgstr "Pilih grup"
-
-#: html/Admin/Queues/index.html:54
-msgid "Select a queue"
-msgstr "Pilih antrian"
-
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr "Pilih antrian untuk tiket baru anda"
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
-msgid "Select a user"
-msgstr "Pilih Pengguna"
-
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr "Pilih kolom kustom"
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr "Pilih kolom kustom untuk seluruh grup pengguna"
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr "Pilih kolom kustom untuk seluruh pengguna"
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
-msgstr "Pilih kolom kustom untuk tiket di seluruh antrian"
-
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr "Pilih kolom kustom untuk transaksi pada tiket di dalam seluruh antrian"
-
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
-msgid "Select group"
-msgstr "Pilih grup"
-
-#: lib/RT/CustomField_Overlay.pm:59
-msgid "Select multiple values"
-msgstr "Pilih beberapa nilai"
-
-#: lib/RT/CustomField_Overlay.pm:60
-msgid "Select one value"
-msgstr "Pilih satu nilai"
-
-#: html/Admin/Elements/QueueTabs:92
-msgid "Select queue"
-msgstr "Pilih antrian"
-
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
-msgid "Select scrip"
-msgstr "Pilih scrip"
-
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
-msgid "Select template"
-msgstr "Pilih template"
-
-#: lib/RT/CustomField_Overlay.pm:61
-msgid "Select up to %1 values"
-msgstr "Pilih sampai %1 nilai"
-
-#: html/Admin/Elements/UserTabs:75
-msgid "Select user"
-msgstr "Pilih pengguna"
-
-#: html/Admin/Elements/EditCustomFields:58
-msgid "Selected Custom Fields"
-msgstr "Kolom Kustom yang dipilih"
-
-#: html/Admin/CustomFields/Objects.html:59
-msgid "Selected objects"
-msgstr "Objek yang dipilih"
-
-#: etc/initialdata:121
-msgid "Send mail to all watchers"
-msgstr "Kirim pesan ke seluruh pengamat"
-
-#: etc/initialdata:117
-msgid "Send mail to all watchers as a \"comment\""
-msgstr "Kirim pesan ke seluruh pengamat dengan \"komentar\""
-
-#: etc/initialdata:112
-msgid "Send mail to requestors and Ccs"
-msgstr "Kirim pesan ke pemohon dan Ccs"
-
-#: etc/initialdata:107
-msgid "Send mail to requestors and Ccs as a comment"
-msgstr "Kirim pesan ke pemohon dan Ccs dengan komentar"
-
-#: etc/initialdata:78
-msgid "Sends a message to the requestors"
-msgstr "Kirim pesan ke pemohon"
-
-#: etc/initialdata:125 etc/initialdata:129
-msgid "Sends mail to explicitly listed Ccs and Bccs"
-msgstr "Kirim pesan ke Ccs and Bccs yang terdaftar dengan jelas"
-
-#: etc/initialdata:94 etc/upgrade/3.1.17/content:7
-msgid "Sends mail to the Ccs"
-msgstr "Kirim pesan ke Ccs"
-
-#: etc/initialdata:90 etc/upgrade/3.1.17/content:3
-msgid "Sends mail to the Ccs as a comment"
-msgstr "Kirim pesan ke Ccs dengan komentar"
-
-#: etc/initialdata:102
-msgid "Sends mail to the administrative Ccs"
-msgstr "Kirim pesan ke Ccs administrasi"
-
-#: etc/initialdata:98
-msgid "Sends mail to the administrative Ccs as a comment"
-msgstr "Kirim pesan ke Ccs administrasi dengan komentar"
-
-#: etc/initialdata:82 etc/initialdata:86
-msgid "Sends mail to the owner"
-msgstr "Kirim pesan ke pemilik"
-
-#: lib/RT/Date.pm:445
-msgid "Sep."
-msgstr "Sep."
-
-#: html/Ticket/Elements/ShowTransaction:150
-msgid "Show"
-msgstr "Tampilkan"
-
-#: html/Approvals/index.html:52
-msgid "Show Approvals"
-msgstr "Tampilkan Izin"
-
-#: html/Search/Elements/EditFormat:56
-msgid "Show Columns"
-msgstr "Tampilkan Kolom"
-
-#: html/Ticket/Elements/Tabs:201
-msgid "Show Results"
-msgstr "Tampilkan Hasil"
-
-#: html/Approvals/Elements/PendingMyApproval:65
-msgid "Show approved requests"
-msgstr "Tamplikan permintaan yang disetujui"
-
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
-msgid "Show basics"
-msgstr "Tampilkan dasar-dasar"
-
-#: html/Approvals/Elements/PendingMyApproval:66
-msgid "Show denied requests"
-msgstr "Tampilkan permintaan yang ditolak"
-
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
-msgid "Show details"
-msgstr "Tampilkan detil"
-
-#: html/Approvals/Elements/PendingMyApproval:64
-msgid "Show pending requests"
-msgstr "Tampilkan permintaan yang ditunda"
-
-#: html/Approvals/Elements/PendingMyApproval:67
-msgid "Show requests awaiting other approvals"
-msgstr "Tampilkan permintaan izin lain yang ditunggu"
-
-#: lib/RT/Queue_Overlay.pm:94
-msgid "ShowACL"
-msgstr "Tampilkan ACL"
-
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr "Tampilkan Tab Config"
-
-#: lib/RT/Queue_Overlay.pm:107
-msgid "ShowOutgoingEmail"
-msgstr "Tampilkan Email yang Keluar"
-
-#: lib/RT/Group_Overlay.pm:176
-msgid "ShowSavedSearches"
-msgstr "Tampilkan Pencarian yang Disimpan"
-
-#: lib/RT/Queue_Overlay.pm:103
-msgid "ShowScrips"
-msgstr "Tampilkan Scrip"
-
-#: lib/RT/Queue_Overlay.pm:100
-msgid "ShowTemplate"
-msgstr "Tampilkan Template"
-
-#: lib/RT/Queue_Overlay.pm:104
-msgid "ShowTicket"
-msgstr "Tampilkan Tiket"
-
-#: lib/RT/Queue_Overlay.pm:105
-msgid "ShowTicketComments"
-msgstr "Tampilkan Komentar Tiket"
-
-#: lib/RT/Queue_Overlay.pm:108
-msgid "Sign up as a ticket Requestor or ticket or queue Cc"
-msgstr "Daftar sebagai pemohon tiket atau tiket atau antrian Cc"
-
-#: lib/RT/Queue_Overlay.pm:109
-msgid "Sign up as a ticket or queue AdminCc"
-msgstr "Daftar sebagai tiket atau antrian AdminCc"
-
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
-msgid "Signature"
-msgstr "Tanda Tangan"
-
-#: html/Admin/Elements/SelectSingleOrMultiple:47
-msgid "Single"
-msgstr "Tunggal"
-
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr "Ukuran"
-
-#: html/Elements/Header:85
-msgid "Skip Menu"
-msgstr "Lewati Menu"
-
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr "Kecil"
-
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
-msgid "Sort"
-msgstr "Sortir"
-
-#: NOT FOUND IN SOURCE
-msgid "Sort results by"
-msgstr "Sortir hasil dengan"
-
-#: html/Admin/Elements/EditScrip:87
-msgid "Stage"
-msgstr "Tingkat"
-
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
-msgid "Started"
-msgstr "Sudah dimulai"
-
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
-msgid "Starts"
-msgstr "Mulai"
-
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
-msgid "State"
-msgstr "Negara"
-
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
-msgid "Status"
-msgstr "Status"
-
-#: etc/initialdata:309
-msgid "Status Change"
-msgstr "Status Diubah"
-
-#: NOT FOUND IN SOURCE
-msgid "Status changed from %1 to %2"
-msgstr "Status diubah dari %1 ke %2"
-
-#: html/Ticket/Elements/Tabs:170
-msgid "Steal"
-msgstr "Curi"
-
-#: lib/RT/Queue_Overlay.pm:118
-msgid "Steal tickets"
-msgstr "Curi tiket"
-
-#: lib/RT/Queue_Overlay.pm:118
-msgid "StealTicket"
-msgstr "Curi Tiket"
-
-#: lib/RT/Transaction_Overlay.pm:667
-#. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "Dicuri dari %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Stolen from %1 "
-msgstr "Dicuri dari %1 "
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr "Gaya"
-
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
-msgid "Subject"
-msgstr "Subjek"
-
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
-#. ($self->Data)
-msgid "Subject changed to %1"
-msgstr "Subjek diganti menjadi %1"
-
-#: html/Elements/Submit:97
-msgid "Submit"
-msgstr "Submit"
-
-#: lib/RT/Group_Overlay.pm:782
-msgid "Succeeded"
-msgstr "Berhasil"
-
-#: lib/RT/Date.pm:419
-msgid "Sun."
-msgstr "Min."
-
-#: lib/RT/System.pm:76
-msgid "SuperUser"
-msgstr "PenggunaSuper"
-
-#: html/User/Elements/DelegateRights:98
-msgid "System"
-msgstr "Sistem"
-
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
-msgid "System Configuration"
-msgstr "Konfigurasi Sistem"
-
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
-msgid "System Error"
-msgstr "Kesalahan Sistem"
-
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr "Kesalahan sistem: %1"
-
-#: html/Admin/Tools/index.html:47
-msgid "System Tools"
-msgstr "Peralatan Sistem"
-
-#: lib/RT/ACE_Overlay.pm:634
-msgid "System error. Right not delegated."
-msgstr "Kesalahan sistem. Hak-hak tidak dapat diserahkan."
-
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
-msgid "System error. Right not granted."
-msgstr "Kesalahan sistem. Hak-hak tidak dapat diberikan."
-
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
-msgid "System groups"
-msgstr "Grup Sistem"
-
-#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
-msgid "SystemRolegroup for internal use"
-msgstr " GrupAturanSistem yang digunakan untuk internal"
-
-#: lib/RT/CurrentUser.pm:358
-msgid "TEST_STRING"
-msgstr "TES_STRING"
-
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
-msgid "Take"
-msgstr "Ambil"
-
-#: lib/RT/Queue_Overlay.pm:116
-msgid "Take tickets"
-msgstr "Ambil tiket"
-
-#: lib/RT/Queue_Overlay.pm:116
-msgid "TakeTicket"
-msgstr "Ambil Tiket"
-
-#: lib/RT/Transaction_Overlay.pm:652
-msgid "Taken"
-msgstr "Diambil"
-
-#: NOT FOUND IN SOURCE
-msgid "Task"
-msgstr "Tugas"
-
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
-msgid "Template"
-msgstr "Template"
-
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
-#. ($TemplateObj->Id())
-msgid "Template #%1"
-msgstr "Template #%1"
-
-#: html/Admin/Elements/EditTemplates:110
-msgid "Template deleted"
-msgstr "Template sudah dihapus"
-
-#: lib/RT/Scrip_Overlay.pm:181
-msgid "Template not found"
-msgstr "Template tidak ditemukan"
-
-#: lib/RT/Template_Overlay.pm:376
-msgid "Template parsed"
-msgstr "Template parsed"
-
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
-msgid "Templates"
-msgstr "Template-template"
-
-#: NOT FOUND IN SOURCE
-msgid "Text"
-msgstr "Teks"
-
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
-msgid "That is already the current value"
-msgstr "Ini adalah nilai yang sekarang"
-
-#: lib/RT/CustomField_Overlay.pm:407
-msgid "That is not a value for this custom field"
-msgstr "Ini bukan nilai untuk kolom kustom ini"
-
-#: lib/RT/Ticket_Overlay.pm:1955
-msgid "That is the same value"
-msgstr "Ini adalah nilai yang sama"
-
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
-msgid "That principal already has that right"
-msgstr "Prinsipal ini sudah memiliki hak-hak tersebut"
-
-#: lib/RT/Queue_Overlay.pm:750
-#. ($args{'Type'})
-msgid "That principal is already a %1 for this queue"
-msgstr "Prinsipal ini sudah %1 untuk antrian ini"
-
-#: lib/RT/Ticket_Overlay.pm:1396
-#. ($self->loc($args{'Type'}))
-msgid "That principal is already a %1 for this ticket"
-msgstr "Prinsipal ini sudah %1 untuk tiket ini"
-
-#: lib/RT/Queue_Overlay.pm:849
-#. ($args{'Type'})
-msgid "That principal is not a %1 for this queue"
-msgstr "Prinsipal ini bukan %1 untuk antrian ini"
-
-#: lib/RT/Ticket_Overlay.pm:1951
-msgid "That queue does not exist"
-msgstr "Antrian ini tidak ada"
-
-#: lib/RT/Ticket_Overlay.pm:3189
-msgid "That ticket has unresolved dependencies"
-msgstr "Tiket ini mempunyai ketergantungan yang belum dapat diselesaikan"
-
-#: lib/RT/Ticket_Overlay.pm:2993
-msgid "That user already owns that ticket"
-msgstr "Pengguna ini sudah memiliki tiket tersebut"
-
-#: lib/RT/Ticket_Overlay.pm:2965
-msgid "That user does not exist"
-msgstr "Pengguna ini tidak ada"
-
-#: lib/RT/User_Overlay.pm:390
-msgid "That user is already privileged"
-msgstr "Pengguna ini sudah memiliki hak-hak istimewa"
-
-#: lib/RT/User_Overlay.pm:411
-msgid "That user is already unprivileged"
-msgstr "Pengguna ini sudah tidak memiliki hak-hak istimewa"
-
-#: lib/RT/User_Overlay.pm:403
-msgid "That user is now privileged"
-msgstr "Pengguna tersebut sekarang memiliki hak-hak istimewa"
-
-#: lib/RT/User_Overlay.pm:424
-msgid "That user is now unprivileged"
-msgstr "Pengguna tersebut sekarang tidak memiliki hak-hak istimewa"
-
-#: lib/RT/Ticket_Overlay.pm:2986
-msgid "That user may not own tickets in that queue"
-msgstr "Pengguna tersebut mungkin tidak memiliki tiket di dalam antrian tersebut"
-
-#: lib/RT/Link_Overlay.pm:234
-msgid "That's not a numerical id"
-msgstr "Ini bukan menurut angka ID"
-
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
-msgid "The Basics"
-msgstr "Dasar-dasar"
-
-#: lib/RT/ACE_Overlay.pm:113
-msgid "The CC of a ticket"
-msgstr "CC tiket"
-
-#: lib/RT/ACE_Overlay.pm:114
-msgid "The administrative CC of a ticket"
-msgstr "CC tiket administrasi"
-
-#: bin/rt-crontool:223
-msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
-msgstr "Perintah berikut ini akan menemukan seluruh tiket yang aktif di dalam antrian 'umum' dan mengatur prioritas mereka ke 99 jika mereka tidak digunakan dalam waktu  4 jam:"
-
-#: NOT FOUND IN SOURCE
-msgid "The following commands were not proccessed:\\n\\n"
-msgstr "Perintah berikut ini tidak akan dijalankan:\\n\\n"
-
-#: lib/RT/Record.pm:934
-msgid "The new value has been set."
-msgstr "Nilai baru sudah diatur."
-
-#: lib/RT/ACE_Overlay.pm:111
-msgid "The owner of a ticket"
-msgstr "Pemilik tiket"
-
-#: lib/RT/ACE_Overlay.pm:112
-msgid "The requestor of a ticket"
-msgstr "Pemohon tiket"
-
-#: html/Admin/Elements/EditUserComments:47
-msgid "These comments aren't generally visible to the user"
-msgstr "Komentar ini umumnya tidak jelas bagi pengguna"
-
-#: lib/RT/CustomField_Overlay.pm:912
-msgid "This custom field does not apply to that object"
-msgstr "Kolom kustom ini tidak dapat digunakan pada objek tersebut"
-
-#: html/Admin/Tools/Configuration.html:50
-msgid "This feature is only available to system administrators"
-msgstr "Fitur ini hanya tersedia untuk sistem administrator"
-
-#: html/Ticket/Elements/PreviewScrips:93
-msgid "This message will be sent to..."
-msgstr "Pesan ini akan dikirim ke..."
-
-#: bin/rt-crontool:214
-msgid "This tool allows the user to run arbitrary perl modules from within RT."
-msgstr "Alat ini mengijinkan pengguna untuk menjalankan modul perl yang berubah-ubah dari dalam RT."
-
-#: lib/RT/Transaction_Overlay.pm:288
-msgid "This transaction appears to have no content"
-msgstr "Transaksi ini tampaknya tidak memiliki isi"
-
-#: html/Ticket/Elements/ShowRequestor:70
-#. ($rows)
-msgid "This user's %1 highest priority tickets"
-msgstr "Pengguna ini memiliki %1 tiket dengan prioritas tertinggi"
-
-#: lib/RT/Date.pm:416
-msgid "Thu."
-msgstr "Kms."
-
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
-#. ($Ticket->Id, $Ticket->Subject)
-msgid "Ticket #%1 Jumbo update: %2"
-msgstr "Tiket #%1 Perbaharui Jumbo: %2"
-
-#: html/Approvals/Elements/ShowDependency:67
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
-msgid "Ticket #%1: %2"
-msgstr "Tiket #%1: %2"
-
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
-#. ($T::Tickets{$template_id}->Id)
-#. ($T::Tickets{$template_id}->id)
-#. ($ticket->Id)
-msgid "Ticket %1"
-msgstr "Tiket %1"
-
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
-#. ($self->Id, $QueueObj->Name)
-msgid "Ticket %1 created in queue '%2'"
-msgstr "Tiket %1 sudah dibuat di dalam antrian '%2'"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket %1 loaded\\n"
-msgstr "Tiket %1 sudah dipanggil\\n"
-
-#: html/Search/Bulk.html:269
-#. ($Ticket->Id,$_)
-msgid "Ticket %1: %2"
-msgstr "Tiket %1: %2"
-
-#: html/Admin/Elements/QueueTabs:74
-msgid "Ticket Custom Fields"
-msgstr "Tiket Kolom Kustom"
-
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
-#. ($Ticket->Id, $Ticket->Subject)
-msgid "Ticket History # %1 %2"
-msgstr "Historis Tiket # %1 %2"
-
-#: etc/initialdata:324
-msgid "Ticket Resolved"
-msgstr "Tiket sudah diselesaikan"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
-msgid "Ticket Transactions"
-msgstr "Transaksi Tiket"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket attachment"
-msgstr "Lampiran Tiket"
-
-#: lib/RT/Tickets_Overlay.pm:1648
-msgid "Ticket content"
-msgstr "Isi Tiket"
-
-#: lib/RT/Tickets_Overlay.pm:1697
-msgid "Ticket content type"
-msgstr "Tipe isi Tiket"
-
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
-msgid "Ticket could not be created due to an internal error"
-msgstr "Tiket tidak dapat dibuat karena ada kesalahan internal"
-
-#: html/Ticket/Display.html:55
-msgid "Ticket metadata"
-msgstr "Metadata Tiket"
-
-#: etc/initialdata:310
-msgid "Ticket status changed"
-msgstr "Status tiket sudah diubah"
-
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr "Pencarian modul Tiket SQL"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
-msgid "Tickets"
-msgstr "Tiket-tiket"
-
-#: NOT FOUND IN SOURCE
-msgid "Tickets %1 %2"
-msgstr "Tiket %1 %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Tickets %1 by %2"
-msgstr "Tiket %1 oleh %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Tickets from %1"
-msgstr "Tiket dari %1"
-
-#: html/Approvals/Elements/ShowDependency:48
-msgid "Tickets which depend on this approval:"
-msgstr "Tiket yang bergantung dengan izin ini:"
-
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
-msgid "Time Estimated"
-msgstr "Perkiraan Waktu"
-
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
-msgid "Time Left"
-msgstr "Sisa Waktu"
-
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
-msgid "Time Worked"
-msgstr "Waktu Kerja"
-
-#: lib/RT/Tickets_Overlay.pm:1619
-msgid "Time left"
-msgstr "Sisa waktu"
-
-#: html/Elements/Footer:71
-msgid "Time to display"
-msgstr "Waktu untuk ditampilkan"
-
-#: lib/RT/Tickets_Overlay.pm:1594
-msgid "Time worked"
-msgstr "Waktu kerja"
-
-#: lib/RT/Ticket_Overlay.pm:1143
-msgid "TimeWorked"
-msgstr "Waktu Kerja"
-
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr "Judul"
-
-#: NOT FOUND IN SOURCE
-msgid "To generate a diff of this commit:"
-msgstr "To generate a diff of this commit:"
-
-#: NOT FOUND IN SOURCE
-msgid "To generate a diff of this commit:\\n"
-msgstr "To generate a diff of this commit:\\n"
-
-#: html/Elements/Footer:61
-#. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
-msgid "To inquire about support, training, custom development or licensing, please contact %1."
-msgstr "Untuk menanyakan tentang bantuan, latihan, perkembangan kustom atau izin, silakan hubungi %1."
-
-#: lib/RT/Ticket_Overlay.pm:1146
-msgid "Told"
-msgstr "Memberitahukan"
-
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
-msgid "Tools"
-msgstr "alat-alat"
-
-#: etc/initialdata:252
-msgid "Transaction"
-msgstr "Transaksi"
-
-#: lib/RT/Transaction_Overlay.pm:794
-#. ($self->Data)
-msgid "Transaction %1 purged"
-msgstr "Transaksi %1 sudah dibersihkan"
-
-#: lib/RT/Transaction_Overlay.pm:174
-msgid "Transaction Created"
-msgstr "Transaksi sudah dibuat"
-
-#: html/Admin/Elements/QueueTabs:78
-msgid "Transaction Custom Fields"
-msgstr "Kolom Kustom Transaksi"
-
-#: lib/RT/Transaction_Overlay.pm:125
-msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr "Transaksi->Tidak dapat dibuat, karena anda tidak menentukan tipe objek dan id"
-
-#: lib/RT/Transaction_Overlay.pm:838
-msgid "Transactions are immutable"
-msgstr "Transaksi yang tetap"
-
-#: lib/RT/Date.pm:414
-msgid "Tue."
-msgstr "Sel."
-
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
-msgid "Type"
-msgstr "Tipe"
-
-#: lib/RT/ScripCondition_Overlay.pm:129
-msgid "Unimplemented"
-msgstr "Belum diimplementasikan"
-
-#: html/Admin/Users/Modify.html:89
-msgid "Unix login"
-msgstr "Login Unix"
-
-#: NOT FOUND IN SOURCE
-msgid "UnixUsername"
-msgstr "Nama Pengguna Unix"
-
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
-#. ($self->ContentEncoding)
-#. ($ContentEncoding)
-msgid "Unknown ContentEncoding %1"
-msgstr "Content Encoding tidak dikenali%1"
-
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr "Kolom tidak dikenali: $key"
-
-#: html/Elements/SelectResultsPerPage:58
-msgid "Unlimited"
-msgstr "Tidak terbatas"
-
-#: html/Search/Elements/SelectSearchesForObjects:63
-msgid "Unnamed search"
-msgstr "Pencarian tidak dikenal"
-
-#: etc/initialdata:32
-msgid "Unprivileged"
-msgstr "Tidak memiliki hak-hak istimewa"
-
-#: html/Admin/Elements/EditCustomFields:60
-msgid "Unselected Custom Fields"
-msgstr "Kolom Kustom tidak dipilih"
-
-#: html/Admin/CustomFields/Objects.html:61
-msgid "Unselected objects"
-msgstr "Objek tidak dipilih"
-
-#: lib/RT/Transaction_Overlay.pm:648
-msgid "Untaken"
-msgstr "Belum diambil"
-
-#: NOT FOUND IN SOURCE
-msgid "Untitled search"
-msgstr "Pencarian yang tidak memiliki judul"
-
-#: html/Search/Bulk.html:54
-msgid "Update"
-msgstr "Perbaharui"
-
-#: html/Search/Bulk.html:178
-msgid "Update All"
-msgstr "Perbahurui Semua"
-
-#: NOT FOUND IN SOURCE
-msgid "Update ID"
-msgstr "Perbaharui ID"
-
-#: html/Ticket/Update.html:133
-msgid "Update Ticket"
-msgstr "Perbaharui Tiket"
-
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
-msgid "Update Type"
-msgstr "Perbaharui Tipe"
-
-#: NOT FOUND IN SOURCE
-msgid "Update all these tickets at once"
-msgstr "Perbaharui seluruh tiket ini pada saat yang sama"
-
-#: NOT FOUND IN SOURCE
-msgid "Update email"
-msgstr "Perbaharui email"
-
-#: html/Search/Results.html:80
-msgid "Update multiple tickets"
-msgstr "Perbaharui beberapa tiket"
-
-#: NOT FOUND IN SOURCE
-msgid "Update name"
-msgstr "Perbaharui nama"
-
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
-msgid "Update not recorded."
-msgstr "Perbaharui tidak dicatat."
-
-#: html/Search/Bulk.html:99
-msgid "Update selected tickets"
-msgstr "Perbaharui tiket yang terpilih"
-
-#: NOT FOUND IN SOURCE
-msgid "Update signature"
-msgstr "Perbaharui tanda tangan"
-
-#: html/Ticket/ModifyAll.html:84
-msgid "Update ticket"
-msgstr "Perbaharui tiket"
-
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
-#. ($Ticket->id)
-msgid "Update ticket #%1"
-msgstr "Perbaharui tiket #%1"
-
-#: html/Ticket/Update.html:156
-#. ($TicketObj->id, $TicketObj->Subject)
-msgid "Update ticket #%1 (%2)"
-msgstr "Perbaharui tiket #%1 (%2)"
-
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
-msgid "Update type was neither correspondence nor comment."
-msgstr " Memperbarui tipe baik korespondensi ataupun  penjelasan."
-
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
-msgid "Updated"
-msgstr "Sudah diperbaharui"
-
-#: html/Tools/Offline.html:95
-msgid "Upload"
-msgstr "Upload"
-
-#: lib/RT/CustomField_Overlay.pm:84
-msgid "Upload multiple files"
-msgstr "Upload beberapa file"
-
-#: lib/RT/CustomField_Overlay.pm:79
-msgid "Upload multiple images"
-msgstr "Upload beberapa gambar"
-
-#: lib/RT/CustomField_Overlay.pm:85
-msgid "Upload one file"
-msgstr "Upload satu file"
-
-#: lib/RT/CustomField_Overlay.pm:80
-msgid "Upload one image"
-msgstr "Upload satu gambar"
-
-#: lib/RT/CustomField_Overlay.pm:86
-msgid "Upload up to %1 files"
-msgstr "Upload sampai %1 file"
-
-#: lib/RT/CustomField_Overlay.pm:81
-msgid "Upload up to %1 images"
-msgstr "Upload sampai %1 gambar"
-
-#: html/Tools/Offline.html:95
-msgid "Upload your changes"
-msgstr "Upload perubahan anda"
-
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
-msgstr "Gunakan alat administrative RT yang lain"
-
-#: lib/RT/Ticket_Overlay.pm:496
-#. ($args{'Owner'})
-msgid "User '%1' could not be found."
-msgstr "Pengguna '%1' tidak dapat ditemukan."
-
-#: etc/initialdata:132 etc/initialdata:206
-msgid "User Defined"
-msgstr "Pengguna didefinisikan"
-
-#: html/Admin/Elements/EditScrip:98
-msgid "User Defined conditions and actions"
-msgstr "Pengguna mendefinisikan kondisi dan aksi"
-
-#: NOT FOUND IN SOURCE
-msgid "User ID"
-msgstr "ID Pengguna"
-
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
-msgid "User Rights"
-msgstr "Hak Pengguna"
-
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
-msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr "Pengguna akan ditanya mengenai tipe pembaharuan yang tidak dikenal untuk kolom kustom %1 untuk %2 objek #%3"
-
-#: html/Admin/Users/Modify.html:293
-#. ($msg)
-msgid "User could not be created: %1"
-msgstr "Pengguna tidak dapat dibuat: %1"
-
-#: lib/RT/User_Overlay.pm:331
-msgid "User created"
-msgstr "Pengguna sudah dibuat"
-
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
-msgid "User defined groups"
-msgstr "Pengguna mendefinisikan grup"
-
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
-msgid "User loaded"
-msgstr "Pengguna sudah dipanggil"
-
-#: NOT FOUND IN SOURCE
-msgid "User view"
-msgstr "Lihat Pengguna"
-
-#: html/Admin/Groups/index.html:99
-msgid "User-defined groups"
-msgstr "Definisi Grup Pengguna"
-
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
-msgid "Username"
-msgstr "Nama Pengguna"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
-msgid "Users"
-msgstr "Pengguna"
-
-#: html/Admin/Users/index.html:85
-msgid "Users matching search criteria"
-msgstr "Pengguna sesuai dengan kriteria pencarian"
-
-#: lib/RT/Tickets_Overlay_SQL.pm:523
-msgid "Valid Query"
-msgstr "Query yang valid"
-
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
-msgid "Values"
-msgstr "Nilai-nilai"
-
-#: lib/RT/Queue_Overlay.pm:108
-msgid "Watch"
-msgstr "Amati"
-
-#: lib/RT/Queue_Overlay.pm:109
-msgid "WatchAsAdminCc"
-msgstr "Amati Sebagai AdminCc"
-
-#: html/Admin/Elements/QueueTabs:63
-msgid "Watchers"
-msgstr "Pengamat"
-
-#: NOT FOUND IN SOURCE
-msgid "WebEncoding"
-msgstr "WebEncoding"
-
-#: lib/RT/Date.pm:415
-msgid "Wed."
-msgstr "Rabu."
-
-#: etc/initialdata:521
-msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
-msgstr "Kalau tiket sudah disetujui oleh semua pemberi persetujuan, tambahkan korespondesi ke tiket yang asli"
-
-#: etc/initialdata:485
-msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
-msgstr "Kalau tiket sudah disetujui oleh beberapa pemberi persetujuan, tambahkan korespondensi ke tiket yang asli"
-
-#: etc/initialdata:146
-msgid "When a ticket is created"
-msgstr "Kalau tiket sudah dibuat"
-
-#: etc/initialdata:418
-msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
-msgstr "Kalau tiket persetujuan sudah dibuat, beritahukan pemilik dan AdminCc dari item yang sedang ditunggu persetujuannya"
-
-#: etc/initialdata:151
-msgid "When anything happens"
-msgstr "Kalau sesuatu terjadi"
-
-#: etc/initialdata:199
-msgid "Whenever a ticket is resolved"
-msgstr "Setiap saat tiket dapat diselesaikan"
-
-#: etc/initialdata:185
-msgid "Whenever a ticket's owner changes"
-msgstr "Setiap saat pemilik tiket dapat diubah"
-
-#: etc/initialdata:178 etc/upgrade/3.1.17/content:16
-msgid "Whenever a ticket's priority changes"
-msgstr "Setiap saat prioritas tiket dapat diubah"
-
-#: etc/initialdata:193
-msgid "Whenever a ticket's queue changes"
-msgstr "Setiap saat antrian tiket dapat diubah"
-
-#: etc/initialdata:170
-msgid "Whenever a ticket's status changes"
-msgstr "Setiap saat status tiket dapat diubah"
-
-#: etc/initialdata:207
-msgid "Whenever a user-defined condition occurs"
-msgstr "Setiap saat kondisi yang didefinisikan oleh pengguna terjadi"
-
-#: etc/initialdata:164
-msgid "Whenever comments come in"
-msgstr "Setiap saat komentar dapat masuk"
-
-#: etc/initialdata:157
-msgid "Whenever correspondence comes in"
-msgstr "Setiap saat korespondensi dapat masuk"
-
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
-msgid "Work"
-msgstr "Bekerja"
-
-#: html/Search/Results.html:84
-msgid "Work offline"
-msgstr "Bekerja offline"
-
-#: NOT FOUND IN SOURCE
-msgid "WorkPhone"
-msgstr "Telepon Kantor"
-
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
-msgid "Worked"
-msgstr "Sedang Bekerja"
-
-#: lib/RT/Ticket_Overlay.pm:3096
-msgid "You already own this ticket"
-msgstr "Anda sudah memiliki tiket ini"
-
-#: html/autohandler:158 html/autohandler:166
-msgid "You are not an authorized user"
-msgstr "Anda bukanlah pengguna yang sah"
-
-#: lib/RT/Ticket_Overlay.pm:2978
-msgid "You can only reassign tickets that you own or that are unowned"
-msgstr "Anda hanya bisa menugaskan kembali tiket yang anda miliki atau yang belum anda miliki"
-
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
-#. ($num, $queue)
-msgid "You found %1 tickets in queue %2"
-msgstr "Anda menemukan %1 tiket di dalam antrian ini %2"
-
-#: html/NoAuth/Logout.html:52
-msgid "You have been logged out of RT."
-msgstr "Anda sudah log out dari RT."
-
-#: html/SelfService/Display.html:109
-msgid "You have no permission to create tickets in that queue."
-msgstr "Anda tidak memiliki izin untuk membuat tiket di dalam antrian tersebut."
-
-#: lib/RT/Ticket_Overlay.pm:1964
-msgid "You may not create requests in that queue."
-msgstr "Anda mungkin tidak akan membuat permintaan di dalam antrian ini."
-
-#: html/NoAuth/Logout.html:56
-msgid "You're welcome to login again"
-msgstr "Anda dapat login kembali"
-
-#: etc/initialdata:502
-msgid "Your request has been approved by %1. Other approvals may still be pending."
-msgstr "Permintaan anda sudah disetujui oleh. Persetujuan yang lain mungkin masih ditunda."
-
-#: etc/initialdata:540
-msgid "Your request has been approved."
-msgstr "Permintaan anda sudah disetujui."
-
-#: etc/initialdata:445
-msgid "Your request was rejected."
-msgstr "Permintaan anda sudah ditolak."
-
-#: html/autohandler:193
-msgid "Your username or password is incorrect"
-msgstr "Nama pengguna dan sandi anda tidak sama"
-
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
-msgid "Zip"
-msgstr "Zip"
-
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
-msgstr "mengijinkan pembuatan pencarian yang disimpan"
-
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
-msgstr "mengijinkan memanggil pencarian yang disimpan"
-
-#: html/User/Elements/DelegateRights:80
-#. ($right->PrincipalObj->Object->SelfDescription)
-msgid "as granted to %1"
-msgstr "sudah diberikan ke %1"
-
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr "Milik"
-
-#: html/SelfService/Closed.html:49
-msgid "closed"
-msgstr "sudah ditutup"
-
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
-msgid "contains"
-msgstr "berisi"
-
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
-msgid "days"
-msgstr "hari"
-
-#: lib/RT/Queue_Overlay.pm:88
-msgid "deleted"
-msgstr "sudah dihapus"
-
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr "Bukan milik"
-
-#: html/Search/Elements/PickBasics:61
-msgid "does not match"
-msgstr "tidak sama"
-
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
-msgid "doesn't contain"
-msgstr "tidak berisi"
-
-#: NOT FOUND IN SOURCE
-msgid "email address"
-msgstr "alamat email"
-
-#: html/Elements/SelectEqualityOperator:59
-msgid "equal to"
-msgstr "sama dengan"
-
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr "kesalahan: tidak dapat dipindahkan ke bawah"
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr "kesalahan: tidak dapat dipindahkan ke kiri"
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr "kesalahan: tidak dapat dipindahkan ke atas"
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr "kesalahan: tidak ada apapun yang dapat dihapus"
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr "kesalahan: tidak ada apapun yang dapat dipindahkan"
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr "kesalahan: tidak ada apapun yang dapat dihubungkan"
-
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
-msgid "greater than"
-msgstr "lebih dari"
-
-#: lib/RT/Group_Overlay.pm:222
-#. ($self->Name)
-msgid "group '%1'"
-msgstr "grup '%1'"
-
-#: lib/RT/Date.pm:338
-msgid "hours"
-msgstr "jam"
-
-#: html/Search/Elements/PickBasics:48
-msgid "id"
-msgstr "id"
-
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
-msgid "is"
-msgstr "adalah"
-
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
-msgid "isn't"
-msgstr "tidak"
-
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
-msgid "less than"
-msgstr "kurang dari"
-
-#: html/Search/Elements/PickBasics:60
-msgid "matches"
-msgstr "sama"
-
-#: lib/RT/Date.pm:334
-msgid "min"
-msgstr "mnt"
-
-#: html/Ticket/Update.html:64
-msgid "minutes"
-msgstr "menit"
-
-#: NOT FOUND IN SOURCE
-msgid "modifications\\n\\n"
-msgstr "perubahan\\n\\n"
-
-#: lib/RT/Date.pm:350
-msgid "months"
-msgstr "bulan"
-
-#: lib/RT/Queue_Overlay.pm:83
-msgid "new"
-msgstr "baru"
-
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
-msgid "no name"
-msgstr "tidak ada nama"
-
-#: html/Admin/Elements/EditScrips:64
-msgid "no value"
-msgstr "tidak ada nilai"
-
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
-msgid "none"
-msgstr "tidak satupun"
-
-#: html/Elements/SelectEqualityOperator:59
-msgid "not equal to"
-msgstr "tidak sama dengan"
-
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
-msgid "open"
-msgstr "buka"
-
-#: lib/RT/Group_Overlay.pm:227
-#. ($self->Name, $user->Name)
-msgid "personal group '%1' for user '%2'"
-msgstr "grup pribadi '%1' untuk pengguna '%2'"
-
-#: lib/RT/Group_Overlay.pm:235
-#. ($queue->Name, $self->Type)
-msgid "queue %1 %2"
-msgstr "antrian %1 %2"
-
-#: lib/RT/Queue_Overlay.pm:87
-msgid "rejected"
-msgstr "sudah ditolak"
-
-#: lib/RT/Queue_Overlay.pm:86
-msgid "resolved"
-msgstr "sudah diselesaikan"
-
-#: lib/RT/Date.pm:330
-msgid "sec"
-msgstr "dtk"
-
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr "tampilkan tab konfigurasi"
-
-#: html/Search/Results.html:82
-msgid "spreadsheet"
-msgstr "lembar kerja"
-
-#: lib/RT/Queue_Overlay.pm:85
-msgid "stalled"
-msgstr "alasan"
-
-#: lib/RT/Group_Overlay.pm:230
-#. ($self->Type)
-msgid "system %1"
-msgstr "sistem %1"
-
-#: lib/RT/Group_Overlay.pm:241
-#. ($self->Type)
-msgid "system group '%1'"
-msgstr "grup sistem '%1'"
-
-#: html/Elements/Error:66 html/SelfService/Error.html:63
-msgid "the calling component did not specify why"
-msgstr "Pemanggilan komponent tidak menetapkan mengapa"
-
-#: lib/RT/Group_Overlay.pm:238
-#. ($self->Instance, $self->Type)
-msgid "ticket #%1 %2"
-msgstr "tiket #%1 %2"
-
-#: lib/RT/Group_Overlay.pm:244
-#. ($self->Id)
-msgid "undescribed group %1"
-msgstr "grup yang belum dijelaskan %1"
-
-#: lib/RT/Group_Overlay.pm:219
-#. ($user->Object->Name)
-msgid "user %1"
-msgstr "pengguna %1"
-
-#: lib/RT/Date.pm:346
-msgid "weeks"
-msgstr "minggu"
-
-#: lib/RT/Date.pm:354
-msgid "years"
-msgstr "tahun"
-
diff --git a/rt/lib/RT/I18N/it.po b/rt/lib/RT/I18N/it.po
index 95d8c18..b0ac454 100644
--- a/rt/lib/RT/I18N/it.po
+++ b/rt/lib/RT/I18N/it.po
@@ -1,13 +1,9 @@
 msgid ""
-msgstr ""
-"Project-Id-Version: RT 3.4.1\n"
-"POT-Creation-Date: 2002-05-02 11:36+0800\n"
-"PO-Revision-Date: 2005-02-12 02:00+0800\n"
-"Last-Translator: Angelo Turetta <aturetta@bestunion.it>\n"
-"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgstr ""modifications\\n"
+"\\n"
+"
+"modifiche\\n"
+"\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "#"
@@ -17,58 +13,60 @@ msgstr "n°"
 msgid "#%1"
 msgstr "n°%1"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr "n°%1: %2"
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
-msgstr "%1 n°%2"
+msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
-msgstr "%1 %3 %2 %7 %4:%5:%6"
+msgstr "%1 %2 %3 %4:%5:%6 %7"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
-msgstr "Aggiunto %1 %2"
+msgstr "%1 %2 aggiunto"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "%1 %2 fa"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 %2 cambiato in %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
@@ -78,79 +76,111 @@ msgstr "%1 %2 eliminato"
 msgid "%1 %2 of group %3"
 msgstr "%1 %2 del gruppo %3"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "%1 %2 con il modello %3"
 
 #: NOT FOUND IN SOURCE
+msgid "%1 %2 הוסף"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 שונה ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 questo ticket\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
-msgstr "%1 (%2) da %3"
+msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
-msgstr "%1 (invariato)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 - %2 shown"
-msgstr "Mostrati da %1 a %2"
+msgstr "Tickets da %1 a %2"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr "%1 - Un parametro da passare a %2"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
-msgstr "%1 - Visualizza aggiornamenti dello stato su STDOUT"
+msgstr "%1 - Lo stato dell'output è stato aggiornato su STDOUT"
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr "%1 - Specificare l'azione che si vuole eseguire"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr "%1 - Specificare la condizione che si vuole utilizzare"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - Specificare la ricerca che si vuole utilizzare"
 
+#: NOT FOUND IN SOURCE
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
+
+     $RT::VERSION, 
+     '2004', 
+    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
-msgstr "ScripAction %1 caricato"
+msgstr "%1 ScripAction caricato"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
-msgstr "%1 aggiunto come valore di %2"
+msgstr "%1 aggiunto(i) come valore di %2"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 aliases require a TicketId to work on"
@@ -162,74 +192,74 @@ msgstr "gli alias %1 necessitano di un TicketId su cui lavorare"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
-msgstr "gli alias %1 necessitano di un TicketId per lavorare con (da %2) %3"
+msgstr "gli alias %1 necessitano di un TicketId per funzionare con (dopo %2) %3"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
-msgstr "%1 sembra essere un oggetto locale, ma non è presente nel database"
+msgstr "%1 sembra essere un oggetto locale, ma è introvabile nel database"
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
-msgstr "%1 da %2"
+msgstr "%1 per %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
-msgstr "%1 cambiato da %2 a %3"
+msgstr "%1 cambiato(1) da %2 a %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
-msgstr "copia di %1"
+msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
-msgstr "%1 non può essere impostato a %2"
+msgstr "%1 non può essere impostato a  %2"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 non ha potuto iniziare una transazione (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
-msgstr "%1 non ho potuto mettere lo stato a risolto. Il database RT potrebbe essere corrotto."
+msgstr "%1 non ho potuto mettere lo stato a risolto. Il database RT può essere inconsistente."
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
-msgstr "creato %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
-msgstr "eliminato %1"
+msgstr ""
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
-msgstr "I %1 ticket a maggior priorità che ho in carico"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 highest priority tickets I own..."
-msgstr "I %1 ticket a maggior priorità che ho in carico..."
+msgstr "I miei %1 tickets a più alta priorità che possiedo..."
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
-msgstr "I %1 ticket a maggior priorità che ho richiesto..."
+msgstr "I miei %1 tickets a più alta priorità che ho richiesto..."
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
-msgstr "%1 è uno strumento per agire sui ticket da uno schedulatore esterno, per esempio cron."
+msgstr "%1 è uno strumento per lavorare sui tickets da uno schedulatore esterno, come cron"
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 non è più un %2 per questa coda."
@@ -238,7 +268,8 @@ msgstr "%1 non è più un %2 per questa coda."
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 non è più un %2 per questo ticket."
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 non è più un valore per il campo personalizzato %2"
 
@@ -246,7 +277,11 @@ msgstr "%1 non è più un valore per il campo personalizzato %2"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 non è un identificativo di coda valido"
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -255,23 +290,31 @@ msgstr "%1 non è un identificativo di coda valido"
 msgid "%1 min"
 msgstr "%1 min"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
-msgstr "I %1 ticket più recenti non ancora assegnati"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 not shown"
 msgstr "%1 non mostrato"
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
-msgstr "%1 oggetti"
+msgstr ""
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
-msgstr "Diritti su %1"
+msgstr "Diritti di %1"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 succeeded\\n"
@@ -289,45 +332,81 @@ msgstr "Tipo %1 sconosciuto per %2"
 msgid "%1 was created without a CurrentUser\\n"
 msgstr "%1 è stato creato senza un CurrentUser\\n"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
-msgstr "%1 risolverà tutti i membri di un gruppo di ticket risolto."
+msgstr "%1 risolverà tutti i membri di un gruppo di ticket risolto."
 
 #: NOT FOUND IN SOURCE
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
-msgstr "%1 bloccherà una BASE [locale] se dipende da [o è membro di] una richiesta collegata."
+msgstr "%1 bloccherà una BASE [locale] se dipende o è membro di una richeista linkata."
+
+#: NOT FOUND IN SOURCE
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 על ידי %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
-msgstr "%2 oggetti di %1"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
-msgstr "%3 oggetti di %2 di %1"
+msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
-msgstr "ricerche salvate di %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: nessun allegato specificato"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1b"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1k"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' è uno stato non valido"
@@ -338,271 +417,283 @@ msgstr "'%1' non è un'azione conosciuta. "
 
 #: NOT FOUND IN SOURCE
 msgid "(Check box to delete group member)"
-msgstr "(spunta la casella per rimuovere un appartenente dal gruppo)"
+msgstr "(Spunta la casella per cancellare il membro di un gruppo)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Check box to delete scrip)"
-msgstr "(spunta la casella per cancellare uno scrip)"
+msgstr "(Spunta la casella per cancellare uno scrip)"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
-msgstr "(spunta la casella per cancellare)"
+msgstr "(Spunta la casella per cancellare)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Check boxes to delete)"
-msgstr "(spunta le caselle per cancellare)"
+msgstr "(Spunta la casella per cancellare)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
-msgstr "(i destinatari con la casella spuntata non ricevono la notifica)"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
-msgstr "(solo i destinatari con la casella spuntata ricevono la notifica)"
+msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
-msgstr "(inserire i numeri o gli URL dei ticket, separati da spazi)"
+msgstr "(Inserire il numero di tickets o gli URL, separati da spazi)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(se non specificato usa: %1)"
+msgid "(If left blank, will default to %1"
+msgstr "Se lasciato vuoto, valore di default : %1"
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
-msgstr "(nessun valore)"
+msgstr "(Nessun Valore)"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
-msgstr "(nessun campo personalizzato)"
+msgstr "Non ci sono campi personalizzati"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
-msgstr "(nessun appartenente)"
+msgstr "(Nessun membro)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
-msgstr "(nessuno Scrip)"
+msgstr "(Nessuno Scrip)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
-msgstr "(nessun modello)"
+msgstr "Nessun modello"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
-msgstr "(nessuno)"
+msgstr ""
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(invia copia silente di questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
+msgstr "(Invia per copia nascosta questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
-msgstr "(invia copia silente di questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierò</b> i destinatari dei successivi aggiornamenti.)"
+msgstr "(Invia per copia nascosta questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(invia copia per conoscenza di questo aggiornamento ad una lista di indirizzi email amministrativi separati da virgole. Queste persone <b>riceveranno</b> i successivi aggiornamenti.)"
+msgstr "(Invia una copia di questo aggiornamento ad una lista di indirizzi email amministrativi separati da virgole. Queste persone <b>riceveranno</b> i successivi aggiornamenti.)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(invia copia per conoscenza di questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
+msgstr "(Invia una copia di questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
-msgstr "(invia copia per conoscenza di questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
+msgstr "(Invia una copia di questo aggiornamento ad una lista di indirizzi email separati da virgole. Ciò <b>non cambierà</b> i destinatari dei successivi aggiornamenti.)"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(invia copia per conoscenza di questo aggiornamento ad una lista di indirizzi email separati da virgole. Queste persone <b>riceveranno</b> i successivi aggiornamenti.)"
+msgstr "(Invia una copia di questo aggiornamento ad una lista di indirizzi email separati da virgole. Queste persone <b>riceveranno</b> i successivi aggiornamenti.)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
-msgstr "(usa questi campi se si sceglie 'Definito dall'utente' come condizione o azione)"
+msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(vuoto)"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
-msgstr "(nessun nome in elenco)"
+msgstr "(nessun nome)"
+
+#: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "(no subject)"
 msgstr "(nessun oggetto)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(nessun valore)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
-msgstr "(nessun valore)"
+msgstr ""
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
-msgstr "(un solo ticket)"
+msgstr "(solo un ticket)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(in attesa di approvazione)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
-msgstr "(in attesa di un'altra Raccolta)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
-msgid "(pending other ticket)"
-msgstr "(in attesa di altri ticket)"
+msgid "(pending other tickets)"
+msgstr "(in attea di altri tickets)"
 
 #: NOT FOUND IN SOURCE
 msgid "(requestor's group)"
 msgstr "(gruppo del richiedente)"
 
-#: html/Admin/Users/Modify.html:71
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(richiesto)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(senza titolo)"
 
 #: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I own..."
-msgstr "I 25 ticket con priorità più alta che ho in carico..."
+msgstr "I miei 25 tickets che devo trattare con priorità più alta..."
 
 #: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I requested..."
-msgstr "I 25 ticket con priorità più alta da me richiesti..."
+msgstr "I miei 25 tickets che hor ichiesto con priorità più alta..."
 
-#: html/Ticket/Elements/ShowBasics:53
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
-msgstr ""
+msgstr "<% $Ticket->Status%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr ""
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Crea un ticket in\">&nbsp;%1"
 
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
 #: etc/initialdata:218
 msgid "A blank template"
 msgstr "Un modello vuoto"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "ACE Deleted"
-msgstr "ACE eliminata"
+msgstr "ACE Eliminata"
 
 #: NOT FOUND IN SOURCE
 msgid "ACE Loaded"
-msgstr "ACE caricata"
+msgstr "ACE Caricata"
 
 #: NOT FOUND IN SOURCE
 msgid "ACE could not be deleted"
-msgstr "impossibile eliminare l'ACE"
+msgstr "l'ACE non è stato possibile elimanarla"
 
 #: NOT FOUND IN SOURCE
 msgid "ACE could not be found"
-msgstr "impossibile trovare l'ACE"
+msgstr "l'ACE non è stato possibile trovarla"
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE non trovata"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "Le ACE possono essere solo create e cancellate."
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "Interruzione per evitare modifiche di ticket involontarie.\\n"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
-msgstr "Informazioni personali"
+msgstr "A proposito"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "Controllo di Accesso"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Azione"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "Azione %1 non trovata"
 
-#: NOT FOUND IN SOURCE
+#: bin/rt-crontool:119
 msgid "Action committed."
 msgstr "Azione eseguita."
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr "Azione eseguita.\\n"
-
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "Azione preparata..."
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
-msgstr "Aggiungi"
+msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
-msgstr "Aggiungi AdminCc"
+msgstr "Aggiungi AdminCC"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
-msgstr "Aggiungi Cc"
-
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr "Aggiungi colonne"
+msgstr "Aggiungi CC"
 
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
-msgstr "Aggiungi criterio"
+msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
-msgstr "Aggiungi altri file"
+msgstr "Aggiungi Altri Files"
 
 #: NOT FOUND IN SOURCE
 msgid "Add Next State"
-msgstr "Aggiungi prossimo stato"
+msgstr "Aggiungi lo Stato Sucessivo"
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
-msgstr "Aggiungi il richiedente"
+msgstr "Aggiungi il Richiedente"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
-msgstr "Aggiungi un valore"
+msgstr "Aggiungi un Valore"
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Add a keyword selection to this queue"
@@ -616,55 +707,51 @@ msgstr "Aggiungi un nuovo scrip globale"
 msgid "Add a scrip to this queue"
 msgstr "Aggiungi uno scrip a questa coda"
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr "Aggiungi uno scrip da applicare a tutte le code"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
-msgstr "Aggiungi criteri addizionali"
+msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
-msgstr "Aggiungere commenti o repliche ai ticket selezionati"
+msgstr "Agiungere commenti o repliche ai tickets selezionati"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
-msgstr "Aggiungi appartenenti"
+msgstr "Aggiungi membri"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Aggiungi nuovi osservatori"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr "Aggiungi, cancella o modifica il valore dei campi personalizzati per gli oggetti"
-
 #: NOT FOUND IN SOURCE
 msgid "AddNextState"
-msgstr "AggiunguProssimoStato"
+msgstr "AggiungereStatoSuccessivo"
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "Aggiunto gruppo/utente come %1 per questa coda"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "Aggiunto gruppo/utente come %1 per questo ticket"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
-msgstr "Indirizzo1"
+msgstr "Inidirizzo1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "Indirizzo2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
-msgstr "Cc amministrativo"
+msgstr "Admin Cc"
 
 #: etc/initialdata:295
 msgid "Admin Comment"
@@ -672,99 +759,103 @@ msgstr "Commento Amministrativo"
 
 #: etc/initialdata:274
 msgid "Admin Correspondence"
-msgstr "Corrispondenza Amministrativa"
+msgstr "Corrispondenza Amministrativa "
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
-msgstr "Gestione delle code"
+msgstr "Amministra le code"
 
 #: NOT FOUND IN SOURCE
 msgid "Admin users"
-msgstr "Gestione degli utenti"
+msgstr "Amministra gli Utenti"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
-msgstr "Amministra/Configurazione globale"
+msgstr "configurazione Amministratore/Globale"
 
 #: NOT FOUND IN SOURCE
 msgid "Admin/Groups"
-msgstr "Gestione/Gruppi"
+msgstr "Amministra/Gruppi"
 
 #: NOT FOUND IN SOURCE
 msgid "Admin/Queue/Basics"
-msgstr "Gestione/Code/Base"
+msgstr "Amministra/Code/Base"
 
 #: NOT FOUND IN SOURCE
 msgid "AdminAllPersonalGroups"
-msgstr "GestisciTuttiGruppiPersonali"
+msgstr "AmministraTuttiIGruppiPersonali"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "AdminCc"
 
 #: NOT FOUND IN SOURCE
 msgid "AdminComment"
-msgstr "GestisciCommenti"
+msgstr "CommentoAmministratore"
 
 #: NOT FOUND IN SOURCE
 msgid "AdminCorrespondence"
-msgstr "GestisciCorrispondenza"
+msgstr "CorrispondenzaAmministratore"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
-msgstr "GestisciCampoPers."
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Queue_Overlay.pm:73
 msgid "AdminCustomFields"
-msgstr "GestisciCampiPers."
+msgstr "AmministraCampiPersonalizzati"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
-msgstr "GestisciGruppo"
+msgstr "AmministraGruppi"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
-msgstr "GestisciAppartenenzaGruppo"
+msgstr "AmministraAppartenenzaGruppi"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
-msgstr "GestisciGruppiPersonali"
+msgstr "AmministraPropriGruppiPersonali"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
-msgstr "GestisciCoda"
+msgstr "AmministraCode"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
-msgstr "GestisciUtenti"
+msgstr "AmministraUtenti"
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
-msgstr "AdminCc"
+msgstr "Cc Amministrativa"
 
 #: NOT FOUND IN SOURCE
 msgid "Admins"
 msgstr "Amministratori"
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
-msgstr "Avanzata"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
-#: html/Elements/SelectDateRelation:57
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
 msgid "After"
-msgstr "dopo il"
+msgstr "Dopo"
 
 #: NOT FOUND IN SOURCE
 msgid "Age"
 msgstr "Età"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr "Aggregatore"
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Alias for"
@@ -772,53 +863,53 @@ msgstr "Alias per"
 
 #: etc/initialdata:363
 msgid "All Approvals Passed"
-msgstr "Ottenute tutte le approvazioni"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "Tutti i campi personalizzati"
 
-#: html/Admin/Queues/index.html:75
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "Tutte le code"
 
 #: NOT FOUND IN SOURCE
 msgid "Always sends a message to the requestors independent of message sender"
-msgstr "Invia comunque un messaggio al richiedente, anche se è lui stesso il mittente"
+msgstr "Invia sempre un messaggio al richiedente inipendentemente dal mittente"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr ""
-
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
-msgstr "Si applica a"
+msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
-msgstr "Applica"
+msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
-msgstr "Applica modifiche"
+msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "Approvazione"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "Approvazione n°%1: %2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr "Approvazione n°%1: Note non registrate a causa di un errore di sistema"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr "Approvazione n°%1: Note registrate"
@@ -829,25 +920,25 @@ msgstr "Dettagli dell'approvazione"
 
 #: etc/initialdata:351
 msgid "Approval Passed"
-msgstr "Approvazione ottenuta"
+msgstr ""
 
 #: etc/initialdata:374
 msgid "Approval Rejected"
-msgstr "Approvazione rifiutata"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Approval diagram"
 msgstr "Diagramma dell'approvazione"
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
-msgstr "Approva"
+msgstr "Approvare"
 
 #: etc/initialdata:504
 msgid "Approver's notes: %1"
 msgstr "Note dell'approvatore: %1"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "Apr."
 
@@ -855,52 +946,72 @@ msgstr "Apr."
 msgid "April"
 msgstr "Aprile"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
-msgstr "Crescente"
+msgstr "Ascendente"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
-msgstr "Assegna e rimuovi campi personalizzati"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
-msgstr "AssegnaCampiPers."
+msgstr ""
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
-msgstr "Allega"
+msgstr "Allegato"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
-msgstr "Allega un file"
+msgstr "Allegare un file"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "File allegato"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
-msgstr "Impossibile caricare l'allegato '%1'"
+msgstr "L'allegato '%1' non può essere caricato"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "Allegato creato"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "Nome file dell'allegato"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Allegati"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
-msgstr "Attributo cancellato"
+msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "Ago."
 
@@ -910,7 +1021,7 @@ msgstr "Agosto"
 
 #: NOT FOUND IN SOURCE
 msgid "AuthSystem"
-msgstr "SistemaAutorizzazioni"
+msgstr "AuthSystem"
 
 #: etc/initialdata:221
 msgid "Autoreply"
@@ -924,13 +1035,17 @@ msgstr "Risposta automatica ai richiedenti"
 msgid "AutoreplyToRequestors"
 msgstr "RispostaAutomaticaAiRichiedenti"
 
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
-msgstr "Firma PGP invalida: %1\\n"
+msgstr "Firma PGP non valida: %1\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
-msgstr "Identificativo allegato errato. Impossibile trovare l'allegato '%1'\\n"
+msgstr "Id di allegato errato. Impossibile trovare l'allegato '%1'\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Bad data in %1"
@@ -940,181 +1055,188 @@ msgstr "Dati incorretti in %1"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "Numero di transazione incorretto per l'allegato. %1 dovrebbe essere %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
-msgstr "Dati base"
+msgstr "Essenziale"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
-msgstr "Se hai aggiornato qualche impostazione, assicurati di premere"
+msgstr "Assicurarsi di salvare le modifiche"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
-msgstr "prima del"
+msgstr "Prima"
 
 #: NOT FOUND IN SOURCE
 msgid "Begin Approval"
-msgstr "Inizia approvazione"
-
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
-msgstr "Logo Best Practical Solutions, LLC"
+msgstr "Inizio dell'approvazione"
 
 #: NOT FOUND IN SOURCE
 msgid "Binary"
-msgstr "Binario"
+msgstr ""
 
 #: etc/initialdata:217
 msgid "Blank"
 msgstr "Vuoto"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr "Grassetto"
-
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
-msgstr "URL assoluto per questa ricerca"
+msgstr "URL predefinito per questa ricerca"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
-msgstr "Link assoluto"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
-msgstr "Intestazione breve"
+msgstr "Intestazioni brevi"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
-msgstr "Modifica di ticket in blocco"
+msgstr "Modifica di massa dei tickets"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "Gli utenti di sistema non possono essere modificati"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
-msgstr "Può il gruppo/utente vedere questa coda"
+msgstr "Il gruppo/utente può vedere questa coda"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "Impossibile aggiungere un valore di campo personalizzato senza un nome"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr "Impossibile trovare una classe collection per '%1'"
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
-msgstr "Impossibile trovare una ricerca salvata su cui lavorare"
+msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "Non è possibile collegare un ticket a se stesso"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
-msgstr "Impossibile unire un ticket ad un ticket già unito. Questo errore non dovrebbe mai verificarsi"
+msgstr "Impossibile unire un ticket ad un ticket già unito. Non dovrebbe mai comparire questo errore"
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
-msgstr "Impossibile salvare questa ricerca"
+msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "Impossibile specificare sia la base che il target"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "Impossibile creare l'utente: %1"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Cc"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
-msgstr "Cambia la password"
+msgstr "Cambiare la passwrd"
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
-msgstr "Spunta tutte le caselle"
+msgstr ""
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
-msgstr "Spunta la casella per cancellare"
+msgstr "Spunta la casella per eliminare"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "Spunta la casella per revocare i diritti"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
-msgstr "Derivati"
+msgstr "Figli"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "Città"
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
-msgstr "Azzera"
+msgstr ""
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "Chiuso"
 
-#: NOT FOUND IN SOURCE
+#: html/SelfService/Closed.html:24
 msgid "Closed Tickets"
-msgstr "Ticket chiusi"
+msgstr "Tickets Chiusi"
 
 #: NOT FOUND IN SOURCE
 msgid "Closed requests"
 msgstr "Richieste chiuse"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
-msgstr "Ticket chiusi"
+msgstr "Tickets chiusi"
+
+#: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Command not understood!\\n"
-msgstr "Comando non riconosciuto!\\n"
+msgstr "Comando non riconosciuto! \\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Commento"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
-msgstr "Inidirizzo per i commenti"
+msgstr "Inidirizzo di Commento"
 
 #: NOT FOUND IN SOURCE
 msgid "Comment not recorded"
 msgstr "Commento non registrato"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
-msgstr "Aggiunta di commenti ai ticket"
+msgstr "Commento sui tickets"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
-msgstr "AggiungiCommentiAlTicket"
+msgstr "CommentoSuiTickets"
 
 #: NOT FOUND IN SOURCE
 msgid "Comments"
 msgstr "Commenti"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
-msgstr "Commenti (non inviati ai richiedenti)"
+msgstr "Commenti (Non inviati ai richiedenti)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "Commenti (non inviati ai richiedenti)"
 
@@ -1122,41 +1244,41 @@ msgstr "Commenti (non inviati ai richiedenti)"
 msgid "Comments about %1"
 msgstr "Commenti su %1"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "Commenti su questo utente"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
-msgstr "Aggiunto commento"
+msgstr "Commenti aggiunti"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
-msgstr ""
+msgstr "tr(Commit Stubbed)"
 
 #: NOT FOUND IN SOURCE
 msgid "Compile Restrictions"
 msgstr "Restrizioni di compilazione"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "Condizione"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
-msgstr "La condizione è soddisfatta..."
+msgstr "La condizione soddisfa..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "Condizione non trovata"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
-msgstr "Conferma"
+msgstr "Confermare"
 
 #: NOT FOUND IN SOURCE
 msgid "ContactInfoSystem"
@@ -1164,23 +1286,23 @@ msgstr "ContactInfoSystem"
 
 #: NOT FOUND IN SOURCE
 msgid "Contacted date '%1' could not be parsed"
-msgstr "Impossibile interpretare la data di contatto '%1'"
+msgstr "La data di contatto '%1' non può essere analizzata"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "Contenuto"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Coould not create group"
-msgstr "Impossibile creare il gruppo"
+msgstr "Non è stato possibile creare il gruppo"
 
-#: html/Search/Elements/EditSearches:64
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
-msgstr "Copia"
+msgstr ""
 
 #: etc/initialdata:286
 msgid "Correspondence"
@@ -1190,59 +1312,45 @@ msgstr "Corrispondenza"
 msgid "Correspondence Address"
 msgstr "Inidirizzo di corrispondenza"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
-msgstr "Aggiunta corrispondenza"
+msgstr "Corrispondenza aggiunta"
 
 #: NOT FOUND IN SOURCE
 msgid "Correspondence not recorded"
 msgstr "Corrispondenza non registrata"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
-msgstr "Impossibile aggiungere un nuovo valore di campo personalizzato al ticket. "
+msgstr "Impossibile aggiungere un  nuovo valore di campo personalizzato a questo ticket. "
 
 #: NOT FOUND IN SOURCE
 msgid "Could not add new custom field value for ticket. %1 "
-msgstr "Impossibile aggiungere un nuovo valore di campo personalizzato al ticket. %1 "
+msgstr "Il valore di campo personalizzato non è stato possibile aggiungerlo. %1"
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr "Impossibile aggiungere un nuovo valore di campo personalizzato. "
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr "Impossibile aggiungere un nuovo valore di campo personalizzato. %1 "
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
-msgstr "Impossibile cambiare l'incaricato. "
+msgstr "Impossibile cambiare il proprietario. "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "Impossibile creare il campo personalizzato"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr "Impossibile creare il campo personalizzato: %1"
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "Impossibile creare il gruppo"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
-msgstr "Impossibile creare il modello: %1"
+msgstr "Impossibile creare il modello : %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "Impossibile creare il ticket. Queue non impostata"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "Impossibile creare l'utente"
 
@@ -1258,11 +1366,11 @@ msgstr "Impossibile trovare il ticket numero %1"
 msgid "Could not find group %1."
 msgstr "Impossibile trovare il gruppo %1."
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "Impossibile trovare o creare questo utente"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "Impossibile trovare questo gruppo/utente"
 
@@ -1270,54 +1378,45 @@ msgstr "Impossibile trovare questo gruppo/utente"
 msgid "Could not find user %1."
 msgstr "Impossibile trovare l'utente %1."
 
-#: html/Admin/CustomFields/Objects.html:69
+#: NOT FOUND IN SOURCE
 msgid "Could not load CustomField %1"
-msgstr "Impossibile caricare il campo personalizzato %1"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "Impossibile caricare questo gruppo"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr "Impossibile caricare l'oggetto per %1"
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr "Impossibile caricare un attributo della ricerca"
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "Impossibile rendere questo gruppo/utente un %1 per questa coda"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "Impossibile rendere questo gruppo/utente un %1 per questo ticket"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
-msgstr "Impossibile rimuovere questo gruppo/utente come un %1 per questa coda"
+msgstr "Impossibile eliminare questo gruppo/utente come un %1 per questa coda"
 
 #: NOT FOUND IN SOURCE
 msgid "Could not remove that principal as a %1 for this ticket"
-msgstr "Impossibile rimuovere questo gruppo/utente come un %1 per questo ticket"
+msgstr "Impossibile eliminare questo gruppo/utente come un %1 per questo ticket"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
-msgstr "Impossibile impostare le informazioni dell'utente"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
-msgstr "Impossibile aggiungere un appartenente al gruppo"
+msgstr "Impossibile aggiungere un membro a questo gruppo"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
-msgstr "Impossibile creare una transazione: %1"
+msgstr "Impossibile creare una transazione : %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't figure out what to do from gpg's reply\\n"
@@ -1325,46 +1424,44 @@ msgstr "Impossibile capire che cosa fare con questa risposta gpg\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find group\\n"
-msgstr "Impossibile trovare il gruppo\\n"
+msgstr "Gruppo introvabile\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
-msgstr "Impossibile trovare la riga"
+msgstr "Riga introvabile"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
-msgstr "Impossibile trovare questo gruppo/utente"
+msgstr "Gruppo/utente introvabile"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
-msgstr "Impossibile trovare questo valore"
+msgstr "Valore introvabile"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find that watcher"
-msgstr "Impossibile trovare questo osservatore"
+msgstr "Osservatore introvabile"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find user\\n"
-msgstr "Impossibile trovare l'utente\\n"
+msgstr "Utente introvabile\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "Impossibile caricare %1 dal database degli utenti.\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
-msgstr "Impossibile caricare la classe %1"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
-msgstr "Impossibile caricare ilcampo personalizzato %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load KeywordSelects."
-msgstr "Impossibile caricare KeywordSelects"
+msgstr "KeywordSelects non è stato possibile caricarlo"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load RT config file '%1' %2"
@@ -1374,26 +1471,25 @@ msgstr "Impossibile caricare il file di configurazione RT '%1' %2"
 msgid "Couldn't load Scrips."
 msgstr "Impossibile caricare gli Scrips"
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "Impossibile caricare il gruppo %1"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
-msgstr "Impossibile caricare il collegamento"
+msgstr "Impossibile caricare il link"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
-msgstr "Impossibile caricare l'oggetto %1"
+msgstr ""
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "Impossibile caricare la coda"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "Impossibile caricare la coda %1"
@@ -1410,59 +1506,61 @@ msgstr "Impossibile caricare il modello"
 msgid "Couldn't load that user (%1)"
 msgstr "Impossibile caricare questo utente (%1)"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "Impossibile caricare il ticket '%1'"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
-msgstr "Nazione"
+msgstr "Stato"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "Crea"
 
 #: etc/initialdata:135
 msgid "Create Tickets"
-msgstr "Crea ticket"
+msgstr "Crea tickets"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "Crea un campo Personalizzato"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
-msgstr "Crea un campo personalizzato per la coda %1"
+msgstr "Crea un campo Custom per la coda %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:47
 msgid "Create a CustomField which applies to all queues"
-msgstr "Crea un campo personalizzato valido per tutte le code"
+msgstr "Crea un campo Personalizzato valido per tutte le code"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new Custom Field"
-msgstr "Crea un nuovo campo personalizzato"
+msgstr "Crea un nuovo campo Personalizzato"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new global scrip"
 msgstr "Crea un nuovo scrip globale"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "Crea un nuovo gruppo"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "Crea un nuovo gruppo personale"
 
@@ -1478,206 +1576,223 @@ msgstr "Crea un nuovo scrip"
 msgid "Create a new template"
 msgstr "Crea un nuovo modello"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "Crea un nuovo ticket"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "Crea un nuovo utente"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "Crea una coda"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a queue called"
-msgstr "Crea una nuova coda di nome"
+msgstr "Crea una nuova coda chiamata"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a request"
 msgstr "Crea una richiesta"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr "Crea uno scrip per la coda %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "Crea un modello"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
-msgstr "Nuovo ticket"
+msgstr "Crea un ticket"
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Create failed: %1 / %2 / %3 "
-msgstr "Creazione fallita: %1 / %2 / %3"
+msgstr "Eccezione durante la creazione: %1 / %2 / %3"
 
 #: NOT FOUND IN SOURCE
 msgid "Create failed: %1/%2/%3"
-msgstr "Creazione fallita: %1/%2/%3"
+msgstr "Eccezione durante la creazione: %1/%2/%3"
 
 #: etc/initialdata:137
 msgid "Create new tickets based on this scrip's template"
-msgstr "Creare nuovi ticket basati su questo modello di scrip"
+msgstr "Creare nuovi tickets basati su questo modello di scrip"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
-msgstr "Crea il ticket"
+msgstr "Crea un ticket"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
-msgstr "Crea nuovi ticket in questa coda"
+msgstr "Crea dei tickets in questa coda"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "Crea, elimina e modifica campi personalizzati"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr "Crea, elimina e modifica le code"
 
 #: NOT FOUND IN SOURCE
 msgid "Create, delete and modify the members of any user's personal groups"
-msgstr "Crea, elimina e modifica gli appartenenti ai gruppi personali di un qualunque utente"
+msgstr "Crea, elimina e modifica i membri dei gruppi personali di un qualunque utente"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
-msgstr "Crea, elimina e modifica gli appartenenti ai gruppi personali "
+msgstr "Crea, elimina e modifica i membri dei gruppi personali "
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "Crea, elimina e modifica gli utenti"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr "CreaRichiestaSalvata"
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr "CreaTicket"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "Creato"
 
-#: NOT FOUND IN SOURCE
-msgid "Created By"
-msgstr "Creato da"
-
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
-msgstr "Campo personalizzato %1 creato"
+msgstr "Campo Personalizzato %1 creato"
+
+#: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr "Modello %1 creato"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
-msgstr "CreatoDa"
+msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
-msgstr "Collegamenti attuali"
+msgstr "Relazioni attuali"
 
-#: html/Admin/Elements/EditScrips:51
+#: NOT FOUND IN SOURCE
+msgid "Current Relationships"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "Scrips attuali"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
-msgstr "Appartenenti attuali"
+msgstr "Membri attuali"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Diritti attuali"
 
 #: NOT FOUND IN SOURCE
 msgid "Current search criteria"
-msgstr "Criterio di ricerca attuale"
+msgstr "Criterio di ricerca corrente"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "Osservatori attuali"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
 msgid "Custom Field #%1"
-msgstr "Campo personalizzato n°%1"
+msgstr "Campo Personalizzato n°%1"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
-msgstr "Campi personalizzati"
+msgstr "Campi Personalizzati"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
-msgstr "Campi personalizzati per %1"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr "Programma di pulizia dell'azione personalizzata"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "Programma di preparazione dell'azione personalizzata"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "Condizione personalizzata"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "Campi personalizzati %1 %2 %3"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: NOT FOUND IN SOURCE
+msgid "Custom field %1 does not apply to this object"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
-msgstr "Il campo personalizzato %1 ha un valore."
+msgstr "Il campo personalizzato %1 ha un valore"
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
-msgstr "Il campo personalizzato %1 non ha valore."
+msgstr "Il campo personalizzato %1 non ha valore"
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
-msgstr "Campo personalizzato %1 non trovato"
+msgstr "Il campo personalizzato %1 è introvabile"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
-msgstr "Campo personalizzato cancellato"
+msgstr "Campo Personalizzato cancellato"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
-msgstr "Campo personalizzato %1 non trovato"
+msgstr "Il campo personalizzato è introvabile"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
-msgstr "Impossibile trovare il valore %1 per il campo personalizzato %2"
+msgstr "Il valore del campo personalizzato %1 non è stato possibile trovarlo per il campo personalizzato %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Custom field value changed from %1 to %2"
-msgstr "Valore del campo personalizzato cambiato da %1 a %2"
+msgstr "Il valore del campo personalizzato è stato modificato da %1 à %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
-msgstr "Impossibile cancellare il valore del campo personalizzato"
+msgstr "Il valore del campo personalizzato non è stato possibile eliminarlo"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
-msgstr "Valore del campo personalizzato non trovato"
+msgstr "Il valore del campo personalizzato non è stato possibile trovarlo"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "Il valore del vampo personalizzato è stato eliminato"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr "CampoPersonalizzato"
 
@@ -1685,11 +1800,11 @@ msgstr "CampoPersonalizzato"
 msgid "Data error"
 msgstr "Errore nei dati"
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Date"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "Dic."
 
@@ -1705,13 +1820,13 @@ msgstr "Modello di default per la risposta automatica"
 msgid "Default Autoresponse template"
 msgstr "Modello di default per la risposta automatica"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
-msgstr "Coda di default"
+msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
-msgstr "Richiedente di default"
+msgstr ""
 
 #: etc/initialdata:296
 msgid "Default admin comment template"
@@ -1729,112 +1844,104 @@ msgstr "Modello di default per la corrispondenza"
 msgid "Default transaction template"
 msgstr "Modello di default per la transazione"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
-msgstr "Default: %1/%2 modificato da %3 a %4"
+msgstr "Defaut: %1/%2 modificato da %3 à %4"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "Delega i diritti"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
-msgstr "Delega diritti specifici tra quelli che ti sono stati accordati"
+msgstr "Delega dei diritti specifici che ti sono stati accordati"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr "DelegaDiritti"
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "Delega"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
-msgstr "Cancella"
+msgstr "Elimina"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
-msgstr "Cancella modello"
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
-msgstr "Cancellazione fallita: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
-msgstr "Cancella gli scrips selezionati"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
-msgstr "Cancella ticket"
+msgstr "Elimina dei tickets"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
-msgstr "CancellaTicket"
-
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr "Ricerca cancellata"
+msgstr "EliminaTicket"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
-msgstr "La cancellazione di quest'oggetto può danneggiare l'integrità referenziale"
+msgstr "Eliminare quest'oggetto può interrompere l'integrità referenziale"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
-msgstr "La cancellazione di quest'oggetto danneggerebbe l'integrità referenziale"
+msgstr "Eliminare quest'oggetto interomperà l'integrità referenziale"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
-msgstr "La cancellazione di quest'oggetto violerebbe l'integrità referenziale"
+msgstr "Eliminare quest'oggetto violerà l'integrità referenziale"
 
 #: NOT FOUND IN SOURCE
 msgid "Deleting this object would violate referential integrity."
-msgstr "La cancellazione di quest'oggetto violerebbe l'integrità referenziale"
+msgstr "Eliminare quest'oggetto violerà l'integrità referenziale"
 
 #: NOT FOUND IN SOURCE
 msgid "Deleting this object would violate referential integrity. That's bad."
-msgstr "La cancellazione di quest'oggetto violerebbe l'integrità referenziale. Ciò è male!"
+msgstr "Eliminare quest'oggetto violerà l'integrità referenziale. Malissimo!"
 
-#: html/Approvals/Elements/Approve:66
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
-msgstr "Nega"
+msgstr "Negare"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
-msgstr "È una dipendenza per"
-
-#: NOT FOUND IN SOURCE
-msgid "DependedOnBy"
-msgstr "DipendenzaPer"
+msgstr "Usato come dipendenza da"
 
 #: NOT FOUND IN SOURCE
 msgid "Dependencies: \\n"
-msgstr "Dipendenze: \\n"
+msgstr "Dipendenze : \\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
-msgstr "Aggiunta dipendenza da parte di %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
-msgstr "Cancellata dipendenza da parte di %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
-msgstr "Aggiunta dipendenza da %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
-msgstr "Cancellata dipendenza da %1"
+msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "Dipende da"
 
@@ -1842,15 +1949,15 @@ msgstr "Dipende da"
 msgid "DependsOn"
 msgstr "DipendeDa"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
-msgstr "Decrescente"
+msgstr "Discendente"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
-msgstr "Descrivi il problema qui sotto"
+msgstr "Descrivere il problema qui sotto"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Descrizione"
 
@@ -1858,51 +1965,47 @@ msgstr "Descrizione"
 msgid "Details"
 msgstr "Dettagli"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
-msgstr "Visualizza"
+msgstr "Mostra"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
-msgstr "Visualizza la Lista Controllo Accessi (ACL)"
+msgstr "Mostra la Lista Controllo Accessi"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
-msgstr "Visualizza colonne"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
-msgstr "Visualizza i modelli di Scrips per questa coda"
+msgstr "Mostra i modelli di Scrips per questa coda"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
-msgstr "Visualizza gli Scrips per questa coda"
+msgstr "Mostra gli Scrips per questa coda"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "Modalità visualizzazione"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
-msgstr "Visualizza le ricerche salvate per questo gruppo"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Display ticket #%1"
-msgstr "Visualizza il ticket n°%1"
+msgstr "Mostra il ticket n°%1"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
-msgstr "Distribuito in accordo con la versione 2 della <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU GPL</a>."
+msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
-msgstr "Fai di tutto e di più"
-
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr "Esegui la ricerca"
+msgstr "Fare di tutto e non importa cosa"
 
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "Non aggiornare questa pagina."
 
@@ -1910,21 +2013,25 @@ msgstr "Non aggiornare questa pagina."
 msgid "Don't show search results"
 msgstr "Non mostrare i risultati della ricerca"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "Download"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
-msgstr "Scarica come file separato da TAB"
+msgstr ""
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
-msgstr "Scadenza"
+msgstr "Termine"
 
 #: NOT FOUND IN SOURCE
 msgid "Due date '%1' could not be parsed"
-msgstr "Impossibile interpretare la data di scadenza '%1'"
+msgstr "La data termine '%1' non è stata interpretata"
 
 #: NOT FOUND IN SOURCE
 msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
@@ -1936,38 +2043,30 @@ msgstr "Modifica"
 
 #: NOT FOUND IN SOURCE
 msgid "Edit Conditions"
-msgstr "Modifica condizioni"
+msgstr "Modifica Condizioni"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
-msgstr "Modifica i campi personalizzati per %1"
-
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr "Modifica i campi personalizzati per tutti i gruppi"
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr "Modifica i campi personalizzati per tutti gli utenti"
-
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
-msgstr "Modifica i campi personalizzati per tutte le code"
+msgstr "Modifica i Campi Personalizzati per %1"
 
 #: NOT FOUND IN SOURCE
-msgid "Edit Custom Fields for transactions on tickets in all queues"
-msgstr "Modifica i campi personalizzati per le transazioni sui ticket in tutte le code"
+msgid "Edit Custom Fields for Class %1"
+msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
-msgstr "Modifica collegamenti"
+msgstr "Modifica Relazioni"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
-msgstr "Modifica query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Relationships"
+msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr "Modifica i modelli per la coda %1"
@@ -1976,15 +2075,15 @@ msgstr "Modifica i modelli per la coda %1"
 msgid "Edit keywords"
 msgstr "Modifica parole chiave"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
-msgstr "Modifica ricerche salvate per questo gruppo"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Edit scrips"
 msgstr "Modifica scrips"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "Modifca i modelli di sistema"
 
@@ -1992,47 +2091,51 @@ msgstr "Modifca i modelli di sistema"
 msgid "Edit templates for %1"
 msgstr "Modifica i modelli per %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
-msgstr "ModificaRicercheSalvate"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
-msgstr "Modifica della configurazione per la coda %1"
+msgstr "Modifica la Configurazione per la coda %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Editing Configuration for user %1"
-msgstr "Modifica della configurazione per l'utente %1"
+msgstr "Modifica la Configurazione per l'utente %1"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
-msgstr "Modifica del campo personalizzato %1"
+msgstr "Modifica il CampoPersonalizzato %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
-msgstr "Modifica degli appartenenti al gruppo %1"
+msgstr "Modifica i membri per il gruppo %1"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
-msgstr "Modifica degli appartenenti al gruppo personale %1"
+msgstr "Modifica i membri per il gruppo personale %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Editing template %1"
-msgstr "Modifica del modello %1"
+msgstr "Modifica il modello %1"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
-msgstr "È necessario specificare base o target"
+msgstr "Uno almeno tra base e target deve essere specificato"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "Email"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "Inidirizzo email in uso"
 
@@ -2042,197 +2145,163 @@ msgstr "IndirizzoEmail"
 
 #: NOT FOUND IN SOURCE
 msgid "EmailEncoding"
-msgstr "CodificaEmail"
+msgstr "EmailEncoding"
+
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
-msgstr "Abilitato (togliere il segno di spunta per disabilitare questo campo personalizzato)"
+msgstr "Abilitato (Togliere il segno di spunta disabilita questo campo personalizzato)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
-msgstr "Abilitato (togliere il segno di spunta per disabilitare questo gruppo)"
+msgstr "Abilitato (Togliere il segno di spunta disabilita questo gruppo)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
-msgstr "Abilitato (togliere il segno di spunta per disabilitare questa coda)"
+msgstr "Abilitato (Togliere il segno di spunta disabilita questa coda)"
 
 #: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
-msgstr "Campi personalizzati abilitati"
+msgstr "Campi Personalizzati Abilitati"
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
-msgstr "Code abilitate"
+msgstr "Code Abilitate"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "Stato %1 abilitato"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
-msgstr "Stato abilitato: %1"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
-msgstr "Valori multipli"
+msgstr "Inserire valori multipli"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
-msgstr "Inserire, separati da spazio, gli oggetti (o URI di oggetti) da collegare."
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
-msgstr "Valore singolo"
+msgstr "Inserire un valore"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
-msgstr "Inserire, separati da spazio, le code (o URI di code) da collegare."
+msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
-msgstr "Inserire, separati da spazio, i ticket (o URI di ticket) da collegare."
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Bulk.html:142
 msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
-msgstr "Inserire, separati da spazio, i ticket (o URI di ticket) da collegare."
+msgstr "Inserire tickets o URI di tickets da collegare. Separare più valori con spazi."
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
-msgstr "Inserimento di un massimo di %1 valori"
+msgstr ""
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Errore"
 
 #: NOT FOUND IN SOURCE
 msgid "Error adding watcher"
-msgstr "Errore durante l'aggiunta di un osservatore"
+msgstr "Errore cercando di aggiungere un osservatore"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
-msgstr "Errore nei parametri passati a Queue->AddWatcher"
+msgstr "Errore nei parametri di Queue->AddWatcher"
 
 #: NOT FOUND IN SOURCE
 msgid "Error in parameters to Queue->DelWatcher"
-msgstr "Errore nei parametri passati a Queue->DelWatcher"
+msgstr "Errore nei parametri di Queue->DelWatcher"
 
-#: lib/RT/Queue_Overlay.pm:830
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
-msgstr "Errore nei parametri passati a Queue->DeleteWatcher"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
-msgstr "Errore nei parametri passati a Ticket->AddWatcher"
+msgstr "Errore nei parametri di Ticket->AddWatcher"
 
 #: NOT FOUND IN SOURCE
 msgid "Error in parameters to Ticket->DelWatcher"
-msgstr "Errore nei parametri passati a Ticket->DelWatcher"
+msgstr "Errore nei parametri di Ticket->DelWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
-msgstr "Errore nei parametri passati a Ticket->DeleteWatcher"
+msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
-msgstr "Propaga ticket"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: NOT FOUND IN SOURCE
+msgid "Estimate"
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
-msgstr "Stima"
+msgstr ""
 
 #: etc/initialdata:20
 msgid "Everyone"
 msgstr "Chiunque"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "Esempio:"
 
 #: NOT FOUND IN SOURCE
-msgid "ExtendedStatus"
-msgstr "StatoAggiuntivo"
-
-#: NOT FOUND IN SOURCE
-msgid "QueueName"
-msgstr "NomeCoda"
-
-#: NOT FOUND IN SOURCE
-msgid "OwnerName"
-msgstr "NomeIncaricato"
-
-#: NOT FOUND IN SOURCE
-msgid "TimeEstimated"
-msgstr "TempoStimato"
-
-#: NOT FOUND IN SOURCE
-msgid "CreatedBy"
-msgstr "CreatoDa"
-
-#: NOT FOUND IN SOURCE
-msgid "StartsRelative"
-msgstr "TempoDaInizioPrevisto"
-
-#: NOT FOUND IN SOURCE
-msgid "StartedRelative"
-msgstr "TempoDaInizio"
-
-#: NOT FOUND IN SOURCE
-msgid "CreatedRelative"
-msgstr "TempoDaCreazione"
-
-#: NOT FOUND IN SOURCE
-msgid "LastUpdatedRelative"
-msgstr "TempoDaUltimoAggiornamento"
-
-#: NOT FOUND IN SOURCE
-msgid "ToldRelative"
-msgstr "TempoDaUltimoContattoRichiedente"
-
-#: NOT FOUND IN SOURCE
-msgid "DueRelative"
-msgstr "TempoDaScadenza"
-
-#: NOT FOUND IN SOURCE
-msgid "ResolvedRelative"
-msgstr "TempoDaRisoluzione"
-
-#: NOT FOUND IN SOURCE
 msgid "ExternalAuthId"
-msgstr "IdAutorizEsterno"
+msgstr "ExternalAuthId"
 
 #: NOT FOUND IN SOURCE
 msgid "ExternalContactInfoId"
-msgstr "IdContattoEsterno"
+msgstr "ExternalContactInfoId"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "Informazioni aggiuntive"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
-msgstr "Impossibile creare un attributo della ricerca"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
-msgstr "Impossibile trovare il pseudogruppo di utenti 'Privilegiato'."
+msgstr "Impossibile trovare il pseudogruppo 'Privilegiato' di utenti."
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
-msgstr "Impossibile trovare il pseudogruppo di utenti 'Non Privilegiato'."
+msgstr "Impossibile trovare il pseudogruppo 'Non Privilegiato' di utenti."
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
-msgstr "Errore nel caricamento del modulo %1. (%2)"
+msgstr "Errore nel caricare il modulo %1. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr "Impossibile caricare un oggetto per %1"
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "Feb."
 
@@ -2240,170 +2309,150 @@ msgstr "Feb."
 msgid "February"
 msgstr "Febbraio"
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
-msgstr "Nome file"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:69
+#: NOT FOUND IN SOURCE
 msgid "Fill in multiple text areas"
-msgstr "Testi multipli"
-
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr "Testi WIKI multipli"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:70
+#: NOT FOUND IN SOURCE
 msgid "Fill in one text area"
-msgstr "Testo singolo"
-
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr "Testo WIKI singolo"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
-msgstr "Testi multipli (max. %1)"
-
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr "Testi WIKI multipli (max. %1)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Fin"
 msgstr "Fin"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
-msgstr "Priorità finale"
+msgstr "Priorità Finale"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
-msgstr "PrioritaFinale"
+msgstr "PrioritàFinale"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
 msgid "Find group whose"
-msgstr "Cerca il gruppo in cui"
+msgstr "Cerca il gruppo che"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
-msgstr "Cerca i gruppi in cui"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Find new/open tickets"
-msgstr "Cerca ticket nuovi/aperti"
+msgstr "Cerca tickets nuovi/aperti"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
-msgstr "Cerca le persone in cui"
+msgstr "Cerca le persone che"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
-msgstr "Ricerca ticket"
+msgstr "Cerca tickets"
 
 #: NOT FOUND IN SOURCE
 msgid "Finish Approval"
-msgstr "Completa approvazione"
+msgstr "Approvazione Finale"
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "Primo"
 
 #: NOT FOUND IN SOURCE
 msgid "First page"
-msgstr "Prima pagina"
+msgstr "Prima Pagina"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
-msgstr "Tizio Caio Sempronio"
+msgstr "Foo Bar Baz"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
-msgstr "Tizio!"
+msgstr "Foo!"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
-msgstr "Forza la modifica"
-
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr "Opzioni colonna"
+msgstr "Forza il cambiamento"
 
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "Trovati %quant(%1,ticket)"
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "Trovato Oggetto"
 
 #: NOT FOUND IN SOURCE
 msgid "Freeform"
-msgstr "Testo libero"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "FreeformContactInfo"
 msgstr "FreeformContactInfo"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:37
 msgid "FreeformMultiple"
 msgstr "FreeformMultiple"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:36
 msgid "FreeformSingle"
 msgstr "FreeformSingle"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/Date.pm:392
 msgid "Fri."
-msgstr "Ven."
+msgstr "Gio."
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
-msgstr "Intestazione completa"
+msgstr "Intestazioni Estese"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
-msgstr "Carica da file un modello compilato"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Getting the current user from a pgp sig\\n"
-msgstr "Sto individuando l'utente corrente da una firma pgp\\n"
+msgstr "Sto prendendo l'utente corrente da una firma pgp\\n"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "Assegnato a %1"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Globale"
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
-msgstr "Campi personalizzati globali"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Global Keyword Selections"
-msgstr "Selezione globale delle parole chiave"
+msgstr "Selezione Globale delle Parole Chiave"
 
 #: NOT FOUND IN SOURCE
 msgid "Global Scrips"
-msgstr "Scrips globali"
-
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr "Configurazione globale campi personalizzati"
+msgstr "Scrips Globali"
 
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "Modello globale: %1"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
-msgstr "Vai"
+msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "Vai!"
 
@@ -2415,7 +2464,7 @@ msgstr "Firma pgp valida da %1\\n"
 msgid "Goto page"
 msgstr "Vai a pagina"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "Vai al ticket"
 
@@ -2423,7 +2472,7 @@ msgstr "Vai al ticket"
 msgid "Grand"
 msgstr "Grand"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Gruppo"
 
@@ -2431,32 +2480,32 @@ msgstr "Gruppo"
 msgid "Group %1 %2: %3"
 msgstr "Gruppo %1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
-msgstr "Diritti di gruppo"
+msgstr "Diritti di Gruppo"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
-msgstr "Appartiene già al gruppo"
+msgstr "Il gruppo ha già il membro"
 
 #: NOT FOUND IN SOURCE
 msgid "Group could not be created."
-msgstr "Impossibile creare il gruppo."
+msgstr "Il gruppo non può essere creato."
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
-msgstr "Impossibile creare il gruppo: %1"
+msgstr "Il gruppo non può essere creato: %1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "Gruppo creato"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
-msgstr "Non appartiene al gruppo"
+msgstr "Il gruppo non ho questo membro"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Gruppo non trovato"
 
@@ -2468,58 +2517,56 @@ msgstr "Gruppo non trovato.\\n"
 msgid "Group not specified.\\n"
 msgstr "Gruppo non specificato.\\n"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Gruppi"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
-msgstr "I gruppi non possono appartenere a gruppi che sono già loro appartenenti"
+msgstr "I gruppi non possono essere membri dei loro membri"
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
-msgstr "Gruppi che corrispondono ai criteri di ricerca"
-
-#: html/Ticket/Elements/ShowRequestor:77
-msgid "Groups this user belongs to"
-msgstr "L'utente appartiene ai gruppi"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
-msgid "HasMember"
-msgstr "HaUnAppartenente"
+msgid "Groups this user belongs to"
+msgstr ""
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "Ciao!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "Ciao, %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
-msgstr "Cronologia"
+msgstr "Storia"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
-msgstr "Cronologia del gruppo %1"
+msgstr ""
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
-msgstr "Cronologia dell'utente %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "HomePhone"
 msgstr "TelefonoCasa"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Homepage"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "Ho %quant(%1,concrete mixer)."
@@ -2528,104 +2575,96 @@ msgstr "Ho %quant(%1,concrete mixer)."
 msgid "I have [quant,_1,concrete mixer]."
 msgstr "Ho [quant,_1,concrete mixer]."
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr "Mi sono perso..."
-
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "Id"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Identità"
 
 #: etc/initialdata:429
 msgid "If an approval is rejected, reject the original and delete pending approvals"
-msgstr "Se un'approvazione viene negata, respingi l'originale e elimina le approvazioni accodate"
+msgstr "Se una richiesta di approvazione è rifiutata, rifiuta l'originale e elimina le richieste di approvazione pendenti"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "(per i nuovi ticket in cui non viene specificato un richiedente)"
+msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
-msgstr "(per i nuovi ticket in cui non viene specificata una coda)"
+msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
-msgstr "Se questo strumento viene ha il flag setgid, un utente locale malintenzionato potrebbe usarlo per ottenere accesso amministrativo a RT."
+msgstr "Se questo strumento viene utilizzato con setgid, un utente locale mlintenzionato può usrae questo strumento per ottenere accesso amministrativo su RT."
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
-msgstr "Se hai aggiornato qualche impostazione, assicurati di premere"
+msgstr "Se hai aggiornato qualchecosa qui sopra, assicurati di"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "Valore non valido per %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Image"
-msgstr "Immagine"
+msgstr ""
 
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "Campo immutabile"
 
 #: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
-msgstr "Elenca anche i campi personalizzati disabilitati."
+msgstr "Includi nella lista i campi personalizzati disabilitati."
 
-#: html/Admin/Groups/index.html:65
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
-msgstr "Elenca anche i gruppi disabilitati."
+msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
-msgstr "Elenca anche le code disabilitate."
+msgstr "Includi nella lista le code disabilitate."
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "Includi nella ricerca gli utenti disabilitati."
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr "Query incompleta"
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr "Query incompleta"
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
-msgstr "Priorità iniziale"
+msgstr "Priorità Iniziale"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
-msgstr "PrioritaIniziale"
+msgstr "PrioritàIniziale"
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
-msgstr "Errore in input"
+msgstr "Errore in Input"
 
 #: NOT FOUND IN SOURCE
 msgid "Interest noted"
 msgstr "Interesse annotato"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
-msgstr "Errore interno"
+msgstr "Errore Interno"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
-msgstr "Errore interno: %1"
+msgstr "Errore Interno: %1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
-msgstr "Tipo di gruppo non valido"
+msgstr "Tipo di Gruppo non valido"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "Diritto non valido"
 
@@ -2633,56 +2672,52 @@ msgstr "Diritto non valido"
 msgid "Invalid Type"
 msgstr "Tipo non valido"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "Dati non validi"
 
 #: NOT FOUND IN SOURCE
 msgid "Invalid owner. Defaulting to 'nobody'."
-msgstr "Incaricato non valido. Uso il default 'nessuno'."
+msgstr "Proprietraio non valido. Verrà usato il default 'nobody'."
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "Coda non valida"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "Diritto non valido"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "Valore non valido per %1"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "Valore non valido per il campo personalizzato"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "Valore non valido per lo stato"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
-msgstr "È estremamente importante che agli utenti non previlegiati non sia consentita l'esecuzione di questo strumento."
+msgstr "E' estremamente importante che agli utenti non previlegiati non sia consentito eseguire questo strumento."
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
-msgstr "Per eseguire questo strumento, si suggerisce di creare un utente unix non privilegiato appartenente al gruppo corretto e con i necessari diritti in RT."
+msgstr "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
-msgstr "Accetta svariati argomenti:"
-
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr "Corsivo"
+msgstr "Richide molteplici argomenti:"
 
 #: NOT FOUND IN SOURCE
 msgid "Items pending my approval"
 msgstr "Oggetti in attesa della mia approvazione"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "Gen."
 
@@ -2690,11 +2725,11 @@ msgstr "Gen."
 msgid "January"
 msgstr "Gennaio"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
-msgstr "Cambia appartenenza a questo gruppo"
+msgstr "Unisciti o lascia questo gruppo"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "Lug."
 
@@ -2702,11 +2737,11 @@ msgstr "Lug."
 msgid "July"
 msgstr "Luglio"
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "Jumbo"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "Giu."
 
@@ -2720,223 +2755,202 @@ msgstr "Parola chiave"
 
 #: NOT FOUND IN SOURCE
 msgid "Lang"
-msgstr "Lingua"
+msgstr "Linguaggio"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
-msgstr "Lingua"
-
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr "Grande"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "Ultimo"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
-msgstr "Ultima comunicazione a richiedenti"
+msgstr "Ultimo Contatto"
+
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
 
-#: html/Elements/SelectDateType:50
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
-msgstr "Ultima comunicazione a richiedenti"
+msgstr "Ultimo Contatto"
 
 #: NOT FOUND IN SOURCE
 msgid "Last Notified"
-msgstr "Ultima notifica"
+msgstr "Ultima Notifica"
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
-msgstr "Ultima modifica"
-
-#: NOT FOUND IN SOURCE
-msgid "Last Updated By"
-msgstr "Modificato Da"
+msgstr "Ultimo Aggiornamento"
 
 #: NOT FOUND IN SOURCE
 msgid "LastUpdated"
-msgstr "UltimaModifica"
+msgstr "UltimoAggiornamento"
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
-msgstr "ModificatoPerUltimoDa"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "Rimasti"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "Consenti a questo utente di accedere a RT"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
-msgstr "Consenti la concessione di diritti espliciti a questo utente"
+msgstr "Concedi a questo utente che gli vengano assegnati i diritti"
 
 #: NOT FOUND IN SOURCE
 msgid "Limiting owner to %1 %2"
-msgstr "Limitare l'incaricato a %1 %2"
+msgstr "Limitare il proprietario %1 %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Limiting queue to %1 %2"
 msgstr "Limitare la coda a %1 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr "Collegamento"
-
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
-msgstr "Il collegamento esiste già"
+msgstr "Il collegamento già esiste"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "Il collegamento non può essere creato"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "Collegamento creato (%1)"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
-msgstr "Collegamento cancellato (%1)"
+msgstr "Collegamento eliminato (%1)"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Collegamento non trovato"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "Collega ticket n°%1"
 
 #: NOT FOUND IN SOURCE
 msgid "Link ticket %1"
-msgstr "Collega ticket %1"
-
-#: NOT FOUND IN SOURCE
-msgid "LinkedTo"
-msgstr "CollegatoA"
+msgstr "Collega ticket  %1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Collegamenti"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
-msgstr "Carica"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
-msgstr "Carica ricerca salvata:"
-
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr "CaricaRicercheSalvate"
+msgstr ""
 
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
-msgstr "Moduli perl caricati"
-
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr "Caricata ricerca %1"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
-msgstr "Domicilio"
+msgstr "Località"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
-msgstr "Impossibile trovare la directory di log %1 (oppure mancano i permessi di scrittura).\\n RT non può essere eseguito."
+msgstr ""
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
-msgstr "Accesso effettuato come %1"
+msgstr "Collegato come %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
-msgstr "Accedi"
+msgstr "Collegamento"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
-msgstr "Esci"
+msgstr "Scollegati"
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
-msgstr "Tipo di ricerca sbagliato"
+msgstr ""
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
-msgstr "Nuovo incaricato"
+msgstr "Crea Proprietario"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
-msgstr "Nuovo stato"
+msgstr "Crea Stato"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
-msgstr "Nuova data scadenza"
+msgstr "Crea data Scadenza"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
-msgstr "Nuova data risoluzione"
+msgstr "Crea data Risolto"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
-msgstr "Nuova data iniziato"
+msgstr "Crea data Iniziato"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
-msgstr "Nuova data inizio previsto"
+msgstr "Crea data Inizia"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
-msgstr "Nuova data ultimo contatto"
+msgstr "Crea data Detto"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
-msgstr "Nuova priorità"
+msgstr "Crea priorità"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
-msgstr "Nuova coda"
+msgstr "Crea coda"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
-msgstr "Nuovo oggetto"
+msgstr "Crea oggetto"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
-msgstr "Rendi questo gruppo visibile all'utente"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
+msgstr ""
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
-msgstr "Gestione campi personalizzati e relativi valori"
+msgstr ""
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
-msgstr "Gestione di gruppi e appartenenze"
+msgstr "Gestisci i gruppi e le appartenenze"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
-msgstr "Gestione di proprietà e configurazioni che si applicano a tutte le code"
+msgstr "Gestisci le proprietà e le configurazioni che si applicano a tutte le code"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
-msgstr "Gestione delle code e delle propietà specifiche delle code"
+msgstr "Gestisci le code e le propietà specifiche delle code"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
-msgstr "Gestione di utenti e password"
+msgstr "Gestisci gli utenti e le password"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "Mar."
 
@@ -2948,109 +2962,108 @@ msgstr "Marzo"
 msgid "May"
 msgstr "Maggio"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "Mag."
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
-msgstr "Aggiunto appartenente %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
-msgstr "Rimosso appartenente %1"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
-msgstr "Aggiunto appartenente"
+msgstr "Aggiunto membro"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
-msgstr "Rimosso appartenente"
+msgstr "Eliminato membro"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
-msgstr "Appartenente non rimosso"
+msgstr "Membro non eliminato"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
-msgstr "Appartenente a"
+msgstr "Membro di"
 
 #: NOT FOUND IN SOURCE
 msgid "MemberOf"
-msgstr "AppartenteA"
+msgstr "MembroDi"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
-msgstr "Appartenenti"
+msgstr "Membri"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
-msgstr "Aggiunta appartenenza al gruppo %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
-msgstr "Rimossa appartenenza al gruppo %1"
+msgstr ""
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
-msgstr "Appartenenza a gruppi"
+msgstr ""
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
-msgstr "Appartenenza a gruppi per l'utente %1"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "Unione avvenuta con Successo"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "Unione fallita. Impossibile impostare EffectiveId"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr "Unione fallita. Impossibile impostare Stato"
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
-msgstr "Unisci a"
+msgstr "Unisci in"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
-msgstr "Unito a %1"
+msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
-msgstr "Impossibile registrare il messaggio"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2517
 msgid "Message recorded"
-msgstr "Messaggio registrato"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
+#: html/Ticket/Elements/PreviewScrips:70
 msgid "Messages about this ticket will not be sent to..."
-msgstr "I messaggi riguardanti questo ticket non saranno inviati a..."
-
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
-msgstr "Parentesi non bilanciate"
+msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "Manca una chiave primaria?: %1"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "Cellulare"
 
@@ -3058,106 +3071,107 @@ msgstr "Cellulare"
 msgid "MobilePhone"
 msgstr "TelefonoCellulare"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
-msgstr "Modifica la Lista Controllo Accessi (ACL)"
+msgstr "Modifca la Lista Controllo Accessi"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify Custom Field %1"
-msgstr "Modifica il campo personalizzato %1"
+msgstr "Modifica il Campo Personalizzato %1"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr "Modifica campi personalizzati applicabili a %1 per ogni %2"
-
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
+#: NOT FOUND IN SOURCE
 msgid "Modify Custom Fields which apply to all %1"
-msgstr "Modifica i campi personalizzati applicabili a tutti %1"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "Modifica i Campi Personalizzati validi per tutte le code"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
-msgstr "Modifica diritti del gruppo"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
-msgstr "Modifica appartenenti al gruppo"
+msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
-msgstr "Modifica diritti"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
-msgstr "Modifica i modelli di Scrips per questa coda"
+msgstr "Modifica i modelli di Scips per questa coda"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "Modifica gli Scrips per questa coda"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify System ACLS"
-msgstr "Modifica le ACL di Sistema"
+msgstr "Modifica le LCA di Sistema"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify Template %1"
-msgstr "Modifica il modello %1"
+msgstr "Modifica il Modello %1"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
-msgstr "Modifica diritti utente"
+msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
-msgstr "Modifica un campo personalizzato per la coda %1"
+msgstr "Modifica un CampoPersonalizzato per la coda %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:52
 msgid "Modify a CustomField which applies to all queues"
-msgstr "Modifica un campo personalizzato valido per tutte le code"
+msgstr "Modifica un CampoPersonalizzato valido per tutte le code"
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr "Modifica uno scrip per la coda %1"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "Modifica uno scrip valido per tutte le code"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
-msgstr "Modifica oggetti associati a %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Modify dates for # %1"
 msgstr "Modifica le date per n° %1"
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "Modifica le date per n°%1"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "Modifica le date per il ticket n° %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr "Modifica campi personalizzati globali"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "Modifica i diritti di gruppo globali"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "Modifica i diritti di gruppo globali."
 
@@ -3173,249 +3187,263 @@ msgstr "Modifica i diritti globali per gli utenti"
 msgid "Modify global scrips"
 msgstr "Modifica gli scrips globali"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "Modifica i diritti globali per gli utenti"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "Modifica i diritti globali per gli utenti."
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
-msgstr "Modifica i metadati del gruppo o elimina un gruppo"
+msgstr "Modifica i metadati di gruppo o elimina un gruppo"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
-msgstr "Modifica i diritti di gruppo per il campo personalizzato %1"
+msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "Modifica i diritti di gruppo per il gruppo %1"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "Modifica i diritti di gruppo per la coda %1"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
-msgstr "Modifica gli appartenenti a questo gruppo"
+msgstr "Modofica i membri di questo gruppo"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr "Modifica il proprio account RT"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
-msgstr "Modifica le persone collegate alla coda %1"
+msgstr "Modifica le persone relative alla coda %1"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
-msgstr "Modifica le persone collegate al ticket n°%1"
+msgstr "Modifica le persone relative al ticket n°%1"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "Modifica gli scrips per la coda %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr "Modifica gli scrips validi per tutte le code"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "Modifica modello %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "Modifica i modelli validi per tutte le code"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "Modifica il gruppo %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "Modifica gli osservatori della coda"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "Modifica l'utente %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "Modifica il ticket n° %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "Modifica il ticket n°%1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
-msgstr "Modifica i ticket"
+msgstr "Modifica i tickets"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
-msgstr "Modifica i diritti utente per il il campo personalizzato %1"
+msgstr ""
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "Modifica i diritti utente per il gruppo %1"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
-msgstr "Modifica i diritti utente per la coda %1"
+msgstr "Modifica i diritti dell'utente per la coda %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify watchers for queue '%1'"
 msgstr "Modifica gli osservatori per la coda '%1'"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
-msgstr "ModificaACL"
-
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr "ModificaCampoPers."
+msgstr "ModificaLCA"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
-msgstr "ModificaPropriaAppartenenzaAlGruppo"
+msgstr "ModificaPropriaAppartenenza"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
-msgstr "ModificaOsservatoriDellaCoda"
+msgstr "ModificaOsservatoriCoda"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr "ModificaScrips"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
-msgstr "ModificaSuoiDati"
+msgstr "ModificaSeStesso"
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr "ModificaModello"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr "ModificaTicket"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "Lun."
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
-msgstr "Maggiori informazioni su %1"
+msgstr "Altre info su %1"
+
+#: NOT FOUND IN SOURCE
+msgid "Move"
+msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:83
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
-msgstr "Sposta in basso"
+msgstr "Move down"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
-msgstr "Sposta in alto"
+msgstr "Move up"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
-msgstr "Multiplo"
+msgstr "Multiple"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
-msgstr "L'attributo 'name' deve essere specificato"
+msgstr "Must specify 'Name' attribute"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
-msgstr "I miei ticket in stato: %1"
+msgstr "I miei%1 tickets"
 
 #: NOT FOUND IN SOURCE
 msgid "My Approvals"
-msgstr "Le mie richieste di approvazione"
+msgstr "Le mie richieste di Approvazione"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "Le mie richieste di approvazione"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
-msgstr "Le mie ricerche salvate"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Nome"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
-msgstr "Nome già usato"
+msgstr "Name in use"
+
+#: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Need approval from system administrator"
-msgstr "È richiesta l'approvazione da parte del system administrator"
+msgstr "Need approval from system administrator"
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
-msgstr "Mai"
+msgstr "Never"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "Nuovo"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
-msgstr "Nuovi collegamenti"
+msgstr "New Relationships"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "Nuova Password"
 
 #: etc/initialdata:332
 msgid "New Pending Approval"
-msgstr "Nuove approvazioni pendenti"
+msgstr "New Pending Approval"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
-msgstr "Nuova query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New Relationships"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "New Search"
 msgstr "Nuova Ricerca"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
-msgstr "Nuovo campo personalizzato"
+msgstr "Nuovo campo Personalizzato"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "Nuovo gruppo"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "Nuova password"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
-msgstr "Inviata notifica della nuova password"
+msgstr "New password notification sent"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "Nuova coda"
 
@@ -3423,11 +3451,11 @@ msgstr "Nuova coda"
 msgid "New request"
 msgstr "Nuova richiesta"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "Nuovi diritti"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "Nuovo scrip"
 
@@ -3435,610 +3463,586 @@ msgstr "Nuovo scrip"
 msgid "New search"
 msgstr "Nuova ricerca"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "Nuovo modello"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr "Nuovo ticket"
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "Il nuovo ticket non esiste"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "Nuovo utente"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
-msgstr "Nuovo utente di nome"
+msgstr "New user called"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "Nuovo osservatore"
 
 #: NOT FOUND IN SOURCE
 msgid "New window setting"
-msgstr "Impostazioni nuova finestra"
+msgstr "New window setting"
 
-#: NOT FOUND IN SOURCE
-msgid "NEWLINE"
-msgstr "NUOVA_RIGA"
-
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
-msgstr "Seguente"
+msgstr "Succesivo"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
-msgstr "Pagina seguente"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Next page"
-msgstr "Pagina seguente"
+msgstr "Pagina succesiva"
 
 #: NOT FOUND IN SOURCE
 msgid "NickName"
-msgstr "Nomignolo"
+msgstr "NickName"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
-msgstr "Nomignolo"
+msgstr "Soprannome"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
-msgstr "Nessuna classe definita"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
-msgstr "Nessun campo personalizzato"
+msgstr "No CustomField"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
-msgstr "Nessun campo personalizzato definito"
+msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
-msgstr "Nessun gruppo definito"
+msgstr "No Group defined"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
-msgstr "Nessuna query"
+msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
-msgstr "Nessuna coda definita"
+msgstr "No Queue defined"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
-msgstr "Nessun utente RT trovato. Consulta il tuo amministratore di RT.\\n"
+msgstr "No RT user found. Please consult your RT administrator.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "Nessun Modello"
 
 #: NOT FOUND IN SOURCE
 msgid "No Ticket specified. Aborting ticket "
-msgstr "Nessun ticket specificato. Annullo il ticket"
+msgstr "No Ticket specified. Aborting ticket "
+
+#: NOT FOUND IN SOURCE
+msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgstr ""
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
-msgstr "Nessuna azione"
+msgstr "No action"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
-msgstr "Nessuna colonna specificata"
+msgstr "No column specified"
 
 #: NOT FOUND IN SOURCE
 msgid "No command found\\n"
-msgstr "Nessun comando trovato\\n"
+msgstr "No command found\\n"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
-msgstr "Nessun commento su questo utente"
+msgstr "No comment entered about this user"
 
 #: NOT FOUND IN SOURCE
 msgid "No correspondence attached"
-msgstr "Nessuna corrispondenza allegata"
+msgstr "No correspondence attached"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "Nessuna descrizione per %1"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
-msgstr "Nessun gruppo specificato"
+msgstr "No group specified"
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
-msgstr "Nessun gruppo corrisponde ai criteri di ricerca."
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
-msgstr "Nessun messaggio allegato"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
-msgstr "Nessuna password impostata"
+msgstr "No password set"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
-msgstr "Manca il permesso per creare code"
+msgstr "No permission to create code"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
-msgstr "Manca il permesso per creare ticket nella coda '%1'"
+msgstr "No permission to create tickets in the coda '%1'"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
-msgstr "Manca il permesso per creare utenti"
+msgstr "No permission to create users"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
-msgstr "Manca il permesso per visualizzare il ticket"
+msgstr "No permission to display that ticket"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
-msgstr "Manca il permesso per aggiornare il ticket"
+msgstr "No permission to view update ticket"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
-msgstr "Nessun utente/gruppo specificato"
+msgstr "No principal specified"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
-msgstr "Nessun utente/gruppo selezionato."
+msgstr "No principals selected."
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
-msgstr "Nessuna coda soddisfa i criteri di ricerca."
+msgstr "No code matching search criteria found."
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "Nessun diritto trovato"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "Nessun diritto concesso."
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr "Nessuna ricerca caricata"
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
-msgstr "Nessuna ricerca su cui operare."
+msgstr "No search to operate on."
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
-msgstr "Senza oggetto"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "No ticket id specified"
-msgstr "Nessun identificativo di ticket specificato"
+msgstr "No ticket id specified"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
-msgstr "Nessun tipo transazione specificato"
+msgstr "No transaction type specified"
 
 #: NOT FOUND IN SOURCE
 msgid "No user or email address specified"
-msgstr "Nessun utente o indirizzo email specificato"
+msgstr "No user or email address specified"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
-msgstr "Nessuna utente soddisfa i criteri di ricerca."
+msgstr "No users matching search criteria found."
 
 #: NOT FOUND IN SOURCE
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
-msgstr "Nessun valore inviato a _Set!\\n"
+msgstr "No value sent to _Set!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "Nessuno"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
-msgstr "Campo inesistente?"
+msgstr "Nonexistant field?"
 
 #: NOT FOUND IN SOURCE
 msgid "Not logged in"
-msgstr "Accesso non effettuato"
+msgstr "Not logged in"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
-msgstr "Accesso non effettuato."
+msgstr "Non collegato."
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
-msgstr "Non impostato"
+msgstr "Non valorizzato"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
-msgstr "Non ancora implementato."
+msgstr "Not yet implemented."
 
 #: NOT FOUND IN SOURCE
 msgid "Not yet implemented...."
-msgstr "Non ancora implementato...."
+msgstr "Not yet implemented...."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
-msgstr "Note"
+msgstr "Notes"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
-msgstr "Impossibile inviare la notifica"
+msgstr "Notification could not be sent"
 
 #: etc/initialdata:101
 msgid "Notify AdminCcs"
-msgstr "invia notifica agli AdminCc"
+msgstr "Notify AdminCcs"
 
 #: etc/initialdata:97
 msgid "Notify AdminCcs as Comment"
-msgstr "invia notifica agli AdminCc come commento"
+msgstr "Notify AdminCcs as Comment"
 
 #: etc/initialdata:93 etc/upgrade/3.1.17/content:6
 msgid "Notify Ccs"
-msgstr "invia notifica ai Cc"
+msgstr ""
 
 #: etc/initialdata:89 etc/upgrade/3.1.17/content:2
 msgid "Notify Ccs as Comment"
-msgstr "invia notifica ai Cc come commento"
+msgstr ""
 
 #: etc/initialdata:128
 msgid "Notify Other Recipients"
-msgstr "invia notifica agli altri destinatari"
+msgstr "Notify Other Recipients"
 
 #: etc/initialdata:124
 msgid "Notify Other Recipients as Comment"
-msgstr "invia notifica agli altri destinatari come commento"
+msgstr "Notify Other Recipients as Comment"
 
 #: etc/initialdata:85
 msgid "Notify Owner"
-msgstr "invia notifica all'incaricato"
+msgstr "Notify Proprietario"
 
 #: etc/initialdata:81
 msgid "Notify Owner as Comment"
-msgstr "invia notifica all'incaricato come commento"
+msgstr "Notify Proprietario as Comment"
 
 #: etc/initialdata:376
 msgid "Notify Owner of their rejected ticket"
-msgstr "invia notifica all'incaricato del ticket respinto"
+msgstr ""
 
 #: etc/initialdata:365
 msgid "Notify Owner of their ticket has been approved by all approvers"
-msgstr "invia notifica all'incaricato del ticket che tutte le approvazioni sono state concesse"
+msgstr ""
 
 #: etc/initialdata:353
 msgid "Notify Owner of their ticket has been approved by some approver"
-msgstr "invia notifica all'incaricato del ticket che alcune approvazioni sono state concesse"
+msgstr ""
 
 #: etc/initialdata:334
 msgid "Notify Owners and AdminCcs of new items pending their approval"
-msgstr "invia notifica agli incaricati e AdminCc quando è necessario richiedere nuove approvazione"
+msgstr "Notify Proprietari and AdminCcs of new items pending their approval"
 
 #: etc/initialdata:77
 msgid "Notify Requestors"
-msgstr "invia notifica al richiedente"
+msgstr "Notifica al Richiedente"
 
 #: etc/initialdata:111
 msgid "Notify Requestors and Ccs"
-msgstr "invia notifica ai richiedenti e ai Cc"
+msgstr "Notifica ai Richiedenti e ai Ccs"
 
 #: etc/initialdata:106
 msgid "Notify Requestors and Ccs as Comment"
-msgstr "invia notifica ai richiedenti e ai Cc come commento"
+msgstr "Notifica ai Richiedenti e ai Ccs come Commento"
 
 #: etc/initialdata:120
 msgid "Notify Requestors, Ccs and AdminCcs"
-msgstr "invia notifica ai richiedenti, Cc e AdminCc"
+msgstr "Notifica ai Richiedenti, Ccs e AdminCcs"
 
 #: etc/initialdata:116
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
-msgstr "invia notifica ai richiedenti, Cc a AdminCc come commento"
+msgstr "Notifica ai Richiedenti, Ccs a AdminCcs come Commento"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "Nov."
 
 #: NOT FOUND IN SOURCE
 msgid "November"
-msgstr "Novembre"
-
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr "OR"
+msgstr "November"
 
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
-msgstr "L'oggetto non può essere creato"
+msgstr "Object could not be created"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr "L'oggetto non può essere cancellato"
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
-msgstr "Oggetto creato"
-
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr "Oggetto cancellato"
+msgstr "Object created"
 
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
-msgstr "Oggetto di tipo %1 non accetta campi personalizzati"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
-msgstr "Tipo oggetto non corrisponde"
+msgstr ""
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "Oct."
 
 #: NOT FOUND IN SOURCE
 msgid "October"
-msgstr "Ottobre"
+msgstr "October"
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
-msgstr "Offline"
+msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
-msgstr "Modifiche offline"
+msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
-msgstr "Upload richiesta offline"
+msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
-msgstr "il"
+msgstr "On"
 
 #: etc/initialdata:163
 msgid "On Comment"
-msgstr "All'arrivo di un commento"
+msgstr "On Comment"
 
 #: etc/initialdata:156
 msgid "On Correspond"
-msgstr "All'arrivo di una corrispondenza"
+msgstr "On Correspond"
 
 #: etc/initialdata:145
 msgid "On Create"
-msgstr "Alla creazione"
+msgstr "On Create"
 
 #: etc/initialdata:184
 msgid "On Owner Change"
-msgstr "Al cambio dell'incaricato"
+msgstr "On Owner Change"
 
 #: etc/initialdata:177 etc/upgrade/3.1.17/content:15
 msgid "On Priority Change"
-msgstr "Al cambio della priorità"
+msgstr ""
 
 #: etc/initialdata:192
 msgid "On Queue Change"
-msgstr "Al cambio di coda"
+msgstr "On Queue Change"
 
 #: etc/initialdata:198
 msgid "On Resolve"
-msgstr "Alla risoluzione"
+msgstr "On Resolve"
 
 #: etc/initialdata:169
 msgid "On Status Change"
-msgstr "Al cambio di stato"
+msgstr "On Status Change"
 
 #: etc/initialdata:150
 msgid "On Transaction"
-msgstr "Ad ogni transazione"
+msgstr "On Transaction"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
-msgstr "Mostra le approvazioni solo per le richieste create dopo il %1"
+msgstr "Mostra le approvazioni solo per le richieste create dopo %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
-msgstr "Mostra le approvazioni solo per le richieste create prima del %1"
+msgstr "Mostra le approvazioni solo per le richieste create prima %1"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Aperto"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
-msgstr "Apri"
+msgstr "Aprilo"
 
 #: NOT FOUND IN SOURCE
 msgid "Open requests"
 msgstr "Richieste aperte"
 
-#: NOT FOUND IN SOURCE
-msgid "Open ticket"
-msgstr "Apri ticket"
-
-#: html/SelfService/Elements/Tabs:63
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
-msgstr "Ticket aperti"
+msgstr "Open tickets"
 
 #: NOT FOUND IN SOURCE
 msgid "Open tickets (from listing) in a new window"
-msgstr "Apre ticket (dalla lista) in una nuova finestra"
+msgstr "Open tickets (from listing) in a new window"
 
 #: NOT FOUND IN SOURCE
 msgid "Open tickets (from listing) in another window"
-msgstr "Apre ticket (dalla lista) in un'altra finestra"
+msgstr "Open tickets (from listing) in another window"
 
 #: etc/initialdata:140
 msgid "Open tickets on correspondence"
-msgstr "Apri i ticket all'arrivo di corrispondenza"
+msgstr "Open tickets on correspondence"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
-msgstr "Ordina per"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ordering and sorting"
-msgstr "Ordinamento"
+msgstr "Visualizzazione e Ordinamento"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Azienda"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
-msgstr "Ticket originario: n°%1"
+msgstr "Originating ticket: n°%1"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
-msgstr "Registrata email in uscita riguardante un commento"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
-msgstr "Registrata email in uscita"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
-msgstr "Al passare del tempo, la priorità cresce fino a"
+msgstr "Se scade il tempo, la priorità sale di"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
-msgstr "Prende in carico ticket"
+msgstr "Own tickets"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
-msgstr "PrendeInCaricoTicket"
+msgstr "PossiediTicket"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
-msgstr "Incaricato"
+msgstr "Proprietario"
 
 #: NOT FOUND IN SOURCE
 msgid "Owner changed from %1 to %2"
-msgstr "Cambiato incaricato da %1 a %2"
+msgstr "Proprietario changed from %1 to %2"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
-msgstr "L'incaricato non può essere impostato."
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
-msgstr "Cambiato forzatamente l'incaricato da %1 a %2"
+msgstr "Owner forcibly changed from %1 to %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Owner is"
-msgstr "In carico a"
+msgstr "Il Proprietario è"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
-msgstr "Pagina %1 di %2"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
-msgstr "Cercapersone"
+msgstr "Pager"
 
 #: NOT FOUND IN SOURCE
 msgid "PagerPhone"
-msgstr "Cercapersone"
+msgstr "PagerPhone"
+
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr ""
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
-msgstr "DerivaDa"
+msgstr "Genitori"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "Password"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
-msgstr "Promemoria password"
-
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr "Password cambiata"
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr "La password deve essere lunga almeno %1 caratteri"
+msgstr "Password Reminder"
 
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
-msgstr "Password troppo corta"
+msgstr "Password too short"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "Password: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
-msgstr "Le passwords non corrispondono."
+msgstr "Passwords do not match."
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
-msgstr "Le password non corrispondono. La password non è stata cambiata"
+msgstr "Passwords do not match. Your password has not been changed"
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "Persone"
 
 #: etc/initialdata:133
 msgid "Perform a user-defined action"
-msgstr "Esegui un'azione personalizzata"
+msgstr "Perform a user-defined action"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
-msgstr "Configurazione perl"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
-msgstr "Operazione non consentita"
+msgstr "Permission Denied"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
-msgstr "Gruppi personali"
+msgstr "Gruppi Personali"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Gruppi personali"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Gruppi personali:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
-msgstr "Numeri telefonici"
+msgstr "Numeri Telefonici"
 
 #: NOT FOUND IN SOURCE
 msgid "Placeholder"
-msgstr "Segnaposto"
+msgstr "Placeholder"
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr ""
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -4046,140 +4050,144 @@ msgstr "Preferenze"
 msgid "Prefs"
 msgstr "Prefs"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
-msgstr "Preparazione non necessaria"
+msgstr "Prepare Stubbed"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "Precedente"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
-msgstr "Pagina precedente"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Previous page"
-msgstr "Pagina precedente"
+msgstr "Previous page"
 
 #: NOT FOUND IN SOURCE
 msgid "Pri"
 msgstr "Pri"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
-msgstr "Utente/gruppo %1 not trovato."
+msgstr "Principal %1 not found."
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Priorità"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "La priorità inizia da"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
-msgstr "Riservatezza:"
+msgstr ""
 
 #: etc/initialdata:25
 msgid "Privileged"
 msgstr "Privilegiato"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "Stato previlegiato: %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "Utenti privilegiati"
 
+#: NOT FOUND IN SOURCE
+msgid "Projects"
+msgstr ""
+
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
-msgstr "Pseudogruppo per uso interno"
+msgstr "Pseudogroup for internal use"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
-msgstr "Query"
+msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
-msgstr "Costruttore di query"
+msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "Coda"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
-msgstr "Coda %1 non trovata"
+msgstr "Queue %1 not found"
 
 #: NOT FOUND IN SOURCE
 msgid "Queue '%1' not found\\n"
-msgstr "Coda '%1' non trovata\\n"
+msgstr "Queue '%1' not found\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Queue Keyword Selections"
-msgstr "Selezione delle parole chiave per la coda"
+msgstr "Queue Keyword Selections"
 
-#: html/Admin/Queues/Modify.html:64
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "Nome della coda"
 
 #: NOT FOUND IN SOURCE
 msgid "Queue Scrips"
-msgstr "Scrips della coda"
+msgstr "Queue Scrips"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
-msgstr "La coda esiste già"
+msgstr "Queue already exists"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
-msgstr "Impossibile creare la coda"
+msgstr "Queue could not be created"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
-msgstr "Impossibile caricare la coda."
+msgstr "Queue could not be loaded."
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
-msgstr "Coda creata"
+msgstr "Queue created"
 
 #: NOT FOUND IN SOURCE
 msgid "Queue is not specified."
-msgstr "Coda non specificata."
+msgstr "Queue is not specified."
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
-msgstr "Coda non trovata"
+msgstr "Queue not found"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "Code"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr "Ricerca veloce"
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
-msgstr "Creazione veloce di un ticket"
+msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
-msgstr "RSS"
+msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 per %2"
@@ -4196,13 +4204,13 @@ msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
-msgstr "Amministrazione di RT"
+msgstr "RT Administration"
 
 #: NOT FOUND IN SOURCE
 msgid "RT Authentication error."
-msgstr "Errore di autenticazione RT."
+msgstr "RT Authentication error."
 
 #: NOT FOUND IN SOURCE
 msgid "RT Bounce: %1"
@@ -4210,74 +4218,78 @@ msgstr "RT Bounce: %1"
 
 #: NOT FOUND IN SOURCE
 msgid "RT Configuration error"
-msgstr "Errore nella configurazione di RT"
+msgstr "RT Configuration error"
 
 #: NOT FOUND IN SOURCE
 msgid "RT Critical error. Message not recorded!"
-msgstr "Errore critico. Messaggio not registrato!"
+msgstr "RT Critical error. Message not recorded!"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
-msgstr "Errore RT"
+msgstr "RT Error"
 
 #: NOT FOUND IN SOURCE
 msgid "RT Received mail (%1) from itself."
-msgstr "RT ha ricevuto email (%1) da se stesso."
+msgstr "RT Received mail (%1) from itself."
 
 #: NOT FOUND IN SOURCE
 msgid "RT Recieved mail (%1) from itself."
-msgstr "RT ha ricevuto email (%1) da se stesso."
+msgstr "RT Recieved mail (%1) from itself."
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "RT Self Service / Closed Tickets"
-msgstr "RT Self Service / Ticket chiusi"
+msgstr "RT Self Service / Closed Tickets"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
-msgstr "Variabili RT"
+msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
-msgstr "Quadro d'insieme"
+msgstr "Colpo d'occhio di RT"
 
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't authenticate you"
-msgstr "RT non ha potuto autenticarti"
+msgstr "RT couldn't authenticate you"
 
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't find requestor via its external database lookup"
-msgstr "RT non è riuscito a trovare il richiedente consultando in database esterno"
+msgstr "RT couldn't find requestor via its external database lookup"
 
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't find the queue: %1"
-msgstr "RT non ha trovato la coda: %1"
-
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr "RT non può memorizzare la tua sessione"
+msgstr "RT couldn't find the coda: %1"
 
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
-msgstr "RT non può verificare questa firma PGP. \\n"
+msgstr "RT couldn't validate this PGP signature. \\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
-msgstr "RT / %1"
+msgstr "RT per %1"
 
 #: NOT FOUND IN SOURCE
 msgid "RT for %1: %2"
-msgstr "RT / %1: %2"
+msgstr "RT per %1: %2"
 
 #: NOT FOUND IN SOURCE
 msgid "RT has proccessed your commands"
-msgstr "RT ha eseguito i comandi"
+msgstr "RT has proccessed your commands"
 
 #: NOT FOUND IN SOURCE
 msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 msgstr "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  RT viene distribuito con la <a href=\"http://www.gnu.org/copyleft/gpl.html\">Versione 2 della GNU General Public License.</a>"
 
 #: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 msgstr "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  RT viene distribuito con la <a href=\"http://www.gnu.org/copyleft/gpl.html\">Versione 2 della GNU General Public License.</a>"
 
@@ -4293,102 +4305,106 @@ msgstr "RT will process this message as if it were unsigned.\\n"
 msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
 msgstr "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
-msgstr "Nome reale"
+msgstr "Nome Reale"
 
 #: NOT FOUND IN SOURCE
 msgid "RealName"
-msgstr "NomeReale"
+msgstr "RealName"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
-msgstr "Aggiunto riferimento da %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
-msgstr "Cancellato riferimento da %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
-msgstr "Aggiunto riferimento a %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
-msgstr "Cancellato riferimento a %1"
+msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
-msgstr "È un riferimento per"
-
-#: NOT FOUND IN SOURCE
-msgid "ReferredToBy"
-msgstr "RiferimentoPer"
+msgstr "Riferito da"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "Fa riferimento a"
 
 #: NOT FOUND IN SOURCE
 msgid "RefersTo"
-msgstr "FaRiferimentoA"
+msgstr "RefersTo"
 
 #: NOT FOUND IN SOURCE
 msgid "Refine"
-msgstr "Rifinisci"
+msgstr "Refine"
 
 #: NOT FOUND IN SOURCE
 msgid "Refine search"
 msgstr "Rifinisci la ricerca"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Aggiorna questa pagina ogni %1 minuti."
 
-#: html/Search/Bulk.html:116
+#: NOT FOUND IN SOURCE
+msgid "Relationships"
+msgstr ""
+
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
-msgstr "Rimuovi AdminCc"
+msgstr "Remove AdminCc"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
-msgstr "Rimuovi Cc"
+msgstr "Remove Cc"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
-msgstr "Rimuovi richiedente"
+msgstr "Rimuovi il RIchiedente"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Risposta"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
-msgstr "Indirizzo a cui indirizzare le risposte"
+msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
-msgstr "Rispondi ai richiedenti"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
-msgstr "Rispondi ai ticket"
+msgstr "Rispondi ai tickets"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "RispondiAlTicket"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "Richiedente"
 
 #: NOT FOUND IN SOURCE
 msgid "Requestor email address"
-msgstr "Indirizzo email del richiedente"
+msgstr "Indirizzo emaildel richiedente"
 
 #: NOT FOUND IN SOURCE
 msgid "Requestor(s)"
@@ -4398,37 +4414,37 @@ msgstr "Richiedente(i)"
 msgid "RequestorAddresses"
 msgstr "IndirizzoRichiedente"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "Richiedenti"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
-msgstr "Le richieste devono essere soddisfatte entro"
+msgstr "Le richieste devono essere soddisfatte in"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
-msgstr "Il parametro obbligatorio '%1' non è stato specificato"
+msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Azzera"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Casa"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "Risolvi"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "Risolvi il ticket n°%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "Risolto"
 
@@ -4436,7 +4452,7 @@ msgstr "Risolto"
 msgid "Response to requestors"
 msgstr "Risposta ai richiedenti"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "Risultati"
 
@@ -4444,121 +4460,115 @@ msgstr "Risultati"
 msgid "Results per page"
 msgstr "Risultati per pagina"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "Ridigita Password"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
-msgstr "Annulla modifiche"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
-msgstr "Diritto %1 non trovato per %2  %3 limitatamente a %4 (%5)\\n"
+msgstr "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
-msgstr "Diritto delegato"
+msgstr "Right Delegated"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
-msgstr "Diritto concesso"
+msgstr "Right Granted"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
-msgstr "Diritto caricato"
+msgstr "Right Loaded"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
-msgstr "Il diritto non può essere revocato"
+msgstr "Right could not be revoked"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
-msgstr "Diritto non trovato"
+msgstr "Right not found"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
-msgstr "Diritto non caricato."
+msgstr "Right not loaded."
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
-msgstr "Diritto revocato"
+msgstr "Right revoked"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Diritti"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
-msgstr "I diritti per %1 non possono essere concessi"
+msgstr "I diritti non possono essere concessi per %1"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
-msgstr "I diritti per %1 non possono essere revocati"
+msgstr "I diritti non possono essere revocaqti per %1"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "Ruoli"
 
 #: NOT FOUND IN SOURCE
 msgid "RootApproval"
-msgstr "ApprovazioneAmministratore"
+msgstr "RootApproval"
 
-#: html/Search/Elements/DisplayOptions:83
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
-msgstr "Righe per pagina"
+msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "Sab."
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
-msgstr "Salva"
+msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
-msgstr "Salva modifiche"
+msgstr "Salva i Cambiamenti"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
-msgstr "Salva preferenze"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
-msgstr "Salva modifiche"
-
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr "Ricerca %1 salvata"
+msgstr "Salva i cambiamenti"
 
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
-msgstr "Ricerche salvate"
+msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr "Scrip n°%1"
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
-msgstr "Scrip creato"
+msgstr "Scrip Created"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
-msgstr "Campi dello scrip"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "Scrip eliminato"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "Scrips"
 
@@ -4566,154 +4576,141 @@ msgstr "Scrips"
 msgid "Scrips for %1\\n"
 msgstr "Scrips per %1\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
-msgstr "Scrips che si applicano a tutte le code"
+msgstr "Scrips which apply to all code"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
-msgstr "Ricerca"
+msgstr "Cerca"
 
 #: NOT FOUND IN SOURCE
 msgid "Search Criteria"
-msgstr "Criteri di ricerca"
-
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr "Errore nel caricamento degli attributi della ricerca"
+msgstr "Crieri di Ricerca"
 
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr "Ricerca le richieste di approvazione"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
-msgstr "Aggiornamento della ricerca: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
+msgstr ""
 
-#: bin/rt-crontool:213
+#: NOT FOUND IN SOURCE
+msgid "Searches can't be associated with that kind of object"
+msgstr ""
+
+#: bin/rt-crontool:184
 msgid "Security:"
-msgstr "Protezione:"
+msgstr "Security:"
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
-msgstr "Vedi campi personalizzati"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
-msgstr "Vedi letteralmente i messaggi in uscita e i loro destinatari"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
-msgstr "Vedi commenti privati del ticket"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
-msgstr "Vedi riassunto dei ticket"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
-msgstr "VediCampoPers."
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr "VediGruppo"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
 msgstr "VediCoda"
 
 #: NOT FOUND IN SOURCE
 msgid "Select"
-msgstr "Seleziona"
+msgstr ""
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Select a Custom Field"
-msgstr "Scegli un campo personalizzato"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
+msgstr ""
 
-#: html/Admin/Groups/index.html:78
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "Seleziona un gruppo"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "Seleziona una coda"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr "Scegli una coda per il nuovo ticket"
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "Seleziona un utente"
 
-#: html/Admin/Elements/CustomFieldTabs:90
+#: NOT FOUND IN SOURCE
+msgid "Select class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
 msgid "Select custom field"
 msgstr "Seleziona un campo personalizzato"
 
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr "Seleziona i campi personalizzati per tutti i gruppi degli utenti"
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr "Seleziona i campi personalizzati per tutti gli utenti"
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
-msgstr "Seleziona i campi personalizzati per i ticket in tutte le code"
-
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr "Seleziona i campi personalizzati per le transazioni relative ai ticket in tutte le code"
-
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
-msgstr "Seleziona il gruppo"
+msgstr "Seleziona gruppo"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
-msgstr "Elenco a selezione multipla"
+msgstr "Seleziona valori multipli"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
-msgstr "Elenco a selezione singola"
+msgstr "Seleziona un volore solo"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
-msgstr "Seleziona la coda"
+msgstr "Seleziona una coda"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
-msgstr "Seleziona lo scrip"
+msgstr "Seleziona uno scrip"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
-msgstr "Seleziona il modello"
+msgstr "Seleziona un modello"
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
-msgstr "Seleziona un massimo di %1 valori"
+msgstr ""
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
-msgstr "Seleziona l'utente"
+msgstr "Seleziona utente"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectMultiple"
-msgstr "SelezioneMultipla"
+msgstr "SelectMultiple"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:34
 msgid "SelectSingle"
-msgstr "SelezioneSingola"
+msgstr "SelectSingle"
 
-#: html/Admin/Elements/EditCustomFields:58
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
-msgstr "Campi personalizzati selezionati"
+msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
-msgstr "Oggetti selezionati"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Self Service"
@@ -4725,7 +4722,7 @@ msgstr "Invia una mail a tutti gli osservatori"
 
 #: etc/initialdata:117
 msgid "Send mail to all watchers as a \"comment\""
-msgstr "Invia una mail atutti gli osservatori come \"commento\""
+msgstr "Invia una mail atutti gli osservatori come un \"commento\""
 
 #: etc/initialdata:112
 msgid "Send mail to requestors and Ccs"
@@ -4733,7 +4730,7 @@ msgstr "Invia mail ai richiedenti e Ccs"
 
 #: etc/initialdata:107
 msgid "Send mail to requestors and Ccs as a comment"
-msgstr "Invia mail come commento a richiedenti e Cc"
+msgstr "Invia mail ai richiedenti e Ccs come commento"
 
 #: etc/initialdata:78
 msgid "Sends a message to the requestors"
@@ -4741,155 +4738,155 @@ msgstr "Invia un messaggio ai richiedenti"
 
 #: etc/initialdata:125 etc/initialdata:129
 msgid "Sends mail to explicitly listed Ccs and Bccs"
-msgstr "Invia mail a Cc e Bcc esplicitamente elencati"
+msgstr "Sends mail to explicitly listed Ccs and Bccs"
 
 #: etc/initialdata:94 etc/upgrade/3.1.17/content:7
 msgid "Sends mail to the Ccs"
-msgstr "Invia mail ai Cc"
+msgstr ""
 
 #: etc/initialdata:90 etc/upgrade/3.1.17/content:3
 msgid "Sends mail to the Ccs as a comment"
-msgstr "Invia mail ai Cc come commento"
+msgstr ""
 
 #: etc/initialdata:102
 msgid "Sends mail to the administrative Ccs"
-msgstr "Invia mail ai Cc amministrativi"
+msgstr "Sends mail to the administrative Ccs"
 
 #: etc/initialdata:98
 msgid "Sends mail to the administrative Ccs as a comment"
-msgstr "Invia mail ai Cc amministrativi come commento"
+msgstr "Sends mail to the administrative Ccs as a comment"
 
 #: etc/initialdata:82 etc/initialdata:86
 msgid "Sends mail to the owner"
-msgstr "Invia mail all'incaricato"
+msgstr "Sends mail to the owner"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
-msgstr "Set."
+msgstr "Sep."
+
+#: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "September"
-msgstr "Settembre"
+msgstr "September"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
-msgstr "Mostra"
+msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
-msgstr "Mostra richieste di approvazione"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
-msgstr "Mostra colonne"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
-msgstr "Mostra i risultati"
+msgstr "Mostra i Risultati"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "Mostra le richieste approvate"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "Mostra info di base"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "Mostra le richieste negate"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "Mostra i dettagli"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "Mostra le richieste in attesa"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "Mostra le richieste in attesa di altre approvazioni"
 
 #: NOT FOUND IN SOURCE
 msgid "Show ticket private commentary"
-msgstr "Mostra commenti privati del ticket"
+msgstr "Show ticket private commentary"
 
 #: NOT FOUND IN SOURCE
 msgid "Show ticket summaries"
-msgstr "Mostra riassunto dei ticket"
+msgstr "Show ticket summaries"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
-msgstr "MostraACL"
+msgstr "MostraLCA"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr "MostraTabConfigurazione"
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
-msgstr "MostraEmailUscente"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
-msgstr "MostraRicercheSalvate"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr "MostraScrips"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr "MostraModello"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr "MostraTicket"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
-msgstr "MostraCommentiAlTicket"
+msgstr "MostraICommentiAlTicket"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
-msgstr "Registra come richiede o come Cc del ticket o della coda"
+msgstr "Sign up as a ticket Requestor or ticket or coda Cc"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
-msgstr "Registra come AdminCc del ticket o della coda"
+msgstr "Sign up as a ticket or coda AdminCc"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "Firma"
 
 #: NOT FOUND IN SOURCE
 msgid "Signed in as %1"
-msgstr "Accesso effettuato come %1"
+msgstr "Signed in as %1"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
-msgstr "Singolo"
-
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr "Carattere"
+msgstr "Single"
 
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
-msgstr "Salta menu"
-
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr "Piccolo"
+msgstr "Skip Menu"
 
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
-msgstr "Ordinamento"
+msgstr "Ordina"
+
+#: NOT FOUND IN SOURCE
+msgid "Sort Order"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Sort key"
-msgstr "Chiave di ordinamento"
+msgstr "Sort key"
 
 #: NOT FOUND IN SOURCE
 msgid "Sort results by"
@@ -4897,9 +4894,13 @@ msgstr "Ordina i risultati per"
 
 #: NOT FOUND IN SOURCE
 msgid "SortOrder"
-msgstr "Ordinamento"
+msgstr "SortOrder"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr ""
 
@@ -4911,183 +4912,187 @@ msgstr "In stallo"
 msgid "Start page"
 msgstr "Pagina iniziale"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "Iniziato"
 
 #: NOT FOUND IN SOURCE
 msgid "Started date '%1' could not be parsed"
-msgstr "Impossibile interpretare data inizio '%1'"
+msgstr "Started date '%1' could not be parsed"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
-msgstr "InizioPrevisto"
+msgstr "Inizia"
 
 #: NOT FOUND IN SOURCE
 msgid "Starts By"
-msgstr "Inizio previsto il"
+msgstr "Inizia Da"
 
 #: NOT FOUND IN SOURCE
 msgid "Starts date '%1' could not be parsed"
-msgstr "Impossibile interpretare data inizio previsto '%1'"
+msgstr "Starts date '%1' could not be parsed"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Provincia"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Stato"
 
 #: etc/initialdata:309
 msgid "Status Change"
-msgstr "Cambiamento di stato"
+msgstr "Cambiamento di Stato"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
-msgstr "Cambiato lo stato da %1 a %2"
+msgstr "Cambiato lo Stato da %1 a %2"
 
 #: NOT FOUND IN SOURCE
 msgid "StatusChange"
-msgstr "CambiamentoStato"
+msgstr "StatusChange"
 
-#: html/Ticket/Elements/Tabs:170
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
-msgstr "Sottrai"
+msgstr "Ruba"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
-msgstr "Sottrae ticket"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
-msgstr "SottraeTicket"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "Sottratto da %1"
-
-#: NOT FOUND IN SOURCE
 msgid "Stolen from %1 "
-msgstr "Sottratto da %1 "
+msgstr "Rubato da %1 "
 
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr "Stile"
-
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Oggetto"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
-msgstr "L'oggetto diventa %1"
+msgstr "Subject changed to %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "Invia"
 
 #: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Submit Workflow"
-msgstr "Imposta workflow"
+msgstr "Submit Workflow"
 
-#: lib/RT/Group_Overlay.pm:782
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
-msgstr "Completato con successo"
+msgstr "Succeeded"
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "Dom."
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "SuperUtente"
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "Sistema"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
-msgstr "Configurazione del sistema"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
-msgstr "Errore di sistema"
+msgstr "Errore di Sistema"
 
 #: NOT FOUND IN SOURCE
 msgid "System Error. Right not granted."
-msgstr "Errore di sistema. Diritto non concesso."
+msgstr "Errore di Sistema. Diritto non concesso."
 
 #: NOT FOUND IN SOURCE
 msgid "System Error. right not granted"
-msgstr "Errore di sistema. Diritto non concesso"
-
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr "Errore di sistema: %1"
+msgstr "Errore di Sistema. Diritto non concesso"
 
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
-msgstr "Strumenti di sistema"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
-msgstr "Errore di sistema. Diritto non delegato."
+msgstr "Errore di Sistema. Diritto non delegato."
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
-msgstr "Errore di sistema. Diritto non concesso."
+msgstr "Errore di Sistema. Diritto non concesso."
 
 #: NOT FOUND IN SOURCE
 msgid "System error. Unable to grant rights."
 msgstr "Errore di sistema. Impossibile concedere i diritti."
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "Gruppi di sistema"
 
 #: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
 msgid "SystemRolegroup for internal use"
-msgstr "SystemRolegroup per uso interno"
+msgstr "SystemRolegroup for internal use"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
-msgstr "Prendi in carico"
+msgstr "Prendi"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
-msgstr "Prendi in carico ticket"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
-msgstr "PrendiInCaricoTicket"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
-msgstr "Preso in carico"
+msgstr "Preso"
+
+#: NOT FOUND IN SOURCE
+msgid "Task"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Modello"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "Modello n°%1"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "Modello eliminato"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Modello non trovato"
 
@@ -5095,11 +5100,11 @@ msgstr "Modello non trovato"
 msgid "Template not found\\n"
 msgstr "Modello non trovato\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Modello elaborato"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Modelli"
 
@@ -5109,490 +5114,498 @@ msgstr "Modelli per %1\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Text"
-msgstr "Testo"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
-msgstr "Il valore attuale è già questo"
+msgstr "That is already the current value"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
-msgstr "Questo campo personalizzato non ammette questo valore"
+msgstr "That is not a value for this custom field"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
-msgstr "Il valore è lo stesso"
+msgstr "That is the same value"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
-msgstr "Questo utente/gruppo ha già questo diritto"
+msgstr "That principal already has that right"
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
-msgstr "Questo utente/gruppo è già %1 per questa coda"
+msgstr "That principal is already a %1 for this coda"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
-msgstr "Questo utente/gruppo è già %1 per questo ticket"
+msgstr "That principal is already a %1 for this ticket"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
-msgstr "Questo utente/gruppo non è %1 per questa coda"
+msgstr "That principal is not a %1 for this coda"
 
 #: NOT FOUND IN SOURCE
 msgid "That principal is not a %1 for this ticket"
-msgstr "Questo utente/gruppo non è %1 per questo ticket"
+msgstr "That principal is not a %1 for this ticket"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
-msgstr "La coda non esiste"
+msgstr "That coda does not exist"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
-msgstr "Il ticket ha dipendenze non risolte"
+msgstr "That ticket has unresolved dependencies"
 
 #: NOT FOUND IN SOURCE
 msgid "That user already has that right"
-msgstr "L'utente ha già questo diritto"
+msgstr "That user already has that right"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
-msgstr "L'utente ha già il ticket in carico"
+msgstr "That user already owns that ticket"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
-msgstr "L'utente non esiste"
+msgstr "That user does not exist"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
-msgstr "L'utente è già previlegiato"
+msgstr "Questo utente è già previlegiato"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
-msgstr "L'utente è già non previlegiato"
+msgstr "Questo utente è già non previlegiato"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
-msgstr "Ora l'utente è previlegiato"
+msgstr "Ora questo utente è previlegiato"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
-msgstr "Ora l'utente è non previlegiato"
+msgstr "Ora questo utente è non previlegiato"
 
 #: NOT FOUND IN SOURCE
 msgid "That user is now unprivilegedileged"
-msgstr "Ora l'utente è non previlegiato"
+msgstr "Questo utente ora è non previlegiato"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
-msgstr "L'utente non può prendere in carico ticket da questa coda"
+msgstr "That user may not own tickets in that coda"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
-msgstr "Non è un identificativo numerico"
+msgstr "That's not a numerical id"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "Dati di base"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
-msgstr "Il Cc di un ticket"
+msgstr "The CC of a ticket"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
-msgstr "Il Cc amministrativo di un ticket"
+msgstr "The administrative CC of a ticket"
 
 #: NOT FOUND IN SOURCE
 msgid "The comment has been recorded"
-msgstr "Il commento è stato registrato"
+msgstr "The comment has been recorded"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
-msgstr "Il comando seguente troverà tutti i ticket attivi nella coda 'general' e ne imposterà la priorità a 99 se nessuno li ha toccati nelle ultime 4 ore:"
+msgstr "The following command will find all active tickets in the coda 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 
-#: lib/RT/Record.pm:934
+#: NOT FOUND IN SOURCE
+msgid "The following commands were not proccessed:\\n\\n"
+msgstr ""
+
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
-msgstr "Il nuovo valore è stato impostato."
+msgstr "The new value has been set."
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
-msgstr "L'incaricato del ticket"
+msgstr "The owner of a ticket"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
-msgstr "Il richiedente del ticket"
+msgstr "Il richiedente di un ticket"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
-msgstr "Questi commenti non vengono normalmente mostrati all'utente"
+msgstr "These comments aren't generally visible to the user"
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
-msgstr "L'oggetto non ammette questo campo personalizzato"
+msgstr ""
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
-msgstr "Questa funzionalità è riservata agli amministratori di sistema"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
-msgstr "Il messaggio sarà inviato a..."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "This ticket %1 %2 (%3)\\n"
-msgstr "Il ticket %1 %2 (%3)\\n"
+msgstr "This ticket %1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
-msgstr "Questo strumento permette di eseguire qualsiasi modulo perl da dentro RT."
+msgstr "This tool allows the user to run arbitrary perl modules from within RT."
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
-msgstr "La transazione sembra non avere alcun contenuto"
+msgstr "This transaction appears to have no content"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
-msgstr "I %1 ticket a maggior priorità richiesti da questo utente"
+msgstr "I %1 tickets di questo utente a più alta priorità"
 
 #: NOT FOUND IN SOURCE
 msgid "This user's 25 highest priority tickets"
-msgstr "I 25 ticket a maggior priorità richiesti da questo utente"
+msgstr "I 25 tickets a più alta priorità di questo utente"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "Gio."
 
 #: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Ticket # %1  %2"
-msgstr "Ticket n° %1 %2"
+msgstr "Ticket n° %1  %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket # %1 Jumbo update: %2"
 msgstr "Ticket n° %1 aggiornamento Jumbo: %2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
-msgstr "Ticket n°%1 aggiornamento Jumbo: %2"
+msgstr "Ticket n° %1 Jumbo update: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "Ticket n°%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
-msgstr "Creato ticket %1 nella coda '%2'"
+msgstr "Ticket %1 created in coda '%2'"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket %1 loaded\\n"
-msgstr "Caricato ticket %1\\n"
+msgstr "Ticket %1 loaded\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "Ticket %1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
-msgstr "Campi personalizzati del ticket"
+msgstr ""
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
-msgstr "Cronologia del ticket n° %1 %2"
+msgstr "Ticket History n° %1 %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket Id"
-msgstr "Identificativo ticket"
+msgstr "Ticket Id"
 
 #: etc/initialdata:324
 msgid "Ticket Resolved"
-msgstr "Ticket risolto"
+msgstr "Ticket Risolto"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
-msgstr "Transazioni sul ticket"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket attachment"
-msgstr "Allegato al ticket"
+msgstr "Allegato al ticket: il "
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "Contenuto del ticket"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
-msgstr "Tipo del contenuto del ticket"
+msgstr "Ticket content type"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
-msgstr "A causa di un errore interno non è stato possibile creare il ticket"
+msgstr "Ticket could not be created due to an internal error"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "Ticket creato"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket creation failed"
-msgstr "Creazione del ticket fallita"
+msgstr "Ticket creation failed"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "Ticket eliminato"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket id not found"
-msgstr "Identificativo del ticket non trovato"
+msgstr "Ticket id not found"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket killed"
-msgstr "Ticket eliminato"
+msgstr "Ticket killed"
 
-#: html/Ticket/Display.html:55
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
-msgstr "Metadati del ticket"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket not found"
-msgstr "Ticket non trovato"
+msgstr "Ticket not found"
 
 #: etc/initialdata:310
 msgid "Ticket status changed"
-msgstr "Stato del ticket cambiato"
+msgstr "Ticket status changed"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket watchers"
 msgstr "Osservatori del ticket"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr "Modulo di ricerca TicketSQL"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
-msgstr "Ticket"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
-msgstr "Ticket %1 da %2"
+msgstr "Tickets %1 by %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Tickets from %1"
-msgstr "Ticket da %1"
+msgstr "Tickets from %1"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
-msgstr "Ticket che dipendono da questa approvazione:"
+msgstr "Tickets which depend on this approval:"
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
-msgstr "Tempo stimato"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
-msgstr "Tempo rimasto"
+msgstr "Tempo RImasto"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
-msgstr "Tempo lavorato"
+msgstr "Tempo Lavorato"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
-msgstr "Tempo rimanente"
+msgstr "Tempo rimasto"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
-msgstr "Tempo impiegato per l'elaborazione"
+msgstr "Time to display"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
-msgstr "Tempo impiegato"
+msgstr "Tempo lavorato"
 
 #: NOT FOUND IN SOURCE
 msgid "TimeLeft"
-msgstr "TempoRimanente"
+msgstr "TempoRimasto"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
-msgstr "TempoImpiegato"
-
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr "Titolo"
+msgstr "TempoLavorato"
 
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:"
-msgstr "Per generare una diff dopo il commit:"
+msgstr "To generate a diff of this commit:"
 
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:\\n"
-msgstr "Per generare una diff dopo il commit:\\n"
+msgstr "To generate a diff of this commit:\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
-msgstr "Per richieste di supporto, formazione, personalizzazioni o acquisto di licenze, si prega di contattare %1."
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
-msgstr "UltimaComunicazioneARichiedenti"
+msgstr "Told"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
-msgstr "Strumenti"
+msgstr ""
 
 #: etc/initialdata:252
 msgid "Transaction"
-msgstr "Transazioni"
+msgstr "Transaction"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
-msgstr "Transazione %1 ripulita"
+msgstr "Transaction %1 purged"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
-msgstr "Transazione creata"
+msgstr "Transaction Created"
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
-msgstr "Campi personalizzati della transazione"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:92
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
-msgstr "Transaction->Create fallita, devi specificare l'identificativo dell'oggetto"
+msgstr "Transaction->Create couldn't, as you didn't specify a ticket id"
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr "Transaction->Create fallita, devi specificare il tipo e l'identificativo dell'oggetto"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
-msgstr "Le transazioni sono immutabili"
+msgstr "Transactions are immutable"
 
 #: NOT FOUND IN SOURCE
 msgid "Trying to delete a right: %1"
-msgstr "Provo a eliminare un diritto: %1"
+msgstr "Sto cercando di eliminare un diritto: %1"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "Mar."
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
-msgstr "Tipo"
+msgstr "Type"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
-msgstr "NonImplementato"
+msgstr "Unimplemented"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
-msgstr "Username unix"
+msgstr "Unix login"
 
 #: NOT FOUND IN SOURCE
 msgid "UnixUsername"
-msgstr "UsernameUnix"
+msgstr "UnixUsername"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
-msgstr "ContentEncoding sconosciuto %1"
-
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr "Campo sconosciuto: $key"
+msgstr "Unknown ContentEncoding %1"
 
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
-msgstr "Illimitato"
+msgstr "Unlimited"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
-msgstr "Ricerca senza nome"
+msgstr ""
 
 #: etc/initialdata:32
 msgid "Unprivileged"
-msgstr "NonPrevilegiato"
+msgstr "Non previlegiato"
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
-msgstr "Campi personalizzati non selezionati"
+msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
-msgstr "Oggetti non selezionati"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
-msgstr "NonPreso"
+msgstr "Untaken"
 
-#: html/Search/Bulk.html:54
+#: NOT FOUND IN SOURCE
+msgid "Untitled search"
+msgstr ""
+
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Aggiornamento"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
-msgstr "Aggiorna tutti"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update ID"
-msgstr "Identificativo aggiornamento"
+msgstr "ID Aggiornamento"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
-msgstr "Aggiorna ticket"
+msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
-msgstr "Tipo aggiornamento"
+msgstr "Tipo Aggiornamento"
 
 #: NOT FOUND IN SOURCE
 msgid "Update all these tickets at once"
-msgstr "Aggiorna tutti questi ticket contemporaneamente"
+msgstr "Aggiorna tutti questi tickets in una sola volta"
 
 #: NOT FOUND IN SOURCE
 msgid "Update email"
-msgstr "Aggiorna email"
+msgstr "Email aggiornamento"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
-msgstr "Aggiorna ticket multipli"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update name"
-msgstr "Aggiorna nome"
+msgstr "Nome aggiornamento"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "Aggiornamento non registrato."
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
-msgstr "Aggiorna i ticket selezionati"
+msgstr "Aggiorna i tickets selezionati"
 
 #: NOT FOUND IN SOURCE
 msgid "Update signature"
 msgstr "Aggiorna la firma"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "Aggiorna il ticket"
 
@@ -5600,176 +5613,175 @@ msgstr "Aggiorna il ticket"
 msgid "Update ticket # %1"
 msgstr "Aggiorna il ticket n° %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "Aggiorna il ticket n°%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "Aggiorna il ticket n°%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
-msgstr "Il tipo aggiornamento non era ne' corrispondenza ne' commento."
+msgstr "Update type was neither correspondence nor comment."
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
-msgstr "Upload"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
-msgstr "Upload file multipli"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
-msgstr "Upload immagini multiple"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
-msgstr "Upload file singolo"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
-msgstr "Upload immagine singola"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
-msgstr "Upload fino a %1 file"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
-msgstr "Upload fino a %1 immagini"
+msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
-msgstr "Upload delle modifiche"
+msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
-msgstr "Usa altri strumenti di amministrazione di RT"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User %1 %2: %3\\n"
-msgstr "Utente %1 %2: %3\\n"
+msgstr "User %1 %2: %3\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "User %1 Password: %2\\n"
-msgstr "Utente %1 Password: %2\\n"
+msgstr "User %1 Password: %2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
-msgstr "Impossibile trovare l'utente '%1'"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User '%1' not found"
-msgstr "Utente '%1' non trovato"
+msgstr "User '%1' not found"
 
 #: NOT FOUND IN SOURCE
 msgid "User '%1' not found\\n"
-msgstr "Utente '%1' non trovato\\n"
+msgstr "User '%1' not found\\n"
 
 #: etc/initialdata:132 etc/initialdata:206
 msgid "User Defined"
-msgstr "Definito dall'utente"
+msgstr "Definito da Utente"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
-msgstr "Condizioni e azioni definite dall'utente"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User ID"
-msgstr "Username"
+msgstr "User ID"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
-msgstr "Username"
+msgstr "User Id"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
-msgstr "Diritti dell'utente"
+msgstr "Diritti Utente"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr "L'utente ha richiesto un aggiornamento di tipo sconosciuto sul campo personalizzato %1 per %2 l'oggetto n°%3"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
-msgstr "Impossibile creare l'utente: %1"
+msgstr "User could not be created: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
-msgstr "Utente creato"
+msgstr "User created"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Gruppi definiti dall'utente"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
-msgstr "Utente caricato"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User notified"
-msgstr "Utente notificato"
+msgstr "User notified"
 
 #: NOT FOUND IN SOURCE
 msgid "User view"
 msgstr "User view"
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
-msgstr "Gruppi definiti dall'utente"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "Username"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Utenti"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "Utenti che soddisfano il criterio di ricerca"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
-msgstr "Query valida"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "ValueOfQueue"
-msgstr "ValoreDellaCoda"
+msgstr "ValueOfQueue"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Valori"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr "Osserva"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr "OsservaComeAdminCc"
 
 #: NOT FOUND IN SOURCE
-msgid "Watcher"
-msgstr "Osservatore"
-
-#: NOT FOUND IN SOURCE
 msgid "Watcher loaded"
 msgstr "Osservatore caricato"
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "Osservatori"
 
@@ -5777,112 +5789,132 @@ msgstr "Osservatori"
 msgid "WebEncoding"
 msgstr "WebEncoding"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "Mer."
 
 #: etc/initialdata:521
 msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
-msgstr "Quando un ticket ha ricevuto tutte le approvazioni richieste, aggiungi una corrispondenza al ticket originale"
+msgstr "When a ticket has been approved by all approvers, add correspondence to the original ticket"
 
 #: etc/initialdata:485
 msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
-msgstr "Quando un ticket riceve una qualsiasi delle approvazioni richieste, aggiungi una corrispondenza al ticket originale"
+msgstr "When a ticket has been approved by any approver, add correspondence to the original ticket"
 
 #: etc/initialdata:146
 msgid "When a ticket is created"
-msgstr "Quando viene creato un ticket"
+msgstr "When a ticket is created"
 
 #: etc/initialdata:418
 msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
-msgstr "Quando una richiesta di approvazione viene creata, notifica chi ha in carico il ticket e gli AdminCc che devono approvarlo"
+msgstr "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
 
 #: etc/initialdata:151
 msgid "When anything happens"
-msgstr "Quando succede qualsiasi cosa"
+msgstr "When anything happens"
 
 #: etc/initialdata:199
 msgid "Whenever a ticket is resolved"
-msgstr "Quando un ticket viene risolto"
+msgstr "Whenever a ticket is resolved"
 
 #: etc/initialdata:185
 msgid "Whenever a ticket's owner changes"
-msgstr "Quando cambia colui che ha in carico il ticket"
+msgstr "Whenever a ticket's owner changes"
 
 #: etc/initialdata:178 etc/upgrade/3.1.17/content:16
 msgid "Whenever a ticket's priority changes"
-msgstr "Quando cambia la priorità di un ticket"
+msgstr ""
 
 #: etc/initialdata:193
 msgid "Whenever a ticket's queue changes"
-msgstr "Quando il ticket si sposta in un'altra coda"
+msgstr "Whenever a ticket's coda changes"
 
 #: etc/initialdata:170
 msgid "Whenever a ticket's status changes"
-msgstr "Quando cambia lo stato di un ticket"
+msgstr "Whenever a ticket's status changes"
 
 #: etc/initialdata:207
 msgid "Whenever a user-defined condition occurs"
-msgstr "Quando si verifica una condizione definita dall'utente"
+msgstr "Whenever a user-defined condition occurs"
 
 #: etc/initialdata:164
 msgid "Whenever comments come in"
-msgstr "Quando arrivano commenti"
+msgstr "Whenever comments come in"
 
 #: etc/initialdata:157
 msgid "Whenever correspondence comes in"
-msgstr "Quando arrivano corrispondenze"
+msgstr "Whenever correspondence comes in"
+
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Lavoro"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
-msgstr "Lavoro offline"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "WorkPhone"
 msgstr "TelefonoLavoro"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
-msgstr "Impiegato"
+msgstr "Lavoro"
+
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
-msgstr "Hai già in carico questo ticket"
+msgstr "You already own this ticket"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
-msgstr "Non sei un utente autorizzato"
+msgstr "You are not an authorized user"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
-msgstr "Puoi solo riassegnare ticket che hai in carico, o che non sono ancora assegnati"
+msgstr "You can only reassign tickets that you own or that are unowned"
 
 #: NOT FOUND IN SOURCE
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "Non hai i permessi per visualizzare questo ticket.\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
-msgstr "Hai trovato %1 ticket nella coda %2"
+msgstr "Hai trovato %1 tickets nella coda %2"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "Ti sei scollegato da RT."
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
-msgstr "Non hai l'autorizzazione per creare ticket in questa coda."
+msgstr "Non hai permessi per creare tickets in questa coda."
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
-msgstr "Non puoi creare ticket in questa coda."
+msgstr "Non puoi creare richieste in questa coda."
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "Collegati di nuovo"
 
@@ -5892,15 +5924,15 @@ msgstr "Le tue %1 richieste"
 
 #: NOT FOUND IN SOURCE
 msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
-msgstr "L'amministratore RT non ha configurato correttamente l'alias di email che invoca RT"
+msgstr "Your RT administrator has misconfigured the mail aliases which invoke RT"
 
 #: etc/initialdata:502
 msgid "Your request has been approved by %1. Other approvals may still be pending."
-msgstr "La tua richiesta è stata approvata da %1. Potrebbero essere necessarie altre approvazioni."
+msgstr "Your request has been approved by %1. Other approvals may still be pending."
 
 #: etc/initialdata:540
 msgid "Your request has been approved."
-msgstr "La tua richiesta è stata approvata."
+msgstr "Your request has been approved."
 
 #: NOT FOUND IN SOURCE
 msgid "Your request was rejected"
@@ -5908,42 +5940,38 @@ msgstr "Your request was rejected"
 
 #: etc/initialdata:445
 msgid "Your request was rejected."
-msgstr "La tua richiesta è stata respinta."
+msgstr "Your request was rejected."
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "Il tuo username o la tua password non sono corretti"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "CAP"
 
 #: NOT FOUND IN SOURCE
 msgid "[no subject]"
-msgstr "[senza oggetto]"
+msgstr "[nessun oggetto]"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
-msgstr "permetti la creazione di ricerche salvate"
+#: NOT FOUND IN SOURCE
+msgid "and is not"
+msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
-msgstr "permetti il caricamento di ricerche salvate"
+#: NOT FOUND IN SOURCE
+msgid "and not"
+msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "come concesso a %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr "appartiene a"
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr "chiuso"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "contiene"
 
@@ -5963,11 +5991,7 @@ msgstr "corrispondenza (probabilmente) non inviata"
 msgid "correspondence sent"
 msgstr "corrispondenza inviata"
 
-#: NOT FOUND IN SOURCE
-msgid "current: $current, want $want, Error near ->$val<- expecting a "
-msgstr "attuale: $current, richiesto $want, Errore vicino a ->$val<- mi aspettavo "
-
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "giorni"
 
@@ -5977,52 +6001,28 @@ msgstr "morto"
 
 #: NOT FOUND IN SOURCE
 msgid "delete"
-msgstr "cancella"
+msgstr "elimina"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
-msgstr "cancellato"
-
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr "non appartiene a"
+msgstr "eliminato"
 
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "non corrisponde a"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "non contiene"
 
-#: html/Elements/SelectEqualityOperator:59
+#: NOT FOUND IN SOURCE
+msgid "email address"
+msgstr ""
+
+#: html/Elements/SelectEqualityOperator:37
 msgid "equal to"
 msgstr "uguale a"
 
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr "errore: impossibile spostare in basso"
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr "errore: impossibile spostare a sinistra"
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr "errore: impossibile spostare in alto"
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr "errore: niente da cancellare"
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr "errore: niente da spostare"
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr "errore: niente da invertire"
-
 #: NOT FOUND IN SOURCE
 msgid "false"
 msgstr "falso"
@@ -6031,68 +6031,76 @@ msgstr "falso"
 msgid "filename"
 msgstr "nome file"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
-msgstr "maggiore di"
+msgstr "più grande di"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "gruppo '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "ore"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
-msgstr "Codice"
+msgstr "id"
+
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
-msgstr "uguale a"
+msgstr "è"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
-msgstr "diverso da"
+msgstr "non è"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "minore di"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "corrisponde a"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "min"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "minuti"
 
-#: lib/RT/Date.pm:350
+#: NOT FOUND IN SOURCE
+msgid "modifications\\n\\n"
+msgstr ""
+
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "mesi"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "nuovo"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
-msgstr "nessun nome"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "nessun valore"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "nessuno"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "diverso da"
 
@@ -6100,82 +6108,86 @@ msgstr "diverso da"
 msgid "notlike"
 msgstr "diverso da"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "aperto"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "Gruppo personale '%1' per l'utente '%2'"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "coda %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
-msgstr "respinto"
+msgstr "rifiutato"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "risolto"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "sec"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr "Mostra configurazione"
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
-msgstr "foglio di calcolo"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "in stallo"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "sistema %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "gruppo di sistema '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
-msgstr "il componente chiamante non ha specificato il perché"
+msgstr "the calling component did not specify why"
+
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:238
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "ticket n°%1 %2"
 
 #: NOT FOUND IN SOURCE
+msgid "till"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "true"
 msgstr "vero"
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
-msgstr "gruppo %1 senza descrizione"
+msgstr "undescribed group %1"
 
 #: NOT FOUND IN SOURCE
 msgid "undescripbed group %1"
-msgstr "gruppo %1 senza descrizione"
+msgstr "undescripbed group %1"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "utente %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "settimane"
 
@@ -6183,7 +6195,7 @@ msgstr "settimane"
 msgid "with template %1"
 msgstr "con il modello %1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "anni"
 
diff --git a/rt/lib/RT/I18N/ja.po b/rt/lib/RT/I18N/ja.po
index 259f857..8af3075 100644
--- a/rt/lib/RT/I18N/ja.po
+++ b/rt/lib/RT/I18N/ja.po
@@ -15,143 +15,175 @@ msgstr ""
 msgid "#"
 msgstr "#"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr ""
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr ""
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr ""
+
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%1 %2 %3 %4:%5:%6 %7"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr ""
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr ""
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%3�変更�れ�%1 %2 "
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "%1 %2 הוסף"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 שונה ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 ���ケット\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
 msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
 msgstr ""
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: NOT FOUND IN SOURCE
+msgid "%1 - %2 shown"
+msgstr ""
+
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr ""
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr ""
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr ""
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr ""
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
+
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "%1スクリプトアクションロード����"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "%2����リュー�%1�追加�れ���"
@@ -168,31 +200,32 @@ msgstr "%1aliasesを動������ケットID�必��� "
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
 msgstr "%1aliasesを動������ケットID�必���(%2�ら) %3"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr ""
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%2�よる%1"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1�%2�ら%3�変更�れ���"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
 msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr ""
 
@@ -200,32 +233,39 @@ msgstr ""
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1�トランザクションを���る�������ん���(%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1�分解�るステータスを設定����ん���。RT�データベース�一貫性����能性��り��。"
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
 msgstr ""
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
 msgstr ""
 
-#: bin/rt-crontool:186
+#: NOT FOUND IN SOURCE
+msgid "%1 highest priority tickets I own..."
+msgstr ""
+
+#: html/Elements/MyTickets:26
+#. ($rows)
+msgid "%1 highest priority tickets I requested..."
+msgstr ""
+
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1���キュー��%2���り��ん"
@@ -234,7 +274,8 @@ msgstr "%1���キュー��%2���り��ん"
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1����ケット��%2���り��ん"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1�カスタムフィールド%2��リュー��り��ん"
 
@@ -242,7 +283,11 @@ msgstr "%1�カスタムフィールド%2��リュー��り��ん"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1�有効�キューID���り��ん。"
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -251,7 +296,15 @@ msgstr "%1�有効�キューID���り��ん。"
 msgid "%1 min"
 msgstr "%1分"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
 msgstr ""
@@ -260,11 +313,11 @@ msgstr ""
 msgid "%1 not shown"
 msgstr "%1表示�れ��ん"
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr ""
@@ -281,7 +334,11 @@ msgstr "%1タイプ�$MessageIdID���明��"
 msgid "%1 type unknown for %2"
 msgstr "%1タイプ�%2���明��"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1�分解�れ�グループ�ケット�����メン�ーを分解���。"
@@ -290,36 +347,72 @@ msgstr "%1ã�¯åˆ†è§£ã�•ã‚Œã�Ÿã‚°ãƒ«ãƒ¼ãƒ—ãƒ�ケットã�®ã�™ã�¹ã�¦ã�®ãƒ¡ãƒ³ãƒ�ーã
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "%1�も�リンク�れ�リクエスト�従属者（も���メン�ー）��る��[ローカル]ベースを行�詰�ら�る����り��。"
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 על ידי %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
 msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1:アタッ�メント�特定����ん"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "%1'�ステータス�無効��リュー��"
@@ -329,52 +422,68 @@ msgid "'%1' not a recognized action. "
 msgstr "%1' アクションを�識����ん���。"
 
 #: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "(Check box to delete scrip)"
 msgstr "（スクリプトを削除�る����ェックボックス）"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "（削除�����ェックボックス）"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr ""
+
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
+msgstr "（�ケットID���URLsを空欄�区切��入力������）"
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
+msgid "(If left blank, will default to %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(No Value)"
 msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "（メン�ー��）"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "（スクリプト��）"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
 msgstr ""
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr ""
 
@@ -382,11 +491,11 @@ msgstr ""
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "（Eメールアドレス���るカンマ�区切られ�リスト��正確�アップデート�ブラインドコピーを�る。今後�アップデートを誰��信�る��<b>変更����ん</b>）"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr ""
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr ""
 
@@ -394,55 +503,75 @@ msgstr ""
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "（Eメールアドレス���るカンマ�区切られ�リスト��正確�アップデート�コピーを�る。今後�アップデートを誰��信�る��<b>変更����ん</b>）"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
 msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "（空）"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "(no subject)"
 msgstr "（サブジェクト��）"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "（�リュー��）"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
 msgstr ""
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "（�����ケット��）"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr ""
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:71
+#: NOT FOUND IN SOURCE
+msgid "(pending other tickets)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "（必���）"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I own..."
 msgstr "��所有���る25�最も���優先権"
 
@@ -450,109 +579,133 @@ msgstr "��所有���る25�最も���優先権"
 msgid "25 highest priority tickets I requested..."
 msgstr "��リクエスト��25�最も���優先権"
 
-#: html/Ticket/Elements/ShowBasics:53
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr ""
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr ""
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"新���ケット\">&nbsp;%1"
 
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
 #: etc/initialdata:218
 msgid "A blank template"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "エース����り��ん"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "エース�作��削除����。"
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "�図的����ケット�修正を防����強制終了���。\\n"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "アクセスコントロール"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "アクション"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "アクション%1�見��り��ん"
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
+#: bin/rt-crontool:119
+msgid "Action committed."
 msgstr ""
 
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr ""
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
 msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "管�Ccを追加�る"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "Ccを追加�る"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
 msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr ""
 
-#: html/Search/Bulk.html:106
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr ""
+
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "リクエスト�る人をを追加�る"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Add a Scrip to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Add a new a global scrip"
 msgstr "新��グロー�ルスクリプトを追加�る"
 
@@ -560,49 +713,49 @@ msgstr "新��グロー�ルスクリプトを追加�る"
 msgid "Add a scrip to this queue"
 msgstr "��キュー�スクリプトを追加�る"
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr "����キュー��応�るスクリプトを追加�る"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
 msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "�択�れ��ケット��コメント���返事を追加�る"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "メン�ーを追加�る"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "新��ウォッ�ャーを追加�る"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
+#: NOT FOUND IN SOURCE
+msgid "AddNextState"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "��キュー�%1�責任者を追加����"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "���ケット�%1�責任者を追加����"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "�所1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "�所2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "管�Cc"
 
@@ -614,7 +767,7 @@ msgstr ""
 msgid "Admin Correspondence"
 msgstr ""
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "管�キュー"
 
@@ -622,7 +775,7 @@ msgstr "管�キュー"
 msgid "Admin users"
 msgstr "管�ユーザー"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "管�/グロー�ル設定"
 
@@ -634,39 +787,59 @@ msgstr "管�/グループ"
 msgid "Admin/Queue/Basics"
 msgstr "管�/キュー/基本"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "管�Cc"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
+msgid "AdminComment"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "AdminCorrespondence"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Queue_Overlay.pm:73
+msgid "AdminCustomFields"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr ""
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr ""
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr ""
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "管�者Cc"
 
-#: html/Ticket/Elements/Tabs:197
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
 msgstr ""
 
@@ -674,59 +847,83 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "絞込�検索"
 
-#: html/Elements/SelectDateRelation:57
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "後"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
+#: NOT FOUND IN SOURCE
+msgid "Age"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
 msgstr ""
 
 #: etc/initialdata:363
 msgid "All Approvals Passed"
 msgstr ""
 
-#: html/Admin/Queues/index.html:75
+#: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
+msgid "All Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "����キュー"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
+#: NOT FOUND IN SOURCE
+msgid "Always sends a message to the requestors independent of message sender"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
 msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr ""
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr ""
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr ""
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Approval Details"
+msgstr ""
+
 #: etc/initialdata:351
 msgid "Approval Passed"
 msgstr ""
@@ -735,7 +932,11 @@ msgstr ""
 msgid "Approval Rejected"
 msgstr ""
 
-#: html/Approvals/Elements/Approve:65
+#: NOT FOUND IN SOURCE
+msgid "Approval diagram"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr ""
 
@@ -743,60 +944,88 @@ msgstr ""
 msgid "Approver's notes: %1"
 msgstr ""
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "四月"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: NOT FOUND IN SOURCE
+msgid "April"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "昇順"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
 msgstr ""
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "添付"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "添付ファイル"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr ""
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "添付ファイル%1�見��り��ん"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "添付ファイル�作��れ���"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "添付ファイル�"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "添付ファイル"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
 msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "八月"
 
 #: NOT FOUND IN SOURCE
+msgid "August"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "AuthSystem"
 msgstr "自動システム"
 
@@ -809,6 +1038,14 @@ msgid "Autoreply To Requestors"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "AutoreplyToRequestors"
+msgstr ""
+
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
 msgstr "悪�PGP署�: %1\\n"
 
@@ -824,145 +1061,164 @@ msgstr "%1�悪�データ��"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "添付ファイル����悪�トランザクションナン�ー��。%1�%2\\n�����"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "基本"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "本当�変更を�存��もよ������"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "�"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
+#: NOT FOUND IN SOURCE
+msgid "Begin Approval"
 msgstr ""
 
-#: etc/initialdata:217
-msgid "Blank"
+#: NOT FOUND IN SOURCE
+msgid "Binary"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
+#: etc/initialdata:217
+msgid "Blank"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
 msgstr "��検索�ブックマーク���るURL��"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
 msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "短�ヘッダー"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "�ケット�一括アップデート"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "システムユーザーを修正����ん"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "�����カスタムフィールド�リュー�追加�����ん"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
 msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "�ケット自体��リンク����ん"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "��������ケット��������ん。��エラー�決��出��������"
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
 msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "ベース�ターゲットを特定����ん"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "ユーザー: %1を作�����ん"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Cc"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "パスワードを変更�る"
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
 msgstr ""
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr ""
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "権利を無効��る�ェックボックス"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "�供"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "町"
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
 msgstr ""
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr ""
 
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Closed requests"
 msgstr "終了��リクエスト��"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Command not understood!\\n"
 msgstr "�解�����コマンド!\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "コメント"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "コメントアドレス"
 
@@ -970,11 +1226,11 @@ msgstr "コメントアドレス"
 msgid "Comment not recorded"
 msgstr "記録�れ����コメント"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr ""
 
@@ -982,11 +1238,11 @@ msgstr ""
 msgid "Comments"
 msgstr "コメント"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "コメント（リクエス���人���信�れ��ん）"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "コメント（リクエス���人���信�れ��ん）"
 
@@ -994,15 +1250,15 @@ msgstr "コメント（リクエス���人���信�れ��ん）"
 msgid "Comments about %1"
 msgstr "%1�����コメント"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "��ユーザー�����コメント"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "コメント�追加�れ���"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr "コメント�短��れ���"
 
@@ -1010,23 +1266,23 @@ msgstr "コメント�短��れ���"
 msgid "Compile Restrictions"
 msgstr "コンパイル�制"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "コンディション"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "コンディション�見��り��ん"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "設定"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "確�"
 
@@ -1038,15 +1294,19 @@ msgstr "コンタクト情報"
 msgid "Contacted date '%1' could not be parsed"
 msgstr "コンタクト�れ�日��'%1'を解�����ん���"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "情報"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:64
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr ""
+
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
 msgstr ""
 
@@ -1058,7 +1318,7 @@ msgstr ""
 msgid "Correspondence Address"
 msgstr "メールアドレス"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "通信�追加�れ���"
 
@@ -1066,51 +1326,45 @@ msgstr "通信�追加�れ���"
 msgid "Correspondence not recorded"
 msgstr "記録�れ����通信"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
 msgstr "�ケット�新��カスタムフィールド�リューを追加����ん���"
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr ""
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
+#: NOT FOUND IN SOURCE
+msgid "Could not add new custom field value for ticket. %1 "
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "オーナー変更�����ん���"
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "カスタムフィールド�作������ん���"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "グループ�作������ん���"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "テンプレート: %1�作������ん���"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "�ケット�作������ん���。キュー�セット�れ����ん"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "ユーザー�作������ん���"
 
 #: NOT FOUND IN SOURCE
+msgid "Could not create watcher for requestor"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Could not find a ticket with id %1"
 msgstr "�ケット���ID%1�見��り��ん���"
 
@@ -1118,11 +1372,11 @@ msgstr "�ケット���ID%1�見��り��ん���"
 msgid "Could not find group %1."
 msgstr "グループ %1�見��り��ん���"
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "��ユーザーを作����見��る�������ん���"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "��責任者を見��る�������ん���"
 
@@ -1130,34 +1384,25 @@ msgstr "��責任者を見��る�������ん���"
 msgid "Could not find user %1."
 msgstr "ユーザー%1を見��る�������ん���"
 
-#: html/Admin/CustomFields/Objects.html:69
+#: NOT FOUND IN SOURCE
 msgid "Could not load CustomField %1"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "グループをロード����ん���"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "��キュー���責任者を%1��る�������ん���"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "���ケット���責任者を%1��る�������ん���"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "��キュー���責任者を%1���削除�る�������ん���"
@@ -1166,15 +1411,15 @@ msgstr "ã�“ã�®ã‚­ãƒ¥ãƒ¼ã�§ã��ã�®è²¬ä»»è€…ã‚’%1ã�¨ã�—ã�¦å‰Šé™¤ã�™ã‚‹ã�“ã�¨ã�Œã�§ã
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "���ケット���責任者を%1���削除�る�������ん���"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "グループ�メン�ー�追加�����ん���"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "トランザクション: %1�作������ん���"
@@ -1187,38 +1432,44 @@ msgstr "GPG�返事\\n�ら何を行��らよ�����り��ん�
 msgid "Couldn't find group\\n"
 msgstr "グループ\\n�見��り��ん���"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "責任者�見��り��ん���"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "���リュー�見��り��ん���"
 
 #: NOT FOUND IN SOURCE
+msgid "Couldn't find that watcher"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Couldn't find user\\n"
 msgstr "ユーザー\\n�見��り��ん���"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "ユーザーデータベース\\n�ら%1をロード����ん���"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load RT config file '%1' %2"
 msgstr "RT設定ファイル'%1' %2をロード����ん���"
 
@@ -1226,26 +1477,25 @@ msgstr "RT設定ファイル'%1' %2をロード����ん���"
 msgid "Couldn't load Scrips."
 msgstr "スクリプトをロード����ん���"
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "グループ%1をロード����ん���"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "リンクをロード����ん���"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
 msgstr ""
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "キューをロード����ん���"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "キュー%1をロード����ん���"
@@ -1262,26 +1512,16 @@ msgstr "テンプレートをロード����ん���"
 msgid "Couldn't load that user (%1)"
 msgstr "��ユーザー（%1）をロード����ん���"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "�ケット'%1'をロード����ん���"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "国"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "作�"
 
@@ -1289,28 +1529,44 @@ msgstr "作�"
 msgid "Create Tickets"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "カスタムフィールド�作�"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr ""
 
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Create a new Custom Field"
 msgstr "新��カスタムフィールド�作�"
 
 #: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new global Scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create a new global scrip"
 msgstr "新��グロー�ルスクリプト�作�"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "新��グループ�作�"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "新��個人グループ�作�"
 
@@ -1319,18 +1575,22 @@ msgid "Create a new queue"
 msgstr "新��キュー�作�"
 
 #: NOT FOUND IN SOURCE
+msgid "Create a new scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create a new template"
 msgstr "新��テンプレート�作�"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "新���ケット�作�"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "新��ユーザー�作�"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "キュー�作�"
 
@@ -1342,137 +1602,182 @@ msgstr "呼�出�れ�キュー�作�"
 msgid "Create a request"
 msgstr "リクエスト�作�"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr ""
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "テンプレート�作�"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1 / %2 / %3 "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr ""
+
 #: etc/initialdata:137
 msgid "Create new tickets based on this scrip's template"
 msgstr ""
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "�ケット�作�"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr ""
 
-#: lib/RT/System.pm:81
-msgid "Create, delete and modify the members of personal groups"
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
 msgstr ""
 
-#: lib/RT/System.pm:82
-msgid "Create, delete and modify users"
+#: lib/RT/System.pm:58
+msgid "Create, delete and modify the members of personal groups"
 msgstr ""
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
+#: lib/RT/System.pm:59
+msgid "Create, delete and modify users"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr ""
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "作�����"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "カスタムフィールド%1を作�����"
 
 #: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr "テンプレート%1を作�����"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
 msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "�在�関係"
 
-#: html/Admin/Elements/EditScrips:51
+#: NOT FOUND IN SOURCE
+msgid "Current Relationships"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "�在�メン�ー"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "�在�権利"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: NOT FOUND IN SOURCE
+msgid "Current search criteria"
+msgstr ""
+
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "�在�ウォッ�ャー"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "カスタムフィールド"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "カスタムフィールド%1 %2 %3"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: NOT FOUND IN SOURCE
+msgid "Custom field %1 does not apply to this object"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "カスタムフィールド%1��リュー��り��"
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "カスタムフィールド%1��リュー��り��ん"
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "カスタムフィールド%1�見��り��ん"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
+msgid "Custom field deleted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "カスタムフィールド�見��り��ん"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "カスタムフィールド%2����カスタムフィールド�リュー%1�見��り��ん"
@@ -1481,39 +1786,51 @@ msgstr "カスタムフィールド%2ã�®ã�Ÿã‚�ã�®ã‚«ã‚¹ã‚¿ãƒ ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãƒ�ã
 msgid "Custom field value changed from %1 to %2"
 msgstr "カスタムフィールド�%1�ら%2�変更�れ���"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "カスタムフィールド�リュー�削除�れ��ん"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "カスタムフィールド�リュー�見��り��ん"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "カスタムフィールド�リュー�削除�れ���"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr ""
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: NOT FOUND IN SOURCE
+msgid "Data error"
+msgstr ""
+
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "日付"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "�二月"
 
+#: NOT FOUND IN SOURCE
+msgid "December"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Default Autoresponse Template"
+msgstr ""
+
 #: etc/initialdata:222
 msgid "Default Autoresponse template"
 msgstr ""
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
 msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
 msgstr ""
 
@@ -1533,68 +1850,76 @@ msgstr ""
 msgid "Default transaction template"
 msgstr ""
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
+msgid "Default: %1/%2 changed from %3 to %4"
+msgstr ""
+
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "代表者�権利"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr ""
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr ""
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "削除"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "��オブジェクトを削除�る�指示�完全性����れる�能性��り��"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "��オブジェクトを削除�る�指示�完全性����れ��"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "��オブジェクトを削除�る�指示�完全性�妨害�れ��"
 
-#: html/Approvals/Elements/Approve:66
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr ""
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "次�も�次第��る"
 
@@ -1602,39 +1927,43 @@ msgstr "次�も�次第��る"
 msgid "Dependencies: \\n"
 msgstr "従属�ケット: \\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "�よる"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "�順�る"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "下��題点を表�"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "記述"
 
@@ -1642,31 +1971,31 @@ msgstr "記述"
 msgid "Details"
 msgstr "詳細"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "表�"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "モードを表�"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
 msgstr ""
 
@@ -1674,31 +2003,35 @@ msgstr ""
 msgid "Display ticket #%1"
 msgstr "�ケット#%1を表�"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr ""
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "��ページを更新��������"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: NOT FOUND IN SOURCE
+msgid "Don't show search results"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "ダウンロード"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
 msgstr ""
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "期�切れ"
 
@@ -1714,37 +2047,41 @@ msgstr "ERROR: ��ケット '%1': %2.\\nをロード����ん���"
 msgid "Edit"
 msgstr "編集"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
-msgid "Edit Custom Fields for %1"
-msgstr "%1�カスタムフィールドを編集�る"
-
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "%1�カスタムフィールドを編集�る"
 
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
 msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "関係を編集�る"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
 msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: NOT FOUND IN SOURCE
+msgid "Edit Relationships"
+msgstr ""
+
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:175
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr ""
 
@@ -1752,7 +2089,7 @@ msgstr ""
 msgid "Edit scrips"
 msgstr "スクリプトを編集�る"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "システムテンプレートを編集�る"
 
@@ -1760,11 +2097,15 @@ msgstr "システムテンプレートを編集�る"
 msgid "Edit templates for %1"
 msgstr "%1�テンプレートを編集�る"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr "キュー%1�設定を編集�る"
@@ -1773,17 +2114,17 @@ msgstr "キュー%1�設定を編集�る"
 msgid "Editing Configuration for user %1"
 msgstr "ユーザー%1�設定を編集�る"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "カスタムフィールド%1を編集�る"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "グループ%1�会員を編集�る"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "個人グループ%1�会員を編集�る"
@@ -1792,15 +2133,15 @@ msgstr "個人グループ%1�会員を編集�る"
 msgid "Editing template %1"
 msgstr "テンプレート%1を編集�る"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "ベースも���ターゲットを特定���れ��り��ん"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "Eメール"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "�使��Eメールアドレス"
 
@@ -1812,61 +2153,84 @@ msgstr "Eメールアドレス"
 msgid "EmailEncoding"
 msgstr "Eメールエンコーディング"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr ""
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "有効��り���（も�一度��ボックスを�ェック�る���キュー�有効����り��）"
 
-#: html/Admin/Queues/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
+msgid "Enabled Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr "有効�キュー"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "有効�ステータス%1"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr ""
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr ""
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
 msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
+msgstr ""
+
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "�ケットをリンク�る�ケット���URLsを入力������。入力�る項目������る場���スペース�区切������。"
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
 msgstr ""
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "エラー"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "パラメーター�エラーQueue->AddWatcher"
 
@@ -1874,11 +2238,11 @@ msgstr "パラメーター�エラーQueue->AddWatcher"
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "パラメーター�エラーQueue->DelWatcher"
 
-#: lib/RT/Queue_Overlay.pm:830
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "パラメーター�エラーTicket->AddWatcher"
 
@@ -1886,15 +2250,19 @@ msgstr "パラメーター�エラーTicket->AddWatcher"
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "パラメーター�エラーTicket->DelWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
 msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: NOT FOUND IN SOURCE
+msgid "Estimate"
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
 msgstr ""
 
@@ -1902,7 +2270,7 @@ msgstr ""
 msgid "Everyone"
 msgstr ""
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr ""
 
@@ -1914,77 +2282,72 @@ msgstr "外部��証ID"
 msgid "ExternalContactInfoId"
 msgstr "外部�コンタクト情報ID"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "��他�情報"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "'特権��る'ユーザー�擬似グループ�検索�失敗����"
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "'特権���'ユーザー�擬似グループ�検索�失敗����"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "二月"
 
-#: html/Elements/SelectAttachmentField:50
-msgid "Filename"
+#: NOT FOUND IN SOURCE
+msgid "February"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:69
-msgid "Fill in multiple text areas"
+#: html/Elements/SelectAttachmentField:28
+msgid "Filename"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
+#: NOT FOUND IN SOURCE
+msgid "Fill in multiple text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:70
+#: NOT FOUND IN SOURCE
 msgid "Fill in one text area"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Fin"
 msgstr "終了"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "最終優先順�"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr ""
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
 msgstr ""
 
@@ -1992,15 +2355,19 @@ msgstr ""
 msgid "Find new/open tickets"
 msgstr "新��/開��ケットを見��る"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "人々を見��る"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:81
+#: NOT FOUND IN SOURCE
+msgid "Finish Approval"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "最��"
 
@@ -2008,44 +2375,52 @@ msgstr "最��"
 msgid "First page"
 msgstr "最��ページ"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "Foo Bar Baz"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "���"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "変更を強制���"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr ""
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Freeform"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "FreeformContactInfo"
 msgstr "フリーフォームコンタクト情報"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "金曜日"
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "フルヘッダー"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
 msgstr ""
 
@@ -2053,37 +2428,37 @@ msgstr ""
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "pgp sig\\n�ら�在�ユーザーを得る"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr ""
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "グロー�ル"
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Global Scrips"
 msgstr "グロー�ルスクリプト"
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr ""
-
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr ""
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
 msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "行��"
 
@@ -2095,11 +2470,15 @@ msgstr "%1\\n�ら�良�pgp　sig"
 msgid "Goto page"
 msgstr "ページ�行�"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "�ケット�行�"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr ""
 
@@ -2107,28 +2486,32 @@ msgstr ""
 msgid "Group %1 %2: %3"
 msgstr "グループ%1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "グループ権利"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "グループ�����メン�ー����"
 
-#: html/Admin/Groups/Modify.html:109
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "グループ�作��れ���"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "グループ�見��り��ん"
 
@@ -2140,42 +2523,44 @@ msgstr "グループ�見��り��ん。\\n"
 msgid "Group not specified.\\n"
 msgstr "グループ�特定����ん。\\n"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "グループ"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "グループ�彼ら�メン�ー���れ��ん"
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
 msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:77
+#: NOT FOUND IN SOURCE
 msgid "Groups this user belongs to"
 msgstr ""
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "�ん����"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "�ん����%1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "ヒストリー"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
 msgstr ""
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
 msgstr ""
 
@@ -2183,11 +2568,11 @@ msgstr ""
 msgid "HomePhone"
 msgstr "自宅�電話"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr ""
@@ -2196,15 +2581,11 @@ msgstr ""
 msgid "I have [quant,_1,concrete mixer]."
 msgstr "��[quant,_1,concrete mixer]��り��。"
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr ""
-
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "ID"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "身分証明書"
 
@@ -2212,80 +2593,92 @@ msgstr "身分証明書"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr ""
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
 msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
 msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr ""
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "上�何�をアップデート���ら�次���を確�������"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr ""
 
-#: lib/RT/Record.pm:936
+#: NOT FOUND IN SOURCE
+msgid "Image"
+msgstr ""
+
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr ""
 
-#: html/Admin/Groups/index.html:65
+#: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
+msgid "Include disabled custom fields in listing."
+msgstr ""
+
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
 msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
 msgstr "リスト�無効�キューを�む"
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "検索�無効�ユーザーを�む"
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "最��優先権"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "入力エラー"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr ""
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "無効�グループタイプ��"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr ""
 
-#: lib/RT/Record.pm:938
+#: NOT FOUND IN SOURCE
+msgid "Invalid Type"
+msgstr ""
+
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr ""
 
@@ -2293,64 +2686,76 @@ msgstr ""
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "無効�オーナー��。 '誰�も��'��期設定���."
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "無効�キュー��"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "無効�権利��"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "%1��無効��リュー��"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "カスタムフィールド��無効��リュー��"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "ステータス��無効��リュー��"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr ""
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr ""
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
+#: NOT FOUND IN SOURCE
+msgid "Items pending my approval"
 msgstr ""
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "一月"
 
-#: lib/RT/Group_Overlay.pm:174
+#: NOT FOUND IN SOURCE
+msgid "January"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr ""
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "七月"
 
-#: html/Ticket/Elements/Tabs:122
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "大��"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "六月"
 
 #: NOT FOUND IN SOURCE
+msgid "June"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Keyword"
 msgstr "キーワード"
 
@@ -2358,43 +2763,51 @@ msgstr "キーワード"
 msgid "Lang"
 msgstr "長�"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr ""
-
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "最後�"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "最後�コンタクト"
 
-#: html/Elements/SelectDateType:50
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
+
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "最後�コンタクト��"
 
-#: html/Elements/SelectDateType:51
+#: NOT FOUND IN SOURCE
+msgid "Last Notified"
+msgstr ""
+
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "最後�アップデート��"
 
-#: html/Search/Elements/PickBasics:103
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr ""
+
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "残��"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "��ユーザーをRT�アクセス���"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "��ユーザー�権利を����"
 
@@ -2406,255 +2819,257 @@ msgstr "オーナーを%1 %2�制����"
 msgid "Limiting queue to %1 %2"
 msgstr "キューを%1 %2�制����"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "リンク����存在�����"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "リンク�作��れ��ん���"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "リンク�作��れ���（%1）"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "リンク�削除�れ���（%1）"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "リンク�見��り��ん"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "リンク�ケット#%1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr ""
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "リンク"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "場所"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "ログディレクトリー%1�見��ら������書�出���ん。\\n RT�動���ん"
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "%1���サイン�る"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "ログイン"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "ログアウト"
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
 msgstr ""
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "オーナーを決�る"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "ステータスを決�る"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "期�期日を決�る"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "解�期日を決�る"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "開始��日を決�る"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "開始日を決�る"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "��れ�日を決�る"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "優先順�を決�る"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "キューを決�る"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "サブジェクトを決�る"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
 msgstr ""
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
 msgstr ""
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr ""
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr ""
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr ""
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr ""
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "三月"
 
-#: lib/RT/Date.pm:441
+#: NOT FOUND IN SOURCE
+msgid "March"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "May"
+msgstr ""
+
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "五月"
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "メン�ー�追加�れ���"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "メン�ー�削除�れ���"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "メン�ー�削除�れ����ん"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "�メン�ー"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: NOT FOUND IN SOURCE
+msgid "MemberOf"
+msgstr ""
+
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "メン�ー"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
 msgstr ""
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "����功����"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "���失敗����。有効�ID�設定����ん���"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "���"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
 msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
-msgid "Message recorded"
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
-msgid "Messages about this ticket will not be sent to..."
+#: lib/RT/Ticket_Overlay.pm:2517
+msgid "Message recorded"
 msgstr ""
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
+#: html/Ticket/Elements/PreviewScrips:70
+msgid "Messages about this ticket will not be sent to..."
 msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "�帯"
 
@@ -2662,7 +3077,15 @@ msgstr "�帯"
 msgid "MobilePhone"
 msgstr "�帯電話"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr ""
 
@@ -2670,189 +3093,208 @@ msgstr ""
 msgid "Modify Custom Field %1"
 msgstr "カスタムフィールド%1を修正�る"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Fields which apply to all %1"
 msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
-msgid "Modify Custom Fields which apply to all %1"
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
 msgstr ""
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
 msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr ""
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify Template %1"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
 msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
 msgstr ""
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr ""
+
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr ""
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
 msgstr ""
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: NOT FOUND IN SOURCE
+msgid "Modify dates for # %1"
+msgstr ""
+
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "#%1�期日を修正�る"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "�ケット#%1�期日を修正�る"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "グロー�ルグループ�権利を修正�る"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "グロー�ルグループ�権利を修正�る"
 
 #: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify global scrips"
 msgstr "グロー�ルスクリプトを修正�る"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr ""
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "グロー�ルユーザー�権利を修正�る"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "%1�グループ権利を修正�る"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "キュー%1�グループ権利を修正�る"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr ""
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr ""
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr "キュー%1�関係��る人々を修正�る"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "�ケット#%1�関係��る人々を修正�る"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "キュー%1�スクリプトを修正�る"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr ""
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "テンプレート%1を修正�る"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr ""
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "グループ%1を修正�る"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "ユーザー%1を修正�る"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "�ケット#　%1を修正�る"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "�ケット#%1を修正�る"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr ""
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "グループ%1�ユーザー権利を修正�る"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr "キュー%1�ユーザー権利を修正�る"
@@ -2861,97 +3303,113 @@ msgstr "キュー%1�ユーザー権利を修正�る"
 msgid "Modify watchers for queue '%1'"
 msgstr "キュー'%1'�ウォッ�ャーを修正�る"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr ""
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr ""
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "月曜日"
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "�ら�%1����"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: NOT FOUND IN SOURCE
+msgid "Move"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr ""
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "多��"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "'��'�属性を特定������"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr ""
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "My Approvals"
+msgstr ""
+
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "��"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "�在�使����"
 
-#: html/Ticket/Elements/ShowDates:73
+#: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Need approval from system administrator"
+msgstr ""
+
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr ""
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "新��"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "新��関係"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "新��パスワード"
 
@@ -2959,27 +3417,39 @@ msgstr "新��パスワード"
 msgid "New Pending Approval"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
 msgstr ""
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New Search"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr ""
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "新��パスワード"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "新��パスワード情報��られ���"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr ""
 
@@ -2987,11 +3457,11 @@ msgstr ""
 msgid "New request"
 msgstr "新��リクエスト"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "新��権利"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr ""
 
@@ -2999,27 +3469,27 @@ msgstr ""
 msgid "New search"
 msgstr "新��検索"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr ""
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "新���ケット��り��ん"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr ""
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "新��ユーザー�呼�れ���"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "新��ウォッ�ャー"
 
@@ -3027,11 +3497,11 @@ msgstr "新��ウォッ�ャー"
 msgid "New window setting"
 msgstr "新��ウインドウ設定"
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "次�"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
 msgstr ""
 
@@ -3039,39 +3509,47 @@ msgstr ""
 msgid "Next page"
 msgstr "次�ページ"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: NOT FOUND IN SOURCE
+msgid "NickName"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "ニック�ーム"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "カスタムフィールド��り��ん"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "グループ�定義�れ��ん"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
 msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "キュー�定義�れ��ん"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr "RTユーザー�見��り��ん。RT管�者�相談������。\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "テンプレート��り��ん"
 
@@ -3083,11 +3561,11 @@ msgstr "�ケット�特定����ん。�ケットを終了���"
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
 msgstr "�ケット�特定����ん。�ケット�修正を終了���\\n\\n"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr ""
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr ""
 
@@ -3095,7 +3573,7 @@ msgstr ""
 msgid "No command found\\n"
 msgstr "コマンド�見��り��ん\\n"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "��ユーザー�関���コメント�入力�れ����ん"
 
@@ -3103,77 +3581,72 @@ msgstr "��ユーザー�関���コメント�入力�れ����
 msgid "No correspondence attached"
 msgstr "通信文書�添付��り��ん"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "%1記述��り��ん"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "グループ�特定����ん"
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "パスワード�設定�れ��ん"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr "キューを作��る許���れ����ん"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "ユーザーを作��る許���れ����ん"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "���ケットを表示�る許���り��ん"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "アップデート�ケットを見る許����り��ん"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "責任者�特定����ん"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "責任者��択�れ����ん"
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr "検索基準����キュー�見��り��ん"
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr ""
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "権利�許��れ����ん"
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "�作����検索�����ん"
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
 msgstr ""
 
@@ -3181,11 +3654,15 @@ msgstr ""
 msgid "No ticket id specified"
 msgstr "�ケットID�特定����ん"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "トランザクションタイプ�特定����ん"
 
-#: html/Admin/Users/index.html:55
+#: NOT FOUND IN SOURCE
+msgid "No user or email address specified"
+msgstr ""
+
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "検索基準����ユーザー�見��り��ん"
 
@@ -3193,27 +3670,31 @@ msgstr "検索基準����ユーザー�見��り��ん"
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "有効�RTユーザー�見��り��ん。RT　cvc�ンドラ�分離�����。RT管�者�相談������。\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr ""
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr ""
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr ""
 
-#: html/Elements/Header:96
+#: NOT FOUND IN SOURCE
+msgid "Not logged in"
+msgstr ""
+
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "ログイン����ん"
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "セット����ん"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "��実行����ん"
 
@@ -3221,11 +3702,11 @@ msgstr "��実行����ん"
 msgid "Not yet implemented...."
 msgstr "��実行����ん。。。"
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "�知ら�を�る�������ん���"
 
@@ -3297,57 +3778,51 @@ msgstr ""
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr ""
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "�一月"
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
+#: NOT FOUND IN SOURCE
+msgid "November"
 msgstr ""
 
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr ""
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr ""
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
 msgstr ""
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "�月"
 
-#: html/Tools/Elements/Tabs:53
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr ""
+
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
 msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
 msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "�"
 
@@ -3387,21 +3862,21 @@ msgstr ""
 msgid "On Transaction"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr ""
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "開�"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "�れを開�"
 
@@ -3409,7 +3884,7 @@ msgstr "�れを開�"
 msgid "Open requests"
 msgstr "リクエストを開�"
 
-#: html/SelfService/Elements/Tabs:63
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr ""
 
@@ -3425,7 +3900,7 @@ msgstr "�ケットを（リスト�ら）���ウインドウ�ら開�
 msgid "Open tickets on correspondence"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
 msgstr ""
 
@@ -3433,44 +3908,52 @@ msgstr ""
 msgid "Ordering and sorting"
 msgstr "整列�並�替�"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "組織"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "時間切れ���優先順����り���"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr ""
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "オーナー"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: NOT FOUND IN SOURCE
+msgid "Owner changed from %1 to %2"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "オーナー�強制的�%1�ら%2を変更����"
@@ -3479,12 +3962,12 @@ msgstr "オーナー�強制的�%1�ら%2を変更����"
 msgid "Owner is"
 msgstr "オーナー�"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "�ケットベル"
 
@@ -3492,53 +3975,40 @@ msgstr "�ケットベル"
 msgid "PagerPhone"
 msgstr "�ケットベル電話"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr ""
+
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "両親"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "パスワード"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "パスワード��知ら�"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "パスワード�短����"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "パスワード: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
 msgstr ""
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr ""
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "人々"
 
@@ -3546,27 +4016,27 @@ msgstr "人々"
 msgid "Perform a user-defined action"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "許��下り��ん���"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr ""
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "個人グループ"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "個人グループ："
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "電話番�"
 
@@ -3578,19 +4048,23 @@ msgstr "代替物"
 msgid "Pref"
 msgstr "�気�入り"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "�気�入り"
 
-#: lib/RT/Action/Generic.pm:196
+#: NOT FOUND IN SOURCE
+msgid "Prefs"
+msgstr ""
+
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "Prepare Stubbed"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "��"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
 msgstr ""
 
@@ -3602,20 +4076,20 @@ msgstr "��ページ"
 msgid "Pri"
 msgstr "優先権"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr ""
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "優先権"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "優先順��次�よ��始�り��"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
 msgstr ""
 
@@ -3623,32 +4097,36 @@ msgstr ""
 msgid "Privileged"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "特権ステータス: %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "特権��るユーザー"
 
+#: NOT FOUND IN SOURCE
+msgid "Projects"
+msgstr ""
+
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr ""
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
 msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
 msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "キュー"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
@@ -3658,7 +4136,11 @@ msgstr ""
 msgid "Queue '%1' not found\\n"
 msgstr "キュー'%1'�見��り��ん���\\n"
 
-#: html/Admin/Queues/Modify.html:64
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "キュー���"
 
@@ -3666,48 +4148,52 @@ msgstr "キュー���"
 msgid "Queue Scrips"
 msgstr "キュースクリプト"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "キュー����存在�����"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr "キュー�作������ん���"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr "キュー�ロード�����ん���"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "キュー�作��れ���"
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: NOT FOUND IN SOURCE
+msgid "Queue is not specified."
+msgstr ""
+
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "キュー�見��り��ん"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "キュー"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr ""
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
 msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "%2�RT %1"
@@ -3720,7 +4206,11 @@ msgstr "<a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>ã�
 msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "RT管�"
 
@@ -3740,7 +4230,7 @@ msgstr "RT設定エラー"
 msgid "RT Critical error. Message not recorded!"
 msgstr "RT�大�エラー。メッセージ�記録�れ��ん"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "RTエラー"
 
@@ -3749,14 +4239,22 @@ msgid "RT Received mail (%1) from itself."
 msgstr "RT�信メール(%1)自身�ら�メール "
 
 #: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT Self Service / Closed Tickets"
 msgstr "RTセルフサービス/クローズ�れ��ケット"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
 msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr ""
 
@@ -3772,20 +4270,20 @@ msgstr "RTã�¯å¤–部ã�®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãƒ«ãƒƒã‚¯ã‚¢ãƒƒãƒ—を使ã�£ã�¦ãƒªã‚¯ã‚¨ã
 msgid "RT couldn't find the queue: %1"
 msgstr "RT�キュー: %1を見��る�������ん���"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "RT���PGPサインを有効��る�������ん���。\\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "RT for %1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT has proccessed your commands"
 msgstr "RT������コマンドを処�����"
 
@@ -3794,6 +4292,14 @@ msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&
 msgstr "RT�&コピー; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;。�れ�<a href=\"http://www.gnu.org/copyleft/gpl.html\">GNUジェ�ラルパブリックライセンス��ージョン2��信�れ����。</a>"
 
 #: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT thinks this message may be a bounce"
 msgstr "RT�よる���メッセージ��ウンス�る�能性��り��"
 
@@ -3805,7 +4311,11 @@ msgstr "RTã�¯ã�“ã�®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã�Œã�¾ã‚‹ã�§ã‚µã‚¤ãƒ³ã�•ã‚Œã�¦ã�„ã�ªã�„よã�†ã
 msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
 msgstr "RT�Eメールコマンドモード��PGP�証�必���り��。貴方�メッセージ�サイン������も����サイン�有効��り��ん"
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "本�"
 
@@ -3813,35 +4323,39 @@ msgstr "本�"
 msgid "RealName"
 msgstr "本�"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "次�も��よ���照��"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "�照�る"
 
 #: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Refine"
 msgstr "絞り込む"
 
@@ -3849,44 +4363,48 @@ msgstr "絞り込む"
 msgid "Refine search"
 msgstr "絞込�検索"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "��ページを%1分���更新������"
 
-#: html/Search/Bulk.html:116
+#: NOT FOUND IN SOURCE
+msgid "Relationships"
+msgstr ""
+
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "管�Ccを削除�る"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Ccを削除�る"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "リクエスト�る人を削除�る"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "返信"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
 msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr ""
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "リクエスト�る人"
 
@@ -3894,37 +4412,45 @@ msgstr "リクエスト�る人"
 msgid "Requestor email address"
 msgstr "リクエスト�る人�Eメールアドレス"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: NOT FOUND IN SOURCE
+msgid "Requestor(s)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr ""
+
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "リクエスト�る人"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "リクエスト�次�日���行�れ��れ��り��ん"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
 msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "リセット"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "�所"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "分解�る"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr ""
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "分解��"
 
@@ -3932,7 +4458,7 @@ msgstr "分解��"
 msgid "Response to requestors"
 msgstr "リクエスト�る人�返答�る"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "�果"
 
@@ -3940,11 +4466,11 @@ msgstr "�果"
 msgid "Results per page"
 msgstr "ページ����果"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "パスワード��入力"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
 msgstr ""
 
@@ -3952,105 +4478,103 @@ msgstr ""
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "%2　%3�権利%1�領域%4　%5\\n�見��り��ん���"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "権利�委託�れ���"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "権利�許��れ���"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "権利�ロード�れ���"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "権利を無効�����ん���"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "権利�見��り��ん���"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "権利�ロード����ん���"
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "権利�無効��り���"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "権利"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr ""
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "役割"
 
-#: html/Search/Elements/DisplayOptions:83
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
 msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "土曜日"
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
 msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "変更を�存�る"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "変更を�存�る"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
 msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "スクリプト�作��れ���"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "スクリプト"
 
@@ -4058,11 +4582,11 @@ msgstr "スクリプト"
 msgid "Scrips for %1\\n"
 msgstr "%1\\n�スクリプト"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr ""
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "検索"
 
@@ -4070,128 +4594,127 @@ msgstr "検索"
 msgid "Search Criteria"
 msgstr "検索基準"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
+#: html/Approvals/Elements/PendingMyApproval:38
+msgid "Search for approvals"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:60
-msgid "Search for approvals"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Searches can't be associated with that kind of object"
 msgstr ""
 
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
+#: lib/RT/Queue_Overlay.pm:68
+msgid "SeeQueue"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:92
-msgid "SeeQueue"
+#: NOT FOUND IN SOURCE
+msgid "Select"
 msgstr ""
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Select a Custom Field"
 msgstr ""
 
-#: html/Admin/Groups/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
+msgstr ""
+
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "グループ��択"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "キュー��択"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr ""
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "ユーザー��択"
 
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr ""
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr ""
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:58
+#: lib/RT/CustomField_Overlay.pm:35
+msgid "SelectMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:34
+msgid "SelectSingle"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
 msgstr ""
 
@@ -4243,112 +4766,128 @@ msgstr ""
 msgid "Sends mail to the owner"
 msgstr ""
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "�月"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "�果を見る"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr ""
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "基本を見る"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr ""
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "詳細を見る"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:94
-msgid "ShowACL"
+#: NOT FOUND IN SOURCE
+msgid "Show ticket private commentary"
 msgstr ""
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
+#: NOT FOUND IN SOURCE
+msgid "Show ticket summaries"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:70
+msgid "ShowACL"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "サイン"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "����"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
 msgstr ""
 
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
-msgid "Sort"
+#: NOT FOUND IN SOURCE
+msgid "Sort Order"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -4363,7 +4902,11 @@ msgstr "次�項目���並�替�"
 msgid "SortOrder"
 msgstr "並�順"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr ""
 
@@ -4375,7 +4918,7 @@ msgstr "�止�����"
 msgid "Start page"
 msgstr "開始ページ"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "開始��"
 
@@ -4383,7 +4926,7 @@ msgstr "開始��"
 msgid "Started date '%1' could not be parsed"
 msgstr "開始日'%1'�見��り��ん���"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "開始�る"
 
@@ -4395,11 +4938,11 @@ msgstr "次�日時���開始�る"
 msgid "Starts date '%1' could not be parsed"
 msgstr "開始日'%1'を解�����ん���"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "状態"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "ステータス"
 
@@ -4407,90 +4950,110 @@ msgstr "ステータス"
 msgid "Status Change"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "ステータス�%1�ら%2�変更�れ���"
 
-#: html/Ticket/Elements/Tabs:170
+#: NOT FOUND IN SOURCE
+msgid "StatusChange"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "盗用�る"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "%1�ら盗用��"
-
-#: NOT FOUND IN SOURCE
 msgid "Stolen from %1 "
-msgstr "%1�ら盗用�� "
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
+msgstr "%1�ら盗用��"
 
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "サブジェクト"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr ""
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "�出"
 
-#: lib/RT/Group_Overlay.pm:782
+#: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Submit Workflow"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr ""
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "日曜日"
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr ""
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "システムエラー"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
 msgstr ""
 
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "システムエラー。権利�委任�れ����ん"
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "システムエラー。権利����れ����ん"
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: NOT FOUND IN SOURCE
+msgid "System error. Unable to grant rights."
+msgstr ""
+
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "システムグループ"
 
@@ -4498,40 +5061,44 @@ msgstr "システムグループ"
 msgid "SystemRolegroup for internal use"
 msgstr ""
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "テスト＿ストリング"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "�る"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "�られ�"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: NOT FOUND IN SOURCE
+msgid "Task"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "テンプレート"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "テンプレート�見��り��ん"
 
@@ -4539,11 +5106,11 @@ msgstr "テンプレート�見��り��ん"
 msgid "Template not found\\n"
 msgstr "テンプレート�見��り��ん\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "テンプレート�解��れ���"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "テンプレート"
 
@@ -4551,33 +5118,37 @@ msgstr "テンプレート"
 msgid "Templates for %1\\n"
 msgstr "%1\\n�テンプレート"
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: NOT FOUND IN SOURCE
+msgid "Text"
+msgstr ""
+
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "�れ���カスタムフィールド��リュー���り��ん"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "�れ����リュー��"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "��責任者������キュー�%1��"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "��責任者�������ケット�%1��"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "��責任者���キュー�%1���り��ん"
@@ -4586,11 +5157,11 @@ msgstr "��責任者���キュー�%1���り��ん"
 msgid "That principal is not a %1 for this ticket"
 msgstr "��責任者����ケット�%1���り��ん"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr "��キュー��り��ん"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "���ケット�従属物を���分解����"
 
@@ -4598,47 +5169,51 @@ msgstr "���ケット�従属物を���分解����"
 msgid "That user already has that right"
 msgstr "��ユーザー����権利��り��"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr "��ユーザー�����ケットを所有�����"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "��ユーザー�存在���ん"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "��ユーザー����特権�与�られ����"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr "��ユーザー�����特権��り��ん"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "��ユーザー�今特権を与�られ���"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr "��ユーザー�今特権を失����"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr "��ユーザー���キュー���ケットを所有������能性��り��"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "�れ�数字�ID���り��ん"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "基本"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr ""
 
@@ -4646,7 +5221,7 @@ msgstr ""
 msgid "The comment has been recorded"
 msgstr "コメント�記録�れ���"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr ""
 
@@ -4654,31 +5229,31 @@ msgstr ""
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "次�コマンド�処��れ��ん���:\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr ""
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "�れら�コメント�実際ユーザー��見る�������ん"
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
 msgstr ""
 
@@ -4686,15 +5261,15 @@ msgstr ""
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "���ケット%1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "��トランザクション��コンテンツ��り��ん"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
 msgstr ""
@@ -4703,32 +5278,40 @@ msgstr ""
 msgid "This user's 25 highest priority tickets"
 msgstr "��ユーザー�25�も��も高�優先�ケット"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "木曜日"
 
 #: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Ticket # %1  %2"
 msgstr "�ケット# %1  %2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "�ケット　#%1　大��アップデート: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr ""
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "�ケット %1�キュー '%2'�作��れ���"
@@ -4737,16 +5320,16 @@ msgstr "�ケット %1�キュー '%2'�作��れ���"
 msgid "Ticket %1 loaded\\n"
 msgstr "�ケット%1�ロード�れ���\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "�ケット　%1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
 msgstr ""
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr "�ケットヒストリー　# %1 %2"
@@ -4759,7 +5342,7 @@ msgstr "�ケットID"
 msgid "Ticket Resolved"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
 msgstr ""
 
@@ -4767,19 +5350,19 @@ msgstr ""
 msgid "Ticket attachment"
 msgstr "�ケット添付"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "�ケットコンテンツ"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "�ケットコンテンツタイプ"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "�ケット�作��れ���"
 
@@ -4787,14 +5370,26 @@ msgstr "�ケット�作��れ���"
 msgid "Ticket creation failed"
 msgstr "�ケット�作��失敗����"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "�ケット�削除�れ���"
 
-#: html/Ticket/Display.html:55
+#: NOT FOUND IN SOURCE
+msgid "Ticket id not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr ""
+
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Ticket not found"
+msgstr ""
+
 #: etc/initialdata:310
 msgid "Ticket status changed"
 msgstr ""
@@ -4803,53 +5398,58 @@ msgstr ""
 msgid "Ticket watchers"
 msgstr "�ケットウォッ�ャー"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
+#: html/Elements/Tabs:46
+msgid "Tickets"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
-msgid "Tickets"
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
+msgid "Tickets %1 %2"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
+msgid "Tickets %1 by %2"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Tickets from %1"
 msgstr "%1�ら��ケット"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "時間�残�����"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "使��時間"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "残���る時間"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "表示�る時間"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "使��時間"
 
-#: lib/RT/Ticket_Overlay.pm:1143
-msgid "TimeWorked"
+#: NOT FOUND IN SOURCE
+msgid "TimeLeft"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
+#: lib/RT/Ticket_Overlay.pm:1277
+msgid "TimeWorked"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -4860,16 +5460,16 @@ msgstr "��コミット�ディフを��る���:"
 msgid "To generate a diff of this commit:\\n"
 msgstr "��コミット�ディフを��る���:\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "言��"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
 msgstr ""
 
@@ -4877,24 +5477,28 @@ msgstr ""
 msgid "Transaction"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "トランザクション%1�消去�れ���"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "トランザクション�作��れ���"
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: lib/RT/Transaction_Overlay.pm:92
+msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "トランザクション�変更�れる����り��ん"
 
@@ -4902,19 +5506,23 @@ msgstr "トランザクション�変更�れる����り��ん"
 msgid "Trying to delete a right: %1"
 msgstr "権利: %1を削除�����"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "�曜日"
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "タイプ"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "導入�れ����"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Unixログイン"
 
@@ -4922,21 +5530,16 @@ msgstr "Unixログイン"
 msgid "UnixUsername"
 msgstr "Unixユーザー�ーム"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "�明�コンテンツエンコーディング%1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "制��れ����"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
 msgstr ""
 
@@ -4944,23 +5547,27 @@ msgstr ""
 msgid "Unprivileged"
 msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "�られ����"
 
-#: html/Search/Bulk.html:54
+#: NOT FOUND IN SOURCE
+msgid "Untitled search"
+msgstr ""
+
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "アップデート"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
 msgstr ""
 
@@ -4968,11 +5575,11 @@ msgstr ""
 msgid "Update ID"
 msgstr "アップデートID"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
 msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "アップデートタイプ"
 
@@ -4984,7 +5591,7 @@ msgstr "�����ケットを一度�アップデート�る"
 msgid "Update email"
 msgstr "アップデートEメール"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
 msgstr ""
 
@@ -4992,11 +5599,11 @@ msgstr ""
 msgid "Update name"
 msgstr "アップデート�ーム"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "アップデート�記録�れ��ん���"
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "�択�れ��ケットをアップデート�る"
 
@@ -5004,7 +5611,7 @@ msgstr "�択�れ��ケットをアップデート�る"
 msgid "Update signature"
 msgstr "サインをアップデート�る"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "�ケットをアップデート�る"
 
@@ -5012,58 +5619,58 @@ msgstr "�ケットをアップデート�る"
 msgid "Update ticket # %1"
 msgstr "アップデート�ケット # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "アップデート�ケット #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr ""
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "アップデートタイプ�通知�もコメント�も�り��ん"
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "アップデート����"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
 msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
 msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5074,7 +5681,7 @@ msgstr "ユーザー%1 %2: %3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "ユーザー%1パスワード: %2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
 msgstr ""
@@ -5091,7 +5698,7 @@ msgstr "ユーザー'%1'�見��り��ん\\n"
 msgid "User Defined"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
 msgstr ""
 
@@ -5099,33 +5706,32 @@ msgstr ""
 msgid "User ID"
 msgstr "ユーザーID"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "ユーザーID"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "ユーザー権利"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "ユーザーを作��る�������ん���: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "ユーザー�作��れ���"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "ユーザー�グループを決定����"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
 msgstr ""
 
@@ -5137,23 +5743,23 @@ msgstr "ユーザー�通告�れ���"
 msgid "User view"
 msgstr "ユーザービュー"
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "ユーザー�ーム"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "ユーザー"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "ユーザー�検索基準�������"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
 msgstr ""
 
@@ -5161,19 +5767,27 @@ msgstr ""
 msgid "ValueOfQueue"
 msgstr "キュー��リュー"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "�リュー"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:63
+#: NOT FOUND IN SOURCE
+msgid "Watcher loaded"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "ウォッ�ャー"
 
@@ -5181,7 +5795,7 @@ msgstr "ウォッ�ャー"
 msgid "WebEncoding"
 msgstr "ウェブエンコーディング"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "水曜日"
 
@@ -5237,11 +5851,19 @@ msgstr ""
 msgid "Whenever correspondence comes in"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "仕事"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr ""
 
@@ -5249,19 +5871,31 @@ msgstr ""
 msgid "WorkPhone"
 msgstr "仕事先�電話"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "Worked"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "����������ケットを所有�����"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "�����証�れ�ユーザー���り��ん"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "����所有����所有�れ�����ケット��を止�る�������"
 
@@ -5269,24 +5903,24 @@ msgstr "����所有����所有�れ�����ケット��
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "�������ケットを見る許���り��ん。\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "����%2��ケット%1を見�����"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "����RT�らログアウト������"
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "������キュー��ケット作��許���り��ん"
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "������キュー�リクエスト�作����る��ょ�"
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "����ログイン������"
 
@@ -5306,44 +5940,56 @@ msgstr ""
 msgid "Your request has been approved."
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr ""
+
 #: etc/initialdata:445
 msgid "Your request was rejected."
 msgstr ""
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "�����ユーザー�ーム�パスワード�間������"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "ジップ"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "and is not"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and not"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "%1��許�"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "�む"
 
 #: NOT FOUND IN SOURCE
+msgid "content"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "content-type"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "correspondence (probably) not sent"
 msgstr "通知�（��ら�）�信�れ����ん"
 
@@ -5351,96 +5997,88 @@ msgstr "通知�（��ら�）�信�れ����ん"
 msgid "correspondence sent"
 msgstr "通知��信�れ���"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "æ—¥"
 
 #: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "delete"
 msgstr "削除"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "削除�れ�"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "����ん"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "����ん"
 
-#: html/Elements/SelectEqualityOperator:59
-msgid "equal to"
-msgstr "等��"
-
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
+#: NOT FOUND IN SOURCE
+msgid "email address"
 msgstr ""
 
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr ""
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr "等��"
 
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
+#: NOT FOUND IN SOURCE
+msgid "false"
 msgstr ""
 
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
+#: NOT FOUND IN SOURCE
+msgid "filename"
 msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "より大��"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "グループ'%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "時間"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "ID"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "��"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "���"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "より少��"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "��"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "最低"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "分"
 
@@ -5448,88 +6086,100 @@ msgstr "分"
 msgid "modifications\\n\\n"
 msgstr "修正\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "月"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "新��"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr ""
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "��"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "等����"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr ""
+
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "開�"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "ユーザー　'%2'　�パーソナルグループ　'%1'　"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "キュー　%1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "拒��れ���"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "分解�れ���"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "秒"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "止�り���"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "システム　%1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "システムグループ　'%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "呼�出���るコン�ー�ント���次�よ�����起�る��特定����ん���"
 
-#: lib/RT/Group_Overlay.pm:238
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "�ケット　#%1 %2"
 
-#: lib/RT/Group_Overlay.pm:244
+#: NOT FOUND IN SOURCE
+msgid "till"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr ""
@@ -5538,12 +6188,12 @@ msgstr ""
 msgid "undescripbed group %1"
 msgstr "表示�れ��グループ　%1"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "ユーザー　%1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "週"
 
@@ -5551,7 +6201,11 @@ msgstr "週"
 msgid "with template %1"
 msgstr "テンプレート　%1�"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "å¹´"
 
+#: NOT FOUND IN SOURCE
+msgid "ニック�ーム"
+msgstr ""
+
diff --git a/rt/lib/RT/I18N/nl.po b/rt/lib/RT/I18N/nl.po
index 91547c8..617f953 100644
--- a/rt/lib/RT/I18N/nl.po
+++ b/rt/lib/RT/I18N/nl.po
@@ -13,147 +13,171 @@ msgstr "#"
 msgid "#%1"
 msgstr "msgstr "" "
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr "#%1: %2"
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%1 %2 %3 %4:%5:%6 %7"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "%1 %2 toegevoegd"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "%1 %2 geleden"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 %2 veranderd naar %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
 msgstr "%1 %2 verwijderd"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 of group %3"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "%1 %2 met sjabloon %3"
 
 #: NOT FOUND IN SOURCE
+msgid "%1 %2 הוסף"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 שונה ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 dit ticket\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
 msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
 msgstr ""
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: NOT FOUND IN SOURCE
+msgid "%1 - %2 shown"
+msgstr ""
+
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr "%1 - Een argument om door te geven aan %2"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr "%1 - Uitvoer status herzieningen naar STDOUT"
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr "%1 - Specificeer de actie module die u wenst te gebruiken"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr "%1 - Specificeer de conditie module die u wenst te gebruiken"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - Specificeer de zoek module die u wenst te gebruiken"
 
+#: NOT FOUND IN SOURCE
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
+
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "%1 ScripAction geladen"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "%1 toegevoegd als waarde voor %2"
@@ -170,31 +194,32 @@ msgstr "%1 aliassen hebben een TicketId nodig om mee te werken"
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
 msgstr "%1 aliassen hebben een TicketId nodig om mee te werken (van %2) %3"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
-msgstr "%1 lijkt een lokaal object te zijn maar kan niet gelokaliseerd worden in de database"
+msgstr ""
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 door %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 veranderd van %2 naar %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
 msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "%1 kon niet veranderd worden naar %2"
 
@@ -202,22 +227,20 @@ msgstr "%1 kon niet veranderd worden naar %2"
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 kon geen transactie initiëren (%2)"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 kon status niet veranderen naar opgelost. RT's Database zou inconsistent kunnen zijn"
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
 msgstr ""
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
 msgstr ""
@@ -226,16 +249,17 @@ msgstr ""
 msgid "%1 highest priority tickets I own..."
 msgstr "De %1 hoogste prioriteit tickets die ik bezit..."
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
-msgstr "De %1 hoogste prioriteit tickets waar ik om verzocht heb..."
+msgstr "De %1 hoogste prioriteit tickets waarom ik verzocht heb..."
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr "%1 is een gereedschap om te reageren op tickets van een extern rooster programma, zoals cron"
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 is niet langer een %2 voor deze rij"
@@ -244,7 +268,8 @@ msgstr "%1 is niet langer een %2 voor deze rij"
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 is niet langer een %2 voor dit ticket"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 is niet langer een waarde voor specifiek veld %2"
 
@@ -252,7 +277,11 @@ msgstr "%1 is niet langer een waarde voor specifiek veld %2"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 is niet een geldig Rij id"
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -261,7 +290,15 @@ msgstr "%1 is niet een geldig Rij id"
 msgid "%1 min"
 msgstr "%1 min"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
 msgstr ""
@@ -270,11 +307,11 @@ msgstr ""
 msgid "%1 not shown"
 msgstr "%1 niet afgebeeld"
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
-msgstr "%1 objecten"
+msgstr ""
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "%1 rechten"
@@ -291,41 +328,85 @@ msgstr "%1 type onbekend voor $MessageId"
 msgid "%1 type unknown for %2"
 msgstr "%1 type onbekend voor %2"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: NOT FOUND IN SOURCE
+msgid "%1 was created without a CurrentUser\\n"
+msgstr ""
+
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 zal alle leden van een opgelost groep ticket omzetten."
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 על ידי %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
 msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: geen aanhechting gespecificeerd"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1b"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1k"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1 is een ongeldige waarde voor status"
@@ -334,53 +415,69 @@ msgstr "'%1 is een ongeldige waarde voor status"
 msgid "'%1' not a recognized action. "
 msgstr "'%1' onherkende actie. "
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete group member)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Check box to delete scrip)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(Vink hokje af om te verwijderen)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: NOT FOUND IN SOURCE
+msgid "(Check boxes to delete)"
+msgstr ""
+
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
-msgstr "(Markeer hokje om notificaties voor de genoemde ontvangers uit te zetten)"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
-msgstr "(Markeer hokje om notificaties voor de genoemde ontvangers aan te zetten)"
+msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
+msgstr "(Vul ticket ids of URLs in, gescheiden door spaties)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(Indien leeggelaten, wordt voorzien van %1)"
+msgid "(If left blank, will default to %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
 msgstr "(Geen Waarde)"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
-msgstr "(Geen eigen velden)"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(Geen Leden)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "(Geen scrips)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
-msgstr "(Geen slablonen)"
+msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
 msgstr ""
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr ""
 
@@ -388,11 +485,11 @@ msgstr ""
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Stuurt een blinde carbon copy van deze herziening naar een comma gescheiden lijst van email adressen. Wie er toekomstige herzieningen zal ontvangen, zal <b>niet</b> veranderen.)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr ""
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr ""
 
@@ -400,87 +497,111 @@ msgstr ""
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Stuurt een carbon copy van deze herziening naar een comma gescheiden lijst van email adressen. Wie er toekomstige herzieningen zal ontvangen, zal <b>niet</b> veranderen.)"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Stuurt een kopie van deze herziening naar een door komma's gescheiden lijst van email-adressen. Deze personen zullen toekomstige herzieningen <b>blijven</b> ontvangen.)"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
 msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(leeg)"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "(no subject)"
 msgstr "(geen onderwerp)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(geen waarde)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
-msgstr "(geen waarden)"
+msgstr ""
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(slechts één ticket)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(wacht op goedkeuring)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
-msgstr "(wacht op andere Collection)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "(pending other tickets)"
 msgstr "(wacht op andere tickets)"
 
-#: html/Admin/Users/Modify.html:71
+#: NOT FOUND IN SOURCE
+msgid "(requestor's group)"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(verplicht)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(zonder titel)"
 
-#: html/Ticket/Elements/ShowBasics:53
+#: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr "<% $Ticket->Status%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr "<% $_ %>"
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Nieuw ticket in\">&nbsp;%1"
 
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
 #: etc/initialdata:218
 msgid "A blank template"
 msgstr "Een leeg sjabloon"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "ACE Deleted"
 msgstr "ACE Verwijderd"
@@ -489,80 +610,80 @@ msgstr "ACE Verwijderd"
 msgid "ACE Loaded"
 msgstr "ACE Geladen"
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE could not be found"
+msgstr ""
+
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE niet gevonden"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "ACEs kunnen allen gecreëerd of verwijderd worden."
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "Afbraak om ongewenste ticket aanpassing te voorkomen.\\n"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
-msgstr "Over mezelf"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "Toegangscontrole"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Actie"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "Actie %1 niet gevonden"
 
-#: NOT FOUND IN SOURCE
+#: bin/rt-crontool:119
 msgid "Action committed."
 msgstr "Actie uitgevoerd."
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr ""
-
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "Actie voorbereid..."
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
-msgstr "Voeg toe"
+msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "Voeg AdminCc toe"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "Voeg Cc toe"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
 msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "Voeg Meer Bestanden Toe"
 
-#: html/Search/Bulk.html:106
+#: NOT FOUND IN SOURCE
+msgid "Add Next State"
+msgstr ""
+
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "Voeg Verzoeker Toe"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr ""
 
@@ -570,53 +691,65 @@ msgstr ""
 msgid "Add a Scrip to this queue"
 msgstr "Voeg een Scrip toe aan deze rij"
 
-#: html/Admin/Global/Scrip.html:76
+#: NOT FOUND IN SOURCE
+msgid "Add a Scrip which will apply to all queues"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a new a global scrip"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a scrip to this queue"
+msgstr ""
+
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
-msgstr "Voeg een Scrip toe dat voor alle rijen zal gelden"
+msgstr "Voeg een scrip toe welke voor alle rijen zal gelden"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
 msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "Voeg commentaar of reacties toe aan geselecteerde tickets"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "Voeg leden toe"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Voeg nieuwe toeschouwers toe"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "AddNextState"
 msgstr "VoegVolgendeStaatToe"
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "Hoofd toegevoegd als %1 voor deze rij"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "Hoofd toegevoegd als %1 voor dit ticket"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "Adres1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "Adres2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "Beheerder Cc"
 
@@ -628,15 +761,15 @@ msgstr ""
 msgid "Admin Correspondence"
 msgstr ""
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "Beheerder rijen"
 
 #: NOT FOUND IN SOURCE
 msgid "Admin users"
-msgstr "Beheerdergebruikers"
+msgstr "Beheerder gebruikers"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "Beheerder/Globale configuratie"
 
@@ -648,7 +781,11 @@ msgstr "Beheerder/Groepen"
 msgid "Admin/Queue/Basics"
 msgstr "Beheerder/Rij/Basis"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: NOT FOUND IN SOURCE
+msgid "AdminAllPersonalGroups"
+msgstr ""
+
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "BeheerderCc"
 
@@ -660,47 +797,55 @@ msgstr "BeheerderCommentaar"
 msgid "AdminCorrespondence"
 msgstr "BeheerderCorrespondentie"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
-msgstr "BeheerderSpecifiekVeld"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Queue_Overlay.pm:73
 msgid "AdminCustomFields"
 msgstr "BeheerderSpecifiekeVelden"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "BeheerderGroep"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "BeheerderGroepLidmaatschap"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr "BeheerderBezitPersoonlijkeGroepen"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr "BeheerderRij"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr "BeheerderGebruikers"
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "Administratieve Cc"
 
-#: html/Ticket/Elements/Tabs:197
+#: NOT FOUND IN SOURCE
+msgid "Admins"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
-msgstr "Geavanceerd"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Advanced Search"
 msgstr "Uitgebreid Zoeken"
 
-#: html/Elements/SelectDateRelation:57
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "Nadat"
 
@@ -708,15 +853,27 @@ msgstr "Nadat"
 msgid "Age"
 msgstr "Leeftijd"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
+#: NOT FOUND IN SOURCE
+msgid "Alias"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Alias for"
 msgstr ""
 
 #: etc/initialdata:363
 msgid "All Approvals Passed"
-msgstr "Alle Gegeven Goedkeuringen"
+msgstr ""
 
-#: html/Admin/Queues/index.html:75
+#: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
+msgid "All Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "Alle Rijen"
 
@@ -724,39 +881,35 @@ msgstr "Alle Rijen"
 msgid "Always sends a message to the requestors independent of message sender"
 msgstr "Stuurt altijd een bericht naar de verzoekers ongeacht de verzender van het bericht"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr ""
-
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
 msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "Goedkeuring"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "Goedkeuring #%1: %2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr "Goedkeuring #%1: Notities niet bewaard vanwege een systeem fout"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr "Goedkeuring #%1: Notities bewaard"
@@ -777,7 +930,7 @@ msgstr ""
 msgid "Approval diagram"
 msgstr "Goedkeuring diagram"
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "Goedkeuring"
 
@@ -785,7 +938,7 @@ msgstr "Goedkeuring"
 msgid "Approver's notes: %1"
 msgstr "Notities van de goedkeurer: %1"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "Ggk."
 
@@ -793,52 +946,72 @@ msgstr "Ggk."
 msgid "April"
 msgstr "april"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "Oplopend"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
-msgstr "WijsSpecifiekeVeldenToe"
+msgstr ""
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "Aanhechten"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "Hecht bestand aan"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "Aangehecht bestand"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "Aanhechting '%1' kon niet geladen worden"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "Aanhechting gecreëerd"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "Aanhechting bestandsnaam"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Aanhechtingen"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
-msgstr "Attribuut Verwijderd"
+msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "aug."
 
@@ -856,19 +1029,19 @@ msgstr "Automatisch-antwoord"
 
 #: etc/initialdata:72
 msgid "Autoreply To Requestors"
-msgstr "Automatisch-antwoord aan Verzoekers"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "AutoreplyToRequestors"
 msgstr "Automatisch-antwoordAanVerzoekers"
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Elements/EditFormat:4
 msgid "Available Columns"
-msgstr "Beschikbare Kolommen"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
-msgstr "Ongeldige PGP Signature: %1\\n"
+msgstr "Ongeldige PGP Signatuur: %1\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
@@ -882,19 +1055,19 @@ msgstr "Ongeldige data in %1"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "Ongeldig transactienummer voor aanhechting. %1 zou %2 moeten zijn\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "Basis"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "Zorg ervoor dat u uw veranderingen bewaard"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "Voorheen"
 
@@ -902,129 +1075,144 @@ msgstr "Voorheen"
 msgid "Begin Approval"
 msgstr "Begin Goedkeuring"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
+#: NOT FOUND IN SOURCE
+msgid "Binary"
 msgstr ""
 
 #: etc/initialdata:217
 msgid "Blank"
 msgstr "Blanco"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
-msgstr "URL voor deze zoekopdracht, geschikt als bookmark"
+msgstr "XXX URL voor deze zoekopdracht"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
 msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "Korte koppen"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "Bulk ticketherziening"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "Kan systeemgebruikers niet wijzigen"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr "Kan dit hoofd deze rij zien"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "Kan geen specifiek veld toevoegen zonder een naam"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
-msgstr "Kan geen bewaarde zoekopdracht vinden om mee te werken"
+msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "Kan een ticket niet koppelen aan zichzelf"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "Kan niet samenvoegen met een reeds samengevoegd ticket. U zou deze boodschap nooit mogen krijgen"
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
-msgstr "Kan deze zoekopdracht niet opslaan"
+msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "Kan niet zowel basis als doel specificeren"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "Kan gebruiker %1 niet aanmaken"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Cc"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
-msgstr "Alle Markeren"
+msgstr ""
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "Vink hokje af om te verwijderen"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "Vink hokje af om recht te verwijderen"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "Kinderen"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "Stad"
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
-msgstr "Alle Wissen"
+msgstr ""
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
-msgstr "Gesloten"
+msgstr ""
+
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Closed requests"
 msgstr "Gesloten verzoeken"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Code"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Command not understood!\\n"
 msgstr "Commando niet begrepen!\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Commentaar"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "Commentaar Adres"
 
@@ -1032,11 +1220,11 @@ msgstr "Commentaar Adres"
 msgid "Comment not recorded"
 msgstr "Commentaar niet bewaard"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr "Commentaar op tickets"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr "CommentaarOpTicket"
 
@@ -1044,11 +1232,11 @@ msgstr "CommentaarOpTicket"
 msgid "Comments"
 msgstr "Commentaar"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "Commentaar (Wordt niet verstuurd aan verzoekers)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "Commentaar (Wordt niet verstuurd aan verzoekers)"
 
@@ -1056,15 +1244,15 @@ msgstr "Commentaar (Wordt niet verstuurd aan verzoekers)"
 msgid "Comments about %1"
 msgstr "Commentaar over %1"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "Commentaar over deze gebruiker"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "Commentaar toegevoegd"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr ""
 
@@ -1072,23 +1260,23 @@ msgstr ""
 msgid "Compile Restrictions"
 msgstr "Compilatie Restricties"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "Voorwaarde"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr "Voorwaarde komt overeen..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "Voorwaarde niet gevonden"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "Bevestig"
 
@@ -1100,15 +1288,19 @@ msgstr "ContactInfoSysteem"
 msgid "Contacted date '%1' could not be parsed"
 msgstr "Contact datum '%1' kon niet ontleed worden"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "Inhoud"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:64
+#: NOT FOUND IN SOURCE
+msgid "Coould not create group"
+msgstr ""
+
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
 msgstr ""
 
@@ -1120,7 +1312,7 @@ msgstr "Correspondentie"
 msgid "Correspondence Address"
 msgstr "Correspondentieadres"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "Correspondentie toegevoegd"
 
@@ -1128,7 +1320,7 @@ msgstr "Correspondentie toegevoegd"
 msgid "Correspondence not recorded"
 msgstr "Correspondentie niet bewaard"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
 msgstr "Kon nieuw specifiek veld niet toevoegen voor dit ticket. "
 
@@ -1136,43 +1328,29 @@ msgstr "Kon nieuw specifiek veld niet toevoegen voor dit ticket. "
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "Kon nieuw specifiek veld niet toevoegen voor dit ticket. %1"
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr ""
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "Kon eigenaar niet wijzigen. "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "Kon SpecifiekVeld niet creëren"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "Kon groep niet creëren"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "Kon sjabloon niet creëren: %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "Kon ticket niet creëren. Rij niet ingesteld"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "Kon gebruiker niet creëren"
 
@@ -1188,11 +1366,11 @@ msgstr "Kon geen ticket vinden met id %1"
 msgid "Could not find group %1."
 msgstr "Kon groep %1 niet vinden. "
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "Kon deze gebruiker niet vinden of creëren"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "Kon dat hoofd niet vinden"
 
@@ -1200,34 +1378,25 @@ msgstr "Kon dat hoofd niet vinden"
 msgid "Could not find user %1."
 msgstr "Kon gebruiker %1 niet vinden."
 
-#: html/Admin/CustomFields/Objects.html:69
+#: NOT FOUND IN SOURCE
 msgid "Could not load CustomField %1"
-msgstr "Kon SpecifiekVeld %1 niet laden"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "Kon groep niet laden"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "Kon dat hoofd geen %1 maken voor deze rij"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "Kon dat hoofd geen %1 maken voor dit ticket"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "Kon dat hoofd niet verwijderen als %1 voor deze rij"
@@ -1236,15 +1405,15 @@ msgstr "Kon dat hoofd niet verwijderen als %1 voor deze rij"
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "Kon dat hoofd niet verwijderen als %1 voor dit ticket"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
-msgstr "Kan gebruikersinformatie niet toewijzen"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "Kon lid niet toevoegen aan groep"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "Kon geen transactie creëren: %1"
@@ -1257,15 +1426,15 @@ msgstr "Kon niet bepalen welke actie te ondernemen aan de hand van gpg's antwoor
 msgid "Couldn't find group\\n"
 msgstr "Kon groep niet vinden\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr "Kon rij niet vinden"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "Kon dat hoofd niet vinden"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "Kon die waarde niet vinden"
 
@@ -1277,18 +1446,16 @@ msgstr "Kon die toeschouwer niet vinden"
 msgid "Couldn't find user\\n"
 msgstr "Kon gebruiker niet vinden\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "Kon %1 niet laden uit de gebruikersdatabase.\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr ""
 
@@ -1304,26 +1471,25 @@ msgstr "Kon RT configuratie bestand niet laden '%1' %2"
 msgid "Couldn't load Scrips."
 msgstr "Kon Scrips niet laden"
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "Kon groep %1 niet laden"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "Kon link niet laden"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
-msgstr "Kon object %1 niet laden"
+msgstr ""
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "Kon rij niet laden"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "Kon rij %1 niet laden "
@@ -1340,26 +1506,16 @@ msgstr "Kon sjabloon niet laden"
 msgid "Couldn't load that user (%1)"
 msgstr "Kon die gebruiker (%1) niet laden"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "Kon ticket '%1' niet laden"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "Land"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "Creëer"
 
@@ -1367,28 +1523,44 @@ msgstr "Creëer"
 msgid "Create Tickets"
 msgstr "Creëer Tickets"
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "Creëer een SpecifiekVeld"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr ""
 
+#: html/Admin/Global/CustomField.html:47
+msgid "Create a CustomField which applies to all queues"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Create a new Custom Field"
 msgstr "Creëer een niuew Specifiek Veld"
 
 #: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create a new global Scrip"
 msgstr "Creëer een nieuw globaal Scrip"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: NOT FOUND IN SOURCE
+msgid "Create a new global scrip"
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "Creëer een nieuwe groep"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "Creëer een nieuwe persoonlijke groep"
 
@@ -1404,15 +1576,15 @@ msgstr "Creëer een nieuw scrip"
 msgid "Create a new template"
 msgstr "Creëer een nieuw template"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "Creëer een nieuw ticket"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "Creëer een nieuwe gebruiker"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "Creëer een rij"
 
@@ -1424,149 +1596,182 @@ msgstr "Creëer een rij genaamd"
 msgid "Create a request"
 msgstr "Creëer een verzoek"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr "Creëer een scrip voor rij %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "Creëer een sjabloon"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
-msgstr "Maak een ticket aan"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Create failed: %1 / %2 / %3 "
 msgstr "Creatie mislukt: %1 / %2 / %3 "
 
+#: NOT FOUND IN SOURCE
+msgid "Create failed: %1/%2/%3"
+msgstr ""
+
 #: etc/initialdata:137
 msgid "Create new tickets based on this scrip's template"
 msgstr "Creëer nieuwe tickets gebaseerd op het sjabloon van dit scrip"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "Creëer ticket"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr "Creëer tickets in deze rij"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "Creëer, verwijder en wijzig specifieke velden"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr "Creëer, verwijder en wijzig rijen"
 
-#: lib/RT/System.pm:81
+#: NOT FOUND IN SOURCE
+msgid "Create, delete and modify the members of any user's personal groups"
+msgstr ""
+
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "Creëer, verwijder en wijzig de leden van persoonlijke groepen"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "Creëer, verwijder en wijzig gebruikers"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr "CreëerTicket"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "Gecreëerd"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "SpecifiekVeld %1 gecreëerd"
 
 #: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr "Sjabloon %1 Gecreëerd"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
-msgstr "Creator"
+msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "Huidige Relaties"
 
-#: html/Admin/Elements/EditScrips:51
+#: NOT FOUND IN SOURCE
+msgid "Current Relationships"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "Huidige Scrips"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "Huidige leden"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Huidige rechten"
 
 #: NOT FOUND IN SOURCE
 msgid "Current search criteria"
-msgstr "Huidige zoekcriteria"
+msgstr ""
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "Huidige toeschouwers"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
+msgid "Custom Field #%1"
+msgstr ""
+
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "Specifieke Velden"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
-msgstr "Specifieke Velden voor %1"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr "Specifieke actie opruim code"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "Specifieke actie voorbereidings code"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "Specifieke voorwaarde"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "Specifiek veld %1 %2 %3"
 
 #: NOT FOUND IN SOURCE
 msgid "Custom field %1 does not apply to this object"
-msgstr "Specifiek Veld %1 is niet van toepassing op dit object"
+msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "Specifiek veld %1 heeft een waarde."
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "Specifiek veld %1 heeft geen waarde."
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "Specifiek veld %1 niet gevonden"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
+msgid "Custom field deleted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "Specifiek veld niet gevonden"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "Specifiek veld waarde %1 kon niet gevonden worden voor specifiek veld %2"
@@ -1575,31 +1780,31 @@ msgstr "Specifiek veld waarde %1 kon niet gevonden worden voor specifiek veld %2
 msgid "Custom field value changed from %1 to %2"
 msgstr "Specifiek veld waarde veranderd van %1 naar %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "Specifiek veld waarde kon niet verwijderd worden"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "Specifiek veld waarde kon niet gevonden worden"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "Specifiek veld waarde verwijderd"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
-msgstr "SpecifiekVeld"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Data error"
 msgstr "Data fout"
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Data"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "dec."
 
@@ -1615,11 +1820,11 @@ msgstr "Standaard Auto-antwoord Sjabloon"
 msgid "Default Autoresponse template"
 msgstr ""
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
 msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
 msgstr ""
 
@@ -1639,64 +1844,60 @@ msgstr "Standaard correspondentie sjabloon"
 msgid "Default transaction template"
 msgstr "Standaard transactie sjabloon"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "Standaard: %1/%2 verandered van %3 naar %4"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "Delegeer rechten"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr "Delegeer specifieke rechten die aan u verleend zijn."
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr "DelegeerRechten"
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr ""
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr "Verwijder tickets"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr "VerwijderTicket"
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "Het verwijderen van dit object zou de referentiële integriteit kunnen ondermijnen"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "Het verwijderen van dit object zou de referentiële integriteit ondermijnen"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "Het verwijderen van dit object zou de referentiële integriteit ondermijnen"
 
@@ -1704,11 +1905,15 @@ msgstr "Het verwijderen van dit object zou de referentiële integriteit ondermij
 msgid "Deleting this object would violate referential integrity."
 msgstr "Het verwijderen van dit object zou de referentiële integriteit ondermijnen"
 
-#: html/Approvals/Elements/Approve:66
+#: NOT FOUND IN SOURCE
+msgid "Deleting this object would violate referential integrity. That's bad."
+msgstr ""
+
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "Wijs af"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "Afhankelijkheid van"
 
@@ -1716,39 +1921,43 @@ msgstr "Afhankelijkheid van"
 msgid "Dependencies: \\n"
 msgstr "Afhankelijkheden: \\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "Is afhankelijk van"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: NOT FOUND IN SOURCE
+msgid "DependsOn"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "Aflopend"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "Omschrijf onderstaande kwestie"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -1756,67 +1965,67 @@ msgstr "Omschrijving"
 msgid "Details"
 msgstr "Details"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "Toon"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr "Toon Toegangs Controle Lijst"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
-msgstr "Toon Kolommen"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr "Toon Scrip sjablonen voor deze rij"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr "Toon Scrips voor deze rij"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "Toon modus"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
-msgstr "Toon bewaarde zoekopdrachten voor deze groep"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Display ticket #%1"
 msgstr "Toon ticket #%1"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "Doe iets en alles"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "Ververs deze pagina niet"
 
 #: NOT FOUND IN SOURCE
 msgid "Don't show search results"
-msgstr "Toon zoekresultaten niet"
+msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "Download"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
-msgstr "Download als een door tabs gescheiden databestand"
+msgstr ""
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "Verwacht"
 
@@ -1832,41 +2041,49 @@ msgstr "FOUT: Kon ticket '%1' niet laden: %2.\\n"
 msgid "Edit"
 msgstr "Wijzig"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
-msgid "Edit Custom Fields for %1"
-msgstr "Wijzig Specifieke Velden voor %1"
-
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
+#: NOT FOUND IN SOURCE
+msgid "Edit Conditions"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Wijzig Specifieke Velden voor %1"
 
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
 msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "Wijzig Relaties"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
-msgstr "Wijzig Zoekopdracht"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Edit Relationships"
+msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:175
+#: NOT FOUND IN SOURCE
+msgid "Edit keywords"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: NOT FOUND IN SOURCE
+msgid "Edit scrips"
+msgstr ""
+
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "Wijzig systeem sjablonen"
 
@@ -1874,11 +2091,15 @@ msgstr "Wijzig systeem sjablonen"
 msgid "Edit templates for %1"
 msgstr "Wijzig sjablonen voor %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
-msgstr "WijzigOpgeslagenZoekopdrachten"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr "Bezig met wijzigen van de configuratie voor rij %1"
@@ -1887,17 +2108,17 @@ msgstr "Bezig met wijzigen van de configuratie voor rij %1"
 msgid "Editing Configuration for user %1"
 msgstr "Bezit met het wijzigen van de configuratie voor gebruiker %1"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "Bezit met het wijzigen van SpecifiekVeld %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "Bezit met het wijzigen van lidmaatschap voor groep %1"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "Bezit met het wijzigen van lidmaatschap voor persoonlijke groep %1"
@@ -1906,15 +2127,15 @@ msgstr "Bezit met het wijzigen van lidmaatschap voor persoonlijke groep %1"
 msgid "Editing template %1"
 msgstr "Bezit met het wijzigen van sjabloon %1"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "Of basis of doel moeten gespecificeerd zijn"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "E-mail"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "E-mailadres in gebruik"
 
@@ -1926,61 +2147,84 @@ msgstr "E-mailAdres"
 msgid "EmailEncoding"
 msgstr "E-mailCodering"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr ""
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "Actief (Het uitvinken van dit hokje zal deze rij deactiveren)"
 
-#: html/Admin/Queues/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
+msgid "Enabled Custom Fields"
+msgstr ""
+
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr "Actieve Rijen"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "Actieve status %1"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr ""
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr ""
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
 msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
+msgstr ""
+
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "Vul tickets of URIs in om deze tickets aan te koppelen. Scheidt meerdere elementen met spaties."
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
 msgstr ""
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Fout"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: NOT FOUND IN SOURCE
+msgid "Error adding watcher"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "Fout in paramaters naar Queue->AddWatcher"
 
@@ -1988,11 +2232,11 @@ msgstr "Fout in paramaters naar Queue->AddWatcher"
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "Fout in paramaters naar Queue->DelWatcher"
 
-#: lib/RT/Queue_Overlay.pm:830
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "Fout in paramaters naar Ticket->AddWatcher"
 
@@ -2000,15 +2244,19 @@ msgstr "Fout in paramaters naar Ticket->AddWatcher"
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "Fout in paramaters naar Ticket->DelWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
 msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: NOT FOUND IN SOURCE
+msgid "Estimate"
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
 msgstr ""
 
@@ -2016,7 +2264,7 @@ msgstr ""
 msgid "Everyone"
 msgstr "Iedereen"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "Voorbeeld:"
 
@@ -2028,73 +2276,72 @@ msgstr "ExternAuteurId"
 msgid "ExternalContactInfoId"
 msgstr "ExternContactInfoId"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "Extra informatie"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "Kon de gebruikers pseudogroep 'Privileged' niet vinden."
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "Kon de gebruikers pseudogroep 'Unprivileged' niet vinden."
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr "Kon module %1 niet laden. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "feb."
 
-#: html/Elements/SelectAttachmentField:50
-msgid "Filename"
-msgstr "Bestandsnaam"
-
-#: lib/RT/CustomField_Overlay.pm:69
-msgid "Fill in multiple text areas"
+#: NOT FOUND IN SOURCE
+msgid "February"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
+#: html/Elements/SelectAttachmentField:28
+msgid "Filename"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:70
-msgid "Fill in one text area"
+#: NOT FOUND IN SOURCE
+msgid "Fill in multiple text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
+#: NOT FOUND IN SOURCE
+msgid "Fill in one text area"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
+#: NOT FOUND IN SOURCE
+msgid "Fin"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "Uiteindelijke Prioriteit"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr "UiteindelijkePrioriteit"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
+msgid "Find group whose"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
 msgstr ""
 
@@ -2102,11 +2349,11 @@ msgstr ""
 msgid "Find new/open tickets"
 msgstr "Zoek nieuwe/open tickets"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "Zoek mensen wier"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr ""
 
@@ -2114,7 +2361,7 @@ msgstr ""
 msgid "Finish Approval"
 msgstr "Beëindig Goedkeuring"
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "Eerste"
 
@@ -2122,86 +2369,90 @@ msgstr "Eerste"
 msgid "First page"
 msgstr "Eerste pagina"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "Aap Noot Mies"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "Aap!"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr ""
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "Gevonden Object"
 
 #: NOT FOUND IN SOURCE
 msgid "Freeform"
-msgstr "Vrije vorm"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "FreeformContactInfo"
 msgstr "VrijevormContactInfo"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:37
 msgid "FreeformMultiple"
 msgstr "VrijevormMeerdere"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "Vr."
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "Volledige Kop"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
-msgstr "Vul sjabloon uit bestand"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "Bezig met het ophalen van de huidige gebruiker middels een pgp handtekening"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "Aan %1 gegeven"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Globaal"
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
-msgstr "Globaal Specifieke Velden"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Global Keyword Selections"
+msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
 msgstr ""
 
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "Globaal sjabloon: %1"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
-msgstr "Ga"
+msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "Ga!"
 
@@ -2213,11 +2464,15 @@ msgstr "Goede pgp handtekening van %1\\n"
 msgid "Goto page"
 msgstr "Ga naar pagina"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "Ga naar ticket"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Groep"
 
@@ -2225,28 +2480,32 @@ msgstr "Groep"
 msgid "Group %1 %2: %3"
 msgstr "Groep %1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "Groeps rechten"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "Groep heeft al een lid"
 
-#: html/Admin/Groups/Modify.html:109
+#: NOT FOUND IN SOURCE
+msgid "Group could not be created."
+msgstr ""
+
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "Groep kon niet gecreërd worden: %1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "Groep gecreërd"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "Groep heeft geen lid onder die naam"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Groep niet gevonden"
 
@@ -2258,42 +2517,44 @@ msgstr "Groep niet gevonden.\\n"
 msgid "Group not specified.\\n"
 msgstr "Groep niet gespecificeerd.\\n"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Groepen"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "Groepen kunnen geen leden zijn van hun leden"
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
 msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:77
+#: NOT FOUND IN SOURCE
 msgid "Groups this user belongs to"
-msgstr "Groepen waar deze gebruiker deel van uitmaakt"
+msgstr ""
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "Hallo!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "Hallo, %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "Geschiedenis"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
 msgstr ""
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
 msgstr ""
 
@@ -2301,24 +2562,24 @@ msgstr ""
 msgid "HomePhone"
 msgstr "ThuisNummer"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Homepage"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
-msgstr "Ik heb %quant(%1,betonmixer)."
+msgstr ""
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "Id"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Identiteit"
 
@@ -2326,88 +2587,92 @@ msgstr "Identiteit"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "Als een goedkeuring afgewezen is, wijs het origineel af en verwijder hangende goedkeuringen"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
 msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
-msgstr "Cre‘er tickets in deze rij indien geen rij is opgegeven."
+msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr "Als dit gereedschap setgid zou zijn, zou een kwaadwillende lokale gebruiker dit gereedschap kunnen gebruiken om administratieve toegang te verkrijgen tot RT"
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "Als u een van de bovenstaande elemented ververst heeft, zorg dan dat u"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "Illegale waarde voor %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Image"
-msgstr "Afbeelding"
+msgstr ""
 
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "Niet-wijzigbaar veld"
 
-#: html/Admin/Groups/index.html:65
+#: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
+msgid "Include disabled custom fields in listing."
+msgstr ""
+
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
-msgstr "Neem inactieve groepen op in de weergave."
+msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
-msgstr "Neem inactieve rijen op in de weergave."
+msgstr "Neem inactieve rijen op in de weergave"
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "Neem inactieve gebruiker op in de zoek opdracht"
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "Initiële Prioriteit"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr "InitiëlePrioriteit"
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "Invoer fout"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "Interne Fout"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "Interne Fout: %1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "Ongeldig Groep Type"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
-msgstr "Ongeldig Recht"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Invalid Type"
 msgstr "Ongeldig Type"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "Ongeldige data"
 
@@ -2415,48 +2680,44 @@ msgstr "Ongeldige data"
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "Ongeldige eigenaar. Val terug op 'nobody'."
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "Ongeldige rij"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "Ongeldige recht"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "Ongeldige waarde voor %1"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "Ongeldige waarde voor specifiek veld"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "Ongeldige waarde voor status"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr "Het is ontzettend belangrijk dat onbevoorrechtigde gebruikers geen toestemming hebben om dit gereedschap te gebruiken."
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr "We stellen voor dat u een onbevoorrechtigde unix gebruiker aanmaakt met het juiste groep lidmaatschap en RT toegang om dit gereedschap te gebruiken."
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr "Het accepteerd meerdere argumenten:"
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Items pending my approval"
 msgstr "Zaken die wachten op mijn goedkeuring"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "jan."
 
@@ -2464,23 +2725,31 @@ msgstr "jan."
 msgid "January"
 msgstr "januari"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "Sluit u aan of verlaat deze groep"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "jul."
 
-#: html/Ticket/Elements/Tabs:122
+#: NOT FOUND IN SOURCE
+msgid "July"
+msgstr ""
+
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "Jumbo"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "jun."
 
 #: NOT FOUND IN SOURCE
+msgid "June"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Keyword"
 msgstr "Sleutelwoord"
 
@@ -2488,47 +2757,51 @@ msgstr "Sleutelwoord"
 msgid "Lang"
 msgstr "Taal"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr ""
-
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "Laatste"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "Laatste Contact"
 
-#: html/Elements/SelectDateType:50
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
+
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "Laatst Gecontacteerd"
 
 #: NOT FOUND IN SOURCE
 msgid "Last Notified"
-msgstr "Laatst Bericht"
+msgstr ""
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "Laatst Ververst"
 
-#: html/Search/Elements/PickBasics:103
+#: NOT FOUND IN SOURCE
+msgid "LastUpdated"
+msgstr ""
+
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
-msgstr "LaatstVerverstDoor"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "Over"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "Geef deze gebruiker toegang tot RT"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "Geef deze gebruiker rechten"
 
@@ -2540,153 +2813,144 @@ msgstr "Eigenaar wordt gelimieteerd tot %1 %2"
 msgid "Limiting queue to %1 %2"
 msgstr "Rij wordt gelimiteerd tot %1 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "Koppeling bestaat al"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "Koppeling kon niet gecreëerd worden"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "Koppeling gecreëerd (%1)"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "Koppelink verwijderd (%1)"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Koppeling niet gevonden"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "Koppel ticket #%1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: NOT FOUND IN SOURCE
+msgid "Link ticket %1"
+msgstr ""
+
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Koppelingen"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "Locatie"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "Log folder %1 niet gevonden of niet toegankelijk.\\n RT kan niet starten."
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "Aangemeld als %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "Aanmelden"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "Afmelden"
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
-msgstr "Lookup type komt niet overeen"
+msgstr ""
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "Maak Eigenaar"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "Maak Status"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "Maak verwachtingsdatum"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "Make oplossingsdatum"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "Maak startdatum"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "Maak datum gestart"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "Maak datum gemeld"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "Maak prioriteit"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "Maak rij"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "Maak onderwerp"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
 msgstr ""
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
-msgstr "Beheer specifieke velden en waarden daarvan"
+msgstr ""
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "Beheer groepen en groeplidmaatschap"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "Beheer eigenschappen en configuraties welke betrekking hebben op alle rijen"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr "Beheer rijen en rij-specifieke eigenschappen"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "Beheer gebruikers en wachtwoorden"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "maa."
 
@@ -2698,33 +2962,33 @@ msgstr "maart"
 msgid "May"
 msgstr "mei"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "mei."
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "Lid toegevoegd"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "Lid verwijderd"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "Lid niet verwijderd"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "Lid van"
 
@@ -2732,75 +2996,74 @@ msgstr "Lid van"
 msgid "MemberOf"
 msgstr "LidVan"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "Leden"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
 msgstr ""
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "Samenvoeging Succesvol"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "Samenvoeging mislukt. Kon EffectiefId niet instellen"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "Voeg samen in"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
-msgstr "Samengevoegd tot %1"
+msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "Bericht"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
-msgid "Message recorded"
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
-msgid "Messages about this ticket will not be sent to..."
+#: lib/RT/Ticket_Overlay.pm:2517
+msgid "Message recorded"
 msgstr ""
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
+#: html/Ticket/Elements/PreviewScrips:70
+msgid "Messages about this ticket will not be sent to..."
 msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "Mist primaire sleutel?: %1"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "Mobiel"
 
@@ -2808,7 +3071,15 @@ msgstr "Mobiel"
 msgid "MobilePhone"
 msgstr "MobieleTelefoon"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "Wijzig Toegangs Controle Lijst"
 
@@ -2816,193 +3087,208 @@ msgstr "Wijzig Toegangs Controle Lijst"
 msgid "Modify Custom Field %1"
 msgstr "Wijzig Specifiek Veld %1"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Fields which apply to all %1"
 msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
-msgid "Modify Custom Fields which apply to all %1"
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
+msgid "Modify Custom Fields which apply to all queues"
 msgstr ""
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
 msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr "Wijzit Scrip sjabloon voor deze rij"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "Wijzig Scrips voor deze rij"
 
 #: NOT FOUND IN SOURCE
+msgid "Modify System ACLS"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify Template %1"
 msgstr "Wijzig Sjabloon %1"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
 msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
-msgstr "Wijzig een Specifiek Veld voor deze rij %1"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:52
+msgid "Modify a CustomField which applies to all queues"
+msgstr ""
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr "Wijzig een scrip voor deze rij %1"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "Wijzig een scrip welke betrekking heeft op alle rijen"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
-msgstr "Wijzig objecten geassocieerd aan %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Modify dates for # %1"
 msgstr "Wijzig data voor # %1"
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "Wijzig data voor #%1"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "Wijzig data voor ticket # %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "Wijzig globale groepsrechten"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "Wijzig globale groepsrechten"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for groups"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global rights for users"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify global scrips"
+msgstr ""
+
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
-msgstr "Wijzig globale gebruikersrechten"
+msgstr ""
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "Wijzig globale gebruikersrechten"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "Wijzig groepsmetadata of verwijder groep"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
-msgstr "Wijzig groepsrechten voor specifiek veld %1"
+msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "Wijzig groepsrechten voor groep %1"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "Wijzig groepsrechten voor rij %1"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "Wijzig lidmaatschap rooster voor dze groep"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr "Wijzig uw eigen RT "
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr "Wijzig mensen gekoppeld aan rij %1"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "Wijzig mensen gekoppeld aan ticket #%1"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "Wijzig scrips voor rij %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr "Wijzig scrips welke betrekking hebben op alle rijen"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "Wijzig sjabloon %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
-msgstr "Wijzig sjablonen die van toepassing zijn op alle rijen"
+msgstr ""
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "Wijzig de groep %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "Wijzig de toeschouwers van de rij"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "Wijzig de gebruiker %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "Wijzig ticket # %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "Wijzig ticket #%1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "Wijzig tickets"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
-msgstr "Wijzig gebruikersrechten voor specifiek veld %1"
+msgstr ""
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "Wijzig gebruikersrechten voor groep %1"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr "Wijzig gebruikersrechten voor rij %1"
@@ -3011,105 +3297,113 @@ msgstr "Wijzig gebruikersrechten voor rij %1"
 msgid "Modify watchers for queue '%1'"
 msgstr "Wijzig toeschouwers voor rij '%1'"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr "WijzigACL"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "WijzigEigenLidmaatschap"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr "WijzigRijToeschouwers"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr "WijzigScrips"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr "WijzigZelf"
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr "WijzigSjabloon"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr "WijzigTicket"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "Ma."
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "Meer over %1"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: NOT FOUND IN SOURCE
+msgid "Move"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr ""
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "Meerdere"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "Specificeren van 'Naam' attribuut verplicht"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
-msgstr "Mijn %1 tickets"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "My Approvals"
 msgstr "Mijn Goedkeuringen"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
-msgstr "Mijn goedkeuringen"
+msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
-msgstr "Mijn bewaarde zoekopdrachten"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Naam"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "Naam in gebruik"
 
 #: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Need approval from system administrator"
 msgstr "Goedkeuring benodigd van de systeem beheerder"
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "Nooit"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "Nieuw"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "Nieuwe Relaties"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "Nieuw Wachtwoord"
 
@@ -3117,67 +3411,79 @@ msgstr "Nieuw Wachtwoord"
 msgid "New Pending Approval"
 msgstr "Nieuwe Hangende Goedkeuring"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
-msgstr "Nieuwe Zoekopdracht"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New Relationships"
+msgstr ""
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New Search"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr ""
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "Bericht voor nieuw wachtwoord verzonden"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
-msgstr "Nieuwe rij"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "New request"
 msgstr "Nieuw verzoek"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "Nieuwe rechten"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
-msgstr "Nieuw scrip"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "New search"
 msgstr "Nieuwe zoekopdracht"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
-msgstr "Nieuw sjabloon"
+msgstr ""
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
-msgstr "Nieuw ticket"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "Nieuw ticket bestaat niet"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
-msgstr "Nieuwe gebruiker"
+msgstr ""
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "Nieuwe gebruiker genaamd"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "Nieuwe toeschouwers"
 
@@ -3185,13 +3491,13 @@ msgstr "Nieuwe toeschouwers"
 msgid "New window setting"
 msgstr "Nieuwe venster instelling"
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "Volgende"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
-msgstr "Volgende pagina"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Next page"
@@ -3201,39 +3507,43 @@ msgstr "Volgende pagina"
 msgid "NickName"
 msgstr "Bijnaam"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
-msgstr "Geen Klasse gedefinieerd"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "Geen SpecifiekVeld"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
-msgstr "Geen SpecifiekVeld gedefinieerd"
+msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "Geen Groep gedefinieerd"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
-msgstr "Geen Zoekopdracht"
+msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "Geen Rij gedefinieerd"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
-msgstr "Geen RT-gebruiker gevonden. Raadpleeg uw RT-beheerder.\\n"
+msgstr "Geen RT gebruiker gevonden. Raadpleeg uw RT beheerder.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "Geen Sjabloon"
 
@@ -3245,11 +3555,11 @@ msgstr "Geen ticket gespecificeerd. Ticket afgebroken "
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
 msgstr "Geen ticket gespecificeerd. Ticket wijzigingen afgebroken\\n\\n"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "Geen actie"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr "Geen kolom gespecificeerd"
 
@@ -3257,7 +3567,7 @@ msgstr "Geen kolom gespecificeerd"
 msgid "No command found\\n"
 msgstr "Geen commando gevonden\\n"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "Geen commentaar ingevuld over deze gebruiker"
 
@@ -3265,85 +3575,80 @@ msgstr "Geen commentaar ingevuld over deze gebruiker"
 msgid "No correspondence attached"
 msgstr "Geen correspondentie aangehecht"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "Geen omschrijving voor %1"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "Geen groep gespecificeerd"
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "Geen wachtwoord ingesteld"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr "Geen rechten om rijen te creëren"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "Geen rechten om tickets te creëren in de rij '%1'"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "Geen rechten om gebruikers te creëren"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "Geen rechten om dat ticket te tonen"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "Geen rechten om verversing ticket te bekijken"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "Geen hoofd gespecificeerd"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "Geen hoofden geselecteerd"
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr "Geen rijen gevonden die aan de zoekcriteria voldoen"
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
-msgstr "Geen rechten gevonden"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "Geen rechten toegekend"
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "Geen zoek opdracht om uit te voeren."
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
-msgstr "Geen onderwerp"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "No ticket id specified"
 msgstr "Geen ticket id gespecificeerd"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "Geen transactie type gespecificeerd"
 
@@ -3351,7 +3656,7 @@ msgstr "Geen transactie type gespecificeerd"
 msgid "No user or email address specified"
 msgstr "Geen gebruiker of email-adres gespecificeerd"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "Geen gebruikers gevonden die aan de zoekcriteria voldoen"
 
@@ -3359,27 +3664,31 @@ msgstr "Geen gebruikers gevonden die aan de zoekcriteria voldoen"
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "Geen geldige RT gebruiker gevonden. RT cvs behandelaar losgemaakt. Neemt u alstublieft contact op met uw RT beheerder.\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr "Geen waarde gestuurd naar _Set!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
-msgstr "Niemand"
+msgstr ""
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr "Nietbestaand veld?"
 
-#: html/Elements/Header:96
+#: NOT FOUND IN SOURCE
+msgid "Not logged in"
+msgstr ""
+
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "Niet aangemeld."
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "Niet gezet"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "Nog niet geïmplementeerd."
 
@@ -3387,11 +3696,11 @@ msgstr "Nog niet geïmplementeerd."
 msgid "Not yet implemented...."
 msgstr "Nog niet geïmplementeerd...."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "Notities"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "Bericht kon niet verstuurd worden"
 
@@ -3463,57 +3772,51 @@ msgstr "Bericht Aanvragers, Ccs en AdminCcs"
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "Bericht Aanvragers, Ccs en AdminCcs als Commentaar"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "nov."
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
+#: NOT FOUND IN SOURCE
+msgid "November"
 msgstr ""
 
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr "Object kon niet gecreëerd worden"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr "Object gecreëerd"
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
 msgstr ""
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "oct."
 
-#: html/Tools/Elements/Tabs:53
+#: NOT FOUND IN SOURCE
+msgid "October"
+msgstr ""
+
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
 msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
 msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "Bij"
 
@@ -3553,21 +3856,21 @@ msgstr "Bij Statuswijziging"
 msgid "On Transaction"
 msgstr "Bij Transactie"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "Toon alleen goedkeuringen voor verzoeken gecreëerd na %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "Toon alleen goedkeuringen voor verzoeken gecreëerd voor %1"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Open"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Open"
 
@@ -3575,7 +3878,7 @@ msgstr "Open"
 msgid "Open requests"
 msgstr "Open verzoeken"
 
-#: html/SelfService/Elements/Tabs:63
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr ""
 
@@ -3589,46 +3892,50 @@ msgstr "Open tickets (van lijst) in een ander venster"
 
 #: etc/initialdata:140
 msgid "Open tickets on correspondence"
-msgstr "Open ticket bij correspondentie"
+msgstr ""
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
-msgstr "Sorteer op"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ordering and sorting"
 msgstr "Ordening en sortering"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Organisatie"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "Voortgekomen uit ticket: #%1"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "Naar mate de tijd vordert, verschuift de prioriteit richting"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr "Eigen tickets"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr "EigenTicket"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "Eigenaar"
 
@@ -3636,11 +3943,11 @@ msgstr "Eigenaar"
 msgid "Owner changed from %1 to %2"
 msgstr "Eigenaar veranderd van %1 naar %2"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "Eigenaar gedwongen veranderd van %1 naar %2"
@@ -3649,12 +3956,12 @@ msgstr "Eigenaar gedwongen veranderd van %1 naar %2"
 msgid "Owner is"
 msgstr "Eigenaar is"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
-msgstr "Pagina %1 van %2"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "Pieper"
 
@@ -3662,53 +3969,40 @@ msgstr "Pieper"
 msgid "PagerPhone"
 msgstr "Pieper"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: NOT FOUND IN SOURCE
+msgid "Parent"
+msgstr ""
+
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "Ouders"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
-msgstr "Wachtwoord Herinnering"
-
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
+msgstr "Wachtwoord Herinerring"
 
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "Wachtwoord te kort"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "Wachtwoord: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
 msgstr ""
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr ""
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "Mensen"
 
@@ -3716,27 +4010,27 @@ msgstr "Mensen"
 msgid "Perform a user-defined action"
 msgstr "Verricht een gebruiker gedefiniëerde actie"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
-msgstr "Perl-configuratie"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "Toestemming Geweigerd"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
-msgstr "Persoonlijke Groepen"
+msgstr ""
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Persoonlijke groepen"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Persoonlijke groepen:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "Telefoonnummers"
 
@@ -3744,7 +4038,11 @@ msgstr "Telefoonnummers"
 msgid "Placeholder"
 msgstr "Plaatshouder"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr ""
+
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -3752,15 +4050,15 @@ msgstr "Voorkeuren"
 msgid "Prefs"
 msgstr "Voorkeuren"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "Bereid Plaatshouder Voor"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "Vorige"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
 msgstr ""
 
@@ -3772,57 +4070,57 @@ msgstr "Vorige pagina"
 msgid "Pri"
 msgstr "Pri"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "Hoofd %1 niet gevonden."
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "Prioriteit begint bij"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
-msgstr "Privacy:"
+msgstr ""
 
 #: etc/initialdata:25
 msgid "Privileged"
 msgstr "Gerechtigd"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "Gerechtigde status: %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "Gerechtigde gebruikers"
 
 #: NOT FOUND IN SOURCE
 msgid "Projects"
-msgstr "Projecten"
+msgstr ""
 
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr "Pseudogroep voor intern gebruik"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
 msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
 msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "Rij"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
@@ -3832,7 +4130,11 @@ msgstr "Rij %1 niet gevonden"
 msgid "Queue '%1' not found\\n"
 msgstr "Rij '%1' niet gevonden\\n"
 
-#: html/Admin/Queues/Modify.html:64
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "Rij Naam"
 
@@ -3840,19 +4142,19 @@ msgstr "Rij Naam"
 msgid "Queue Scrips"
 msgstr "Rij Scrips"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "Rij bestaat al"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr "Rij kon niet aangemaakt worden"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr "Rij kon niet geladen worden."
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "Rij aangemaakt"
 
@@ -3860,45 +4162,49 @@ msgstr "Rij aangemaakt"
 msgid "Queue is not specified."
 msgstr "Rij is niet gespecificeerd"
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "Rij niet gevonden"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "Rijen"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr ""
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
 msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 voor %2"
 
 #: NOT FOUND IN SOURCE
 msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
-msgstr "RT %1 van <a href=\"http://bestpractical.com/\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1 van <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
 
 #: NOT FOUND IN SOURCE
 msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "RT Beheer"
 
@@ -3918,7 +4224,7 @@ msgstr "RT Configuratie fout"
 msgid "RT Critical error. Message not recorded!"
 msgstr "RT Kritieke fout: Bericht niet bewaard!"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "RT Fout"
 
@@ -3927,16 +4233,24 @@ msgid "RT Received mail (%1) from itself."
 msgstr "RT Ontving mail (%1) van zichzelf."
 
 #: NOT FOUND IN SOURCE
+msgid "RT Recieved mail (%1) from itself."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT Self Service / Closed Tickets"
 msgstr "RT Zelfbediening / Afgesloten Tickets"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
-msgstr "RT Variabelen"
+msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
-msgstr "RT in een oogopslag"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't authenticate you"
@@ -3950,15 +4264,11 @@ msgstr "RT kon de verzoeker niet vinden in zijn interne database"
 msgid "RT couldn't find the queue: %1"
 msgstr "RT kon de rij %1 niet vinden"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "RT kon deze PGP signatuur niet valideren. \\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "RT voor %1"
@@ -3976,6 +4286,14 @@ msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&
 msgstr "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Het is gedistribueerd onder <a href=\"http://www.gnu.org/copyleft/gpl.html\">Versie 2 van de GNU General Public License.</a>""
 
 #: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT thinks this message may be a bounce"
 msgstr "RT denkt dat dit bericht onbestelbaar zou kunnen zijn"
 
@@ -3987,7 +4305,11 @@ msgstr "RT zal dit bericht verwerken als of het ongesigneerd is.\\n"
 msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
 msgstr "RT's email commando modus vereist PGP authenticatie.  Of u heeft uw bericht niet gesigneerd, of uw signatuur kon niet geverifieerd worden."
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "Echte Naam"
 
@@ -3995,35 +4317,39 @@ msgstr "Echte Naam"
 msgid "RealName"
 msgstr "EchteNaam"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "Naar gerefeerd door"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "Refereert aan"
 
 #: NOT FOUND IN SOURCE
+msgid "RefersTo"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Refine"
 msgstr "Verfijn"
 
@@ -4031,44 +4357,48 @@ msgstr "Verfijn"
 msgid "Refine search"
 msgstr "Verfijn Zoekopdracht"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Ververs deze pagina elke %1 minuten."
 
-#: html/Search/Bulk.html:116
+#: NOT FOUND IN SOURCE
+msgid "Relationships"
+msgstr ""
+
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "Verwijder AdminCc"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Verwijder Cc"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "Verwijder Verzoeker"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Antwoord"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
-msgstr "Antwoord naar adres"
+msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
-msgstr "Antwoord naar verzoekers"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "Antwoord op tickets"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "AntwoordOpTicket"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "Verzoeker"
 
@@ -4080,37 +4410,41 @@ msgstr "Verzoeker email adres"
 msgid "Requestor(s)"
 msgstr "Verzoeker(s)"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: NOT FOUND IN SOURCE
+msgid "RequestorAddresses"
+msgstr ""
+
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "Verzoekers"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "Verzoek is terug verwacht"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
-msgstr "Verplichte parameter '%1' ontbreekt"
+msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Herstel"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Woonplaats"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "Los op"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "Los ticket #%1 (%2) op"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "Opgelost"
 
@@ -4118,7 +4452,7 @@ msgstr "Opgelost"
 msgid "Response to requestors"
 msgstr "Antwoord aan verzoekers"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "Resultaten"
 
@@ -4126,61 +4460,61 @@ msgstr "Resultaten"
 msgid "Results per page"
 msgstr "Resultaten per pagina"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
-msgstr "Geef wachtwoord opnieuw"
+msgstr "Type wachtwoord opnieuw"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
-msgstr "Herstel"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "Recht %1 niet gevonden voor %2  %3 in bereik %4 (%5)\\n"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "Recht Gedelegeerd"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "Recht Toegekend"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "Recht Geladen"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "Recht kon niet afgenomen worden"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "Recht niet gevonden"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "Recht niet geladen"
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
-msgstr "Recht ingetrokken"
+msgstr ""
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Rechten"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr ""
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "Rollen"
 
@@ -4188,59 +4522,53 @@ msgstr "Rollen"
 msgid "RootApproval"
 msgstr "RootGoedkeuring"
 
-#: html/Search/Elements/DisplayOptions:83
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
 msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "Za."
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
-msgstr "Bewaar"
+msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "Bewaarwijzigingen"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
-msgstr "Bewaar wijzigingen"
-
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
+msgstr "Bewaarwijzigingen"
 
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
-msgstr "Opgeslagen zoekopdrachten"
+msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
-msgstr "Scrip #%1"
+msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "Scrip aangemaakt"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "Script verwijderd"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "Scrips"
 
@@ -4248,11 +4576,11 @@ msgstr "Scrips"
 msgid "Scrips for %1\\n"
 msgstr "Scrips voor %1\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr "Scrips welke betrekking hebben op alle rijen"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "Zoek"
 
@@ -4260,140 +4588,127 @@ msgstr "Zoek"
 msgid "Search Criteria"
 msgstr "Zoek Criteria"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
-
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Searches can't be associated with that kind of object"
-msgstr "Zoekopdrachten kunnen niet met dat type object geassocieerd worden"
+msgstr ""
 
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr "Veiligheid"
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
 msgstr "ZieRij"
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Select"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Select a Custom Field"
 msgstr ""
 
-#: html/Admin/Groups/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
+msgstr ""
+
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "Selecteer een groep"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "Selecteer een rij"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr ""
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "Selecteer een gebruiker"
 
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr ""
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr ""
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr ""
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectMultiple"
 msgstr "SelecteerMeerdere"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:34
 msgid "SelectSingle"
 msgstr "SelecteerEnkele"
 
-#: html/Admin/Elements/EditCustomFields:58
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
 msgstr ""
 
@@ -4445,47 +4760,59 @@ msgstr "Stuurt mail aan de administratieve Ccs als een \"commentaar\""
 msgid "Sends mail to the owner"
 msgstr "Stuurt mail aan de eigenaar"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "Sep."
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "September"
+msgstr ""
+
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "Toon Resultaten"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "Toon goedgekeurde verzoeken"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "Toon beginselen"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "Toon afgewezen verzoeken"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "Toon details"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "Toon hangende verzoeken"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "Toon verzoeken die wachten op andere goedkeuringen"
 
@@ -4497,68 +4824,64 @@ msgstr "Toon ticket privé commentaar"
 msgid "Show ticket summaries"
 msgstr "Toon ticket samenvattingen"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
 msgstr "ToonACL"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
-msgstr "ToonUitgaandeEmail"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
-msgstr "ToonOpgeslagenZoekopdrachten"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr "ToonScrips"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr "ToonSjabloon"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr "ToonTicket"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr "ToonTicketCommentaar"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr "Schrijf in als een ticket Verzoeker of ticket of rij Cc"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "Schrijf in als een ticket of rij AdminCc"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "Signatuur"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: NOT FOUND IN SOURCE
+msgid "Signed in as %1"
+msgstr ""
+
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "Enkel"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
 msgstr ""
 
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
-msgid "Sort"
+#: NOT FOUND IN SOURCE
+msgid "Sort Order"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -4573,19 +4896,23 @@ msgstr "Sorteer resultaten op"
 msgid "SortOrder"
 msgstr "SorteerVolgorde"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
-msgstr "Stadium"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Stalled"
-msgstr "Is blijven steken"
+msgstr "Blijft Steken"
 
 #: NOT FOUND IN SOURCE
 msgid "Start page"
 msgstr "Start pagina"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "Gestart"
 
@@ -4593,7 +4920,7 @@ msgstr "Gestart"
 msgid "Started date '%1' could not be parsed"
 msgstr "Startum '%1' kon niet ontleed worden"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "Begint"
 
@@ -4605,11 +4932,11 @@ msgstr "Begint op"
 msgid "Starts date '%1' could not be parsed"
 msgstr "Begindatum '%1' kon niet ontleed worden"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Staat"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Status"
 
@@ -4617,7 +4944,8 @@ msgstr "Status"
 msgid "Status Change"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "Status veranderd van %1 naar %2"
 
@@ -4625,86 +4953,93 @@ msgstr "Status veranderd van %1 naar %2"
 msgid "StatusChange"
 msgstr "StatusVerandering"
 
-#: html/Ticket/Elements/Tabs:170
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "Steel"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
-msgstr "Steel ticket"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
-msgstr "SteelTicket"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "Gestolen van %1"
-
-#: NOT FOUND IN SOURCE
 msgid "Stolen from %1 "
-msgstr "Gestolen van %1 "
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
+msgstr "Gestolen van %1"
 
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "Onderwerp veranderd naar %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "Registreer"
 
 #: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Submit Workflow"
 msgstr "Registreer Workflow"
 
-#: lib/RT/Group_Overlay.pm:782
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "Gelukt"
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "Zo."
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "SuperGebruiker"
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "Systeem"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
-msgstr "Systeemconfiguratie"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "Systeem Fout"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
+#: NOT FOUND IN SOURCE
+msgid "System Error. Right not granted."
 msgstr ""
 
-#: html/Admin/Tools/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "System Error. right not granted"
+msgstr ""
+
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "Systeem fout. Recht niet gedelegeerd."
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "Systeem fout. Recht niet toegekend."
 
@@ -4712,7 +5047,7 @@ msgstr "Systeem fout. Recht niet toegekend."
 msgid "System error. Unable to grant rights."
 msgstr "Systeem fout. Niet mogelijk om rechten toe te kennen"
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "Systeem groepen"
 
@@ -4720,44 +5055,44 @@ msgstr "Systeem groepen"
 msgid "SystemRolegroup for internal use"
 msgstr "SysteemRolgroep voor intern gebruik"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "Neem"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
-msgstr "Neem ticket"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
-msgstr "NeemTicket"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "Genomen"
 
 #: NOT FOUND IN SOURCE
 msgid "Task"
-msgstr "Taak"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Sjabloon"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
-msgstr "Sjabloon verwijderd"
+msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Sjabloon niet gevonden"
 
@@ -4765,11 +5100,11 @@ msgstr "Sjabloon niet gevonden"
 msgid "Template not found\\n"
 msgstr "Sjabloon niet gevonden\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Sjabloon ontleed"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Sjablonen"
 
@@ -4779,35 +5114,35 @@ msgstr "Sjablonen voor %1\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Text"
-msgstr "Tekst"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "Dat is al de huidige waarde"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "Dat is geen waarde voor dit specifieke veld"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "Dat is de zelfde waarde"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
-msgstr "Dat hoofd heeft reeds dat recht"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "Dat hoofd is reeds een %1 voor deze rij"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "Dat hoofd is reeds een %1 voor dit ticket"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "Dat hoofd is geen %1 voor deze rij"
@@ -4816,11 +5151,11 @@ msgstr "Dat hoofd is geen %1 voor deze rij"
 msgid "That principal is not a %1 for this ticket"
 msgstr "Dat hoofd is geen %1 voor dit ticket"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr "Die rij bestaat niet"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "Dat ticket heeft onopgeloste afhankelijkheden"
 
@@ -4828,47 +5163,51 @@ msgstr "Dat ticket heeft onopgeloste afhankelijkheden"
 msgid "That user already has that right"
 msgstr "Die gebruiker heeft dat recht reeds"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr "Die gebruiker is al eigenaar van dat ticket"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "Die gebruiker bestaat niet"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "Die gebruiker is al gerechtigd"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr "Die gebruiker is reeds ontrechtigd"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "Die gebruiker is nu gerechtigd"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr "Die gebruiker is nu ontrechtigd"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: NOT FOUND IN SOURCE
+msgid "That user is now unprivilegedileged"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr "Die gebruiker mag geen eigenaar zijn van tickets in die rij"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "Dat is niet een numeriek ID"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "De Beginselen"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr "De CC van een ticket"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr "De administratieve CC van een ticket"
 
@@ -4876,7 +5215,7 @@ msgstr "De administratieve CC van een ticket"
 msgid "The comment has been recorded"
 msgstr "Het commentaar is bewaard"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr "Het volgende commando zal alle actieve tickets in de rij 'general' vinden en hun prioriteit op 99 zetten als ze meer dan 4 uur niet aangeraakt zijn:"
 
@@ -4884,77 +5223,89 @@ msgstr "Het volgende commando zal alle actieve tickets in de rij 'general' vinde
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "De volgende commando's zijn niet verwerkt:\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "De waarde is gezet."
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr "De eigenaar van een ticket"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "De verzoeker van een ticket"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "Dit commentaar is gewoonlijk niet zichtbaar voor de gebruiker"
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
-msgstr "Dit specifieke veld is niet van toepassing op dat object"
+msgstr ""
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
-msgstr "Dit onderdeel is alleen beschikbaar voor systeembeheerders"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
-msgstr "Dit bericht zal verstuurd worden aan..."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "Dit ticket %1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "Dit gereedschap stelt de gebruiker in staat arbitraire perl modules te gebruiken vanuit RT"
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "Het lijkt erop alsof deze transactie geen inhoud heeft"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
-msgstr "De %1 tickets met hoogste prioriteit van deze gebruiker"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "This user's 25 highest priority tickets"
 msgstr "De 25 hoogste prioriteit tickets van deze gebruiker"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "Do."
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: NOT FOUND IN SOURCE
+msgid "Ticket"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1  %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Ticket # %1 Jumbo update: %2"
+msgstr ""
+
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "Ticket #%1 Jumbo actualisering: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "Ticket #%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
-msgstr "Ticket %1"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "Ticket %1 aangemaakt in rij '%2'"
@@ -4963,16 +5314,16 @@ msgstr "Ticket %1 aangemaakt in rij '%2'"
 msgid "Ticket %1 loaded\\n"
 msgstr "Toclet %1 geladen\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "Ticket %1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
-msgstr "Ticket-Specifieke Velden"
+msgstr ""
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr "Ticket Historie # %1 %2"
@@ -4985,27 +5336,27 @@ msgstr "Ticket Id"
 msgid "Ticket Resolved"
 msgstr "Ticket Opgelost"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
-msgstr "Ticket Transacties"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket attachment"
 msgstr "Ticket aanhechting"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "Ticket inhoud"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "Ticket inhoud type"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "Ticket kong niet aangemaakt worden vanwege een interne fout"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "Ticket aangemaakt"
 
@@ -5013,7 +5364,7 @@ msgstr "Ticket aangemaakt"
 msgid "Ticket creation failed"
 msgstr "Ticket aanmaken gefaald"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "Ticket verwijderd"
 
@@ -5021,9 +5372,13 @@ msgstr "Ticket verwijderd"
 msgid "Ticket id not found"
 msgstr "Ticket id niet gevonden"
 
-#: html/Ticket/Display.html:55
+#: NOT FOUND IN SOURCE
+msgid "Ticket killed"
+msgstr ""
+
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
-msgstr "Ticket metagegevens"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket not found"
@@ -5037,20 +5392,17 @@ msgstr "Ticket status gewijzigd"
 msgid "Ticket watchers"
 msgstr "Ticket toeschouwers"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
-msgstr "Tickets"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "Tickets %1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "Tickets %1 door %2"
 
@@ -5058,31 +5410,31 @@ msgstr "Tickets %1 door %2"
 msgid "Tickets from %1"
 msgstr "Tickets van %1"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr "Tickets welke afhankelijk zijn van deze goedkeuring"
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
-msgstr "Geschatte Tijd"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "Tijd Over"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "Tijd Gewerkt"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "Tijd over"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "Tijd om te tonen"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "Tijd gewerkt"
 
@@ -5090,14 +5442,10 @@ msgstr "Tijd gewerkt"
 msgid "TimeLeft"
 msgstr "TijdOver"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
 msgstr "TijdGewerkt"
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:"
 msgstr "Om een diff van deze uitvoering te genereren:"
@@ -5106,45 +5454,45 @@ msgstr "Om een diff van deze uitvoering te genereren:"
 msgid "To generate a diff of this commit:\\n"
 msgstr "Om een diff van deze uitvoering te genereren:\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
-msgstr "Voor vragen over support, training, bedrijfsspecifieke software-ontwikkeling of licentieovereenkomsten, gelieve contact op te nemen met %1."
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "Verteld"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
-msgstr "Hulpstukken"
+msgstr ""
 
 #: etc/initialdata:252
 msgid "Transaction"
 msgstr "Transactie"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "Transactie %1 gezuiverd"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "Transactie Gecreëerd"
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
-msgstr "Transactie Specifieke Velden"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:92
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "Transactie->Creëer kon niet, aangezien u geen ticket id gespecificeerd heeft"
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr "Transactie->Cre‘r kon niet aangezien er geen objectttype en -id gespecificeerd is"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "Transacties zijn onwijzigbaar"
 
@@ -5152,19 +5500,23 @@ msgstr "Transacties zijn onwijzigbaar"
 msgid "Trying to delete a right: %1"
 msgstr "Tracht een recht te verwijderen: %1"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "Di."
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "Type"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "Niet geïmplementeerd"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Unix aanmelden"
 
@@ -5172,49 +5524,44 @@ msgstr "Unix aanmelden"
 msgid "UnixUsername"
 msgstr "UnixGebruikersnaam"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "Onbekende InhoudCodering %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "Ongelimiteerd"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
-msgstr "Onbenoemde zoekopdracht"
+msgstr ""
 
 #: etc/initialdata:32
 msgid "Unprivileged"
 msgstr "Ongerechtigd"
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "Vrij"
 
 #: NOT FOUND IN SOURCE
 msgid "Untitled search"
-msgstr "Naamloze zoekopdracht"
+msgstr ""
 
-#: html/Search/Bulk.html:54
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Ververs"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
 msgstr ""
 
@@ -5222,11 +5569,11 @@ msgstr ""
 msgid "Update ID"
 msgstr "Ververs ID"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
 msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "Ververs Type"
 
@@ -5238,19 +5585,19 @@ msgstr "Ververs al deze tickets in eens"
 msgid "Update email"
 msgstr "Ververs email"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
-msgstr "Ververs meer dan ŽŽn ticket"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update name"
 msgstr "Ververs naam"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "Verversing niet opgeslagen."
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "Ververs geselecteerde tickets"
 
@@ -5258,7 +5605,7 @@ msgstr "Ververs geselecteerde tickets"
 msgid "Update signature"
 msgstr "Ververs signatuur"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "Ververs ticket"
 
@@ -5266,58 +5613,58 @@ msgstr "Ververs ticket"
 msgid "Update ticket # %1"
 msgstr "Ververs ticket # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "Ververs ticket #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "Ververs ticket #%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "Verversingstype was noch correspondentie, noch commentaar"
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "Ververst"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
 msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
 msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5328,7 +5675,7 @@ msgstr "Gebruiker %1 %2: %3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "Gebruiker %1 Wachtwoord: %2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
 msgstr ""
@@ -5345,7 +5692,7 @@ msgstr "Gebruiker '%1' niet gevonden\\n"
 msgid "User Defined"
 msgstr "Gebruiker Gedifiniëerd"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
 msgstr ""
 
@@ -5353,35 +5700,34 @@ msgstr ""
 msgid "User ID"
 msgstr "GebruikersID"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "Gebruiker Id"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "Gebruikersrechten"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr "De gebruiker vroeg om een onbekende aanpassing van specifiek veld %1 voor %2 object #%3"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "Gebruiker kon niet aangemaakt worden: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "Gebruiker aangemaakt"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Door gebruiker gedefiniëerde groepen"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
-msgstr "Gebruiker opgehaald"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User notified"
@@ -5391,39 +5737,43 @@ msgstr "Gebruiker verwittigd"
 msgid "User view"
 msgstr "Gebruikers aanzicht"
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
-msgstr "Door gebruiker gedefinieerde groepen"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Gebruikers"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "Gebruikers die voldoen aan de zoek criteria"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
-msgstr "Geldige Zoekopdracht"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "ValueOfQueue"
 msgstr "WaardeVanRij"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Waarden"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr "Schouw toe"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr "SchouwToeAlsAdminCc"
 
@@ -5431,7 +5781,7 @@ msgstr "SchouwToeAlsAdminCc"
 msgid "Watcher loaded"
 msgstr "Toeschouwer geladen"
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "Toeschouwers"
 
@@ -5439,7 +5789,7 @@ msgstr "Toeschouwers"
 msgid "WebEncoding"
 msgstr "WebCodering"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "Wo."
 
@@ -5495,11 +5845,19 @@ msgstr "Wanneer commentaar binnenkomt"
 msgid "Whenever correspondence comes in"
 msgstr "Wanneer correspondentie binnenkomt"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Werk"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr ""
 
@@ -5507,44 +5865,56 @@ msgstr ""
 msgid "WorkPhone"
 msgstr "WerkTelefoon"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "Gewerkt"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "U bent al eigenaar van dit ticket"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "U bent geen geauthorizeerde gebruiker"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
-msgstr "U kunt alleen tickets opnieuw toebedelen die van u zijn, of van niemand"
+msgstr "U kunt alleen tickets opnieuw toe bedelen die van u zijn, of van niemand"
 
 #: NOT FOUND IN SOURCE
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "U heeft geen toestemming om dat ticket te bekijken"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "U vond %1 tickets in rij %2"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "U bent afgemeld bij RT"
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "U heeft geen toestemming om tickets aan te maken in die rij."
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "U mag geen verzoeken aanmaken in die rij"
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "U mag zich weer aanmelden"
 
@@ -5564,40 +5934,44 @@ msgstr "Uw verzoek is goedgekeurd door %1. Er zijn wellicht nog andere hangende
 msgid "Your request has been approved."
 msgstr "Uw verzoek is goedgekeurd."
 
+#: NOT FOUND IN SOURCE
+msgid "Your request was rejected"
+msgstr ""
+
 #: etc/initialdata:445
 msgid "Your request was rejected."
 msgstr "Uw verzoek was geweigerd."
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "Uw gebruikersnaam of wachtwoord zijn onjuist"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "Postcode"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "[no subject]"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "and is not"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and not"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "zoals gegeven aan %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "bevat"
 
@@ -5617,7 +5991,7 @@ msgstr "correspondentie (waarschijnlijk) niet verstuurd"
 msgid "correspondence sent"
 msgstr "correspondentie verstuurd"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "dagen"
 
@@ -5629,92 +6003,76 @@ msgstr "dood"
 msgid "delete"
 msgstr "verwijder"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "verwijderd"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "voldoet niet aan"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "bevat niet"
 
-#: html/Elements/SelectEqualityOperator:59
-msgid "equal to"
-msgstr "gelijk aan"
-
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
+#: NOT FOUND IN SOURCE
+msgid "email address"
 msgstr ""
 
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr ""
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr "gelijk aan"
 
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
+#: NOT FOUND IN SOURCE
+msgid "false"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "filename"
 msgstr "bestandsnaam"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "groter dan"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "groep '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "uren"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "id"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "is"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "is niet"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "minder dan"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "voldoet aan"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "min"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "minuten"
 
@@ -5722,98 +6080,114 @@ msgstr "minuten"
 msgid "modifications\\n\\n"
 msgstr "wijzigingen\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "maanden"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "nieuw"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr ""
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "geen"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "niet gelijk aan"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: NOT FOUND IN SOURCE
+msgid "notlike"
+msgstr ""
+
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "open"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "persoonlijke groep '%1' voor gebruiker '%2'"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "rij %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "geweigerd"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "opgelost"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "sec"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "bleef steken"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "systeem %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "systeem groep '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "het aanroepende component specificeerde niet waarom"
 
-#: lib/RT/Group_Overlay.pm:238
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "ticket #%1 %2"
 
-#: lib/RT/Group_Overlay.pm:244
+#: NOT FOUND IN SOURCE
+msgid "till"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "true"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "onbeschreven groep %1"
 
-#: lib/RT/Group_Overlay.pm:219
+#: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "gebruiker %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "weken"
 
@@ -5821,7 +6195,11 @@ msgstr "weken"
 msgid "with template %1"
 msgstr "met sjabloon %1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "jaren"
 
+#: NOT FOUND IN SOURCE
+msgid "ニック�ーム"
+msgstr ""
+
diff --git a/rt/lib/RT/I18N/no.po b/rt/lib/RT/I18N/no.po
index 995ab78..1c0dc73 100644
--- a/rt/lib/RT/I18N/no.po
+++ b/rt/lib/RT/I18N/no.po
@@ -17,58 +17,60 @@ msgstr "#"
 msgid "#%1"
 msgstr "#%1"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr "#%1: %2"
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%1 %3. %2 %7 %4:%5:%6"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "%1 %2 lagt til"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "%1 %2 siden"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 %2 ble endret til %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
@@ -78,25 +80,50 @@ msgstr "%1 %2 slettet"
 msgid "%1 %2 of group %3"
 msgstr "%1 %2 av gruppen %3"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "%1 %2 med mal %3"
 
 #: NOT FOUND IN SOURCE
+msgid "%1 %2 הוסף"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 שונה ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 denne saken\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
 msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
 msgstr ""
 
@@ -104,68 +131,57 @@ msgstr ""
 msgid "%1 - %2 shown"
 msgstr "%1 - %2 vist"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr "%1 - Et parameter til %2"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr "%1 - Viser statusoppdateringer til STDOUT"
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr "%1 - Oppgi kommandomodulen du ønsker å bruke"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr "%1 - Oppgi betingelsesmodulen du ønsker å bruke"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - Oppgi søkemodulen du ønsker å bruke"
 
+#: NOT FOUND IN SOURCE
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
+
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "%1 KommandoScript lastet"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "%1 ble lagt til som verdi for %2"
@@ -182,31 +198,32 @@ msgstr "%1 alias trenger en saksnummer å jobbe mot "
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
 msgstr "%1 alias trenger et saksnummer å jobbe mot (fra %2) %3"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 ser ut til å være et lokalt objekt, men kan ikke finnes i databasen"
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 av %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 ble endret fra %2 til %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
 msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "%1 kunne ikke settes til %2."
 
@@ -214,22 +231,20 @@ msgstr "%1 kunne ikke settes til %2."
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 kunne ikke starte en transaksjon (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 kunne ikke sette status til løst. RT-basen kan være inkonsistent."
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
 msgstr ""
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
 msgstr ""
@@ -238,16 +253,17 @@ msgstr ""
 msgid "%1 highest priority tickets I own..."
 msgstr "Mine %1 høyst prioriterte saker..."
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "Mine %1 høyst prioriterte forespørsler..."
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr "%1 er et verktøy for å behandle saker fra eksterne verktøy, slik som cron."
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 er ikke lenger en %2 for denne køen."
@@ -256,7 +272,8 @@ msgstr "%1 er ikke lenger en %2 for denne køen."
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 er ikke lenger en %2 for denne saken."
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 er ikke lenger en verdi for fleksifeltet %2"
 
@@ -264,7 +281,11 @@ msgstr "%1 er ikke lenger en verdi for fleksifeltet %2"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 er ikke et gyldig saksnummer."
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -273,7 +294,15 @@ msgstr "%1 er ikke et gyldig saksnummer."
 msgid "%1 min"
 msgstr "%1 min"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
 msgstr ""
@@ -282,11 +311,11 @@ msgstr ""
 msgid "%1 not shown"
 msgstr "%1 vises ikke"
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "%1 rettigheter"
@@ -307,7 +336,7 @@ msgstr "%1 er ukjent type for %2"
 msgid "%1 was created without a CurrentUser\\n"
 msgstr "%1 ble opprettet uten en aktiv bruker\\n"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 vil løse alle medlemmer av en løst gruppesak."
@@ -316,36 +345,72 @@ msgstr "%1 vil løse alle medlemmer av en løst gruppesak."
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "%1 vil stoppe en [lokal] BASE hvis den er avhengig av/medlem av en tilkoblet sak."
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 על ידי %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
 msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: ingen vedlegg oppgitt"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1b"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1k"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' er en ugyldig statusverdi"
@@ -362,7 +427,7 @@ msgstr "(Merk for å slette gruppemedlem)"
 msgid "(Check box to delete scrip)"
 msgstr "(Merk for å slette Scrip)"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(Merk for å slette)"
 
@@ -370,49 +435,53 @@ msgstr "(Merk for å slette)"
 msgid "(Check boxes to delete)"
 msgstr "(Merk boksene for å slette)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr "(Skriv inn referansenummer eller URler, separert med mellomrom)"
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
+msgid "(If left blank, will default to %1"
 msgstr "(Settes til standard %1 hvis blank)"
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
 msgstr "(Ingen Verdi)"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(Ingen fleksifelt)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(Ingen medlemmer)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "(Ingen scrips)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr "(Ingen maler)"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
 msgstr ""
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Sender en kopi av denne oppdateringen til en kommaseparert liste med epostaddresser. Endrer <b>ikke</b> hvem som vil motta fremtidige oppdatreinger.)"
 
@@ -420,11 +489,11 @@ msgstr "(Sender en kopi av denne oppdateringen til en kommaseparert liste med ep
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Sender en kopi av denne oppdateringen til en kommaseparert liste med epostaddresser. Endrer <b>ikke</b> hvem som vil motta fremtidige oppdateringer.)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Sender en kopi av denne oppdateringen til en kommaseparert liste av administrative epostaddresser. Disse vil <b>vil</b> motta fremtidige oppdateringer.)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Sender en kopi av denne oppdateringen til en komma-separert liste av epostaddresser. Endrer <b>ikke</b> hvem som vil motta fremtidige oppdateringer.)"
 
@@ -432,43 +501,51 @@ msgstr "(Sender en kopi av denne oppdateringen til en komma-separert liste av ep
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Sender en kopi av denne oppdateringen til en kommaseparert liste med epost-addresser. Endrer <b->ikke</b> hvem som vi motta fremtige utfordrer dere nå."
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Sender en kopi av dette oppdateringen til en kommaseparert liste med epostaddresser. Disse <b>vill</b> motta fremtidige oppdateringer.)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
 msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(tom)"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr "(navn ikke oppgitt)"
 
 #: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "(no subject)"
 msgstr "(ingen overskrift)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(ingen verdi)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
 msgstr ""
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(bare en sak)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(Venter på godkjenning)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
 msgstr ""
 
@@ -480,15 +557,19 @@ msgstr "(venter på andre saker)"
 msgid "(requestor's group)"
 msgstr "(kundens gruppe)"
 
-#: html/Admin/Users/Modify.html:71
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(nødvendig)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(ingen tittel)"
 
 #: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I own..."
 msgstr "Mine 25 høyst prioriterte saker..."
 
@@ -496,23 +577,23 @@ msgstr "Mine 25 høyst prioriterte saker..."
 msgid "25 highest priority tickets I requested..."
 msgstr "Mine 25 høyst priorterte forespørsler..."
 
-#: html/Ticket/Elements/ShowBasics:53
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr "<% $Ticket-:Status%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr "<% $_ %>"
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Ny sak i\">&nbsp;%1"
@@ -525,10 +606,6 @@ msgstr "??????"
 msgid "A blank template"
 msgstr "En tom mal"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "ACE Deleted"
 msgstr "ACE slettet"
@@ -545,72 +622,60 @@ msgstr "ACE kunne ikke slettes"
 msgid "ACE could not be found"
 msgstr "fant ikke ACE"
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE ikke funnet"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "ACEr kan bare opprettes og slettes."
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "Avbryter for å ungå uånsket saksendring"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "Om meg"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "Aksesskontroll"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Handling"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "Handling %1 finnes ikke"
 
-#: NOT FOUND IN SOURCE
+#: bin/rt-crontool:119
 msgid "Action committed."
 msgstr "Handling skrevet."
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr ""
-
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "Handling forberedt"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
 msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "Legg til AdminCc"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "Legg til Cc"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
 msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "Legg til flere filer"
 
@@ -618,11 +683,11 @@ msgstr "Legg til flere filer"
 msgid "Add Next State"
 msgstr "Legg til neste status"
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "Legg til kunde"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr "Legg til verdi"
 
@@ -646,53 +711,49 @@ msgstr "Legg til et globalt Scrip"
 msgid "Add a scrip to this queue"
 msgstr "Legg til et Scrip til denne køen"
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr "Legg til et Scrip som vil gjelde for alle køer"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
 msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "Legg til kommentarer eller svar til denne saken"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "Legg til medlemmer"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Legg til overvåkere"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "AddNextState"
 msgstr "AddNextState"
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "La til primær som en %1 for denne køen"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "La til primær som en %1 for denne saken"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "Adresse1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "Adresse2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "Admin Cc"
 
@@ -704,7 +765,7 @@ msgstr "Admin Kommentar"
 msgid "Admin Correspondence"
 msgstr "Admin-korrespondanse"
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "Adminkøer"
 
@@ -712,7 +773,7 @@ msgstr "Adminkøer"
 msgid "Admin users"
 msgstr "Adminbrukere"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "Admin/Global konfigurasjon"
 
@@ -728,7 +789,7 @@ msgstr "Admin/Køer/Grunnleggende"
 msgid "AdminAllPersonalGroups"
 msgstr "AdminAllePersonalGrupper"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "AdminCc"
 
@@ -740,35 +801,35 @@ msgstr "AdminKommentar"
 msgid "AdminCorrespondence"
 msgstr "AdminKorrespondanse"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Queue_Overlay.pm:73
 msgid "AdminCustomFields"
 msgstr "AdminFleksifelt"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "AdminGruppe"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "AdminGruppeMedlemskap"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr "AdminEgnePersonligeGrupper"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr "AdminKø"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr "AdminBrukere"
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "Administrativ Cc"
 
@@ -776,7 +837,7 @@ msgstr "Administrativ Cc"
 msgid "Admins"
 msgstr "Admin"
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
 msgstr ""
 
@@ -784,7 +845,11 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avansert Søk"
 
-#: html/Elements/SelectDateRelation:57
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "Etter"
 
@@ -792,10 +857,6 @@ msgstr "Etter"
 msgid "Age"
 msgstr "Alder"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Alias"
 msgstr "Alias"
@@ -809,10 +870,14 @@ msgid "All Approvals Passed"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "Alle Fleksifelt"
 
-#: html/Admin/Queues/index.html:75
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "Alle køer"
 
@@ -820,39 +885,35 @@ msgstr "Alle køer"
 msgid "Always sends a message to the requestors independent of message sender"
 msgstr "Send alltid en melding til kunden uavhengig av meldingssender"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr ""
-
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
 msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "Godkjennelse"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "Godkjennelse #%1: %2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr "Godkjenning # %1: Notater kunne ikke lagres pga. systemfeil"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr "Godkjenning #%1: Notater lagret"
@@ -873,7 +934,7 @@ msgstr ""
 msgid "Approval diagram"
 msgstr "Godkjenningsdiagram"
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "Godkjenn"
 
@@ -881,7 +942,7 @@ msgstr "Godkjenn"
 msgid "Approver's notes: %1"
 msgstr "Godkjenners notater: %1"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "Apr."
 
@@ -889,52 +950,72 @@ msgstr "Apr."
 msgid "April"
 msgstr "April"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "Stigende"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
 msgstr ""
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "Legg Ved"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "Legg ved fil"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "Vedlagt fil"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "Vedlegg '%1' kunne ikke lastes"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "Vedlegg opprettet"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "Vedleggsnavn"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
 msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "Aug."
 
@@ -958,6 +1039,10 @@ msgstr "Autosvar Til Kunde"
 msgid "AutoreplyToRequestors"
 msgstr "AutosvarTilKunde"
 
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
 msgstr "Ugyldig PGP-signatur: %1\\n"
@@ -974,19 +1059,19 @@ msgstr "Ugyldig data i %1"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "Ugyldig transaksjonsnummer for vedlegg. %1 skulle vært %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "Detaljer"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "Sørg for å lagre endringene dine"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "Før"
 
@@ -994,113 +1079,120 @@ msgstr "Før"
 msgid "Begin Approval"
 msgstr "Begynn Godkjenning"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
+#: NOT FOUND IN SOURCE
+msgid "Binary"
 msgstr ""
 
 #: etc/initialdata:217
 msgid "Blank"
 msgstr "Blank"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
 msgstr "URL som kan brukes som bokmerke for dette søket"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
 msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "Begrens headere"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "Masseoppdatering av saker"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "Kan ikke endre systembrukere"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr "Kan denne primæren se denne køen"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "Kan ikke legge til en verdi for et fleksifelt uten navn"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
 msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "Kan ikke koble en sak til seg selv"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "Kan ikke flette inn i en flettet sak. Denne meldingen bør ikke forekomme"
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
 msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "Kan ikke spesifisere både base og mål."
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "Kunne ikke oprette bruker: %1"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Cc"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "Endre passord"
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
 msgstr ""
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "Merk for å slette"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "Merk for å trekke tilbake rettighet"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "Barn"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "By"
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
 msgstr ""
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "Lukket"
 
-#: NOT FOUND IN SOURCE
+#: html/SelfService/Closed.html:24
 msgid "Closed Tickets"
 msgstr "Lukkede Saker"
 
@@ -1108,7 +1200,7 @@ msgstr "Lukkede Saker"
 msgid "Closed requests"
 msgstr "Lukkede forespørsler"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr "Lukkede saker"
 
@@ -1120,11 +1212,11 @@ msgstr "Kode"
 msgid "Command not understood!\\n"
 msgstr "Kunne ikke tolke kommando!\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Kommenter"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "Kommentaraddresse"
 
@@ -1132,11 +1224,11 @@ msgstr "Kommentaraddresse"
 msgid "Comment not recorded"
 msgstr "Kommentaren ble ikke lagret"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr "Kommenter saker"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr "KommenterSak"
 
@@ -1144,11 +1236,11 @@ msgstr "KommenterSak"
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "Kommentarer (Ikke send til kunder)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "Kommentarer (ikke sendt til kunder)"
 
@@ -1156,15 +1248,15 @@ msgstr "Kommentarer (ikke sendt til kunder)"
 msgid "Comments about %1"
 msgstr "Kommentarer til %1"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "Kommentarer om denne brukeren"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "La til kommentarer "
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr "Lagring forkortet"
 
@@ -1172,23 +1264,23 @@ msgstr "Lagring forkortet"
 msgid "Compile Restrictions"
 msgstr "Kompilatorrestriksjoner"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "Forutsetning"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr "Forutsetning gjelder..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "Forutsetning ikke funnet"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "Bekreft"
 
@@ -1200,11 +1292,11 @@ msgstr "KontaktInfoSystem"
 msgid "Contacted date '%1' could not be parsed"
 msgstr "Kontatdato '%1' kunne ikke tolkes"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "Innhold"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr ""
 
@@ -1212,7 +1304,7 @@ msgstr ""
 msgid "Coould not create group"
 msgstr "Kunne ikke opprette gruppen"
 
-#: html/Search/Elements/EditSearches:64
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
 msgstr ""
 
@@ -1224,7 +1316,7 @@ msgstr "Korrespondanse"
 msgid "Correspondence Address"
 msgstr "Korrespondanseaddresse"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "Korrespondanse lagt til"
 
@@ -1232,7 +1324,7 @@ msgstr "Korrespondanse lagt til"
 msgid "Correspondence not recorded"
 msgstr "Korrespondansen ble ikke lagret"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
 msgstr "Kunne ikke legge til nye fleksifeltverdier for saken. "
 
@@ -1240,43 +1332,29 @@ msgstr "Kunne ikke legge til nye fleksifeltverdier for saken. "
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "Kunne ikke legge til nye fleksifeltverdier for saken. %1 "
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr ""
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "Kunne ikke endre eier. "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "Kunne ikke opprette fleksifelt"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "Kunne ikke opprette gruppe"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "Kunne ikke opprette mal: %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "Kunne ikke opprette sak. Kø ikke satt"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "Kunne ikke opprette bruker"
 
@@ -1292,11 +1370,11 @@ msgstr "Kunne ikke finne en sak med id %1"
 msgid "Could not find group %1."
 msgstr "Kunne ikke finne gruppen %1."
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "Kunne ikke finne eller lage den brukeren"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "Kunne ikke finne den primæren"
 
@@ -1304,34 +1382,25 @@ msgstr "Kunne ikke finne den primæren"
 msgid "Could not find user %1."
 msgstr "Kunne ikke finne brukeren %1."
 
-#: html/Admin/CustomFields/Objects.html:69
+#: NOT FOUND IN SOURCE
 msgid "Could not load CustomField %1"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "Kunne ikke hente gruppen"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "Kunne ikke sette den primæren som %1 for denne køen"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "Kunne ikke sette den primæren som %1 for denne saken"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "Kunne ikke fjerne den primæren som %1 for denne køen"
@@ -1340,15 +1409,15 @@ msgstr "Kunne ikke fjerne den primæren som %1 for denne køen"
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "Knne ikke fjære den primæren som %1 for denne saken"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "Kunne ikke legge til medlemmmer i gruppen"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "Kunne ikke opprette en transaksjon: %1"
@@ -1361,15 +1430,15 @@ msgstr "Kunne ikke tolke gpgs svar\\n"
 msgid "Couldn't find group\\n"
 msgstr "Kunne ikke finne gruppen\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr "Kunne ikke finne raden"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "Kunne ikke finne primæren"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "Kunne ikke finne verdien"
 
@@ -1381,18 +1450,16 @@ msgstr "Kunne ikke finne den overvåkern"
 msgid "Couldn't find user\\n"
 msgstr "Kunne ikke finne bruker\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "Kunne ikke laste %1 fra brukerdatabasen.\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr ""
 
@@ -1408,26 +1475,25 @@ msgstr "Kunne ikke laste RTs konfigurasjonsfil '%1' %2"
 msgid "Couldn't load Scrips."
 msgstr "Kunne ikke laste Scripsene."
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "Kunne ikke laste gruppen %1"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "Kunne ikke laste linken"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
 msgstr ""
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "Kunne ikke laste køen"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "Kunne ikke laste køen %1"
@@ -1444,26 +1510,16 @@ msgstr "Kunne ikke finne mal"
 msgid "Couldn't load that user (%1)"
 msgstr "Kunne ikke laste den brukeren (%1)"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "Kunne ikke laste saken '%1'"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "Land"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "Opprett"
 
@@ -1471,16 +1527,20 @@ msgstr "Opprett"
 msgid "Create Tickets"
 msgstr "Opprett Saker"
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "Oprett et fleksifelt"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr "Opprett et fleksifelt for køen %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:47
 msgid "Create a CustomField which applies to all queues"
 msgstr "Opprett et fleksifelt for alle køer"
 
@@ -1489,6 +1549,10 @@ msgid "Create a new Custom Field"
 msgstr "Opprett et nytt fleksifelt"
 
 #: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create a new global Scrip"
 msgstr "Opprett et globalt Scrip"
 
@@ -1496,11 +1560,11 @@ msgstr "Opprett et globalt Scrip"
 msgid "Create a new global scrip"
 msgstr "Opprett et nytt globalt scrip"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "Opprett en ny gruppe"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "Opprett en ny personlig gruppe"
 
@@ -1516,15 +1580,15 @@ msgstr "Opprett et nytt scrip"
 msgid "Create a new template"
 msgstr "Opprett en ny mal"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "Opprett en ny sak"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "Opprett en ny bruker"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "Opprett en ny kø"
 
@@ -1536,20 +1600,28 @@ msgstr "Opprett en kø kalt"
 msgid "Create a request"
 msgstr "Opprett en forespørsel"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr "Opprett et scrip for køen %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "Opprett en mal"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr "Opprett en sak"
 
 #: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create failed: %1 / %2 / %3 "
 msgstr "Opprettelse feilet: %1 / %2 / %3"
 
@@ -1561,19 +1633,19 @@ msgstr "Opprettelse feilet: %1/%2/%3"
 msgid "Create new tickets based on this scrip's template"
 msgstr "Opprett nye saker basert på dette scripets mal"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "Opprett sak"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr "Opprett saker i denne køen"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "Opprett, slett og modifiser fleksifelt"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr "Opprett, slett og endre køer"
 
@@ -1581,52 +1653,60 @@ msgstr "Opprett, slett og endre køer"
 msgid "Create, delete and modify the members of any user's personal groups"
 msgstr "Opprett, slett og modifiser medlemmene av en brukers personlige grupper"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "Opprett, slett og modifiser medlemmene av personlige grupper"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "Opprett, slett og modifiser brukere"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr "OpprettSak"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "Opprettet"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "Opprettet Fleksifelt %1"
 
 #: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr "Opprettet malen %1"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
 msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "Eksisterende Forhold"
 
-#: html/Admin/Elements/EditScrips:51
+#: NOT FOUND IN SOURCE
+msgid "Current Relationships"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "Eksisterende Scrips"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "Eksisterende medlemmer"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Eksisterende rettigheter"
 
@@ -1634,63 +1714,68 @@ msgstr "Eksisterende rettigheter"
 msgid "Current search criteria"
 msgstr "Eksisterende søkekriterier"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "Eksisterende overvåkere"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
 msgid "Custom Field #%1"
 msgstr "Fleksifeltet #%1"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "Fleksifelt"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr "Avsluttningskode"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "Forberedelseskode"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "Forutsetning"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "Fleksifeltet %1 %2 %3"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: NOT FOUND IN SOURCE
+msgid "Custom field %1 does not apply to this object"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "Fleksifeltet %1 har en verdi."
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "Fleksifeltet %1 har ingen verdi."
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "Fleksifeltet %1 kunne ikke finnes"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
 msgstr "Fleksifeltet slettet"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "Fleksifeltet kunne ikke finnes"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "Verdien %1 for fleksifeltet %2 kunne ikke finnes"
@@ -1699,19 +1784,19 @@ msgstr "Verdien %1 for fleksifeltet %2 kunne ikke finnes"
 msgid "Custom field value changed from %1 to %2"
 msgstr "Fleksifeltets verdi endret fra %1 til %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "Fleksifeltets verdi kunne ikke slettes"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "Fleksifeltets verdi kunne ikke finnes"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "Fleksifeltverdi slettet"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr "FleksiFelt"
 
@@ -1719,11 +1804,11 @@ msgstr "FleksiFelt"
 msgid "Data error"
 msgstr "Datafeil"
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Datoer"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "Des."
 
@@ -1739,11 +1824,11 @@ msgstr "Standard Autosvarmal"
 msgid "Default Autoresponse template"
 msgstr "Standard Autosvarmal"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
 msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
 msgstr ""
 
@@ -1763,64 +1848,60 @@ msgstr "Standard korrespondensemal"
 msgid "Default transaction template"
 msgstr "Standard transaksjonsmal"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "Standard: %1/%2 endret seg fra %3 til %4"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "Deleger rettigheter"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr "Deleger spesifikke rettigheter som har blitt gitt til deg."
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr "DelegerRettigheter"
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "Delegering"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "Slett"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr "Slett saker"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr "SlettSak"
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "Sletting av dette objektet kan føre til inkonsistens"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "Sletting av dette objektet vil føre til inkonsistens"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "Sletting av dette objektet ville føre til inkonsistens"
 
@@ -1832,11 +1913,11 @@ msgstr "Sletting av dette objektet ville føre til inkonsisistens."
 msgid "Deleting this object would violate referential integrity. That's bad."
 msgstr "Sletting av dette objektet ville føre til inkonsistens. Det er uheldig."
 
-#: html/Approvals/Elements/Approve:66
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "Nekt"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "Avhengighet fra"
 
@@ -1844,27 +1925,27 @@ msgstr "Avhengighet fra"
 msgid "Dependencies: \\n"
 msgstr "Avhengigheter: \\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "Avhengig av"
 
@@ -1872,15 +1953,15 @@ msgstr "Avhengig av"
 msgid "DependsOn"
 msgstr "AvhengigAv"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "Synkende"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "Beskriv problemet under"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -1888,31 +1969,31 @@ msgstr "Beskrivelse"
 msgid "Details"
 msgstr "Detaljer"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "Vis"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr "Vis Rettigheter"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr "Vis Scrip-maler for denne køen"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr "Vis Scrip-maler for denne køen"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "Visningsmodus"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
 msgstr ""
 
@@ -1920,19 +2001,15 @@ msgstr ""
 msgid "Display ticket #%1"
 msgstr "Vis saken #%1"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "Gjør hva som helst"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "Ikke last denne siden på nytt"
 
@@ -1940,15 +2017,19 @@ msgstr "Ikke last denne siden på nytt"
 msgid "Don't show search results"
 msgstr "Ikke vis søkeresultat"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "Last ned"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
 msgstr ""
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "Innen"
 
@@ -1968,32 +2049,28 @@ msgstr "Rediger"
 msgid "Edit Conditions"
 msgstr "Rediger Forhold"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "Rediger fleksifelt for %1"
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
 msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "Rediger Forhold"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
 msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: NOT FOUND IN SOURCE
+msgid "Edit Relationships"
+msgstr ""
+
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr "Rediger Maler for køen %1"
@@ -2002,7 +2079,7 @@ msgstr "Rediger Maler for køen %1"
 msgid "Edit keywords"
 msgstr "Rediger nøkkelord"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr ""
 
@@ -2010,7 +2087,7 @@ msgstr ""
 msgid "Edit scrips"
 msgstr "Rediger scrips"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "Rediger systemmal"
 
@@ -2018,11 +2095,15 @@ msgstr "Rediger systemmal"
 msgid "Edit templates for %1"
 msgstr "Rediger maler for %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr "Rediger Konfigurasjon for køen %1"
@@ -2031,17 +2112,17 @@ msgstr "Rediger Konfigurasjon for køen %1"
 msgid "Editing Configuration for user %1"
 msgstr "Redigerer Konfigurasjonen av brukern %1"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "Redigerer Fleksifeltet %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "Redigerer medlemsskap for gruppen %1"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "Redigerer medlemsskap for den personlige gruppen %1"
@@ -2050,15 +2131,15 @@ msgstr "Redigerer medlemsskap for den personlige gruppen %1"
 msgid "Editing template %1"
 msgstr "Redigerer malen %1"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "Enten base eller mål må oppgis"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "Epost"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "Epostaddresse i bruk"
 
@@ -2070,61 +2151,76 @@ msgstr "EpostAddresse"
 msgid "EmailEncoding"
 msgstr "EpostFormat"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr "Aktivt (Fjern merkingen for å deaktivere dette fleksifeltet)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "Aktiv (Fjern merkingen for å deaktivere denne gruppen)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "Aktiv (Fjern merkingen for å deaktivere denne køen)"
 
 #: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
 msgstr "Aktive Fleksifelt"
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr "Aktive Køer"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "Aktiv status %1"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "Skriv multiple verdier"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "Skriv en verdi"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
 msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
+msgstr ""
+
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "Skriv saker og/eller URIer som det skal linkes til. Separer dem med mellomrom"
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
 msgstr ""
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Feil"
 
@@ -2132,7 +2228,7 @@ msgstr "Feil"
 msgid "Error adding watcher"
 msgstr "Feilet ved opprettelse av Overvåker"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "Feil i parameterne til Queue->AddWatcher"
 
@@ -2140,11 +2236,11 @@ msgstr "Feil i parameterne til Queue->AddWatcher"
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "Feil i parameterne til Queue->DelWatcher"
 
-#: lib/RT/Queue_Overlay.pm:830
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "Feil i parameterne til Ticket->AddWatcher"
 
@@ -2152,15 +2248,19 @@ msgstr "Feil i parameterne til Ticket->AddWatcher"
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "Feil i parameterne til Ticket->DelWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
 msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: NOT FOUND IN SOURCE
+msgid "Estimate"
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
 msgstr ""
 
@@ -2168,7 +2268,7 @@ msgstr ""
 msgid "Everyone"
 msgstr "Alle"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "Eksempel:"
 
@@ -2180,33 +2280,32 @@ msgstr "EksternAutId"
 msgid "ExternalContactInfoId"
 msgstr "EksternKontaktInfoId"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "Ekstra info"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "Kunne ikke finne pseudogruppen 'Privilgerte' brukere."
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "Kunne ikke finne 'pseudogruppen 'Upriviligerte' brukere"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr "Kunne ikke laste modulen %1. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "Feb."
 
@@ -2214,51 +2313,39 @@ msgstr "Feb."
 msgid "February"
 msgstr "Februar"
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:69
+#: NOT FOUND IN SOURCE
 msgid "Fill in multiple text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
+#: NOT FOUND IN SOURCE
 msgid "Fill in one text area"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Fin"
 msgstr "End"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "Endelig Prioritet"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr "EndeligPrioritet"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
 msgid "Find group whose"
 msgstr "Finn grupper hvor"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
 msgstr ""
 
@@ -2266,11 +2353,11 @@ msgstr ""
 msgid "Find new/open tickets"
 msgstr "Finn nye/Ã¥pne saker"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "Finn folk hvor"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "Finn saker"
 
@@ -2278,7 +2365,7 @@ msgstr "Finn saker"
 msgid "Finish Approval"
 msgstr "Fullfør godkjennelse"
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "Først"
 
@@ -2286,52 +2373,52 @@ msgstr "Først"
 msgid "First page"
 msgstr "Første side"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "Foo Bar Baz"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "Foo!"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "Tving gjennom endring"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "Fant %quant(%1) sak(er)"
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "Fant Objektet"
 
 #: NOT FOUND IN SOURCE
+msgid "Freeform"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "FreeformContactInfo"
 msgstr "FriforkKontaktInfo"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:37
 msgid "FreeformMultiple"
 msgstr "FriformMultipel"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:36
 msgid "FreeformSingle"
 msgstr "FriformSingel"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "Fre."
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "Fulle headere"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
 msgstr ""
 
@@ -2339,16 +2426,16 @@ msgstr ""
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "Henter brukerinfo fra pgp signatur\\n"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "Gitt til %1"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Global"
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
 msgstr ""
 
@@ -2360,20 +2447,16 @@ msgstr "Globale Nøkkelordvalg"
 msgid "Global Scrips"
 msgstr "Globale Scrip"
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr ""
-
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "Globale maler: %1"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
 msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "Start!"
 
@@ -2385,7 +2468,7 @@ msgstr "Gyldig pgp sig fra %1\\n"
 msgid "Goto page"
 msgstr "GÃ¥ til siden"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "GÃ¥ til saken"
 
@@ -2393,7 +2476,7 @@ msgstr "GÃ¥ til saken"
 msgid "Grand"
 msgstr "Stor"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Gruppe"
 
@@ -2401,11 +2484,11 @@ msgstr "Gruppe"
 msgid "Group %1 %2: %3"
 msgstr "Gruppen %1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "Grupperettigheter"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "Alt medlem av gruppen"
 
@@ -2413,20 +2496,20 @@ msgstr "Alt medlem av gruppen"
 msgid "Group could not be created."
 msgstr "Gruppen kunne ikke lastes."
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "Gruppen kunne ikke opprettes: %1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "Gruppen opprettet"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "Gruppen har ikke det medlemmet"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Fant ikke gruppen"
 
@@ -2438,42 +2521,44 @@ msgstr "Fant ikke gruppen.\\n"
 msgid "Group not specified.\\n"
 msgstr "Ikke spesifisert gruppe.\\n"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Grupper"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "Grupper kan ikke være medlemmer av sine medlemmer"
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
 msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:77
+#: NOT FOUND IN SOURCE
 msgid "Groups this user belongs to"
 msgstr ""
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "Hallo!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "Hallo, %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "Historikk"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
 msgstr ""
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
 msgstr ""
 
@@ -2481,11 +2566,11 @@ msgstr ""
 msgid "HomePhone"
 msgstr "HjemmeTelefon"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "Jeg har %quant(%1, sementblandere)."
@@ -2494,15 +2579,11 @@ msgstr "Jeg har %quant(%1, sementblandere)."
 msgid "I have [quant,_1,concrete mixer]."
 msgstr "Jeg har [quant,_1,sementblandere]."
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr ""
-
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "Id"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Identitet"
 
@@ -2510,63 +2591,63 @@ msgstr "Identitet"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "Hvis en godkjenner blir avvist, avvis orginalen, og slett ventende godkjenninger"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
 msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
 msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr "Hvis dette verktøyet var setgid kunne en fiendtlig lokal bruker bruke dette verktøyet for å oppnå administrativ tilgang til RT."
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "Hvis du har oppdatert noe over, sørg for at"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "Ugyldig verdig for %1"
 
-#: lib/RT/Record.pm:936
+#: NOT FOUND IN SOURCE
+msgid "Image"
+msgstr ""
+
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "LÃ¥st felt"
 
 #: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "Inkluder deaktiverte fleksifelt i listen."
 
-#: html/Admin/Groups/index.html:65
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
 msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
 msgstr "Inkluder deaktiverte køer i listen."
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "Inkluder deaktiverte brukere i søket."
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "Startprioritet"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr "StartPrioritet"
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "Feil i inntasting"
 
@@ -2574,20 +2655,20 @@ msgstr "Feil i inntasting"
 msgid "Interest noted"
 msgstr "Interesse registrert"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "Intern Feil"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "Intern Feil: %1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "Ugyldig gruppetype"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "Ugyldige rettigheter"
 
@@ -2595,7 +2676,7 @@ msgstr "Ugyldige rettigheter"
 msgid "Invalid Type"
 msgstr "Ugyldig Type"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "Ugyldig data"
 
@@ -2603,48 +2684,44 @@ msgstr "Ugyldig data"
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "Ugydlig eier. Setter til 'nobody'."
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "Ugyldig kø"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "Ugyldige rettigheter"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "Ugyldig verdi for %1"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "Ugyldig verdi for fleksifeltet."
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "Ugyldig verdi for status"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr "Det er ekstremt viktig at ikkepriviligerte brukere ikke har tilgang til dette verktøyet."
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr "Det er anbefalt at du oppretter en upriviligert unixbruker med korrekt gruppemedlemsskap og tilgang til RT for  kjøre dette verktøyet."
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr "Det tar flere parametere:"
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Items pending my approval"
 msgstr "Ting som venter på min godkjenning"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "Jan."
 
@@ -2652,11 +2729,11 @@ msgstr "Jan."
 msgid "January"
 msgstr "Januar"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "Bli med i eller forlat denne gruppen"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "Jul."
 
@@ -2664,11 +2741,11 @@ msgstr "Jul."
 msgid "July"
 msgstr "Juli"
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "Total"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "Jun."
 
@@ -2684,23 +2761,23 @@ msgstr "Nøkkelord"
 msgid "Lang"
 msgstr "Språk"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr ""
-
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "Siste"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "Siste Kontakt"
 
-#: html/Elements/SelectDateType:50
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
+
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "Sist kontaktet"
 
@@ -2708,7 +2785,7 @@ msgstr "Sist kontaktet"
 msgid "Last Notified"
 msgstr "Sist Informert"
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "Sist Oppdatert"
 
@@ -2716,19 +2793,19 @@ msgstr "Sist Oppdatert"
 msgid "LastUpdated"
 msgstr "SistOppdatert"
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "Igjen"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "La denne brukeren få tilgang til RT"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "La denne brukeren få rettigheter"
 
@@ -2740,33 +2817,29 @@ msgstr "Begrenser eier til %1 %2"
 msgid "Limiting queue to %1 %2"
 msgstr "Begrenser køen til %1 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "Lenke finnes alt"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "Lenke kunne ikke opprettes"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "Lenke opprettet (%1)"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "Lenke slettet (%1)"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Lenke ble ikke funnet"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "Knytt sak #%1"
@@ -2775,122 +2848,113 @@ msgstr "Knytt sak #%1"
 msgid "Link ticket %1"
 msgstr "Knytt sak %1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Lenker"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "Lokasjon"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "Logkatalogen %1 ble ikke funnet eller kunne ikke skrives til.\\nRT kan ikke kjøre."
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "Logget inn som %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "Innlogging"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "Logg av"
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
 msgstr ""
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "Sett Eier"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "Sett Status"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "msgstr "Sett tidsfrist" "
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "Sett løsningsdato"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "Sett startdato"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "Sett startdato"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "Sett informert dato"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "Sett prioritet"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "Sett Kø"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "Sett Emne"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
 msgstr ""
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
 msgstr ""
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "Sett grupper og gruppemedlemsskap"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "Rediger egenskaper og konfigurasjon som gjelder for alle køer"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr "Rediger køer og kø-spesifike egenskaper"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "Rediger brukere og passord"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "Mar."
 
@@ -2902,33 +2966,33 @@ msgstr "Mars"
 msgid "May"
 msgstr "Mai"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "Mai."
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "Medlem lagt til"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "Medlem slettet"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "Medlem ikke slettet"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "Medlem av"
 
@@ -2936,75 +3000,74 @@ msgstr "Medlem av"
 msgid "MemberOf"
 msgstr "MedlemAv"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "Medlemmer"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
 msgstr ""
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "Fletting vellykket"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "Fletting feilet. Kunne ikke sette EffektivId"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "Flett inn i"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
 msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "Melding"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
-msgid "Message recorded"
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
-msgid "Messages about this ticket will not be sent to..."
+#: lib/RT/Ticket_Overlay.pm:2517
+msgid "Message recorded"
 msgstr ""
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
+#: html/Ticket/Elements/PreviewScrips:70
+msgid "Messages about this ticket will not be sent to..."
 msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "Mangler en primærnøkkel?: %1"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "Mobil"
 
@@ -3012,7 +3075,15 @@ msgstr "Mobil"
 msgid "MobilePhone"
 msgstr "MobilTelefon"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "Endre Tilgangslister"
 
@@ -3020,37 +3091,31 @@ msgstr "Endre Tilgangslister"
 msgid "Modify Custom Field %1"
 msgstr "Endre Fleksifeltet %1"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr ""
-
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
+#: NOT FOUND IN SOURCE
 msgid "Modify Custom Fields which apply to all %1"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "Endre Fleksifelt som gjelder for alle køer"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
 msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr "Endre Scripmaler for denne køen"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "Endre Scrips for denne køen"
 
@@ -3062,30 +3127,33 @@ msgstr "Endre SystemACLer"
 msgid "Modify Template %1"
 msgstr "Endre Malen %1"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
 msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
 msgstr "Endre et fleksifelt for køen %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:52
 msgid "Modify a CustomField which applies to all queues"
 msgstr "Endre et fleksifelt som gjelder for alle køer"
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr "Endre et scrip for køen %1"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "Endre et scrip som gjelder for alle køer"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
 msgstr ""
 
@@ -3093,25 +3161,21 @@ msgstr ""
 msgid "Modify dates for # %1"
 msgstr "Endre datoer for # %1"
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "Endre datoer for #%1"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "Endre datoer for sak # %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "Endre globale grupperettigheter"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "Endre globale grupperettigheter"
 
@@ -3127,110 +3191,108 @@ msgstr "Endre globale rettigheter for brukere"
 msgid "Modify global scrips"
 msgstr "Endre globale scrips"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "Endre globale brukerrettigheter"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "Endre globale brukerrettigheter"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "Endre gruppens metadata eller slette gruppen"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "Endre grupperettigheter for %1 gruppen"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "Endre grupperettigheter %1 køen"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "Endre medlemsliste for denne gruppen"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr "Endre sin egen RT konto"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr "Endre hvem som er relatert til %1 køen"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "Endre hvem som er relater til sak #%1"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "Endre scrips for %1 køen"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr "Endre scrips som gjelder alle køer"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "Endre mal %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "Endre maler som gjelder for alle køer"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "Endre gruppen %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "Endre overvåkere for køen"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "Endre brukeren %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "Endre sak # %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "Endre sak #%1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "Endre saker"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "Endre brukerrettigheter for %1 gruppen"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr "Endre brukerrettigheter for %1 køen"
@@ -3239,64 +3301,64 @@ msgstr "Endre brukerrettigheter for %1 køen"
 msgid "Modify watchers for queue '%1'"
 msgstr "Endre overvåkere for '%1' køen"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr "EndreACL"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "EndreEgetMedlemskap"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr "EndreKøOvervåkere"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr "EndreScrips"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr "EndreSegSelv"
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr "EndreMal"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr "EndreSak"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "Man."
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "Mer om %1"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: NOT FOUND IN SOURCE
+msgid "Move"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr "Flytt ned"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr "Flytt opp"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "Flere"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "MÃ¥ spesifisere attributten 'Navn'"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr "Mine %1 saker"
@@ -3305,39 +3367,47 @@ msgstr "Mine %1 saker"
 msgid "My Approvals"
 msgstr "Mine saker til godkjenning"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "Mine saker til godkjenning"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Navn"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "Navnet er i bruk"
 
 #: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Need approval from system administrator"
 msgstr "Trenger godkjennelse fra systemadministrator"
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "Aldri"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "Ny"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "Nye forhold"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "Nytt Passord"
 
@@ -3345,31 +3415,39 @@ msgstr "Nytt Passord"
 msgid "New Pending Approval"
 msgstr "Ny, Venter på Godkjennelse"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "New Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "New Search"
 msgstr "Nytt Søk"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "Nytt fleksifelt"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "Ny gruppe"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "Nytt passord"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "Melding om nytt passord sendt"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "Ny kø"
 
@@ -3377,11 +3455,11 @@ msgstr "Ny kø"
 msgid "New request"
 msgstr "Ny forespørsel"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "Nye rettigheter"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "Nytt scrip"
 
@@ -3389,27 +3467,27 @@ msgstr "Nytt scrip"
 msgid "New search"
 msgstr "Nytt søk"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "Ny mal"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr "Ny sak"
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "Ny sak eksistere ikke"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "Ny bruker"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "Ny bruker kalt"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "Ny overvåker"
 
@@ -3417,11 +3495,11 @@ msgstr "Ny overvåker"
 msgid "New window setting"
 msgstr "Instillinger for nytt vindu"
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "Neste"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
 msgstr ""
 
@@ -3433,39 +3511,43 @@ msgstr "Neste side"
 msgid "NickName"
 msgstr "KalleNavn"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "Ingen FleksiFelt"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "Ingen grupper definert"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
 msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "Ingen kø definert"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr "Ingen RT bruker funnet. Vennligst referer til manualen.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "Ingen Mal"
 
@@ -3477,11 +3559,11 @@ msgstr "Ingen sak oppgitt. Avbryter sak "
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
 msgstr "Ingen Sak oppgitt. Avbryter saksendring\\n\\n"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "Ingen handling"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr "Ingen kolonne spesifisert"
 
@@ -3489,7 +3571,7 @@ msgstr "Ingen kolonne spesifisert"
 msgid "No command found\\n"
 msgstr "Ingen kommando funnet\\n"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "Ingen kommentar skrevet om denne brukeren"
 
@@ -3497,77 +3579,72 @@ msgstr "Ingen kommentar skrevet om denne brukeren"
 msgid "No correspondence attached"
 msgstr "Ingen korrespondanse vedlagt"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "Ingen beskrivelse for %1"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "Ingen gruppe spesifisert"
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "Passordet er ikke satt"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr "Ingen tilgang til å opprette køer"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "Ikke tilgang til å opprette saker for køen '%1'"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "Ikke tilgang til å opprette brukere"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "Ikke tilgang til å vise den saken"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "Ingen tilgang til å se oppdatering av saken"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "Ingen primær spesifisert"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "Ingen primære spesifisert"
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr "Det er ingen køer som matcher søkekriteriet"
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "Ingen rettigheter funnet"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "Ingen rettigheter tildelt"
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "Ingen søk å behandle"
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
 msgstr ""
 
@@ -3575,7 +3652,7 @@ msgstr ""
 msgid "No ticket id specified"
 msgstr "Ingen saksid oppgitt"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "Transaksjonstype ikke spesifisert"
 
@@ -3583,7 +3660,7 @@ msgstr "Transaksjonstype ikke spesifisert"
 msgid "No user or email address specified"
 msgstr "Ingen bruker eller epostaddresse oppgitt"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "Fant ingen brukere som treffer søkekriteriene."
 
@@ -3591,15 +3668,15 @@ msgstr "Fant ingen brukere som treffer søkekriteriene."
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "Fant ingen gyldig RT bruker. RT cvs handler avstengt. Kontakt din RT administrator.\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr "Ingen verdi sendt til _Set!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "Ingen"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr "Ukjent felt?"
 
@@ -3607,15 +3684,15 @@ msgstr "Ukjent felt?"
 msgid "Not logged in"
 msgstr "Ikke logget inn"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "Ikke logget inn."
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "Ikke satt"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "Ikke implementert enda."
 
@@ -3623,11 +3700,11 @@ msgstr "Ikke implementert enda."
 msgid "Not yet implemented...."
 msgstr "Ikke implementert enda...."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "Notater"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "Melding kunne ikke sendes"
 
@@ -3699,7 +3776,7 @@ msgstr "Rapporter til Kunder Cc og AdminCc"
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "Rapporter til Kunder Cc og AdminCc som Kommentar"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "Nov."
 
@@ -3707,37 +3784,23 @@ msgstr "Nov."
 msgid "November"
 msgstr "November"
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr ""
-
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr "Objekter kunne ikke opprettes"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr "Objektet ble opprettet"
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
 msgstr ""
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "Okt."
 
@@ -3745,19 +3808,19 @@ msgstr "Okt."
 msgid "October"
 msgstr "Oktober"
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
 msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
 msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "Ved"
 
@@ -3797,21 +3860,21 @@ msgstr "Ved statusendring"
 msgid "On Transaction"
 msgstr "Ved Transaksjon"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "Vis kun godkjennelse for saker opprettet etter %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "Bare vis godkjennelse for saker opprettet før %1"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Ã…pne"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Ã…pne den"
 
@@ -3819,7 +3882,7 @@ msgstr "Ã…pne den"
 msgid "Open requests"
 msgstr "Åpne forespørsler"
 
-#: html/SelfService/Elements/Tabs:63
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr "Ã…pne saker"
 
@@ -3835,7 +3898,7 @@ msgstr "Ã…pne saker (fra utlisting) it et annet vinud"
 msgid "Open tickets on correspondence"
 msgstr "Ã…pne saker ved korrespondanse"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
 msgstr ""
 
@@ -3843,36 +3906,40 @@ msgstr ""
 msgid "Ordering and sorting"
 msgstr "Rekkefølge og sortering"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "Opprinnelig sak: #%1"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "Over tid beveger prioriteten seg mot"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr "Eie saker"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr "EieSak"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "Eier"
 
@@ -3880,11 +3947,11 @@ msgstr "Eier"
 msgid "Owner changed from %1 to %2"
 msgstr "Eier endret fra %1 til %2"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "Eier ble tvunget til å endres fra %1 til %2"
@@ -3893,12 +3960,12 @@ msgstr "Eier ble tvunget til å endres fra %1 til %2"
 msgid "Owner is"
 msgstr "Eier er"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "Personsøker"
 
@@ -3910,53 +3977,36 @@ msgstr "PersonSøker"
 msgid "Parent"
 msgstr "Forelder"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "Foreldre"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "Passord"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "Passordhint"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "For kort passord"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "Passord: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
 msgstr "Passordene stemmer ikke overens."
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr "Passordene stemmer ikke overrens. Passordet ble ikke endret"
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "Personer"
 
@@ -3964,27 +4014,27 @@ msgstr "Personer"
 msgid "Perform a user-defined action"
 msgstr "Kjør en brukerdefinert handling"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "Ingen Tilgang"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "Personlige Grupper"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Personlige grupper"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Personlige grupper:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "Telefonnummer"
 
@@ -3996,7 +4046,7 @@ msgstr "Stedholder"
 msgid "Pref"
 msgstr "Pref"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "Instillinger"
 
@@ -4004,15 +4054,15 @@ msgstr "Instillinger"
 msgid "Prefs"
 msgstr "Pref"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "Klargjør Forkortet"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "Forrige"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
 msgstr ""
 
@@ -4024,20 +4074,20 @@ msgstr "Forrige side"
 msgid "Pri"
 msgstr "Pri"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "Primær %1 ikke funnet."
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Prioritet"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "Prioritet starter på"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
 msgstr ""
 
@@ -4045,32 +4095,36 @@ msgstr ""
 msgid "Privileged"
 msgstr "Priviligert"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "Priviligert status: %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "Priviligerte brukere"
 
+#: NOT FOUND IN SOURCE
+msgid "Projects"
+msgstr ""
+
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr "Pseduogruppe for intern bruk"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
 msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
 msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "Kø"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
@@ -4084,7 +4138,7 @@ msgstr "Køen '%1' ikke funnet\\n"
 msgid "Queue Keyword Selections"
 msgstr "Nøkkelordvalg for kø"
 
-#: html/Admin/Queues/Modify.html:64
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "Kønavn"
 
@@ -4092,19 +4146,19 @@ msgstr "Kønavn"
 msgid "Queue Scrips"
 msgstr "Køscrip"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "Køen eksisterer allerede"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr "Køen kunne ikke opprettes"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr "Køen kunne ikke lastes."
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "Køen opprettet"
 
@@ -4112,32 +4166,32 @@ msgstr "Køen opprettet"
 msgid "Queue is not specified."
 msgstr "Køen er ikke oppgitt."
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "Køen ikke funnet"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "Køer"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr "Raskt søk"
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
 msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 for %2"
@@ -4154,7 +4208,7 @@ msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "RT-administrasjon"
 
@@ -4174,7 +4228,7 @@ msgstr "RT Konfigurasjonsfeil"
 msgid "RT Critical error. Message not recorded!"
 msgstr "Kritisk RT feil. Meldingen ble ikke lagret!"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "RT Feil"
 
@@ -4187,14 +4241,18 @@ msgid "RT Recieved mail (%1) from itself."
 msgstr "RT Mottok mail (%1) fra seg selv."
 
 #: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT Self Service / Closed Tickets"
 msgstr "RT Selvbetjening / Lukkede Saker"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
 msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "RT oversikt"
 
@@ -4210,15 +4268,11 @@ msgstr "RT kunne ikke finne kunde via sitt eksterne databaseoppslag"
 msgid "RT couldn't find the queue: %1"
 msgstr "RT kunne ikke finne køen: %1"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "msgstr "RT kunne ikke validere denne PGP signaturen. \\n" "
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "RT for %1"
@@ -4236,6 +4290,10 @@ msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&
 msgstr "RT er &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Den er distribuert under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 
 #: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 msgstr "RT er &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;. Den er distribuert under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 
@@ -4251,7 +4309,11 @@ msgstr "RT vil behandle denne meldingen som om den var usignert"
 msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
 msgstr "RT's epost kommandomodus krever PGP autentisering. Meldingen din var enten ikke signert, eller signaturen din kunne ikke bekreftes."
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "Ekte Navn"
 
@@ -4259,31 +4321,31 @@ msgstr "Ekte Navn"
 msgid "RealName"
 msgstr "EkteNavn"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "Referert til av"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "Refererer til"
 
@@ -4299,44 +4361,48 @@ msgstr "Redefiner"
 msgid "Refine search"
 msgstr "Redefiner søket"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Last siden på nytt hvert %1 minutt."
 
-#: html/Search/Bulk.html:116
+#: NOT FOUND IN SOURCE
+msgid "Relationships"
+msgstr ""
+
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "Fjern AdminCc"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Fjern Cc"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "Fjern Kunde"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Svar"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
 msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "Svar på sak"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "SvarPÃ¥Sak"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "Kunde"
 
@@ -4352,37 +4418,37 @@ msgstr "Kunde(r)"
 msgid "RequestorAddresses"
 msgstr "KundeAddresser"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "Kunder"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "Forespørsler skal være behandlet innen"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
 msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Reset"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Hjemme"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "Løs"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "Løs saknr #%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "Løst"
 
@@ -4390,7 +4456,7 @@ msgstr "Løst"
 msgid "Response to requestors"
 msgstr "Svar til kunder"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "Resultater"
 
@@ -4398,11 +4464,11 @@ msgstr "Resultater"
 msgid "Results per page"
 msgstr "Resultater per side"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "Skriv Passord igjen"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
 msgstr ""
 
@@ -4410,49 +4476,49 @@ msgstr ""
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "Rettighet %1 kunne ikke finnes for %2  %3 in scope %4 (%5)\\n"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "Rettighet Deligert"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "Rettighet Tildelt"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "Rettighet lastet"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "Rettigheten kunne ikke trekkes tilbake"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "Rettighet ikke funnet"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "Rettighet ikke lastet."
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "Rettighet fjernet"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Rettigheter"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "Rettigheter kunne ikke tildeles for %1"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "Rettigheter kunne ikke trekkes tilbake for %1"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "Roller"
 
@@ -4460,59 +4526,53 @@ msgstr "Roller"
 msgid "RootApproval"
 msgstr "RootGodkjenning"
 
-#: html/Search/Elements/DisplayOptions:83
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
 msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "Lør."
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
 msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "Lagre Endringer"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "Lage endringer"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
 msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr "Scrip #%1"
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "Scrip Opprettet"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "Scrip slettet"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "Scrip"
 
@@ -4520,11 +4580,11 @@ msgstr "Scrip"
 msgid "Scrips for %1\\n"
 msgstr "Scrip for %1\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr "Scrip som gjelder for alle køer"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "Søk"
 
@@ -4532,136 +4592,127 @@ msgstr "Søk"
 msgid "Search Criteria"
 msgstr "Søkekriteria"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
-
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr "Søk etter godkjenninger"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
 msgstr ""
 
-#: bin/rt-crontool:213
+#: NOT FOUND IN SOURCE
+msgid "Searches can't be associated with that kind of object"
+msgstr ""
+
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr "Sikkerhet:"
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
 msgstr "SeKø"
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Select"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Select a Custom Field"
 msgstr ""
 
-#: html/Admin/Groups/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
+msgstr ""
+
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "Velg en gruppe"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "Velg en kø"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr ""
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "Velg en bruker"
 
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr "Velg fleksifelt"
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr ""
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "Velg fleksifelt"
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "Velg gruppe"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr "Velg flere verdier"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr "Velg en verdi"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr "Velg kø"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr "Velg scrip"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr "Velg mal"
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr "Velg bruker"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectMultiple"
 msgstr "VelgFlere"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:34
 msgid "SelectSingle"
 msgstr "VelgEnkelt"
 
-#: html/Admin/Elements/EditCustomFields:58
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
 msgstr ""
 
@@ -4713,51 +4764,59 @@ msgstr "Sender epost til de administrative Ccene som kommentar"
 msgid "Sends mail to the owner"
 msgstr "Sender epost til eieren"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "Sep."
 
 #: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "September"
 msgstr "September"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "Vis Resultater"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "Vis godkjente forespørsler"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "Vis basisinfo"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "Vis avviste forespørsler"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "Vis detaljer"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "Vis ventende forespørsler"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "Vis forespørsler som venter på andre godkjenninger"
 
@@ -4769,47 +4828,43 @@ msgstr "Vis sakens private kommentarer"
 msgid "Show ticket summaries"
 msgstr "Vis sakssammendrag"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
 msgstr "VisACL"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr "VisScrip"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr "VisMal"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr "VisSak"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr "VisSaksKommentarer"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr "Meld deg på som saksforespørrer eller sak/kø Cc"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "Meld deg på som sak/kø AdminCc"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "Signatur"
 
@@ -4817,27 +4872,23 @@ msgstr "Signatur"
 msgid "Signed in as %1"
 msgstr "Logget inn som %1"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "Enkel"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr "Dropp Meny"
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr ""
-
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
 msgstr "Sorter"
 
 #: NOT FOUND IN SOURCE
+msgid "Sort Order"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Sort key"
 msgstr "Sorter nøkkel"
 
@@ -4849,7 +4900,11 @@ msgstr "Sorter resultater etter"
 msgid "SortOrder"
 msgstr "SorteringsRekkefølge"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr ""
 
@@ -4861,7 +4916,7 @@ msgstr "Pauset"
 msgid "Start page"
 msgstr "Startside"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "Startet"
 
@@ -4869,7 +4924,7 @@ msgstr "Startet"
 msgid "Started date '%1' could not be parsed"
 msgstr "Startdato '%1' kunne ikke tolkes"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "Starter"
 
@@ -4881,11 +4936,11 @@ msgstr "Starter Etter"
 msgid "Starts date '%1' could not be parsed"
 msgstr "Startdato '%1' kunne ikke tolkes"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Stat"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Status"
 
@@ -4893,7 +4948,8 @@ msgstr "Status"
 msgid "Status Change"
 msgstr "Statusendring"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "Status endret fra %1 til %2"
 
@@ -4901,69 +4957,73 @@ msgstr "Status endret fra %1 til %2"
 msgid "StatusChange"
 msgstr "EndreStatus"
 
-#: html/Ticket/Elements/Tabs:170
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "Stjel"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "Stjålet fra %1"
-
-#: NOT FOUND IN SOURCE
 msgid "Stolen from %1 "
 msgstr "Stjålet fra %1 "
 
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
-
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Emne"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "Endre emne til %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "Oppdater"
 
 #: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Submit Workflow"
 msgstr "Send Arbeidsflyt"
 
-#: lib/RT/Group_Overlay.pm:782
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "Lykkes"
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "Søn."
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "SuperBruker"
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "System"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "Systemfeil"
 
@@ -4975,20 +5035,15 @@ msgstr "Systemfeil. Rettighet ikke tildelt."
 msgid "System Error. right not granted"
 msgstr "Systemfeil. rettigheter ikke tildelt"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr ""
-
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "Systemfeil. Rettighet ikke tildelt."
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "Systemfeil. Rettighet ikke tildelt."
 
@@ -4996,7 +5051,7 @@ msgstr "Systemfeil. Rettighet ikke tildelt."
 msgid "System error. Unable to grant rights."
 msgstr "Systemfeil. Kunne ikke tildele rettigheter."
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "Systemgrupper"
 
@@ -5004,40 +5059,44 @@ msgstr "Systemgrupper"
 msgid "SystemRolegroup for internal use"
 msgstr "SystemRollegruppe for intern bruk"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TEST_STRENG"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "Ta"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "Tatt"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: NOT FOUND IN SOURCE
+msgid "Task"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Mal"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "Mal #%1"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "Mal slettet"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Kunne ikke finne mal"
 
@@ -5045,11 +5104,11 @@ msgstr "Kunne ikke finne mal"
 msgid "Template not found\\n"
 msgstr "Kunne ikke finne mal\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Mal tolket"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Maler"
 
@@ -5057,33 +5116,37 @@ msgstr "Maler"
 msgid "Templates for %1\\n"
 msgstr "Maler for %1\\n"
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: NOT FOUND IN SOURCE
+msgid "Text"
+msgstr ""
+
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "Verdien er allerede satt"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "Det er ikke en verdi for dette fleksifeltet"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "Det er den samme verdien"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
 msgstr "Den primæren har allerede den rettigheten"
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "Den primæren er allerede en %1 for denne køen"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "Den primæren er allerede en %1 for denne køen"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "Den primæren er ikke en %1 for denne køen"
@@ -5092,11 +5155,11 @@ msgstr "Den primæren er ikke en %1 for denne køen"
 msgid "That principal is not a %1 for this ticket"
 msgstr "Den primæren er ikke en %1 for denne saken"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr "Den køen eksisterer ikke"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "Denne saken har uløste avhengigheter"
 
@@ -5104,27 +5167,27 @@ msgstr "Denne saken har uløste avhengigheter"
 msgid "That user already has that right"
 msgstr "Den brukeren har allerede den rettigheten"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr "Den brukeren eier allerede den saken"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "Den brukeren finnes ikke"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "Den brukeren er allerede priviligert"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr "Den brukeren er allerede upriviligert"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "Denne brukeren er nå priviligert"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr "Dette brukeren er nå upriviligert"
 
@@ -5132,23 +5195,23 @@ msgstr "Dette brukeren er nå upriviligert"
 msgid "That user is now unprivilegedileged"
 msgstr "Den brukeren er allerede upriviligert"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr "Den brukeren kan ikke eie saker i den køen"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "Dette er ikke en numerisk id"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "Detaljer"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr "CCen til en sak"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr "Administrative CCer for en sak"
 
@@ -5156,7 +5219,7 @@ msgstr "Administrative CCer for en sak"
 msgid "The comment has been recorded"
 msgstr "Kommentarer er lagret"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr "De følgende kommandoene vil finne alle aktive saker i køen 'general' og sette deres prioritet til 99 hvis de ikke har blitt rørt de siste 4 timene:"
 
@@ -5164,31 +5227,31 @@ msgstr "De følgende kommandoene vil finne alle aktive saker i køen 'general' o
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "De følgende kommandoene ble ikke behandlet:\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "Den nye verdien har blitt satt."
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr "Eieren av en sak"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "Forespørren av en sak"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "Disse kommentarene er generelt ikke synlig for brukeren"
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
 msgstr ""
 
@@ -5196,15 +5259,15 @@ msgstr ""
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "Denne saken %1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "Dette verktøyet tillater brukeren  å kjøre perlmoduler fra inni RT."
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "Denne transaksjonen ser ikke ut til å ha noe innhold"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
 msgstr "Denne brukerens %1 høyst prioriterte saker"
@@ -5213,7 +5276,7 @@ msgstr "Denne brukerens %1 høyst prioriterte saker"
 msgid "This user's 25 highest priority tickets"
 msgstr "Denne brukerens 23 høys prioriterte saker"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "Tor."
 
@@ -5229,24 +5292,24 @@ msgstr "Sak # %1 %2"
 msgid "Ticket # %1 Jumbo update: %2"
 msgstr "Sak $ %1 Jumbo oppdater: %2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "Sak #%1 Jumbo oppdatering: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "Sak #%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "Sak %1 opprettet i '%2' køen"
@@ -5255,16 +5318,16 @@ msgstr "Sak %1 opprettet i '%2' køen"
 msgid "Ticket %1 loaded\\n"
 msgstr "Sak %1 lastet\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "Sak %1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
 msgstr ""
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr "Sakshistorikk # %1 %2"
@@ -5277,7 +5340,7 @@ msgstr "SaksId"
 msgid "Ticket Resolved"
 msgstr "Løst Sak"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
 msgstr ""
 
@@ -5285,19 +5348,19 @@ msgstr ""
 msgid "Ticket attachment"
 msgstr "Saks-vedlegg"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "Saks-innhold"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "Sakens innholdstype"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "Saken kunne ikke opprettes på grunn av en intern feil"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "Sak opprettet"
 
@@ -5305,7 +5368,7 @@ msgstr "Sak opprettet"
 msgid "Ticket creation failed"
 msgstr "Saksopprettelse feilet"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "Sak slettet"
 
@@ -5317,7 +5380,7 @@ msgstr "Saksid ikke funnet"
 msgid "Ticket killed"
 msgstr "Sak drept"
 
-#: html/Ticket/Display.html:55
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
 msgstr ""
 
@@ -5333,20 +5396,17 @@ msgstr "Saksstatus endret"
 msgid "Ticket watchers"
 msgstr "Saksovervåkere"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "Saker"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "Saker %1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "Saker %1 av %2"
 
@@ -5354,31 +5414,31 @@ msgstr "Saker %1 av %2"
 msgid "Tickets from %1"
 msgstr "Saker fra %1"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr "Saker som er avhengige av denne godkjennelsen:"
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "Tid Igjen"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "Arbeidstid"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "Tid igjen"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "Tid å vise"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "Arbeidstid"
 
@@ -5386,14 +5446,10 @@ msgstr "Arbeidstid"
 msgid "TimeLeft"
 msgstr "TidIgjen"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
 msgstr "ArbeidsTid"
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:"
 msgstr "For å generere en diff av denne bekreftelsen:"
@@ -5402,16 +5458,16 @@ msgstr "For å generere en diff av denne bekreftelsen:"
 msgid "To generate a diff of this commit:\\n"
 msgstr "For å genere en diff av denne bekreftelsen"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "Fortalt"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
 msgstr ""
 
@@ -5419,28 +5475,28 @@ msgstr ""
 msgid "Transaction"
 msgstr "Transaksjon"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "Transaksjon %1 slettet"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "Transaksjon Opprettet"
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:92
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "Transaction->Create kunne ikke, siden du ikke spesifiserte en saksid"
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "Transaksjoner er låst"
 
@@ -5448,19 +5504,23 @@ msgstr "Transaksjoner er låst"
 msgid "Trying to delete a right: %1"
 msgstr "Prøver å slette en rettighet: %1"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "Tir."
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "Type"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "Uimplementert"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Unix login"
 
@@ -5468,21 +5528,16 @@ msgstr "Unix login"
 msgid "UnixUsername"
 msgstr "UnixBrukerNavn"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "Ukjent InnholdsFormatering %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "Ubegrenset"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
 msgstr ""
 
@@ -5490,23 +5545,27 @@ msgstr ""
 msgid "Unprivileged"
 msgstr "Upriviligert"
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "Ikke tatt"
 
-#: html/Search/Bulk.html:54
+#: NOT FOUND IN SOURCE
+msgid "Untitled search"
+msgstr ""
+
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Oppdater"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
 msgstr ""
 
@@ -5514,11 +5573,11 @@ msgstr ""
 msgid "Update ID"
 msgstr "Oppdater ID"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
 msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "Oppdater Type"
 
@@ -5530,7 +5589,7 @@ msgstr "Oppdater alle disse sakene samtidig"
 msgid "Update email"
 msgstr "Oppdater epost"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
 msgstr ""
 
@@ -5538,11 +5597,11 @@ msgstr ""
 msgid "Update name"
 msgstr "Oppdater navn"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "Oppdatering ikke lagret."
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "Oppdater valgte saker"
 
@@ -5550,7 +5609,7 @@ msgstr "Oppdater valgte saker"
 msgid "Update signature"
 msgstr "Oppdater signatur"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "Oppdater sak"
 
@@ -5558,58 +5617,58 @@ msgstr "Oppdater sak"
 msgid "Update ticket # %1"
 msgstr "Ooppdater sak # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "Oppdater sak #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "Oppdater sak #%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "Oppdateringstype var verken korrespondanse eller kommentar."
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
 msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
 msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5620,7 +5679,7 @@ msgstr "Bruker %1 %2: %3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "Bruker %1 Passord: %2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
 msgstr ""
@@ -5637,7 +5696,7 @@ msgstr "Brukeren '%1' ble ikke funnet"
 msgid "User Defined"
 msgstr "Bruker Definert"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
 msgstr ""
 
@@ -5645,33 +5704,32 @@ msgstr ""
 msgid "User ID"
 msgstr "BrukerID"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "BrukerId"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "Brukerrettigheter"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "Bruker kunne ikke opprettes: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "Bruker opprettet"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Brukerdefinerte grupper"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
 msgstr ""
 
@@ -5683,23 +5741,23 @@ msgstr "Bruker informert"
 msgid "User view"
 msgstr "Brukervisning"
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "Brukernavn"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Brukere"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "Brukere som treffer søkekriteria"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
 msgstr ""
 
@@ -5707,7 +5765,7 @@ msgstr ""
 msgid "ValueOfQueue"
 msgstr "KøVerdi"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Verdier"
 
@@ -5715,11 +5773,11 @@ msgstr "Verdier"
 msgid "VrijevormEnkele"
 msgstr "VrijevormEnkele"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr "Overvåk"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr "OvervåkSomAdminCc"
 
@@ -5727,7 +5785,7 @@ msgstr "OvervåkSomAdminCc"
 msgid "Watcher loaded"
 msgstr "Overvåker lastet"
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "Overvåkere"
 
@@ -5735,7 +5793,7 @@ msgstr "Overvåkere"
 msgid "WebEncoding"
 msgstr "WebFormatering"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "Ons."
 
@@ -5791,11 +5849,19 @@ msgstr "NÃ¥r kommentarer kommer inn"
 msgid "Whenever correspondence comes in"
 msgstr "NÃ¥r korrespondanse kommer inn"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Arbeid"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr ""
 
@@ -5803,19 +5869,31 @@ msgstr ""
 msgid "WorkPhone"
 msgstr "ArbeidsTelefon"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "Arbeidet"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "Du eier allerede denne saken"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "Du er ikke en autorisert bruker"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "Du kan bare omfordele saker som du eier eller som ikke har en eier"
 
@@ -5823,24 +5901,24 @@ msgstr "Du kan bare omfordele saker som du eier eller som ikke har en eier"
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "Du har ikke tilgang til å se den saken.\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "Du fant %1 saker i %2 køen"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr ""
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "Du har ikke tilgang til å opprette saker i den køen."
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "Du kan ikke opprette forespørsler i den køen."
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "Velkommen tilbake"
 
@@ -5868,11 +5946,11 @@ msgstr "Din forespørsel ble avvist"
 msgid "Your request was rejected."
 msgstr "Din forespørsel ble avvist"
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "Ditt brukernavn/passord er ugyldig"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "Zip"
 
@@ -5880,28 +5958,24 @@ msgstr "Zip"
 msgid "[no subject]"
 msgstr "[ikke noe emne]"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and is not"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and not"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "som tildelt til %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr "lukket"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "inneholder"
 
@@ -5921,7 +5995,7 @@ msgstr "korrespondanse (sansynligvis) ikke sendt"
 msgid "correspondence sent"
 msgstr "korrespondanse sendt"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "dager"
 
@@ -5933,49 +6007,25 @@ msgstr "død"
 msgid "delete"
 msgstr "slett"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "slettet"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "treffer ikke"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "inneholder ikke"
 
-#: html/Elements/SelectEqualityOperator:59
-msgid "equal to"
-msgstr "lik som"
-
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr ""
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
+#: NOT FOUND IN SOURCE
+msgid "email address"
 msgstr ""
 
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr ""
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr "lik som"
 
 #: NOT FOUND IN SOURCE
 msgid "false"
@@ -5985,44 +6035,48 @@ msgstr "usant"
 msgid "filename"
 msgstr "filnavn"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "større enn"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "gruppe '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "timer"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "id"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "er"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "er ikke"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "mindre enn"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "treffer"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "min"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "minutter"
 
@@ -6030,27 +6084,27 @@ msgstr "minutter"
 msgid "modifications\\n\\n"
 msgstr "endringer\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "måneder"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "ny"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "ingen verdi"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "ingen"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "ikke lik som"
 
@@ -6058,68 +6112,72 @@ msgstr "ikke lik som"
 msgid "notlike"
 msgstr "ikkelik"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "Ã¥pen"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "personlig gruppe '%1' for bruker '%2'"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "kø %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "avvist"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "løst"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "sek"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "pauset"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "system %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "systemgruppe '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "den kallende komponenten oppga ikke hvorfor"
 
-#: lib/RT/Group_Overlay.pm:238
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "sak #%1 %2"
 
 #: NOT FOUND IN SOURCE
+msgid "till"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "true"
 msgstr "sant"
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "ubeskrevet gruppe %1"
@@ -6128,12 +6186,12 @@ msgstr "ubeskrevet gruppe %1"
 msgid "undescripbed group %1"
 msgstr "ubeskrevet gruppe %1"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "bruker %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "uker"
 
@@ -6141,7 +6199,11 @@ msgstr "uker"
 msgid "with template %1"
 msgstr "med malen %1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "Ã¥r"
 
+#: NOT FOUND IN SOURCE
+msgid "ニック�ーム"
+msgstr ""
+
diff --git a/rt/lib/RT/I18N/pl.po b/rt/lib/RT/I18N/pl.po
deleted file mode 100644
index 3faa4ec..0000000
--- a/rt/lib/RT/I18N/pl.po
+++ /dev/null
@@ -1,6436 +0,0 @@
-# Copyright (c) 2002 Jesse Vincent <jesse@bestpractical.com>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: RT 3.2.2\n"
-"POT-Creation-Date: 2007-01-18 11:36+0800\n"
-"PO-Revision-Date: 2005-01-18 02:00+0800\n"
-"Last-Translator: Piotr Åšliwa <piotr.sliwa@comarch.pl>\n"
-"Language-Team: rt-devel <rt-devel@lists.fsck.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: NOT FOUND IN SOURCE
-msgid "#"
-msgstr "Nr"
-
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
-#. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
-#. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
-msgid "#%1: %2"
-msgstr "#%1: %2"
-
-#: lib/RT/Record.pm:926
-#. ($label)
-msgid "$prefix %1"
-msgstr ""
-
-#: lib/RT/URI/fsck_com_rt.pm:257
-#. ($self->ObjectType, $self->Object->Id)
-msgid "%1 #%2"
-msgstr "%1 nr%2"
-
-#: lib/RT/Date.pm:361
-#. ($s, $time_unit)
-msgid "%1 %2"
-msgstr "%1 %2"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 %2 %3"
-msgstr "%1 %2 %3"
-
-#: lib/RT/Date.pm:397
-#. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
-msgid "%1 %2 %3 %4:%5:%6 %7"
-msgstr "%1 %3 %2 %7, %4:%5:%6"
-
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
-#. ($cf->Name, $new_value->Content)
-#. ($field, $self->NewValue)
-#. ($self->Field, $principal->Object->Name)
-msgid "%1 %2 added"
-msgstr "%1 %2 zostały dodane"
-
-#: lib/RT/Date.pm:358
-#. ($s, $time_unit)
-msgid "%1 %2 ago"
-msgstr "przed %1 %2"
-
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
-#. ($field, $self->OldValue, $self->NewValue)
-msgid "%1 %2 changed to %3"
-msgstr "%1 %2 zostało zamienione na %3"
-
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
-#. ($field, $self->OldValue)
-#. ($self->Field, $principal->Object->Name)
-msgid "%1 %2 deleted"
-msgstr "%1 %2 zostało usunięte"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 %2 of group %3"
-msgstr "%1 %2 z groupy %3"
-
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
-#. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
-msgid "%1 %2 with template %3"
-msgstr "%1 %2 wg szablonu %3"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 (%2) %3 this ticket\\n"
-msgstr "%1 (%2) %3 tego zgłoszenia\\n"
-
-#: html/Ticket/Elements/ShowAttachments:72
-#. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
-msgid "%1 (%2) by %3"
-msgstr "%1 (%2) przez %3"
-
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
-#. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
-msgid "%1 (Unchanged)"
-msgstr "%1 (Niezmienione)"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 - %2 shown"
-msgstr "wyświetlone %1 - %2"
-
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
-#. ("--search-argument", "--search")
-#. ("--condition-argument", "--condition")
-#. ("--action-argument", "--action")
-msgid "%1 - An argument to pass to %2"
-msgstr "%1 - warunek przejścia na %2"
-
-#: bin/rt-crontool:210
-#. ("--verbose")
-msgid "%1 - Output status updates to STDOUT"
-msgstr "%1 - Status wyjściowy zaktualizowany na STDOUT"
-
-#: bin/rt-crontool:204
-#. ("--action")
-msgid "%1 - Specify the action module you want to use"
-msgstr "%1 - Określ moduł działań, którego chcesz użyć"
-
-#: bin/rt-crontool:198
-#. ("--condition")
-msgid "%1 - Specify the condition module you want to use"
-msgstr "%1 - Określ moduł warunków, którego chcesz użyć"
-
-#: bin/rt-crontool:191
-#. ("--search")
-msgid "%1 - Specify the search module you want to use"
-msgstr "%1 - Określ moduł wyszukiwania, którego chcesz użyć"
-
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
-#. ('&#187;&#124;&#171;', 
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-msgid "%1 RT %2 Copyright 1996-%3 %4."
-msgstr "%1 RT %2 Wszelkie prawa zastrzeżone 1996-%3 %4"
-
-#: lib/RT/ScripAction_Overlay.pm:151
-#. ($self->Id)
-msgid "%1 ScripAction loaded"
-msgstr "Skrypt %1 został załadowany"
-
-#: lib/RT/Record.pm:1708
-#. ($args{'Value'}, $cf->Name)
-msgid "%1 added as a value for %2"
-msgstr "dodano %1 jako wartość dla %2"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 aliases require a TicketId to work on"
-msgstr "do określenia aliasów dla %1 wymagany numer zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 aliases require a TicketId to work on "
-msgstr "do określenia aliasów dla %1 wymagany numer zgłoszenia "
-
-#: NOT FOUND IN SOURCE
-msgid "%1 aliases require a TicketId to work on (from %2) %3"
-msgstr "do określenia aliasów dla %1 wymagany numer zgłoszenia (od %2) %3"
-
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
-#. ($args{'Base'})
-#. ($args{'Target'})
-msgid "%1 appears to be a local object, but can't be found in the database"
-msgstr "Wydaje się, że %1 to obiekt lokalny, ale nie udało się wyszukać go w bazie danych"
-
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
-#. ($self->BriefDescription , $self->CreatorObj->Name)
-#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
-msgid "%1 by %2"
-msgstr "%1 przez %2"
-
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
-#. ($self->Field , $q1->Name , $q2->Name)
-#. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
-msgid "%1 changed from %2 to %3"
-msgstr "%1 zmieniło się z %2 na %3"
-
-# Nie jestem pewien!
-#: html/Search/Build.html:212
-#. ($Description)
-msgid "%1 copy"
-msgstr "kopia %1"
-
-#: lib/RT/Record.pm:930
-msgid "%1 could not be set to %2."
-msgstr "nie udało się ustawić %1 na %2"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 couldn't init a transaction (%2)\\n"
-msgstr "%1 nie udało się rozpocząć transakcji (%2)\\n"
-
-#: lib/RT/Ticket_Overlay.pm:2743
-#. ($self)
-msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
-msgstr "%1 nie udało się ustawić statusu na zamknięty. Baza danych RT może być niespójna"
-
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
-msgid "%1 created"
-msgstr "%1 crĂŠĂŠ(e)"
-
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
-msgid "%1 deleted"
-msgstr "%1 supprimĂŠ(e)"
-
-#: html/Elements/MyTickets:47
-#. ($rows)
-msgid "%1 highest priority tickets I own"
-msgstr "%1 zgłoszeń o najwyższym priorytecie, których jestem właścicielem"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 highest priority tickets I own..."
-msgstr "%1 zgłoszeń o najwyższym priorytecie, których właścicielem jest użytkownik..."
-
-#: NOT FOUND IN SOURCE
-msgid "%1 highest priority tickets I requested..."
-msgstr "%1 zgłoszeń o najwyższym priorytecie zarejestrowanych przez użytkownika..."
-
-#: bin/rt-crontool:186
-#. ($0)
-msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
-msgstr "%1 jest narzędziem umożliwiającym obsługę zgłoszeń z zewnętrznej aplikacji do sporządzania wykazów, takiej jak cron."
-
-#: lib/RT/Queue_Overlay.pm:860
-#. ($principal->Object->Name, $args{'Type'})
-msgid "%1 is no longer a %2 for this queue."
-msgstr "%1 nie jest już %2 dla tej kolejki"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 is no longer a %2 for this ticket."
-msgstr "%1 nie jest już %2 dla tego zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 is no longer a value for custom field %2"
-msgstr "%1 nie jest już wartością pola %2"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 isn't a valid Queue id."
-msgstr "%1 nie jest aktualnie obowiÄ…zujÄ…cym Id kolejki"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 matches"
-msgstr "%1 pasuje"
-
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
-#. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
-#. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
-#. ($Ticket->TimeEstimated)
-#. ($Ticket->TimeWorked)
-#. ($Ticket->TimeLeft)
-msgid "%1 min"
-msgstr "%1 min."
-
-#: NOT FOUND IN SOURCE
-msgid "%1 most recently updated articles"
-msgstr "%1 ostatnio zaktualizowanych artykułów"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 newest articles"
-msgstr "%1 najnowszych artykułów"
-
-#: html/Elements/MyRequests:47
-#. ($rows)
-msgid "%1 newest unowned tickets"
-msgstr "%1 zgłoszeń bez właściciela"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 not shown"
-msgstr "%1 nie zostało wyświetlone"
-
-#: lib/RT/CustomField_Overlay.pm:827
-msgid "%1 objects"
-msgstr "%1 objets"
-
-#: html/User/Elements/DelegateRights:97
-#. (loc($ObjectType =~ /^RT::(.*)$/))
-msgid "%1 rights"
-msgstr "%1 - uprawnienia"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 succeeded\\n"
-msgstr "%1 udało się"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 type unknown for $MessageId"
-msgstr "%1 to nieznany typ Id wiadomości ($MessageId)"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 type unknown for %2"
-msgstr "%1 to nieznany typ dla %2"
-
-#: NOT FOUND IN SOURCE
-msgid "%1 was created without a CurrentUser\\n"
-msgstr "%1 a ĂŠtĂŠ crĂŠĂŠ sans utilisateur courant\\n"
-
-#: lib/RT/Action/ResolveMembers.pm:63
-#. (ref $self)
-msgid "%1 will resolve all members of a resolved group ticket."
-msgstr "%1 zamknie wszystkie części zamykanego zgłoszenia grupowego."
-
-#: NOT FOUND IN SOURCE
-msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
-msgstr "%1 zamknie bazę lokalną, jeśli jest powiązana z podłączonym zgłoszeniem (lub jest jego częścią)"
-
-#: lib/RT/CustomField_Overlay.pm:828
-msgid "%1's %2 objects"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:829
-msgid "%1's %2's %3 objects"
-msgstr ""
-
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
-#. ($Object->Name)
-msgid "%1's saved searches"
-msgstr "Zapisane zapytania %1"
-
-#: lib/RT/Transaction_Overlay.pm:470
-#. ($self)
-msgid "%1: no attachment specified"
-msgstr "%1: nie określono załącznika"
-
-#: html/Ticket/Elements/ShowTransactionAttachments:78
-#. ($size)
-msgid "%1b"
-msgstr "%1b"
-
-#: html/Ticket/Elements/ShowTransactionAttachments:75
-#. (int( $size / 102.4 ) / 10)
-msgid "%1k"
-msgstr "%1k"
-
-#: lib/RT/Ticket_Overlay.pm:1118
-#. ($args{'Status'})
-msgid "'%1' is an invalid value for status"
-msgstr "'%1' to nieprawidłowa wartość statusu"
-
-#: NOT FOUND IN SOURCE
-msgid "'%1' not a recognized action. "
-msgstr "'%1' n'est pas une action connue. "
-
-#: NOT FOUND IN SOURCE
-msgid "(Check box to delete group member)"
-msgstr "(Zaznacz pole, aby usunąć element z grupy)"
-
-#: NOT FOUND IN SOURCE
-msgid "(Check box to delete scrip)"
-msgstr "(Zaznacz pole, aby usunąć skrypt)"
-
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
-msgid "(Check box to delete)"
-msgstr "(Zaznacz pole, aby usunąć)"
-
-#: NOT FOUND IN SOURCE
-msgid "(Check boxes to delete)"
-msgstr "(Zaznacz pola, aby usunąć)"
-
-#: html/Ticket/Elements/PreviewScrips:94
-msgid "(Check boxes to disable notifications to the listed recipients)"
-msgstr "(Zaznacz pola przy odbiorcach na liście, aby zablokować wysyłanie powiadomień)"
-
-#: html/Ticket/Elements/PreviewScrips:116
-msgid "(Check boxes to enable notifications to the listed recipients)"
-msgstr "(Zaznacz pola przy odbiorcach na liście, aby uruchomić wysyłanie powiadomień)"
-
-#: html/Ticket/Create.html:209
-msgid "(Enter ticket ids or URLs, separated with spaces)"
-msgstr "(Wprowadź numery lub adresy URL zgłoszeń, oddzielone spacjami)"
-
-#: NOT FOUND IN SOURCE
-msgid "(Enter ticket ids or URLs, seperated with spaces)"
-msgstr "(Wprowadź numery lub adresy URL zgłoszeń, oddzielone spacjami)"
-
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
-#. ($RT::CorrespondAddress)
-#. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(Jeśli pozostawisz puste, domyślnie zostanie ustawione na %1)"
-
-#: NOT FOUND IN SOURCE
-msgid "(No Value)"
-msgstr "(Non renseignĂŠ)"
-
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
-msgid "(No custom fields)"
-msgstr "(Brak pól definiowanych przez użytkownika)"
-
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
-msgid "(No members)"
-msgstr "(Brak członków grupy)"
-
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
-msgid "(No scrips)"
-msgstr "(Brak skryptów)"
-
-#: html/Admin/Elements/EditTemplates:52
-msgid "(No templates)"
-msgstr "(Brak szablonów)"
-
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
-msgid "(None)"
-msgstr "(Aucun)"
-
-#: html/Ticket/Update.html:88
-msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(Wysyła kopię zgłoszenia na listę adresów mailowych oddzielonych przecinkami, umieszczonych w polu BCC.<b> Nie zmienia</b> tego, kto będzie otrzymywał informacje o stanie zgłoszenia)"
-
-#: NOT FOUND IN SOURCE
-msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
-msgstr "(Wysyła kopię zgłoszenia na listę adresów mailowych oddzielonych przecinkami, umieszczonych w polu BCC. <b>Nie zmienia</b> tego, kto będzie otrzymywał informacje o stanie zgłoszenia)"
-
-#: html/Ticket/Create.html:100
-msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Wysyła kopię zgłoszenia na listę administracyjnych adresów mailowych oddzielonych przecinkami. Te osoby <b> będą</b> otrzymywać informacje o stanie zgłoszenia)"
-
-#: html/Ticket/Update.html:84
-msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(Wysyła kopię zgłoszenia na listę adresów mailowych oddzielonych przecinkami. <b>Nie</b> zmienia tego, kto będzie otrzymywał informacje o stanie zgłoszenia)"
-
-#: NOT FOUND IN SOURCE
-msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
-msgstr "(Wysyła kopię zgłoszenia na listę adresów mailowych oddzielonych przecinkami. <b>Nie</b> zmienia tego, kto będzie otrzymywał informacje o stanie zgłoszenia)"
-
-#: html/Ticket/Create.html:90
-msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Wysyła kopię zgłoszenia na listę adresów mailowych oddzielonych przecinkami. Te osoby <b>będą</b> otrzymywać informacje o stanie zgłoszenia)"
-
-#: html/Admin/Elements/EditScrip:102
-msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
-msgstr "(Skorzystaj z tych pól jeśli wybrano 'Definiowany przez użytkownika' w atrybutach warunku lub operacji)"
-
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
-msgid "(empty)"
-msgstr "(pusta)"
-
-#: NOT FOUND IN SOURCE
-msgid "(no Summary)"
-msgstr "(brak streszczenia)"
-
-#: html/Admin/Users/index.html:60
-msgid "(no name listed)"
-msgstr "(brak listy użytkowników)"
-
-#: NOT FOUND IN SOURCE
-msgid "(no name)"
-msgstr "(brak nazwy)"
-
-#: NOT FOUND IN SOURCE
-msgid "(no subject)"
-msgstr "(brak tematu)"
-
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
-msgid "(no value)"
-msgstr "(brak wartości)"
-
-#: html/Admin/Elements/EditCustomFieldValues:47
-msgid "(no values)"
-msgstr "(aucune valeur)"
-
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
-msgid "(only one ticket)"
-msgstr "(tylko jedno zgłoszenie)"
-
-#: html/Elements/RT__Ticket/ColumnMap:146
-msgid "(pending approval)"
-msgstr "(oczekuje na zatwierdzenie)"
-
-#: html/Elements/RT__Ticket/ColumnMap:149
-msgid "(pending other Collection)"
-msgstr "(oczekuje na innÄ… KolekcjÄ™)"
-
-#: NOT FOUND IN SOURCE
-msgid "(pending other tickets)"
-msgstr "(oczekuje na inne zgłoszenia)"
-
-#: NOT FOUND IN SOURCE
-msgid "(requestor's group)"
-msgstr "(groupe du demandeur)"
-
-#: html/Admin/Users/Modify.html:71
-msgid "(required)"
-msgstr "(wymagana)"
-
-#: html/Ticket/Elements/ShowTransactionAttachments:82
-msgid "(untitled)"
-msgstr "(nienazwany)"
-
-#: NOT FOUND IN SOURCE
-msgid "25 highest priority tickets I own..."
-msgstr "25 zgłoszeń o najwyższym priorytecie, których właścicielem jest użytkownik..."
-
-#: NOT FOUND IN SOURCE
-msgid "25 highest priority tickets I requested..."
-msgstr "25 zgłoszeń o najwyższym priorytecie zarejestrowanych przez użytkownika..."
-
-#: html/Ticket/Elements/ShowBasics:53
-msgid "<% $Ticket->Status%>"
-msgstr "<% $Ticket->Status%>"
-
-#: html/Elements/SelectTicketTypes:48
-msgid "<% $_ %>"
-msgstr "<% $_ %>"
-
-#: html/Search/Elements/SelectLinks:48
-msgid "<%$_%>"
-msgstr ""
-
-#: html/Search/Elements/DisplayOptions:65
-msgid "<%$field%>"
-msgstr ""
-
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
-#. ($m->scomp('/Elements/SelectNewTicketQueue'))
-msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
-msgstr "<input type=\"submit\" value=\"Nowe zgłoszenie w\">&nbsp;%1"
-
-#: etc/initialdata:218
-msgid "A blank template"
-msgstr "Pusty szablon"
-
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "ACE Deleted"
-msgstr "ACE SupprimĂŠ"
-
-#: NOT FOUND IN SOURCE
-msgid "ACE Loaded"
-msgstr "ACE ChargĂŠ"
-
-#: NOT FOUND IN SOURCE
-msgid "ACE could not be deleted"
-msgstr "l'ACE n'a pu ĂŞtre supprimĂŠ"
-
-#: NOT FOUND IN SOURCE
-msgid "ACE could not be found"
-msgstr "l'ACE n'a pu ĂŞtre trouvĂŠ"
-
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
-msgid "ACE not found"
-msgstr "Nie udało się odnaleźć ACE"
-
-#: lib/RT/ACE_Overlay.pm:854
-msgid "ACEs can only be created and deleted."
-msgstr "ACE mogą być tylko utworzone lub usunięte."
-
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
-msgstr "Przerwanie operacji, aby uniknąć niezamierzonych modyfikacji zgłoszenia.\\n"
-
-#: html/User/Elements/Tabs:53
-msgid "About me"
-msgstr "Użytkownika"
-
-#: html/Admin/Users/Modify.html:106
-msgid "Access control"
-msgstr "Kontrola dostępu"
-
-#: html/Admin/Elements/EditScrip:71
-msgid "Action"
-msgstr "Operacja"
-
-#: lib/RT/Scrip_Overlay.pm:173
-#. ($args{'ScripAction'})
-msgid "Action %1 not found"
-msgstr "Operacja %1 nie została odnaleziona"
-
-#: NOT FOUND IN SOURCE
-msgid "Action committed."
-msgstr "Operacja została zatwierdzona"
-
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr ""
-
-#: bin/rt-crontool:144
-msgid "Action prepared..."
-msgstr "Operacja została przygotowana..."
-
-#: html/Search/Build.html:85
-msgid "Add"
-msgstr "Dodaj"
-
-#: html/Search/Bulk.html:114
-msgid "Add AdminCc"
-msgstr "Dodaj AdminCc"
-
-#: html/Search/Bulk.html:110
-msgid "Add Cc"
-msgstr "Dodaj Cc"
-
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
-msgid "Add Criteria"
-msgstr "Dodaj kryterium"
-
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
-msgid "Add More Files"
-msgstr "Dodaj więcej plików"
-
-#: NOT FOUND IN SOURCE
-msgid "Add Next State"
-msgstr "Ajouter Ä‚Å tape suivant"
-
-#: html/Search/Bulk.html:106
-msgid "Add Requestor"
-msgstr "Dodaj zgłaszającego"
-
-#: html/Admin/Elements/AddCustomFieldValue:46
-msgid "Add Value"
-msgstr "Dodaj wartość"
-
-#: NOT FOUND IN SOURCE
-msgid "Add a keyword selection to this queue"
-msgstr "Ajouter une sĂŠlection de mots clĂŠ Ă  cette queue"
-
-#: NOT FOUND IN SOURCE
-msgid "Add a new a global scrip"
-msgstr "Dodaj nowy skrypt globalny"
-
-#: NOT FOUND IN SOURCE
-msgid "Add a scrip to this queue"
-msgstr "Dodaj skrypt dla tej kolejki"
-
-#: html/Admin/Global/Scrip.html:76
-msgid "Add a scrip which will apply to all queues"
-msgstr "Dodaj skrypt, który będzie dotyczył wszystkich kolejek"
-
-#: html/Search/Build.html:85
-msgid "Add additional criteria"
-msgstr "Dodaj kolejne kryterium"
-
-#: html/Search/Bulk.html:146
-msgid "Add comments or replies to selected tickets"
-msgstr "Dodaj komentarze lub odpowiedzi do wybranych zgłoszeń"
-
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
-msgid "Add members"
-msgstr "Dodaj członków grupy"
-
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
-msgid "Add new watchers"
-msgstr "Dodaj nowych obserwatorów"
-
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "AddNextState"
-msgstr "Dodaj następny status"
-
-#: lib/RT/Queue_Overlay.pm:760
-#. ($args{'Type'})
-msgid "Added principal as a %1 for this queue"
-msgstr "Został dodany zarządzający %1 dla tej kolejki"
-
-#: lib/RT/Ticket_Overlay.pm:1416
-#. ($self->loc($args{'Type'}))
-msgid "Added principal as a %1 for this ticket"
-msgstr "Został dodany zarządzający %1 dla tego zgłoszenia"
-
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
-msgid "Address1"
-msgstr "Adres 1"
-
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
-msgid "Address2"
-msgstr "Adres 2"
-
-#: html/Ticket/Create.html:95
-msgid "Admin Cc"
-msgstr "Admin Cc"
-
-#: etc/initialdata:295
-msgid "Admin Comment"
-msgstr "Administracja komentarzami"
-
-#: etc/initialdata:274
-msgid "Admin Correspondence"
-msgstr "Administracja korespondencjÄ…"
-
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
-msgid "Admin queues"
-msgstr "Administracja kolejkami"
-
-#: NOT FOUND IN SOURCE
-msgid "Admin users"
-msgstr "Administracja użytkownikami"
-
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
-msgid "Admin/Global configuration"
-msgstr "Globalna konfiguracja - administracja"
-
-#: NOT FOUND IN SOURCE
-msgid "Admin/Groups"
-msgstr "Grupy - administracja"
-
-#: NOT FOUND IN SOURCE
-msgid "Admin/Queue/Basics"
-msgstr "Administracja kolejkami . podstawowe informacje"
-
-#: NOT FOUND IN SOURCE
-msgid "AdminAllPersonalGroups"
-msgstr "AdminAllPersonalGroups"
-
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
-msgid "AdminCc"
-msgstr "AdminCc"
-
-#: NOT FOUND IN SOURCE
-msgid "AdminComment"
-msgstr "AdminComment"
-
-#: NOT FOUND IN SOURCE
-msgid "AdminCorrespondence"
-msgstr "AdminCorrespondence"
-
-#: lib/RT/CustomField_Overlay.pm:101
-msgid "AdminCustomField"
-msgstr "AdminPolamiUżytk"
-
-#: NOT FOUND IN SOURCE
-msgid "AdminCustomFields"
-msgstr "AdminCustomFields"
-
-#: lib/RT/Group_Overlay.pm:171
-msgid "AdminGroup"
-msgstr "AdminGroup"
-
-#: lib/RT/Group_Overlay.pm:173
-msgid "AdminGroupMembership"
-msgstr "AdminGroupMembership"
-
-#: lib/RT/System.pm:81
-msgid "AdminOwnPersonalGroups"
-msgstr "AdminOwnPersonalGroups"
-
-#: lib/RT/Queue_Overlay.pm:93
-msgid "AdminQueue"
-msgstr "AdminQueue"
-
-#: lib/RT/System.pm:82
-msgid "AdminUsers"
-msgstr "AdminUsers"
-
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
-msgid "Administrative Cc"
-msgstr "Administracyjne Cc"
-
-#: NOT FOUND IN SOURCE
-msgid "Admins"
-msgstr "Administrateurs"
-
-#: html/Ticket/Elements/Tabs:197
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: NOT FOUND IN SOURCE
-msgid "Advanced Search"
-msgstr "Wyszukiwanie zaawansowane"
-
-#: NOT FOUND IN SOURCE
-msgid "Advanced Search Criteria"
-msgstr "Kryteria wyszukiwania zaawansowanego"
-
-#: html/Elements/SelectDateRelation:57
-msgid "After"
-msgstr "po"
-
-#: NOT FOUND IN SOURCE
-msgid "Age"
-msgstr "Wiek"
-
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Alias for"
-msgstr "Alias pour"
-
-#: etc/initialdata:363
-msgid "All Approvals Passed"
-msgstr "Wszystkie warunki poprawności spełnione"
-
-#: NOT FOUND IN SOURCE
-msgid "All Classes"
-msgstr "Wszystkie klasy"
-
-#: NOT FOUND IN SOURCE
-msgid "All Custom Fields"
-msgstr "Wszystkie pola definiowane przez użytkownika"
-
-#: html/Admin/Queues/index.html:75
-msgid "All Queues"
-msgstr "Wszystkie kolejki"
-
-#: NOT FOUND IN SOURCE
-msgid "Always sends a message to the requestors independent of message sender"
-msgstr "Zawsze wysyła wiadomość do zgłaszających niezależnie od nadawcy wiadomości"
-
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr ""
-
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
-msgid "Applies to"
-msgstr "S'applique Ă "
-
-#: html/Search/Edit.html:64
-msgid "Apply"
-msgstr "Zastosuj"
-
-#: html/Search/Edit.html:64
-msgid "Apply your changes"
-msgstr "Zastosuj zmiany"
-
-#: html/Elements/Tabs:74
-msgid "Approval"
-msgstr "Potwierdzenia"
-
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
-#. ($Ticket->Id, $Ticket->Subject)
-#. ($ticket->id, $msg)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
-msgid "Approval #%1: %2"
-msgstr "Potwierdzenie #%1: %2"
-
-#: html/Approvals/index.html:75
-#. ($ticket->Id)
-msgid "Approval #%1: Notes not recorded due to a system error"
-msgstr "Potwierdzenie #%1: Uwagi nie zostały zapisane z powodu błędu systemu"
-
-#: html/Approvals/index.html:73
-#. ($ticket->Id)
-msgid "Approval #%1: Notes recorded"
-msgstr "Potwierdzenie #%1: Uwagi zostały zapisane"
-
-#: NOT FOUND IN SOURCE
-msgid "Approval Details"
-msgstr "Szczegóły zatwierdzenia"
-
-#: etc/initialdata:351
-msgid "Approval Passed"
-msgstr "Zatwierdzone"
-
-#: etc/initialdata:374
-msgid "Approval Rejected"
-msgstr "Odrzucone"
-
-#: NOT FOUND IN SOURCE
-msgid "Approval diagram"
-msgstr "Diagram potwierdzenia"
-
-#: html/Approvals/Elements/Approve:65
-msgid "Approve"
-msgstr "Zatwierdź"
-
-#: etc/initialdata:504
-msgid "Approver's notes: %1"
-msgstr "Uwagi zatwierdzajÄ…cego: %1"
-
-#: lib/RT/Date.pm:440
-msgid "Apr."
-msgstr "Kwi."
-
-#: NOT FOUND IN SOURCE
-msgid "April"
-msgstr "Kwiecień"
-
-#: NOT FOUND IN SOURCE
-msgid "Are you sure you want to delete this article?"
-msgstr "Czy jestes pewien, że chcesz usunąć ten artykuł?"
-
-#: NOT FOUND IN SOURCE
-msgid "Article #%1 deleted"
-msgstr "Artykuł #%1 został usunięty"
-
-#: NOT FOUND IN SOURCE
-msgid "Article #%1: %2"
-msgstr "Artykuł #%1: %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Article not found"
-msgstr "Artykuł nie został odnaleziony"
-
-#: NOT FOUND IN SOURCE
-msgid "Articles"
-msgstr "Artykuły"
-
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
-msgid "Ascending"
-msgstr "RosnÄ…co"
-
-#: lib/RT/Queue_Overlay.pm:97
-msgid "Assign and remove custom fields"
-msgstr "Fixer et supprimer les champs personnalisĂŠs"
-
-#: lib/RT/Queue_Overlay.pm:97
-msgid "AssignCustomFields"
-msgstr "FixerChampsPersonnalisĂŠs"
-
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
-msgid "Attach"
-msgstr "Załączniki"
-
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
-msgid "Attach file"
-msgstr "Załącz plik"
-
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
-msgid "Attached file"
-msgstr "Plik został załączony"
-
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
-#. ($Attachment)
-msgid "Attachment '%1' could not be loaded"
-msgstr "Nie udało się dodać załącznika '%1'"
-
-#: lib/RT/Transaction_Overlay.pm:478
-msgid "Attachment created"
-msgstr "Załącznik został utworzony"
-
-#: lib/RT/Tickets_Overlay.pm:1673
-msgid "Attachment filename"
-msgstr "Nazwa pliku załącznika"
-
-#: html/Ticket/Elements/ShowAttachments:47
-msgid "Attachments"
-msgstr "Załączniki"
-
-#: lib/RT/Attributes_Overlay.pm:172
-msgid "Attribute Deleted"
-msgstr "Atrybut usunięty"
-
-#: lib/RT/Date.pm:444
-msgid "Aug."
-msgstr "Sie."
-
-#: NOT FOUND IN SOURCE
-msgid "August"
-msgstr "Sierpień"
-
-#: NOT FOUND IN SOURCE
-msgid "AuthSystem"
-msgstr "AuthSystem"
-
-#: etc/initialdata:221
-msgid "Autoreply"
-msgstr "Automatyczna odpowiedź"
-
-#: etc/initialdata:72
-msgid "Autoreply To Requestors"
-msgstr "Automatyczna odpowiedź wysyłana do zgłaszających"
-
-#: NOT FOUND IN SOURCE
-msgid "AutoreplyToRequestors"
-msgstr "Automatyczna odpowiedź wysyłana do zgłaszających"
-
-#: NOT FOUND IN SOURCE
-msgid "Available Columns"
-msgstr "Dostępne kolumny"
-
-#: NOT FOUND IN SOURCE
-msgid "Bad PGP Signature: %1\\n"
-msgstr "Niewłaściwy podpis PGP: %1\\n"
-
-#: NOT FOUND IN SOURCE
-msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
-msgstr "Niewłaściwy numer id załącznika. Nie udało się wyszukać załącznika '%1'\\n"
-
-#: NOT FOUND IN SOURCE
-msgid "Bad data in %1"
-msgstr "Niewłaściwe dane w %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Bad transaction number for attachment. %1 should be %2\\n"
-msgstr "Niewłaściwy numer transakcji dla załącznika. %1 należy zastąpić przez %2\\n"
-
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
-msgid "Basics"
-msgstr "Podst. informacje"
-
-#: html/Ticket/Update.html:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
-msgid "Be sure to save your changes"
-msgstr "Pamiętaj, aby zapisać zmiany"
-
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
-msgid "Before"
-msgstr "przed"
-
-#: NOT FOUND IN SOURCE
-msgid "Begin Approval"
-msgstr "Rozpocznij zatwierdzanie"
-
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Binary"
-msgstr "Binaire"
-
-#: etc/initialdata:217
-msgid "Blank"
-msgstr "Pusty"
-
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Bookmarkable URL for this search"
-msgstr "Adres URL do zapamiętania dla tego wyszukiwania"
-
-#: html/Search/Results.html:81
-msgid "Bookmarkable link"
-msgstr "URL do zapamiętania"
-
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
-msgid "Brief headers"
-msgstr "Krótkie nagłówki"
-
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
-msgid "Bulk ticket update"
-msgstr "Hurtowa aktualizacja zgłoszeń"
-
-#: lib/RT/User_Overlay.pm:1722
-msgid "Can not modify system users"
-msgstr "Nie można zmienić użytkowników systemu"
-
-#: lib/RT/Queue_Overlay.pm:92
-msgid "Can this principal see this queue"
-msgstr "Czy ten zarzÄ…dzajÄ…cy widzi tÄ™ kolejkÄ™"
-
-#: lib/RT/CustomField_Overlay.pm:370
-msgid "Can't add a custom field value without a name"
-msgstr "Nie można wprowadzić wartości pola bez nazwy"
-
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
-msgid "Can't find a saved search to work with"
-msgstr ""
-
-#: lib/RT/Link_Overlay.pm:160
-msgid "Can't link a ticket to itself"
-msgstr "Nie można połączyć zgłoszenia z tym samym zgłoszeniem"
-
-#: NOT FOUND IN SOURCE
-msgid "Can't merge into a merged ticket. You should never get this error"
-msgstr "Niemożliwe połączenie w jedno zgłoszenie"
-
-#: html/Search/Build.html:766
-msgid "Can't save this search"
-msgstr "Niemożliwe jest zapisanie tego zapytania"
-
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
-msgid "Can't specifiy both base and target"
-msgstr "Niemożliwe określenie jednocześnie podstaw i celu"
-
-#: html/autohandler:148
-#. ($msg)
-msgid "Cannot create user: %1"
-msgstr "Niemożliwe utworzenie użytkownika: %1"
-
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
-msgid "Cc"
-msgstr "Cc"
-
-#: html/SelfService/Prefs.html:52
-msgid "Change password"
-msgstr "Zmień hasło"
-
-#: html/Elements/Submit:100
-msgid "Check All"
-msgstr "Tout vĂŠrifier"
-
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
-msgid "Check box to delete"
-msgstr "Zaznacz pole, aby usunąć"
-
-#: html/Admin/Elements/SelectRights:55
-msgid "Check box to revoke right"
-msgstr "Zaznacz pole, aby odebrać uprawnienie"
-
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
-msgid "Children"
-msgstr "Zgłoszenia podrzędne"
-
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
-msgid "City"
-msgstr "Miasto"
-
-#: NOT FOUND IN SOURCE
-msgid "Class"
-msgstr "Klasa"
-
-#: NOT FOUND IN SOURCE
-msgid "Class Name"
-msgstr "Nazwa klasy"
-
-#: NOT FOUND IN SOURCE
-msgid "Class is"
-msgstr "KlasÄ… jest"
-
-#: NOT FOUND IN SOURCE
-msgid "Classes"
-msgstr "Klasy"
-
-#: html/Elements/Submit:102
-msgid "Clear All"
-msgstr "Tout effacer"
-
-#: html/Ticket/Elements/ShowDates:68
-msgid "Closed"
-msgstr "Zamknięte"
-
-#: NOT FOUND IN SOURCE
-msgid "Closed Tickets"
-msgstr "Zamknięte zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Closed requests"
-msgstr "Demandes closes"
-
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
-msgid "Closed tickets"
-msgstr "Zamknięte zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Command not understood!\\n"
-msgstr "Niezrozumiałe polecenie!\\n"
-
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
-msgid "Comment"
-msgstr "Komentuj"
-
-#: html/Admin/Queues/Modify.html:79
-msgid "Comment Address"
-msgstr "Adres komentarza"
-
-#: NOT FOUND IN SOURCE
-msgid "Comment not recorded"
-msgstr "Komentarz nie został zapisany"
-
-#: lib/RT/Queue_Overlay.pm:112
-msgid "Comment on tickets"
-msgstr "Komentarz do zgłoszeń"
-
-#: lib/RT/Queue_Overlay.pm:112
-msgid "CommentOnTicket"
-msgstr "CommentOnTicket"
-
-#: NOT FOUND IN SOURCE
-msgid "Comments"
-msgstr "Komentarze"
-
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
-msgid "Comments (Not sent to requestors)"
-msgstr "Komentarze (które nie zostaną wysłane zgłaszającym)"
-
-#: html/Search/Bulk.html:150
-msgid "Comments (not sent to requestors)"
-msgstr "Komentarze (które nie zostały wysłane zgłaszającym)"
-
-#: NOT FOUND IN SOURCE
-msgid "Comments about %1"
-msgstr "Komentarze dotyczÄ…ce %1"
-
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
-msgid "Comments about this user"
-msgstr "Uwagi dotyczące użytkownika"
-
-#: lib/RT/Transaction_Overlay.pm:623
-msgid "Comments added"
-msgstr "Komentarze zostały dodane"
-
-#: lib/RT/Action/Generic.pm:176
-msgid "Commit Stubbed"
-msgstr "Potwierdzenie wysłane do zgłaszającego"
-
-#: NOT FOUND IN SOURCE
-msgid "Compile Restrictions"
-msgstr "Ograniczenia kompilacji"
-
-#: html/Admin/Elements/EditScrip:63
-msgid "Condition"
-msgstr "Warunek"
-
-#: bin/rt-crontool:131
-msgid "Condition matches..."
-msgstr "Warunek zgadza siÄ™ z ..."
-
-#: lib/RT/Scrip_Overlay.pm:189
-msgid "Condition not found"
-msgstr "Warunek nie został odnaleziony"
-
-#: html/Elements/Tabs:81
-msgid "Configuration"
-msgstr "Konfiguracja"
-
-#: html/SelfService/Prefs.html:54
-msgid "Confirm"
-msgstr "Potwierdź"
-
-#: NOT FOUND IN SOURCE
-msgid "ContactInfoSystem"
-msgstr "ContactInfoSystem"
-
-#: NOT FOUND IN SOURCE
-msgid "Contacted date '%1' could not be parsed"
-msgstr "Nie udało się rozpoznać daty modyfikacji'%1'"
-
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
-msgid "Content"
-msgstr "Zawartość"
-
-#: html/Elements/SelectAttachmentField:49
-msgid "Content-Type"
-msgstr "Typ zawartości"
-
-#: NOT FOUND IN SOURCE
-msgid "Coould not create group"
-msgstr "Le groupe n'a pas pu ĂŞtre crĂŠĂŠ"
-
-#: html/Search/Elements/EditSearches:64
-msgid "Copy"
-msgstr "Kopiuj"
-
-#: etc/initialdata:286
-msgid "Correspondence"
-msgstr "Korespondencja"
-
-#: NOT FOUND IN SOURCE
-msgid "Correspondence Address"
-msgstr "Adres korespondencyjny"
-
-#: lib/RT/Transaction_Overlay.pm:619
-msgid "Correspondence added"
-msgstr "Korespondencja została dodana"
-
-#: NOT FOUND IN SOURCE
-msgid "Correspondence not recorded"
-msgstr "Korespondencja nie została zapisana"
-
-#: NOT FOUND IN SOURCE
-msgid "Could not add new custom field value for ticket. "
-msgstr "Nie udało się wprowadzić nowej wartości pola dla zgłoszenia."
-
-#: NOT FOUND IN SOURCE
-msgid "Could not add new custom field value for ticket. %1 "
-msgstr "La valeur de champ personnalisĂŠ n'a pas pu ĂŞtre ajoutĂŠe. %1"
-
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr ""
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
-msgid "Could not change owner. "
-msgstr "Nie udało się zmienić właściciela."
-
-#: html/Admin/CustomFields/Modify.html:119
-#. ($msg)
-msgid "Could not create CustomField"
-msgstr "Nie udało się utworzyć pola definiowanego przez użytkownika"
-
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
-msgid "Could not create group"
-msgstr "Nie udało się utworzyć grupy"
-
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
-#. ($msg)
-msgid "Could not create template: %1"
-msgstr "Nie udało się utworzyć szablonu: %1"
-
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
-msgid "Could not create ticket. Queue not set"
-msgstr "Nie udało się utworzyć zgłoszenia. Nie określono kolejki"
-
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
-msgid "Could not create user"
-msgstr "Nie udało się utworzyć użytkownika"
-
-#: NOT FOUND IN SOURCE
-msgid "Could not create watcher for requestor"
-msgstr "L'observateur n'a pas pu ĂŞtre crĂŠe pour le demandeur"
-
-#: NOT FOUND IN SOURCE
-msgid "Could not find a ticket with id %1"
-msgstr "Nie udało się wyszukać zgłoszenia o numerze %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Could not find group %1."
-msgstr "Nie udało się wyszukać grupy %1."
-
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
-msgid "Could not find or create that user"
-msgstr "Nie udało się wyszukać ani utworzyć tego użytkownika"
-
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
-msgid "Could not find that principal"
-msgstr "Nie udało się wyszukać tego zarządzającego"
-
-#: NOT FOUND IN SOURCE
-msgid "Could not find user %1."
-msgstr "Nie udało się wyszukać użytkownika %1."
-
-#: html/Admin/CustomFields/Objects.html:69
-msgid "Could not load CustomField %1"
-msgstr "Impossible de charger le champ personnalisĂŠ %1"
-
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
-msgid "Could not load group"
-msgstr "Nie udało się załadować grupy"
-
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
-#. ($args{'Type'})
-msgid "Could not make that principal a %1 for this queue"
-msgstr "Nie udało się przypisać tego zarządzającego jako %1 dla tej kolejki"
-
-#: lib/RT/Ticket_Overlay.pm:1405
-#. ($self->loc($args{'Type'}))
-msgid "Could not make that principal a %1 for this ticket"
-msgstr "Nie udało się przypisać tego zarządzającego jako %1 dla tego zgłoszenia"
-
-#: lib/RT/Queue_Overlay.pm:857
-#. ($args{'Type'})
-msgid "Could not remove that principal as a %1 for this queue"
-msgstr "Nie udało się usunąć tego zarządzającego jako %1 dla tej kolejki"
-
-#: NOT FOUND IN SOURCE
-msgid "Could not remove that principal as a %1 for this ticket"
-msgstr "Nie udało się usunąć tego zarządzającego jako %1 dla tego zgłoszenia"
-
-#: lib/RT/User_Overlay.pm:192
-msgid "Could not set user info"
-msgstr "Niemożliwe było zapisanie danych użytkownika"
-
-#: lib/RT/Group_Overlay.pm:1011
-msgid "Couldn't add member to group"
-msgstr "Nie udało się dodać nowego członka grupy"
-
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
-#. ($Msg)
-msgid "Couldn't create a transaction: %1"
-msgstr "Nie udało się utworzyć transakcji: %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't figure out what to do from gpg's reply\\n"
-msgstr "Nie udało się ustalić, co zrobić na podstawie odpowiedzi z gpg\\n"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't find group\\n"
-msgstr "Nie udało się wyszukać grupy\\n"
-
-#: lib/RT/Record.pm:939
-msgid "Couldn't find row"
-msgstr "Nie udało się wyszukać wiersza"
-
-#: lib/RT/Group_Overlay.pm:985
-msgid "Couldn't find that principal"
-msgstr "Nie udało się wyszukać tego zarządzającego"
-
-#: lib/RT/CustomField_Overlay.pm:404
-msgid "Couldn't find that value"
-msgstr "Nie udało się wyszukać tej wartości"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't find that watcher"
-msgstr "L'observateur n'a pas pu ĂŞtre trouvĂŠ"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't find user\\n"
-msgstr "Nie udało się wyszukać użytkownika\\n"
-
-#: lib/RT/CurrentUser.pm:146
-#. ($self->Id)
-msgid "Couldn't load %1 from the users database.\\n"
-msgstr "Nie udało się załadować %1 z bazy użytkowników.\\n"
-
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
-msgid "Couldn't load Class %1"
-msgstr "Nie udało się załadować klasy %1"
-
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
-msgid "Couldn't load CustomField %1"
-msgstr "Nie udało się załadować pola %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't load KeywordSelects."
-msgstr "KeywordSelects n'a pas pu ĂŞtre chargĂŠ"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't load RT config file '%1' %2"
-msgstr "Nie udało się załadować pliku konfiguracji RT '%1' %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't load Scrips."
-msgstr "Nie udało się załadować skryptów"
-
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
-#. ($id)
-msgid "Couldn't load group %1"
-msgstr "Nie udało się załadować grupy %1"
-
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
-msgid "Couldn't load link"
-msgstr "Nie udało się załadować połączenia"
-
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
-msgid "Couldn't load object %1"
-msgstr "Impossible de charger l'objet %1"
-
-#: html/Admin/Queues/People.html:142
-#. ($id)
-msgid "Couldn't load queue"
-msgstr "Nie udało się załadować kolejki"
-
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
-#. ($id)
-msgid "Couldn't load queue %1"
-msgstr " Nie udało się załadować kolejki %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't load scrip"
-msgstr "Nie udało się załadować skryptu"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't load template"
-msgstr "Nie udało się załadować szablonu"
-
-#: NOT FOUND IN SOURCE
-msgid "Couldn't load that user (%1)"
-msgstr "Nie udało się załadować użytkownika (%1)"
-
-#: html/SelfService/Display.html:156
-#. ($id)
-msgid "Couldn't load ticket '%1'"
-msgstr "Nie udało się załadować zgłoszenia '%1'"
-
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
-msgid "Country"
-msgstr "Kraj"
-
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
-msgid "Create"
-msgstr "Utwórz"
-
-#: etc/initialdata:135
-msgid "Create Tickets"
-msgstr "Utwórz zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Create a Class"
-msgstr "Utwórz klasę"
-
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
-msgid "Create a CustomField"
-msgstr "Utwórz pole definiowane przez użytkownika"
-
-#: html/Admin/Queues/CustomField.html:69
-#. ($QueueObj->Name())
-msgid "Create a CustomField for queue %1"
-msgstr "Utwórz pole dla kolejki %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Create a CustomField which applies to all queues"
-msgstr "Utwórz pole, które dotyczy wszystkich kolejek"
-
-#: NOT FOUND IN SOURCE
-msgid "Create a new Custom Field"
-msgstr "Utwórz nowe pole definiowane przez użytkownika"
-
-#: NOT FOUND IN SOURCE
-msgid "Create a new article"
-msgstr "Utwórz nowy artykuł"
-
-#: NOT FOUND IN SOURCE
-msgid "Create a new global scrip"
-msgstr "Utwórz nowy skrypt globalny"
-
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
-msgid "Create a new group"
-msgstr "Utwórz nową grupę"
-
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
-msgid "Create a new personal group"
-msgstr "Utwórz nową grupę prywatną"
-
-#: NOT FOUND IN SOURCE
-msgid "Create a new queue"
-msgstr "Utwórz nową kolejkę"
-
-#: NOT FOUND IN SOURCE
-msgid "Create a new scrip"
-msgstr "Utwórz nowy skrypt"
-
-#: NOT FOUND IN SOURCE
-msgid "Create a new template"
-msgstr "Utwórz nowy szablon"
-
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
-msgid "Create a new ticket"
-msgstr "Utwórz nowe zgłoszenie"
-
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
-msgid "Create a new user"
-msgstr "Utwórz nowego użytkownika"
-
-#: html/Admin/Queues/Modify.html:125
-msgid "Create a queue"
-msgstr "Utwórz kolejkę"
-
-#: NOT FOUND IN SOURCE
-msgid "Create a queue called"
-msgstr "Utwórz kolejkę nazwaną"
-
-#: NOT FOUND IN SOURCE
-msgid "Create a request"
-msgstr "Utwórz zgłoszenie"
-
-#: html/Admin/Queues/Scrip.html:80
-#. ($QueueObj->Name)
-msgid "Create a scrip for queue %1"
-msgstr "Utwórz skrypt dla kolejki %1"
-
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
-msgid "Create a template"
-msgstr "Utwórz szablon"
-
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
-msgid "Create a ticket"
-msgstr "Utwórz zgłoszenie"
-
-#: NOT FOUND IN SOURCE
-msgid "Create an article"
-msgstr "Utwórz artykuł"
-
-#: NOT FOUND IN SOURCE
-msgid "Create an article in class..."
-msgstr "Utwórz artykuł w ramach klasy..."
-
-#: NOT FOUND IN SOURCE
-msgid "Create failed: %1 / %2 / %3 "
-msgstr "Echec Ă  la crĂŠation de: %1 / %2 / %3"
-
-#: NOT FOUND IN SOURCE
-msgid "Create failed: %1/%2/%3"
-msgstr "Echec Ă  la crĂŠation de: %1/%2/%3"
-
-#: etc/initialdata:137
-msgid "Create new tickets based on this scrip's template"
-msgstr "Utwórz nowe zgłoszenia na podstawie szablonu tego skryptu"
-
-#: html/SelfService/Create.html:105
-msgid "Create ticket"
-msgstr "Utwórz zgłoszenie"
-
-#: lib/RT/Queue_Overlay.pm:110
-msgid "Create tickets in this queue"
-msgstr "Utwórz zgłoszenia w tej kolejce"
-
-#: lib/RT/CustomField_Overlay.pm:101
-msgid "Create, delete and modify custom fields"
-msgstr "Utwórz, usuń i zmodyfikuj pola def. przez użytkownika"
-
-#: lib/RT/Queue_Overlay.pm:93
-msgid "Create, delete and modify queues"
-msgstr "Utwórz, usuń i zmodyfikuj kolejki"
-
-#: NOT FOUND IN SOURCE
-msgid "Create, delete and modify the members of any user's personal groups"
-msgstr "Utwórz, usuń i zmodyfikuj członków którejś z prywatnych grup użytkownika"
-
-#: lib/RT/System.pm:81
-msgid "Create, delete and modify the members of personal groups"
-msgstr " Utwórz, usuń i zmodyfikuj członków prywatnych grup"
-
-#: lib/RT/System.pm:82
-msgid "Create, delete and modify users"
-msgstr "Utwórz, usuń i zmodyfikuj użytkowników"
-
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:110
-msgid "CreateTicket"
-msgstr "CreateTicket"
-
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
-msgid "Created"
-msgstr "Zarejestrowane"
-
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
-#. ($CustomFieldObj->Name())
-msgid "Created CustomField %1"
-msgstr "Pole %1 zostało utworzone"
-
-#: NOT FOUND IN SOURCE
-msgid "Created by"
-msgstr "Utworzony przez"
-
-#: NOT FOUND IN SOURCE
-msgid "Created during"
-msgstr "Utworzony podczas"
-
-#: NOT FOUND IN SOURCE
-msgid "Created template %1"
-msgstr "Szablon %1 został utworzony"
-
-#: html/Search/Elements/PickBasics:102
-msgid "Creator"
-msgstr "Zgłaszający"
-
-#: html/Elements/EditLinks:49
-msgid "Current Links"
-msgstr "Aktualne powiÄ…zania"
-
-#: NOT FOUND IN SOURCE
-msgid "Current Relationships"
-msgstr "Aktualne powiÄ…zania"
-
-#: html/Admin/Elements/EditScrips:51
-msgid "Current Scrips"
-msgstr "Aktualne skrypty"
-
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
-msgid "Current members"
-msgstr "Aktualni członkowie"
-
-#: html/Admin/Elements/SelectRights:51
-msgid "Current rights"
-msgstr "Aktualne uprawnienia"
-
-#: NOT FOUND IN SOURCE
-msgid "Current search criteria"
-msgstr "Aktualne kryteria wyszukiwania"
-
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
-msgid "Current watchers"
-msgstr "Aktualni obserwatorzy"
-
-#: NOT FOUND IN SOURCE
-msgid "Custom Field #%1"
-msgstr "Pole def. przez użytkownika #%1"
-
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
-msgid "Custom Fields"
-msgstr "Pola def. przez użytkownika"
-
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
-msgid "Custom Fields for %1"
-msgstr "Champs personnalisĂŠs pour %1"
-
-#: html/Admin/Elements/EditScrip:123
-msgid "Custom action cleanup code"
-msgstr "Treść procedury czyszczenia definiowana przez użytkownika"
-
-#: html/Admin/Elements/EditScrip:115
-msgid "Custom action preparation code"
-msgstr "Treść procedury definiowana przez użytkownika"
-
-#: html/Admin/Elements/EditScrip:107
-msgid "Custom condition"
-msgstr "Warunek definiowany przez użytkownika"
-
-#: NOT FOUND IN SOURCE
-msgid "Custom field %1 %2 %3"
-msgstr "Pole definiowane przez użytkownika %1 %2 %3"
-
-#: NOT FOUND IN SOURCE
-msgid "Custom field %1 does not apply to this object"
-msgstr "Le champ personnalisĂŠ %1 ne s'applique pas Ă  cet objet"
-
-#: lib/RT/Tickets_Overlay.pm:2147
-#. ($CF->Name)
-msgid "Custom field %1 has a value."
-msgstr "Pole %1 definiowane przez użytkownika ma wartość."
-
-#: lib/RT/Tickets_Overlay.pm:2143
-#. ($CF->Name)
-msgid "Custom field %1 has no value."
-msgstr "Brak wartości w polu %1 definiowanym przez użytkownika."
-
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
-#. ($args{'Field'})
-msgid "Custom field %1 not found"
-msgstr "Nie udało się wyszukać pola %1 definiowanego przez użytkownika"
-
-#: NOT FOUND IN SOURCE
-msgid "Custom field deleted"
-msgstr "Pole definiowane przez użytkownika zostało usunięte"
-
-#: NOT FOUND IN SOURCE
-msgid "Custom field not found"
-msgstr "Nie udało się wyszukać pola definiowanego przez użytkownika"
-
-#: lib/RT/CustomField_Overlay.pm:1041
-#. ($args{'Content'}, $self->Name)
-msgid "Custom field value %1 could not be found for custom field %2"
-msgstr "Nie udało się wyszukać wartości %1 dla pola %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Custom field value changed from %1 to %2"
-msgstr "Wartość pola zmieniła się z %1 na %2"
-
-#: lib/RT/CustomField_Overlay.pm:414
-msgid "Custom field value could not be deleted"
-msgstr "Nie można usunąć wartości pola"
-
-#: lib/RT/CustomField_Overlay.pm:1047
-msgid "Custom field value could not be found"
-msgstr "Nie udało się wyszukać wartości pola"
-
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
-msgid "Custom field value deleted"
-msgstr "Wartość pola została usunięta"
-
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
-msgid "CustomField"
-msgstr "Pole"
-
-#: NOT FOUND IN SOURCE
-msgid "Data error"
-msgstr "Erreur de donnĂŠes"
-
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
-msgid "Dates"
-msgstr "Daty"
-
-#: lib/RT/Date.pm:448
-msgid "Dec."
-msgstr "Gru."
-
-#: NOT FOUND IN SOURCE
-msgid "December"
-msgstr "Grudzień"
-
-#: NOT FOUND IN SOURCE
-msgid "Default Autoresponse Template"
-msgstr "Domyślnie wybierany szablon odpowiedzi wysyłanej automatycznie"
-
-#: etc/initialdata:222
-msgid "Default Autoresponse template"
-msgstr "Domyślnie wybierany szablon odpowiedzi wysyłanej automatycznie"
-
-#: html/Tools/Offline.html:61
-msgid "Default Queue"
-msgstr "Domyślna kolejka"
-
-#: html/Tools/Offline.html:70
-msgid "Default Requestor"
-msgstr "Domyślny zgłaszający"
-
-#: etc/initialdata:296
-msgid "Default admin comment template"
-msgstr "Domyślnie wybierany szablon komentarza administratora"
-
-#: etc/initialdata:275
-msgid "Default admin correspondence template"
-msgstr "Domyślnie wybierany szablon korespondencji administratora"
-
-#: etc/initialdata:287
-msgid "Default correspondence template"
-msgstr "Domyślnie wybierany szablon korespondencji"
-
-#: etc/initialdata:253
-msgid "Default transaction template"
-msgstr "Domyślnie wybierany szablon transakcji"
-
-#: NOT FOUND IN SOURCE
-msgid "Default: %1/%2 changed from %3 to %4"
-msgstr "Domyślnie: %1/%2 zmieniane z \"%3\" na \"%4\""
-
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
-msgid "Delegate rights"
-msgstr "Przekaż uprawnienia"
-
-#: lib/RT/System.pm:85
-msgid "Delegate specific rights which have been granted to you."
-msgstr "Przekaż specyficzne uprawnienia, które zostały Ci przyznane"
-
-#: lib/RT/System.pm:85
-msgid "DelegateRights"
-msgstr "DelegateRights"
-
-#: html/User/Elements/Tabs:59
-msgid "Delegation"
-msgstr "Przekazywanie uprawnień"
-
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
-msgid "Delete"
-msgstr "Usuń"
-
-#: html/Admin/Elements/EditTemplates:79
-msgid "Delete Template"
-msgstr "Usuń szablon"
-
-#: NOT FOUND IN SOURCE
-msgid "Delete article #%1"
-msgstr "Usuń artykuł #%1"
-
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
-msgstr ""
-
-#: html/Admin/Elements/EditScrips:74
-msgid "Delete selected scrips"
-msgstr "Usuń zaznaczone skrypty"
-
-#: lib/RT/Queue_Overlay.pm:115
-msgid "Delete tickets"
-msgstr "Usuń zgłoszenia"
-
-#: lib/RT/Queue_Overlay.pm:115
-msgid "DeleteTicket"
-msgstr "DeleteTicket"
-
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Deleting this object could break referential integrity"
-msgstr "Usunięcie tego obiektu mogło spowodować brak spójności"
-
-#: lib/RT/Queue_Overlay.pm:391
-msgid "Deleting this object would break referential integrity"
-msgstr "Usunięcie tego obiektu spowoduje brak spójności"
-
-#: lib/RT/User_Overlay.pm:513
-msgid "Deleting this object would violate referential integrity"
-msgstr "Usunięcie tego obiektu naruszy spójność"
-
-#: NOT FOUND IN SOURCE
-msgid "Deleting this object would violate referential integrity."
-msgstr "Effacer cet objet violerait l'intĂŠgritĂŠ rĂŠfĂŠrentielle"
-
-#: NOT FOUND IN SOURCE
-msgid "Deleting this object would violate referential integrity. That's bad."
-msgstr "Effacer cet objet violerait l'intĂŠgritĂŠ rĂŠfĂŠrentielle, c'est serait facheux!"
-
-#: html/Approvals/Elements/Approve:66
-msgid "Deny"
-msgstr "Odrzucić"
-
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
-msgid "Depended on by"
-msgstr "Zgłoszenia zależne"
-
-#: NOT FOUND IN SOURCE
-msgid "Dependencies: \\n"
-msgstr "Zależności"
-
-#: lib/RT/Transaction_Overlay.pm:707
-#. ($value)
-msgid "Dependency by %1 added"
-msgstr "Zależność %1 dodana"
-
-#: lib/RT/Transaction_Overlay.pm:747
-#. ($value)
-msgid "Dependency by %1 deleted"
-msgstr "Zależność %1 usunięta"
-
-#: lib/RT/Transaction_Overlay.pm:704
-#. ($value)
-msgid "Dependency on %1 added"
-msgstr "Zależność od %1 dodana"
-
-#: lib/RT/Transaction_Overlay.pm:744
-#. ($value)
-msgid "Dependency on %1 deleted"
-msgstr "Zależność od %1 usunięta"
-
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
-msgid "Depends on"
-msgstr "Zależy od"
-
-#: NOT FOUND IN SOURCE
-msgid "DependsOn"
-msgstr "ZależyOd"
-
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
-msgid "Descending"
-msgstr "MalejÄ…co"
-
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
-msgid "Describe the issue below"
-msgstr "Opis zgłoszenia"
-
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
-msgid "Description"
-msgstr "Opis"
-
-#: NOT FOUND IN SOURCE
-msgid "Details"
-msgstr "Szczegóły"
-
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
-msgid "Display"
-msgstr "Wyświetl"
-
-#: lib/RT/Queue_Overlay.pm:94
-msgid "Display Access Control List"
-msgstr "Wyświetl Listę Praw Dostępu"
-
-#: html/Search/Elements/DisplayOptions:46
-msgid "Display Columns"
-msgstr "Wybierz kolumny"
-
-#: lib/RT/Queue_Overlay.pm:100
-msgid "Display Scrip templates for this queue"
-msgstr "Wyświetl szablony skryptów dla tej kolejki"
-
-#: lib/RT/Queue_Overlay.pm:103
-msgid "Display Scrips for this queue"
-msgstr "Wyświetl skrypty dla tej kolejki"
-
-#: html/Ticket/Elements/ShowHistory:56
-msgid "Display mode"
-msgstr "Tryb wyświetlania"
-
-#: lib/RT/Group_Overlay.pm:176
-msgid "Display saved searches for this group"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Display ticket #%1"
-msgstr "Wyświetl zgłoszenie #%1"
-
-#: html/Elements/Footer:60
-msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
-msgstr "Rozpowszechniane na mocy wersji 2 licencji GNU GPL <a href=\"http://www.gnu.org/copyleft/gpl.html\">."
-
-#: lib/RT/System.pm:76
-msgid "Do anything and everything"
-msgstr "Zrób cokolwiek i wszystko"
-
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
-msgid "Don't refresh this page."
-msgstr "Nie odświeżaj tej strony."
-
-#: NOT FOUND IN SOURCE
-msgid "Don't show search results"
-msgstr "Nie wyświetlaj wyników wyszukiwania"
-
-#: html/Ticket/Elements/ShowTransactionAttachments:82
-msgid "Download"
-msgstr "Pobierz "
-
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
-msgid "Download as a tab-delimited file"
-msgstr "TĂŠlĂŠcharger en tant que fichier dĂŠlimitĂŠ par tabulations"
-
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
-msgid "Due"
-msgstr "Termin realizacji"
-
-#: NOT FOUND IN SOURCE
-msgid "Due date '%1' could not be parsed"
-msgstr "Termin realizacji '%1' nie może być rozpoznany"
-
-#: NOT FOUND IN SOURCE
-msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
-msgstr "B�ĄD: Nie udało się załadować zgłoszenia: '%1': %2.\\n"
-
-#: NOT FOUND IN SOURCE
-msgid "Edit"
-msgstr "Edytuj"
-
-#: NOT FOUND IN SOURCE
-msgid "Edit Conditions"
-msgstr "Modifier les conditions"
-
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
-msgid "Edit Custom Fields for %1"
-msgstr "Edytuj pola dla kolejki %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Edit Custom Fields for Class %1"
-msgstr "Edytuj pola dla klasy %1"
-
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
-msgstr ""
-
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
-msgid "Edit Links"
-msgstr "Edytuj powiÄ…zania"
-
-#: html/Search/Edit.html:68
-msgid "Edit Query"
-msgstr "Zmodyfikuj zapytanie"
-
-#: NOT FOUND IN SOURCE
-msgid "Edit Relationships"
-msgstr "Edytuj powiÄ…zania"
-
-#: html/Admin/Queues/Templates.html:63
-#. ($QueueObj->Name)
-msgid "Edit Templates for queue %1"
-msgstr "Edytuj szablony kolejki %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Edit keywords"
-msgstr "Modifier les mots clĂ"
-
-#: lib/RT/Group_Overlay.pm:175
-msgid "Edit saved searches for this group"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Edit scrips"
-msgstr "Edytuj skrypty"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
-msgid "Edit system templates"
-msgstr "Edytuj szablony systemowe"
-
-#: NOT FOUND IN SOURCE
-msgid "Edit templates for %1"
-msgstr "Edytuj szablony dla %1"
-
-#: lib/RT/Group_Overlay.pm:175
-msgid "EditSavedSearches"
-msgstr "EdytujZapisaneZapytania"
-
-#: NOT FOUND IN SOURCE
-msgid "Editing Configuration for Class %1"
-msgstr "Edytuj konfiguracjÄ™ klasy %1"
-
-#: html/Admin/Queues/Modify.html:140
-#. ($QueueObj->Name)
-msgid "Editing Configuration for queue %1"
-msgstr "Edytuj konfiguracjÄ™ kolejki %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Editing Configuration for user %1"
-msgstr "Edytuj konfigurację użytkownika %1"
-
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
-#. ($CustomFieldObj->Name())
-msgid "Editing CustomField %1"
-msgstr "Edytuj pole %1"
-
-#: html/Admin/Groups/Members.html:53
-#. ($Group->Name)
-msgid "Editing membership for group %1"
-msgstr "Edytuj listę członków grupy %1"
-
-#: html/User/Groups/Members.html:150
-#. ($Group->Name)
-msgid "Editing membership for personal group %1"
-msgstr "Edytuj listę członków prywatnej grupy %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Editing template %1"
-msgstr "Edytuj szablon %1"
-
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
-msgid "Either base or target must be specified"
-msgstr "Podstawy lub cel muszą być określone"
-
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
-msgid "Email"
-msgstr "e-mail"
-
-#: lib/RT/User_Overlay.pm:236
-msgid "Email address in use"
-msgstr "Używany adres e-mail "
-
-#: NOT FOUND IN SOURCE
-msgid "EmailAddress"
-msgstr "adres e-mail"
-
-#: NOT FOUND IN SOURCE
-msgid "EmailEncoding"
-msgstr "kodowanie e-maila"
-
-#: NOT FOUND IN SOURCE
-msgid "Enabled (Unchecking this box disables this Class)"
-msgstr "Udostępniona (nieoznaczenie tego pola spowoduje, że klasa będzie niedostępna)"
-
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
-msgid "Enabled (Unchecking this box disables this custom field)"
-msgstr "Udostępnione (nieoznaczenie tego pola spowoduje, że pole będzie niedostępne)"
-
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
-msgid "Enabled (Unchecking this box disables this group)"
-msgstr "Udostępniona (nieoznaczenie tego pola spowoduje, że grupa będzie niedostępna)"
-
-#: html/Admin/Queues/Modify.html:105
-msgid "Enabled (Unchecking this box disables this queue)"
-msgstr "Udostępniona (nieoznaczenie tego pola spowoduje, że kolejka będzie niedostępna)"
-
-#: NOT FOUND IN SOURCE
-msgid "Enabled Classes"
-msgstr "Dostępne klasy"
-
-#: NOT FOUND IN SOURCE
-msgid "Enabled Custom Fields"
-msgstr "Dostępne pola definiowane przez użytkownika"
-
-#: html/Admin/Queues/index.html:78
-msgid "Enabled Queues"
-msgstr "Dostępne kolejki"
-
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
-#. (loc_fuzzy($msg))
-msgid "Enabled status %1"
-msgstr "Dostępny status %1"
-
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
-msgid "Enabled status: %1"
-msgstr "Statut actif: %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
-msgstr "Aby powiązać artykuły, wprowadź artykuły lub URI oddzielone spacjami."
-
-#: lib/RT/CustomField_Overlay.pm:64
-msgid "Enter multiple values"
-msgstr "Wprowadzanie wielu wartości"
-
-#: html/Elements/EditLinks:124
-msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
-msgstr "Aby powiązać obiekty, wprowadź URI obiektów oddzielone spacjami."
-
-#: lib/RT/CustomField_Overlay.pm:65
-msgid "Enter one value"
-msgstr "Wprowadzanie jednej wartości"
-
-#: html/Elements/EditLinks:121
-msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
-msgstr "Aby powiązać kolejki, wprowadź URI kolejek oddzielone spacjamii."
-
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
-msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
-msgstr "Aby powiązać zgłoszenia, wprowadź numery zgłoszeń lub URI oddzielone spacjami."
-
-#: NOT FOUND IN SOURCE
-msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
-msgstr "Aby powiązać zgłoszenia, wprowadź numery zgłoszeń lub URI oddzielone spacjami."
-
-#: lib/RT/CustomField_Overlay.pm:66
-msgid "Enter up to %1 values"
-msgstr "Saisir %1 valeurs maximum"
-
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
-msgid "Error"
-msgstr "BÅ‚Ä…d"
-
-#: NOT FOUND IN SOURCE
-msgid "Error adding watcher"
-msgstr "Erreur Ă  l'ajout de l'observateur"
-
-#: lib/RT/Queue_Overlay.pm:669
-msgid "Error in parameters to Queue->AddWatcher"
-msgstr "Błąd w określeniu parametrów kolejki->Dodaj Obserwatora"
-
-#: NOT FOUND IN SOURCE
-msgid "Error in parameters to Queue->DelWatcher"
-msgstr "Błąd w określeniu parametrów kolejki -> Usuń Obserwatora"
-
-#: lib/RT/Queue_Overlay.pm:830
-msgid "Error in parameters to Queue->DeleteWatcher"
-msgstr "Błąd w określeniu parametrów kolejki -> Usuń Obserwatora"
-
-#: lib/RT/Ticket_Overlay.pm:1333
-msgid "Error in parameters to Ticket->AddWatcher"
-msgstr "Błąd w określeniu parametrów zgłoszenia -> Dodaj Obserwatora"
-
-#: NOT FOUND IN SOURCE
-msgid "Error in parameters to Ticket->DelWatcher"
-msgstr " Błąd w określeniu parametrów zgłoszenia -> Usuń Obserwatora"
-
-#: lib/RT/Ticket_Overlay.pm:1499
-msgid "Error in parameters to Ticket->DeleteWatcher"
-msgstr "Błąd w określeniu parametrów Zgłoszenia-> Usuń Obserwatora"
-
-#: bin/rt-crontool:233
-msgid "Escalate tickets"
-msgstr "Eskaluj zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Estimate"
-msgstr "Estimer"
-
-#: html/Ticket/Elements/ShowBasics:57
-msgid "Estimated"
-msgstr "Szacowane"
-
-#: etc/initialdata:20
-msgid "Everyone"
-msgstr "Wszyscy"
-
-#: bin/rt-crontool:219
-msgid "Example:"
-msgstr "Przykład:"
-
-#: NOT FOUND IN SOURCE
-msgid "ExternalAuthId"
-msgstr "Zewnętrzne AuthId"
-
-#: NOT FOUND IN SOURCE
-msgid "ExternalContactInfoId"
-msgstr "ExternalContactInfoId"
-
-#: html/Admin/Users/Modify.html:99
-msgid "Extra info"
-msgstr "Informacje dodatkowe"
-
-#: NOT FOUND IN SOURCE
-msgid "Extract article from ticket #%1"
-msgstr "Wydziel artykuł ze zgłoszenia #%1"
-
-#: NOT FOUND IN SOURCE
-msgid "Extract article from ticket #%1 into class %2"
-msgstr "Wydziel artykuł ze zgłoszenia #%1 w klasie %2"
-
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:377
-msgid "Failed to find 'Privileged' users pseudogroup."
-msgstr "Nie udało się wyszukać członków grupy 'Uprawnieni'"
-
-#: lib/RT/User_Overlay.pm:384
-msgid "Failed to find 'Unprivileged' users pseudogroup"
-msgstr "Nie udało się wyszukać członków grupy 'Nieuprawnieni'"
-
-#: bin/rt-crontool:163
-#. ($modname, $@)
-msgid "Failed to load module %1. (%2)"
-msgstr "Nie udało się załadować modułu %1. (%2)"
-
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
-msgid "Feb."
-msgstr "Lut."
-
-#: NOT FOUND IN SOURCE
-msgid "February"
-msgstr "Luty"
-
-# Nie jestem pewien: jedno słowo!
-#: html/Elements/SelectAttachmentField:50
-msgid "Filename"
-msgstr "Nazwa pliku"
-
-#: lib/RT/CustomField_Overlay.pm:69
-msgid "Fill in multiple text areas"
-msgstr "Saisir dans plusieurs champs de type texte"
-
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
-msgid "Fill in one text area"
-msgstr "Saisir dans un champ de type texte"
-
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
-msgid "Fill in up to %1 text areas"
-msgstr "Saisir dans %1 champs de type texte maximum"
-
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Fin"
-msgstr "Koniec"
-
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
-msgid "Final Priority"
-msgstr "Końcowy priorytet"
-
-#: lib/RT/Ticket_Overlay.pm:1140
-msgid "FinalPriority"
-msgstr "Końcowy priorytet"
-
-#: NOT FOUND IN SOURCE
-msgid "Find group whose"
-msgstr "Wyszukaj grupę, której"
-
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
-msgid "Find groups whose"
-msgstr "Trouver les groupes dont"
-
-#: NOT FOUND IN SOURCE
-msgid "Find new/open tickets"
-msgstr "Wyszykaj nowe/otwarte zgłoszenia"
-
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
-msgid "Find people whose"
-msgstr "Wyszukaj użytkowników, których"
-
-#: html/Search/Results.html:109
-msgid "Find tickets"
-msgstr "Wyszukaj zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Finish Approval"
-msgstr "Zakończ zatwierdzanie"
-
-#: html/Ticket/Elements/Tabs:81
-msgid "First"
-msgstr "Pierwsze"
-
-#: NOT FOUND IN SOURCE
-msgid "First page"
-msgstr "Pierwsza strona"
-
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
-msgid "Foo Bar Baz"
-msgstr "Ble ble"
-
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
-msgid "Foo!"
-msgstr "ble ble"
-
-#: html/Search/Bulk.html:105
-msgid "Force change"
-msgstr "WymuÅ› zmianÄ™"
-
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
-#. ($ticketcount)
-msgid "Found %quant(%1,ticket)"
-msgstr "Wyszukano %1 zgłoszeń"
-
-#: lib/RT/Record.pm:942
-msgid "Found Object"
-msgstr "Wyszukany obiekt"
-
-#: NOT FOUND IN SOURCE
-msgid "Freeform"
-msgstr "FormulaireLibre"
-
-#: NOT FOUND IN SOURCE
-msgid "FreeformContactInfo"
-msgstr "FreeformContactInfo"
-
-#: NOT FOUND IN SOURCE
-msgid "FreeformMultiple"
-msgstr "FreeformMultiple"
-
-#: NOT FOUND IN SOURCE
-msgid "FreeformSingle"
-msgstr "FreeformSingle"
-
-#: lib/RT/Date.pm:417
-msgid "Fri."
-msgstr "Pt."
-
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
-msgid "Full headers"
-msgstr "Pełne nagłówki"
-
-#: html/Tools/Offline.html:87
-msgid "Get template from file"
-msgstr "Pobierz szablon z pliku"
-
-#: NOT FOUND IN SOURCE
-msgid "Getting the current user from a pgp sig\\n"
-msgstr "Uzyskanie aktualnego użytkownika na podstawie podpisu pgp\\n"
-
-#: lib/RT/Transaction_Overlay.pm:673
-#. ($New->Name)
-msgid "Given to %1"
-msgstr "Nadany dla %1"
-
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
-msgid "Global"
-msgstr "Globalna"
-
-#: html/Admin/Elements/EditCustomFields:55
-msgid "Global Custom Fields"
-msgstr "Champs personnalisĂŠs globaux"
-
-#: NOT FOUND IN SOURCE
-msgid "Global Keyword Selections"
-msgstr "Mots clĂŠ globaux"
-
-#: NOT FOUND IN SOURCE
-msgid "Global Scrips"
-msgstr "Skrypty globalne"
-
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr ""
-
-#: html/Admin/Elements/SelectTemplate:59
-#. (loc($Template->Name))
-msgid "Global template: %1"
-msgstr "Szablon globalny: %1"
-
-#: html/Tools/Offline.html:91
-msgid "Go"
-msgstr "Pobierz"
-
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
-msgid "Go!"
-msgstr "Start!"
-
-#: NOT FOUND IN SOURCE
-msgid "Good pgp sig from %1\\n"
-msgstr "Poprawny podpis pgp dla %1\\n "
-
-#: NOT FOUND IN SOURCE
-msgid "Goto page"
-msgstr "Przejdź do strony"
-
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
-msgid "Goto ticket"
-msgstr "Przejdź do zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Grand"
-msgstr "Accorder"
-
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
-msgid "Group"
-msgstr "Grupa"
-
-#: NOT FOUND IN SOURCE
-msgid "Group %1 %2: %3"
-msgstr "Grupa %1 %2: %3"
-
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
-msgid "Group Rights"
-msgstr "Uprawnienia grupowe"
-
-#: lib/RT/Group_Overlay.pm:991
-msgid "Group already has member"
-msgstr "Grupa ma już członka"
-
-#: NOT FOUND IN SOURCE
-msgid "Group could not be created."
-msgstr "Le groupe n'a pas pu ĂŞtre crĂŠĂŠ"
-
-#: html/Admin/Groups/Modify.html:109
-#. ($create_msg)
-msgid "Group could not be created: %1"
-msgstr "Nie udało się utworzyć grupy: %1"
-
-#: lib/RT/Group_Overlay.pm:529
-msgid "Group created"
-msgstr "Grupa została utworzona"
-
-#: lib/RT/Group_Overlay.pm:1163
-msgid "Group has no such member"
-msgstr "Nie ma takiego członka grupy"
-
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
-msgid "Group not found"
-msgstr "Nie udało się wyszukać grupy"
-
-#: NOT FOUND IN SOURCE
-msgid "Group not found.\\n"
-msgstr "Nie udało się wyszukać grupy.\\n"
-
-#: NOT FOUND IN SOURCE
-msgid "Group not specified.\\n"
-msgstr "Grupa nie została określona.\\n"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
-msgid "Groups"
-msgstr "Grupy"
-
-#: lib/RT/Group_Overlay.pm:997
-msgid "Groups can't be members of their members"
-msgstr "Nie można przypisac grup jako członków tych grup"
-
-#: html/Admin/Groups/index.html:82
-msgid "Groups matching search criteria"
-msgstr "Groupes correspondant au critère de recherche"
-
-#: html/Ticket/Elements/ShowRequestor:77
-msgid "Groups this user belongs to"
-msgstr "Cette utilisateur appartient aux groupes"
-
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
-msgid "Hello!"
-msgstr "Witaj!"
-
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
-#. ($name)
-msgid "Hello, %1"
-msgstr "Witaj, %1"
-
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
-msgid "History"
-msgstr "Historia"
-
-#: NOT FOUND IN SOURCE
-msgid "History for article #%1"
-msgstr "Historia artykułu #%1"
-
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
-msgid "History of the group %1"
-msgstr "Historique du groupe %1"
-
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
-msgid "History of the user %1"
-msgstr "Historique de l'utilisateur %1"
-
-#: NOT FOUND IN SOURCE
-msgid "HomePhone"
-msgstr "Tel. domowy"
-
-#: html/Elements/Tabs:65
-msgid "Homepage"
-msgstr "Start"
-
-#: lib/RT/Base.pm:110
-#. (6)
-msgid "I have %quant(%1,concrete mixer)."
-msgstr "Posiadam %quant(%1,concrete mixer)."
-
-#: NOT FOUND IN SOURCE
-msgid "I have [quant,_1,concrete mixer]."
-msgstr "I have [quant,_1,concrete mixer]."
-
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr ""
-
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
-msgid "Id"
-msgstr "Nr "
-
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
-msgid "Identity"
-msgstr "Identyfikacja użytkownika"
-
-#: etc/initialdata:429
-msgid "If an approval is rejected, reject the original and delete pending approvals"
-msgstr "Jeśli potwierdzenie zostało odrzucone, odrzuć oryginał i usuń oczekujące potwierdzenia"
-
-#: html/Tools/Offline.html:74
-msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "Jeśli zgłaszający nie został określony, twórz zgłoszenia dla tego użytkownika."
-
-#: html/Tools/Offline.html:65
-msgid "If no queue is specified, create tickets in this queue."
-msgstr "Jeśli kolejka nie została określona, twórz zgłoszenia w tej kolejce."
-
-#: bin/rt-crontool:215
-msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
-msgstr "Jeśli ta aplikacja została zachwiana, obcy lokalny użytkownik mógł używać tej aplikacji, aby uzyskać do RT dostęp na prawach administratora"
-
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
-msgid "If you've updated anything above, be sure to"
-msgstr "Jeśli zmodyfikowałeś coś powyżej"
-
-#: lib/RT/Record.pm:933
-msgid "Illegal value for %1"
-msgstr "Niedopuszczalna wartość dla %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Image"
-msgstr "Image"
-
-#: lib/RT/Record.pm:936
-msgid "Immutable field"
-msgstr "Pole, które nie może być powielane"
-
-#: NOT FOUND IN SOURCE
-msgid "Include disabled classes in listing."
-msgstr "Uwzględnij na liście nieaktywne klasy"
-
-#: NOT FOUND IN SOURCE
-msgid "Include disabled custom fields in listing."
-msgstr "Uwzględnij na liście nieaktywne pola."
-
-#: html/Admin/Groups/index.html:65
-msgid "Include disabled groups in listing."
-msgstr "Uwzględnij na liście nieaktywne grupy."
-
-#: html/Admin/Queues/index.html:65
-msgid "Include disabled queues in listing."
-msgstr "Uwzględnij na liście nieaktywne kolejki."
-
-#: html/Admin/Users/index.html:71
-msgid "Include disabled users in search."
-msgstr "Uwzględnij w wyszukiwaniu nieaktywnych użytkowników."
-
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
-msgid "Initial Priority"
-msgstr "PoczÄ…tkowy priorytet"
-
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
-msgid "InitialPriority"
-msgstr "PoczÄ…tkowy priorytet"
-
-#: lib/RT/ScripAction_Overlay.pm:134
-msgid "Input error"
-msgstr "Błąd na wejściu"
-
-#: NOT FOUND IN SOURCE
-msgid "Interest noted"
-msgstr "Votre intĂŠret est notĂŠ"
-
-#: lib/RT/Ticket_Overlay.pm:3454
-msgid "Internal Error"
-msgstr "Błąd wewnętrzny"
-
-#: lib/RT/Record.pm:305
-#. ($id->{error_message})
-msgid "Internal Error: %1"
-msgstr "Błąd wewnętrzny: %1"
-
-#: lib/RT/Group_Overlay.pm:676
-msgid "Invalid Group Type"
-msgstr "Nieprawidłowy typ grupy"
-
-#: lib/RT/Principal_Overlay.pm:161
-msgid "Invalid Right"
-msgstr "Nieprawidłowe uprawnienie"
-
-#: NOT FOUND IN SOURCE
-msgid "Invalid Type"
-msgstr "Type invalide"
-
-#: lib/RT/Record.pm:938
-msgid "Invalid data"
-msgstr "Nieprawidłowe dane"
-
-#: NOT FOUND IN SOURCE
-msgid "Invalid owner. Defaulting to 'nobody'."
-msgstr "Nieprawidłowy właściciel. Domyślnie 'nikt'"
-
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
-msgid "Invalid queue"
-msgstr "Nieprawidłowa kolejka"
-
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
-msgid "Invalid right"
-msgstr "Nieprawidłowe uprawnienie"
-
-#: lib/RT/Record.pm:280
-#. ($key)
-msgid "Invalid value for %1"
-msgstr "Nieprawidłowa wartość dla %1"
-
-#: lib/RT/Record.pm:1597
-msgid "Invalid value for custom field"
-msgstr "Nieprawidłowa wartość pola"
-
-#: lib/RT/Ticket_Overlay.pm:413
-msgid "Invalid value for status"
-msgstr "Nieprawidłowy status"
-
-#: bin/rt-crontool:216
-msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
-msgstr "Bardzo ważne, aby nieuprawnieni użytkownicy nie posiadali uprawnień do uruchomienia tej aplikacji."
-
-#: bin/rt-crontool:217
-msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
-msgstr "Sugeruje się, aby utworzyć nieuprawnionego użytkownika w odpowiedniej grupie o odpowiednim dostępie do RT, aby uruchomić tę aplikację"
-
-#: bin/rt-crontool:188
-msgid "It takes several arguments:"
-msgstr "Wymaga kilku argumentów:"
-
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Items pending my approval"
-msgstr "Pozycje oczekujÄ…ce na moje zatwierdzenie"
-
-#: lib/RT/Date.pm:437
-msgid "Jan."
-msgstr "Sty."
-
-#: NOT FOUND IN SOURCE
-msgid "January"
-msgstr "Styczeń"
-
-#: lib/RT/Group_Overlay.pm:174
-msgid "Join or leave this group"
-msgstr "Dołącz albo opuść tę grupę"
-
-#: lib/RT/Date.pm:443
-msgid "Jul."
-msgstr "Lip."
-
-#: NOT FOUND IN SOURCE
-msgid "July"
-msgstr "Lipiec"
-
-#: html/Ticket/Elements/Tabs:122
-msgid "Jumbo"
-msgstr "Wszystko"
-
-#: lib/RT/Date.pm:442
-msgid "Jun."
-msgstr "Cze."
-
-#: NOT FOUND IN SOURCE
-msgid "June"
-msgstr "Czerwiec"
-
-#: NOT FOUND IN SOURCE
-msgid "Keyword"
-msgstr "SÅ‚owo kluczowe"
-
-#: NOT FOUND IN SOURCE
-msgid "Lang"
-msgstr "Język"
-
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
-msgid "Language"
-msgstr "Język"
-
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr ""
-
-#: html/Ticket/Elements/Tabs:96
-msgid "Last"
-msgstr "Ostatnie"
-
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
-msgid "Last Contact"
-msgstr "Ostatnia modyfikacja"
-
-#: html/Elements/SelectDateType:50
-msgid "Last Contacted"
-msgstr "Ostatnio modyfikowane"
-
-#: NOT FOUND IN SOURCE
-msgid "Last Notified"
-msgstr "Ostatnio powiadomiony"
-
-#: html/Elements/SelectDateType:51
-msgid "Last Updated"
-msgstr "Ostatnio zaktualizowane"
-
-#: NOT FOUND IN SOURCE
-msgid "LastUpdated"
-msgstr "OstAktualiz"
-
-#: html/Search/Elements/PickBasics:103
-msgid "LastUpdatedBy"
-msgstr "OstAktPrzez"
-
-#: html/Ticket/Elements/ShowBasics:68
-msgid "Left"
-msgstr "Pozostały"
-
-#: html/Admin/Users/Modify.html:109
-msgid "Let this user access RT"
-msgstr "Udostępnij temu użytkownikowi RT"
-
-#: html/Admin/Users/Modify.html:113
-msgid "Let this user be granted rights"
-msgstr "Przydziel uprawnienia temu użytkownikowi"
-
-#: NOT FOUND IN SOURCE
-msgid "Limiting owner to %1 %2"
-msgstr "Ograniczenie właściciela do %1 %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Limiting queue to %1 %2"
-msgstr "Ograniczenie kolejki do %1 %2"
-
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
-#: lib/RT/Record.pm:1292
-msgid "Link already exists"
-msgstr "Połączenie już istnieje"
-
-#: lib/RT/Record.pm:1306
-msgid "Link could not be created"
-msgstr "Nie udało się utworzyć połączenia"
-
-#: lib/RT/Record.pm:1312
-#. ($TransString)
-msgid "Link created (%1)"
-msgstr "Połączenie zostało utworzone (%1)"
-
-#: lib/RT/Record.pm:1373
-#. ($TransString)
-msgid "Link deleted (%1)"
-msgstr "Połączenie zostało usunięte (%1)"
-
-#: lib/RT/Record.pm:1379
-msgid "Link not found"
-msgstr "Połączenie nie zostało odnalezione"
-
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
-#. ($Ticket->Id)
-msgid "Link ticket #%1"
-msgstr "Powiąż zgłoszenie #%1"
-
-#: NOT FOUND IN SOURCE
-msgid "Link ticket %1"
-msgstr "Lier au ticket %1"
-
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
-msgid "Links"
-msgstr "PowiÄ…zania"
-
-#: html/Search/Elements/EditSearches:76
-msgid "Load"
-msgstr "Załaduj"
-
-#: html/Search/Elements/EditSearches:74
-msgid "Load saved search:"
-msgstr "Załaduj zapisane zapytanie:"
-
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:64
-msgid "Loaded perl modules"
-msgstr "Załadowane moduły PERL"
-
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
-msgid "Location"
-msgstr "Lokalizacja"
-
-#: lib/RT.pm:212
-#. ($RT::LogDir)
-msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
-msgstr "Ścieżka logowania %1 nie została odnaleziona lub nie mógła być zapisana.\\n Nie udało się uruchomić RT"
-
-#: html/Elements/Header:94
-#. ("<b>".$session{'CurrentUser'}->Name."</b>")
-msgid "Logged in as %1"
-msgstr "Zalogowano jako %1"
-
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
-msgid "Login"
-msgstr "Zaloguj siÄ™"
-
-#: html/Elements/Header:91
-msgid "Logout"
-msgstr "Wyloguj siÄ™"
-
-#: lib/RT/CustomField_Overlay.pm:866
-msgid "Lookup type mismatch"
-msgstr "Faire attention aux types diffĂŠrents"
-
-#: html/Search/Bulk.html:104
-msgid "Make Owner"
-msgstr "Wprowadź właściciela"
-
-#: html/Search/Bulk.html:128
-msgid "Make Status"
-msgstr "Wprowadź status"
-
-#: html/Search/Bulk.html:136
-msgid "Make date Due"
-msgstr "Wprowadź termin realizacji"
-
-#: html/Search/Bulk.html:138
-msgid "Make date Resolved"
-msgstr "Wprowadź datę zamknięcia"
-
-#: html/Search/Bulk.html:132
-msgid "Make date Started"
-msgstr "Wprowadź datę rozpoczęcia realizacji"
-
-#: html/Search/Bulk.html:130
-msgid "Make date Starts"
-msgstr "Wprowadź datę rozpoczęcia realizacji"
-
-#: html/Search/Bulk.html:134
-msgid "Make date Told"
-msgstr "Wprowadź datę wpływu"
-
-#: html/Search/Bulk.html:124
-msgid "Make priority"
-msgstr "Wprowadź priorytet"
-
-#: html/Search/Bulk.html:126
-msgid "Make queue"
-msgstr "Wprowadź kolejkę"
-
-#: html/Search/Bulk.html:122
-msgid "Make subject"
-msgstr "Wprowadź temat"
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
-msgstr ""
-
-#: html/Admin/index.html:78
-msgid "Manage custom fields and custom field values"
-msgstr "GĂŠrer les champs personnalisĂŠs et leur valeurs"
-
-#: html/Admin/index.html:69
-msgid "Manage groups and group membership"
-msgstr "Administracja grupami i członkami grup"
-
-#: html/Admin/index.html:85
-msgid "Manage properties and configuration which apply to all queues"
-msgstr "Administracja właściwościami i konfiguracją, które dotyczą wszystkich kolejek"
-
-#: html/Admin/index.html:74
-msgid "Manage queues and queue-specific properties"
-msgstr "Administracja kolejkami i specyficznymi właściwościami kolejek"
-
-#: html/Admin/index.html:64
-msgid "Manage users and passwords"
-msgstr "Administracja użytkownikami i hasłami"
-
-#: lib/RT/Date.pm:439
-msgid "Mar."
-msgstr "Mar."
-
-#: NOT FOUND IN SOURCE
-msgid "March"
-msgstr "Marzec"
-
-#: NOT FOUND IN SOURCE
-msgid "May"
-msgstr "Maj"
-
-#: lib/RT/Date.pm:441
-msgid "May."
-msgstr "Maj"
-
-#: lib/RT/Transaction_Overlay.pm:720
-#. ($value)
-msgid "Member %1 added"
-msgstr "Członek %1 dodany"
-
-#: lib/RT/Transaction_Overlay.pm:760
-#. ($value)
-msgid "Member %1 deleted"
-msgstr "Członek %1 usunięty"
-
-#: lib/RT/Group_Overlay.pm:1008
-msgid "Member added"
-msgstr "Członek grupy został dodany"
-
-#: lib/RT/Group_Overlay.pm:1170
-msgid "Member deleted"
-msgstr "Członek grupy został usunięty"
-
-#: lib/RT/Group_Overlay.pm:1174
-msgid "Member not deleted"
-msgstr "Członek grupy nie został usunięty"
-
-#: html/Elements/SelectLinkType:47
-msgid "Member of"
-msgstr "Członek grupy"
-
-#: NOT FOUND IN SOURCE
-msgid "MemberOf"
-msgstr "CzłonekGrupy"
-
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
-msgid "Members"
-msgstr "Członkowie grup"
-
-#: lib/RT/Transaction_Overlay.pm:717
-#. ($value)
-msgid "Membership in %1 added"
-msgstr "Członkowstwo w %1 dodane"
-
-#: lib/RT/Transaction_Overlay.pm:757
-#. ($value)
-msgid "Membership in %1 deleted"
-msgstr "Członkowstwo w %1 usunięte"
-
-#: html/Admin/Elements/UserTabs:61
-msgid "Memberships"
-msgstr "Affiliations"
-
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
-msgid "Memberships of the user %1"
-msgstr "Affiliations de l'utilisateur %1"
-
-#: lib/RT/Ticket_Overlay.pm:2849
-msgid "Merge Successful"
-msgstr "Udało się połączyć"
-
-#: lib/RT/Ticket_Overlay.pm:2736
-msgid "Merge failed. Couldn't set EffectiveId"
-msgstr "Nie udało się połączyć. Nie udało się ustawić efektywnego Id"
-
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
-msgid "Merge into"
-msgstr "Połączyć w"
-
-#: lib/RT/Transaction_Overlay.pm:723
-#. ($value)
-msgid "Merged into %1"
-msgstr "Połączono z %1"
-
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
-msgid "Message"
-msgstr "Wiadomość"
-
-#: lib/RT/Ticket_Overlay.pm:2406
-msgid "Message could not be recorded"
-msgstr "Wiadomość nie mogła zostać zapisana"
-
-#: lib/RT/Ticket_Overlay.pm:2409
-msgid "Message recorded"
-msgstr "Wiadomość zapisana"
-
-#: html/Ticket/Elements/PreviewScrips:115
-msgid "Messages about this ticket will not be sent to..."
-msgstr "Powiadomienie o tym zgłoszeniu nie zostanie wysłane do..."
-
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
-msgstr ""
-
-#: lib/RT/Record.pm:940
-msgid "Missing a primary key?: %1"
-msgstr "Brakujący klucz główny?: %1:"
-
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
-msgid "Mobile"
-msgstr "Tel. komórkowy"
-
-#: NOT FOUND IN SOURCE
-msgid "MobilePhone"
-msgstr "Tel. komórkowy"
-
-#: NOT FOUND IN SOURCE
-msgid "Modified"
-msgstr "Zmieniony"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify"
-msgstr "Zmodyfikuj"
-
-#: lib/RT/Queue_Overlay.pm:95
-msgid "Modify Access Control List"
-msgstr "Modyfikuj Listę Praw Dostępu"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify Custom Field %1"
-msgstr "Modyfikuj pole %1"
-
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr ""
-
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
-msgid "Modify Custom Fields which apply to all %1"
-msgstr "Modifier les champs personnalisĂŠs qui s'appliquent Ă  tous les %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify Custom Fields which apply to all queues"
-msgstr "Modyfikuj pola, które dotyczą wszystkich kolejek"
-
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
-msgid "Modify Group Rights"
-msgstr "Zmodyfikuj uprawnienia grup"
-
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
-msgid "Modify Members"
-msgstr "Modyfikuj Członków"
-
-#: html/User/Delegation.html:58
-msgid "Modify Rights"
-msgstr "Zapisz uprawnienia"
-
-#: lib/RT/Queue_Overlay.pm:98
-msgid "Modify Scrip templates for this queue"
-msgstr "Modyfikuj szablony skryptów dla tej kolejki"
-
-#: lib/RT/Queue_Overlay.pm:101
-msgid "Modify Scrips for this queue"
-msgstr "Modyfikuj skrypty dla tej kolejki"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify System ACLS"
-msgstr "Modifier ACLs système"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify Template %1"
-msgstr "Modyfikuj szablon %1"
-
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
-msgid "Modify User Rights"
-msgstr "Zmodyfikuj uprawnienia użytkowników"
-
-#: html/Admin/Queues/CustomField.html:66
-#. ($QueueObj->Name())
-msgid "Modify a CustomField for queue %1"
-msgstr "Modyfikuj pole dla kolejki %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify a CustomField which applies to all queues"
-msgstr "Modyfikuj pole, które dotyczy wszystkich kolejek"
-
-#: html/Admin/Queues/Scrip.html:75
-#. ($QueueObj->Name)
-msgid "Modify a scrip for queue %1"
-msgstr "Modyfikuj skrypt dla kolejki %1"
-
-#: html/Admin/Global/Scrip.html:69
-msgid "Modify a scrip which applies to all queues"
-msgstr "Modyfikuj skrypt, który dotyczy wszystkich kolejek"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify article #%1"
-msgstr "Modyfikuj artykuł #%1"
-
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
-msgid "Modify associated objects for %1"
-msgstr "Modifier les objets associĂŠs Ă  %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify dates for # %1"
-msgstr "Modifier les dates pur n°%1"
-
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
-#. ($TicketObj->Id)
-msgid "Modify dates for #%1"
-msgstr "Modyfikuj daty dla #%1"
-
-#: html/Ticket/ModifyDates.html:56
-#. ($TicketObj->Id)
-msgid "Modify dates for ticket # %1"
-msgstr "Modyfikuj daty dla zgłoszenia # %1"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
-msgid "Modify global group rights"
-msgstr "Modyfikuj globalne uprawnienia grupowe"
-
-#: html/Admin/Global/GroupRights.html:54
-msgid "Modify global group rights."
-msgstr "Modyfikuj globalne uprawnienia grupowe"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify global rights for groups"
-msgstr "Modifier les droits globaux des groupes"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify global rights for users"
-msgstr "Modifier les droits globaux des utilisateurs"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify global scrips"
-msgstr "Modyfikuj globalne skrypty"
-
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
-msgid "Modify global user rights"
-msgstr "Modyfikuj globalne uprawnienia użytkowników"
-
-#: html/Admin/Global/UserRights.html:54
-msgid "Modify global user rights."
-msgstr "Modyfikuj globalne uprawnienia użytkowników."
-
-#: lib/RT/Group_Overlay.pm:171
-msgid "Modify group metadata or delete group"
-msgstr "Modyfikuj grupowe dane pośrednie lub usuń grupę"
-
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
-msgid "Modify group rights for custom field %1"
-msgstr "Modyfikuj uprawnienia grupowe dla pola %1"
-
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
-#. ($GroupObj->Name)
-msgid "Modify group rights for group %1"
-msgstr "Modyfikuj uprawnienia grupowe dla grupy %1"
-
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
-#. ($QueueObj->Name)
-msgid "Modify group rights for queue %1"
-msgstr "Modyfikuj uprawnienia grupowe dla kolejki %1"
-
-#: lib/RT/Group_Overlay.pm:173
-msgid "Modify membership roster for this group"
-msgstr "Modyfikuj listę członków tej grupy"
-
-#: lib/RT/System.pm:83
-msgid "Modify one's own RT account"
-msgstr "Modyfikuj konto w RT"
-
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
-#. ($QueueObj->Name)
-msgid "Modify people related to queue %1"
-msgstr "Modyfikuj użytkowników powiązanych z kolejką %1"
-
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
-#. ($Ticket->id)
-#. ($Ticket->Id)
-msgid "Modify people related to ticket #%1"
-msgstr "Modyfikuj użytkowników powiązanych ze zgłoszeniem %1"
-
-#: html/Admin/Queues/Scrips.html:67
-#. ($QueueObj->Name)
-msgid "Modify scrips for queue %1"
-msgstr "Modyfikuj skrypty dla kolejki %1"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
-msgid "Modify scrips which apply to all queues"
-msgstr "Modyfikuj skrypty, które dotyczą wszystkich kolejek"
-
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
-#. (loc($TemplateObj->Name()))
-#. ($TemplateObj->id)
-msgid "Modify template %1"
-msgstr "Edytuj szablon %1"
-
-#: html/Admin/Global/Templates.html:65
-msgid "Modify templates which apply to all queues"
-msgstr "Modyfikuj szablony, które dotyczą wszystkich kolejek"
-
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
-#. ($Group->Name)
-msgid "Modify the group %1"
-msgstr "Modyfikuj grupÄ™ %1"
-
-#: lib/RT/Queue_Overlay.pm:96
-msgid "Modify the queue watchers"
-msgstr "Modyfikuj obserwatorów kolejki"
-
-#: html/Admin/Users/Modify.html:301
-#. ($UserObj->Name)
-msgid "Modify the user %1"
-msgstr "Modyfikuj użytkownika %1"
-
-#: html/Ticket/ModifyAll.html:58
-#. ($Ticket->Id)
-msgid "Modify ticket # %1"
-msgstr "Modyfikuj zgłoszenie %1"
-
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
-#. ($TicketObj->Id)
-msgid "Modify ticket #%1"
-msgstr "Modyfikuj zgłoszenie %1"
-
-#: lib/RT/Queue_Overlay.pm:114
-msgid "Modify tickets"
-msgstr "Modyfikuj zgłoszenia"
-
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
-msgid "Modify user rights for custom field %1"
-msgstr "Modifier les droits utilisateurs pour le champ personnalisĂŠ %1"
-
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
-#. ($GroupObj->Name)
-msgid "Modify user rights for group %1"
-msgstr "Modyfikuj uprawnienia użytkowników dla grupy %1"
-
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
-#. ($QueueObj->Name)
-msgid "Modify user rights for queue %1"
-msgstr "Modyfikuj uprawnienia użytkowników dla kolejki %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Modify watchers for queue '%1'"
-msgstr "Modyfikuj obserwatorów kolejki %1"
-
-#: lib/RT/Queue_Overlay.pm:95
-msgid "ModifyACL"
-msgstr "ModifyACL"
-
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:174
-msgid "ModifyOwnMembership"
-msgstr "ModifyOwnMembership"
-
-#: lib/RT/Queue_Overlay.pm:96
-msgid "ModifyQueueWatchers"
-msgstr "ModifyQueueWatchers"
-
-#: lib/RT/Queue_Overlay.pm:101
-msgid "ModifyScrips"
-msgstr "ModifyScrips"
-
-#: lib/RT/System.pm:83
-msgid "ModifySelf"
-msgstr "ModifySelf"
-
-#: lib/RT/Queue_Overlay.pm:98
-msgid "ModifyTemplate"
-msgstr "ModifyTemplate"
-
-#: lib/RT/Queue_Overlay.pm:114
-msgid "ModifyTicket"
-msgstr "ModifyTicket"
-
-#: lib/RT/Date.pm:413
-msgid "Mon."
-msgstr "Pon."
-
-#: html/Ticket/Elements/ShowRequestor:62
-#. ($name)
-msgid "More about %1"
-msgstr "Więcej o %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Move"
-msgstr "DÄ‚Å placer"
-
-#: html/Admin/Elements/PickCustomFields:83
-msgid "Move down"
-msgstr "Przesuń w dół"
-
-#: html/Admin/Elements/PickCustomFields:75
-msgid "Move up"
-msgstr "Przesuń w górę"
-
-#: html/Admin/Elements/SelectSingleOrMultiple:48
-msgid "Multiple"
-msgstr "Wielokrotny"
-
-#: lib/RT/User_Overlay.pm:227
-msgid "Must specify 'Name' attribute"
-msgstr "Należy określić atrybut 'Nazwa'"
-
-#: html/SelfService/Elements/MyRequests:70
-#. ($friendly_status)
-msgid "My %1 tickets"
-msgstr "%1 moich zgłoszeń"
-
-#: NOT FOUND IN SOURCE
-msgid "My Approvals"
-msgstr "Moje potwierdzenia"
-
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
-msgid "My approvals"
-msgstr "Moje potwierdzenia"
-
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
-msgid "My saved searches"
-msgstr "Moje zapytania"
-
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
-msgid "Name"
-msgstr "Nazwa"
-
-#: lib/RT/User_Overlay.pm:234
-msgid "Name in use"
-msgstr "Używana nazwa"
-
-#: NOT FOUND IN SOURCE
-msgid "Name matches"
-msgstr "Nazwa zgadza siÄ™ z"
-
-#: NOT FOUND IN SOURCE
-msgid "Need approval from system administrator"
-msgstr "Wymagane potwierdzenie od administratora systemu"
-
-#: html/Ticket/Elements/ShowDates:73
-msgid "Never"
-msgstr "Nigdy"
-
-#: html/Elements/Quicksearch:51
-msgid "New"
-msgstr "Nowe"
-
-#: NOT FOUND IN SOURCE
-msgid "New Article"
-msgstr "Nowy artykuł"
-
-#: html/Elements/EditLinks:115
-msgid "New Links"
-msgstr "Nowe powiÄ…zania"
-
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
-msgid "New Password"
-msgstr "Nowe hasło"
-
-#: etc/initialdata:332
-msgid "New Pending Approval"
-msgstr "Nowe zgłoszenie oczekujące na zatwierdzenie"
-
-#: html/Ticket/Elements/Tabs:193
-msgid "New Query"
-msgstr "Nowe zapytanie"
-
-#: NOT FOUND IN SOURCE
-msgid "New Relationships"
-msgstr "Nowe powiÄ…zania"
-
-#: NOT FOUND IN SOURCE
-msgid "New Search"
-msgstr "Nowe wyszukiwanie"
-
-#: NOT FOUND IN SOURCE
-msgid "New class"
-msgstr "Nowa klasa"
-
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
-msgid "New custom field"
-msgstr "Nowe pole def. przez użytkownika"
-
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
-msgid "New group"
-msgstr "Nowa grupa"
-
-#: html/SelfService/Prefs.html:53
-msgid "New password"
-msgstr "Nowe hasło"
-
-#: lib/RT/User_Overlay.pm:817
-msgid "New password notification sent"
-msgstr "Nowe hasło zostało wysłane"
-
-#: html/Admin/Elements/QueueTabs:95
-msgid "New queue"
-msgstr "Nowa kolejka"
-
-#: NOT FOUND IN SOURCE
-msgid "New request"
-msgstr "Nouvelle demande"
-
-#: html/Admin/Elements/SelectRights:65
-msgid "New rights"
-msgstr "Nowe uprawnienia"
-
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
-msgid "New scrip"
-msgstr "Nowy skrypt"
-
-#: NOT FOUND IN SOURCE
-msgid "New search"
-msgstr "Nowe wyszukiwanie"
-
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
-msgid "New template"
-msgstr "Nowy szablon"
-
-#: html/SelfService/Elements/Tabs:69
-msgid "New ticket"
-msgstr "Nowe zgłoszenie"
-
-#: lib/RT/Ticket_Overlay.pm:2713
-msgid "New ticket doesn't exist"
-msgstr "Nowe zgłoszenie nie istnieje"
-
-#: html/Admin/Elements/UserTabs:78
-msgid "New user"
-msgstr "Nowy użytkownik"
-
-#: html/Admin/Elements/CreateUserCalled:47
-msgid "New user called"
-msgstr "Nowy użytkownik został nazwany"
-
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
-msgid "New watchers"
-msgstr "Nowi obserwatorzy"
-
-#: NOT FOUND IN SOURCE
-msgid "New window setting"
-msgstr "Nowe ustawienia okna"
-
-#: html/Ticket/Elements/Tabs:92
-msgid "Next"
-msgstr "Następne"
-
-#: html/Elements/TicketList:104
-msgid "Next Page"
-msgstr "Następna strona"
-
-#: NOT FOUND IN SOURCE
-msgid "Next page"
-msgstr "Następna strona"
-
-#: NOT FOUND IN SOURCE
-msgid "NickName"
-msgstr "Pseudonim"
-
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
-msgid "Nickname"
-msgstr "Pseudonim"
-
-#: NOT FOUND IN SOURCE
-msgid "No"
-msgstr "Nie"
-
-#: html/Admin/CustomFields/UserRights.html:145
-msgid "No Class defined"
-msgstr "Nie zdefiniowano klasy"
-
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
-msgid "No CustomField"
-msgstr "Brak pola definiowanego przez użytkownika"
-
-#: html/Admin/CustomFields/GroupRights.html:103
-msgid "No CustomField defined"
-msgstr "Nie zdefiniowano pola def. przez użytkownika"
-
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
-msgid "No Group defined"
-msgstr "Nie zdefiniowano grupy"
-
-#: lib/RT/Tickets_Overlay_SQL.pm:477
-msgid "No Query"
-msgstr "Brak zapytania"
-
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
-msgid "No Queue defined"
-msgstr "Nie zdefiniowano kolejki"
-
-#: bin/rt-crontool:73
-msgid "No RT user found. Please consult your RT administrator.\\n"
-msgstr "Nie odnaleziono użytkownika RT. Proszę skontaktować się z administratorem RT.\\n"
-
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
-msgid "No Template"
-msgstr "Brak szablonu"
-
-#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
-msgstr "Nie określono zgłoszenia. Odrzucenie zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
-msgstr "Nie określono zgłoszenia. Odrzucenie modyfikacji zgłoszenia\\n\\n"
-
-#: html/Approvals/Elements/Approve:67
-msgid "No action"
-msgstr "Zawieszenie operacji"
-
-#: lib/RT/Record.pm:935
-msgid "No column specified"
-msgstr "Nie określono kolumny"
-
-#: NOT FOUND IN SOURCE
-msgid "No command found\\n"
-msgstr "Nie udało się wyszukać polecenia\\n"
-
-#: html/Ticket/Elements/ShowRequestor:68
-msgid "No comment entered about this user"
-msgstr "Nie wprowadzono komentarza dotyczącego tego użytkownika"
-
-#: NOT FOUND IN SOURCE
-msgid "No correspondence attached"
-msgstr "Nie załączono korespondencji"
-
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
-#. (ref $self)
-msgid "No description for %1"
-msgstr "Brak opisu dla %1"
-
-#: lib/RT/Users_Overlay.pm:185
-msgid "No group specified"
-msgstr "Nie określono grupy"
-
-#: html/Admin/Groups/index.html:52
-msgid "No groups matching search criteria found."
-msgstr "Aucun groupe trouvÊ d'après le critère de recherche."
-
-#: lib/RT/Ticket_Overlay.pm:2349
-msgid "No message attached"
-msgstr "Brak załączonej wiadomości"
-
-#: lib/RT/User_Overlay.pm:1035
-msgid "No password set"
-msgstr "Nie ustawiono hasła"
-
-#: lib/RT/Queue_Overlay.pm:358
-msgid "No permission to create queues"
-msgstr "Brak uprawnień do tworzenia kolejek"
-
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
-msgid "No permission to create tickets in the queue '%1'"
-msgstr "Brak uprawnień do tworzenia zgłoszeń w kolejce '%1'"
-
-#: lib/RT/User_Overlay.pm:187
-msgid "No permission to create users"
-msgstr "Brak uprawnień do tworzenia użytkowników"
-
-#: html/SelfService/Display.html:165
-msgid "No permission to display that ticket"
-msgstr "Brak uprawnień do wyświetlenia tego zgłoszenia"
-
-#: html/SelfService/Update.html:117
-msgid "No permission to view update ticket"
-msgstr "Brak uprawnień do przeglądania aktualizacji zgłoszenia"
-
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
-msgid "No principal specified"
-msgstr "Nie określono zarządzającego"
-
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
-msgid "No principals selected."
-msgstr "Nie wybrano zarzÄ…dzajÄ…cych."
-
-#: html/Admin/Queues/index.html:57
-msgid "No queues matching search criteria found."
-msgstr "Brak kolejek odpowiadajÄ…cych kryteriom wyszukiwania"
-
-#: html/Admin/Elements/SelectRights:106
-msgid "No rights found"
-msgstr "Nie udało się wyszukać uprawnień"
-
-#: html/Admin/Elements/SelectRights:53
-msgid "No rights granted."
-msgstr "Nie przyznano uprawnień."
-
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
-msgid "No search to operate on."
-msgstr "Brak kryteriów wyszukiwania"
-
-#: html/Elements/RT__Ticket/ColumnMap:134
-msgid "No subject"
-msgstr "Brak tematu"
-
-#: NOT FOUND IN SOURCE
-msgid "No ticket id specified"
-msgstr "Nie określono numeru zgłoszenia"
-
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
-msgid "No transaction type specified"
-msgstr "Nie określono typu transakcji"
-
-#: NOT FOUND IN SOURCE
-msgid "No user or email address specified"
-msgstr "Aucun utilisateur ou adresse email spĂŠcifiĂŠ"
-
-#: html/Admin/Users/index.html:55
-msgid "No users matching search criteria found."
-msgstr "Brak użytkowników odpowiadających kryteriom wyszukiwania"
-
-#: NOT FOUND IN SOURCE
-msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
-msgstr "Brak aktualnego użytkownika RT. Proszę skontaktować się z administratorem RT.\\n"
-
-#: lib/RT/Record.pm:932
-msgid "No value sent to _Set!\\n"
-msgstr "Nie wysłano wartości do zestawu!\\n"
-
-#: html/Elements/QuickCreate:61
-msgid "Nobody"
-msgstr "Nikt"
-
-#: lib/RT/Record.pm:937
-msgid "Nonexistant field?"
-msgstr "NieistniejÄ…ce pole?"
-
-#: NOT FOUND IN SOURCE
-msgid "Not logged in"
-msgstr "Nie udało się zalogować"
-
-#: html/Elements/Header:96
-msgid "Not logged in."
-msgstr "Nie udało się zalogować."
-
-#: lib/RT/Date.pm:393
-msgid "Not set"
-msgstr "Nie ustawiona"
-
-#: html/NoAuth/Reminder.html:48
-msgid "Not yet implemented."
-msgstr "Jeszcze nie zaimplementowane."
-
-#: NOT FOUND IN SOURCE
-msgid "Not yet implemented...."
-msgstr "Jeszcze nie zaimplementowane..."
-
-#: html/Approvals/Elements/Approve:70
-msgid "Notes"
-msgstr "Uwagi"
-
-#: lib/RT/User_Overlay.pm:820
-msgid "Notification could not be sent"
-msgstr "Powiadomienie nie może zostać wysłane"
-
-#: etc/initialdata:101
-msgid "Notify AdminCcs"
-msgstr "Wyślij powiadomienie do osób o uprawnieniach AdminCc"
-
-#: etc/initialdata:97
-msgid "Notify AdminCcs as Comment"
-msgstr "Wyślij powiadomienie do osób o uprawnieniach AdminCc jako komentarz"
-
-#: etc/initialdata:93 etc/upgrade/3.1.17/content:6
-msgid "Notify Ccs"
-msgstr "Wyślij powiadomienia do osób o uprawnieniach Cc"
-
-#: etc/initialdata:89 etc/upgrade/3.1.17/content:2
-msgid "Notify Ccs as Comment"
-msgstr "Wyślij powiadomienia do osób o uprawnieniach Cc jako komentarz"
-
-#: etc/initialdata:128
-msgid "Notify Other Recipients"
-msgstr "Wyślij powiadomienie do innych odbiorców"
-
-#: etc/initialdata:124
-msgid "Notify Other Recipients as Comment"
-msgstr "Wyślij powiadomienie do innych odbiorców jako komentarz"
-
-#: etc/initialdata:85
-msgid "Notify Owner"
-msgstr "Wyślij powiadomienie do właściciela"
-
-#: etc/initialdata:81
-msgid "Notify Owner as Comment"
-msgstr "Wyślij powiadomienie do właściciela jako komentarz"
-
-#: etc/initialdata:376
-msgid "Notify Owner of their rejected ticket"
-msgstr "Powiadom Właściciela o odrzuceniu jego zgłoszenia"
-
-#: etc/initialdata:365
-msgid "Notify Owner of their ticket has been approved by all approvers"
-msgstr "Powiadom Zgłaszającego o zatwierdzeniu jego zgłoszenia przez wszystkich zatwierdzających"
-
-#: etc/initialdata:353
-msgid "Notify Owner of their ticket has been approved by some approver"
-msgstr "Powiadom Zgłaszającego o zatwierdzeniu jego zgłoszenia przez niektórych zatwierdzających"
-
-#: etc/initialdata:334
-msgid "Notify Owners and AdminCcs of new items pending their approval"
-msgstr "Wyślij powiadomienie do właścicieli i osób o uprawnieniach AdminCc o nowych pozycjach oczekujących na zatwierdzenie przez nich"
-
-#: etc/initialdata:77
-msgid "Notify Requestors"
-msgstr "Wyślij powiadomienie do zgłaszających"
-
-#: etc/initialdata:111
-msgid "Notify Requestors and Ccs"
-msgstr "Wyślij powiadomienie do zgłaszających i osób o uprawnieniach Cc"
-
-#: etc/initialdata:106
-msgid "Notify Requestors and Ccs as Comment"
-msgstr "Wyślij powiadomienie do zgłaszających i osób o uprawnieniach Cc jako komentarz"
-
-#: etc/initialdata:120
-msgid "Notify Requestors, Ccs and AdminCcs"
-msgstr "Wyślij powiadomienie do zgłaszających oraz osób o uprawnieniach Cc i AdminCc"
-
-#: etc/initialdata:116
-msgid "Notify Requestors, Ccs and AdminCcs as Comment"
-msgstr "Wyślij powiadomienie do zgłaszających oraz osób o uprawnieniach Cc i  AdminCC jako komentarz"
-
-#: lib/RT/Date.pm:447
-msgid "Nov."
-msgstr "Lis."
-
-#: NOT FOUND IN SOURCE
-msgid "November"
-msgstr "Listopad"
-
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr ""
-
-#: lib/RT/Record.pm:319
-msgid "Object could not be created"
-msgstr "Nie udało się utworzyć obiektu"
-
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
-msgid "Object created"
-msgstr "Obiekt został utworzony"
-
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
-msgid "Object of type %1 cannot take custom fields"
-msgstr "Les objets de type %1 ne peuvent avoir de champs personnalisĂŠs"
-
-#: lib/RT/CustomField_Overlay.pm:901
-msgid "Object type mismatch"
-msgstr "Le type d'objet ne correspond pas"
-
-#: lib/RT/Date.pm:446
-msgid "Oct."
-msgstr "Paź."
-
-#: NOT FOUND IN SOURCE
-msgid "October"
-msgstr "Październik"
-
-#: html/Tools/Elements/Tabs:53
-msgid "Offline"
-msgstr "Praca zdalna"
-
-#: html/Tools/Offline.html:49
-msgid "Offline edits"
-msgstr "Zdalne modyfikacje"
-
-#: html/Tools/Offline.html:46
-msgid "Offline upload"
-msgstr "Załaduj modyfikowane zdalnie"
-
-#: html/Elements/SelectDateRelation:56
-msgid "On"
-msgstr "dnia"
-
-#: etc/initialdata:163
-msgid "On Comment"
-msgstr "w przypadku komentarza"
-
-#: etc/initialdata:156
-msgid "On Correspond"
-msgstr "w przypadku korespondencji"
-
-#: etc/initialdata:145
-msgid "On Create"
-msgstr "w przypadku rejestracji zgłoszeń"
-
-#: etc/initialdata:184
-msgid "On Owner Change"
-msgstr "w przypadku zmiany właściciela"
-
-#: etc/initialdata:177 etc/upgrade/3.1.17/content:15
-msgid "On Priority Change"
-msgstr "w przypadku zmiany priorytetu"
-
-#: etc/initialdata:192
-msgid "On Queue Change"
-msgstr "w przypadku zmiany kolejki"
-
-#: etc/initialdata:198
-msgid "On Resolve"
-msgstr "w przypadku zamykania zgłoszeń"
-
-#: etc/initialdata:169
-msgid "On Status Change"
-msgstr "w przypadku zmiany statusu"
-
-#: etc/initialdata:150
-msgid "On Transaction"
-msgstr "w przypadku transakcji"
-
-#: html/Approvals/Elements/PendingMyApproval:71
-#. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
-msgid "Only show approvals for requests created after %1"
-msgstr "Wyświetl tylko potwierdzenia dotyczące zgłoszeń zarejestrowanych po %1"
-
-#: html/Approvals/Elements/PendingMyApproval:69
-#. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
-msgid "Only show approvals for requests created before %1"
-msgstr "Wyświetl tylko potwierdzenia dotyczące zgłoszeń zarejestrowanych przed %1"
-
-#: html/Elements/Quicksearch:52
-msgid "Open"
-msgstr "Otwarte"
-
-#: NOT FOUND IN SOURCE
-msgid "Open Tickets"
-msgstr "Otwórz zgłoszenia"
-
-#: html/Ticket/Elements/Tabs:159
-msgid "Open it"
-msgstr "Otwórz"
-
-#: NOT FOUND IN SOURCE
-msgid "Open requests"
-msgstr "Ouvrir les demandes"
-
-#: html/SelfService/Elements/Tabs:63
-msgid "Open tickets"
-msgstr "Otwórz zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Open tickets (from listing) in a new window"
-msgstr "Otwórz zgłoszenia (z listy) w nowym oknie"
-
-#: NOT FOUND IN SOURCE
-msgid "Open tickets (from listing) in another window"
-msgstr "Otwórz zgłoszenia (z listy) w innym oknie"
-
-#: etc/initialdata:140
-msgid "Open tickets on correspondence"
-msgstr "Otwórz zgłoszenia, które są w trakcie ustalania (wymiany korespondencji)"
-
-#: html/Search/Elements/DisplayOptions:56
-msgid "Order by"
-msgstr "UporzÄ…dkuj wg"
-
-#: NOT FOUND IN SOURCE
-msgid "Ordering and sorting"
-msgstr "PorzÄ…dkowanie i sortowanie"
-
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
-msgid "Organization"
-msgstr "Firma"
-
-#: html/Approvals/Elements/Approve:54
-#. ($approving->Id, $approving->Subject)
-msgid "Originating ticket: #%1"
-msgstr "Zgłoszenie źródłowe: #%1"
-
-#: lib/RT/Transaction_Overlay.pm:611
-msgid "Outgoing email about a comment recorded"
-msgstr "Mail sortant suite Ă  l'enregistrement d'un commentaire"
-msgstr "Zarejestrowano wychodzącą wiadomość o komentarzu"
-
-#: lib/RT/Transaction_Overlay.pm:615
-msgid "Outgoing email recorded"
-msgstr "Zarejestrowano wiadomość wychodzącą"
-
-#: html/Admin/Queues/Modify.html:90
-msgid "Over time, priority moves toward"
-msgstr "Z upływem czasu priorytet wzrasta do"
-
-#: NOT FOUND IN SOURCE
-msgid "Overview"
-msgstr "PrzeglÄ…d"
-
-#: lib/RT/Queue_Overlay.pm:113
-msgid "Own tickets"
-msgstr "Moje zgłoszenia"
-
-#: lib/RT/Queue_Overlay.pm:113
-msgid "OwnTicket"
-msgstr "OwnTicket"
-
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
-msgid "Owner"
-msgstr "Właściciel"
-
-#: NOT FOUND IN SOURCE
-msgid "Owner changed from %1 to %2"
-msgstr "Właściciel zmienił się z %1 na %2"
-
-#: lib/RT/Ticket_Overlay.pm:495
-msgid "Owner could not be set."
-msgstr "Właściciel nie mógł być ustanowiony."
-
-#: lib/RT/Transaction_Overlay.pm:661
-#. ($Old->Name , $New->Name)
-msgid "Owner forcibly changed from %1 to %2"
-msgstr "Wymuszono zmianę właściciela z %1 na %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Owner is"
-msgstr "Właścicielem"
-
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
-msgid "Page %1 of %2"
-msgstr "Strona %1 z %2"
-
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
-msgid "Pager"
-msgstr "Pager"
-
-#: NOT FOUND IN SOURCE
-msgid "PagerPhone"
-msgstr "Nr pager'a"
-
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
-msgid "Parents"
-msgstr "Zgłoszenia nadrzędne"
-
-#: html/Elements/Login:74 html/User/Prefs.html:105
-msgid "Password"
-msgstr "Hasło"
-
-#: html/NoAuth/Reminder.html:46
-msgid "Password Reminder"
-msgstr "Przypomnienie o haśle"
-
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Password too short"
-msgstr "Hasło jest zbyt krótkie"
-
-#: html/User/Prefs.html:232
-#. (loc_fuzzy($msg))
-msgid "Password: %1"
-msgstr "Hasło: %1"
-
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
-msgid "Passwords do not match."
-msgstr "Hasła są różne."
-
-#: html/User/Prefs.html:234
-msgid "Passwords do not match. Your password has not been changed"
-msgstr "Hasła są różne. Twoje hasło nie zostało zmienione."
-
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
-msgid "People"
-msgstr "Osoby"
-
-#: etc/initialdata:133
-msgid "Perform a user-defined action"
-msgstr "Wykonaj operację zdefiniowaną przez użytkownika"
-
-#: html/Admin/Tools/Configuration.html:94
-msgid "Perl configuration"
-msgstr "Konfiguracja PERL"
-
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
-msgid "Permission Denied"
-msgstr "Odmowa dostępu"
-
-#: html/User/Elements/Tabs:56
-msgid "Personal Groups"
-msgstr "Grupy prywatne"
-
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
-msgid "Personal groups"
-msgstr "Grupy prywatne"
-
-#: html/User/Elements/DelegateRights:58
-msgid "Personal groups:"
-msgstr "Grupy prywatne:"
-
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
-msgid "Phone numbers"
-msgstr "Numery tel."
-
-#: NOT FOUND IN SOURCE
-msgid "Placeholder"
-msgstr "Placeholder"
-
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
-msgid "Preferences"
-msgstr "Właściwości"
-
-#: NOT FOUND IN SOURCE
-msgid "Prefs"
-msgstr "Właściwości"
-
-#: lib/RT/Action/Generic.pm:196
-msgid "Prepare Stubbed"
-msgstr "Informacja o przygotowaniu została wysłana do zgłaszającego"
-
-#: html/Ticket/Elements/Tabs:84
-msgid "Prev"
-msgstr "Poprzednie"
-
-#: html/Elements/TicketList:101
-msgid "Previous Page"
-msgstr "Poprzednia strona"
-
-#: NOT FOUND IN SOURCE
-msgid "Previous page"
-msgstr "Poprzednia strona"
-
-#: NOT FOUND IN SOURCE
-msgid "Pri"
-msgstr "Poprzedni"
-
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
-#. ($args{'PrincipalId'})
-msgid "Principal %1 not found."
-msgstr "Nie udało się wyszukać zarządzającego %1."
-
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
-msgid "Priority"
-msgstr "Priorytet"
-
-#: html/Admin/Queues/Modify.html:86
-msgid "Priority starts at"
-msgstr "Priorytet rozpoczyna siÄ™ od"
-
-#: html/Search/Elements/EditSearches:50
-msgid "Privacy:"
-msgstr "Prywatne:"
-
-#: etc/initialdata:25
-msgid "Privileged"
-msgstr "Uprawnieni"
-
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
-#. (loc_fuzzy($msg))
-msgid "Privileged status: %1"
-msgstr "Uprawniony status: %1"
-
-#: html/Admin/Users/index.html:102
-msgid "Privileged users"
-msgstr "Uprawnieni użytkownicy"
-
-#: NOT FOUND IN SOURCE
-msgid "Projects"
-msgstr "Projets"
-
-#: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
-msgid "Pseudogroup for internal use"
-msgstr "Grupa do użytku wewnętrznego"
-
-#: html/Search/Elements/EditQuery:47
-msgid "Query"
-msgstr "Zapytanie"
-
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
-msgid "Query Builder"
-msgstr "Kreator zapytań"
-
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
-msgid "Queue"
-msgstr "Kolejka "
-
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
-#. ($Queue)
-#. ($id)
-msgid "Queue %1 not found"
-msgstr "Nie udało się wyszukać kolejki %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Queue '%1' not found\\n"
-msgstr "Nie udało się wyszukać kolejki '%1 '\\n"
-
-#: NOT FOUND IN SOURCE
-msgid "Queue Keyword Selections"
-msgstr "SĂŠlection des mots clĂŠ de queue"
-
-#: html/Admin/Queues/Modify.html:64
-msgid "Queue Name"
-msgstr "Nazwa kolejki"
-
-#: NOT FOUND IN SOURCE
-msgid "Queue Scrips"
-msgstr "Skrypty kolejki"
-
-#: lib/RT/Queue_Overlay.pm:362
-msgid "Queue already exists"
-msgstr "Kolejka już istnieje"
-
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
-msgid "Queue could not be created"
-msgstr "Nie udało się utworzyć kolejki"
-
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
-msgid "Queue could not be loaded."
-msgstr "Nie udało się załadować kolejki"
-
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
-msgid "Queue created"
-msgstr "Kolejka została utworzona"
-
-#: NOT FOUND IN SOURCE
-msgid "Queue is not specified."
-msgstr "Kolejka nie została określona."
-
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
-msgid "Queue not found"
-msgstr "Nie udało się wyszukać kolejki"
-
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
-msgid "Queues"
-msgstr "Kolejki"
-
-#: html/Elements/Quicksearch:46
-msgid "Quick search"
-msgstr "Szybkie wyszukiwanie"
-
-#: html/Elements/QuickCreate:46
-msgid "Quick ticket creation"
-msgstr "Szybkie tworzenie zgłoszeń"
-
-#: html/Search/Results.html:83
-msgid "RSS"
-msgstr "RSS (XML)"
-
-#: html/Elements/Login:66
-#. ($RT::VERSION)
-msgid "RT %1"
-msgstr "RT %1"
-
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
-#. ($RT::VERSION, $RT::rtname)
-msgid "RT %1 for %2"
-msgstr "RT %1 dla %2"
-
-#: NOT FOUND IN SOURCE
-msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
-msgstr "RT %1 wyprodukowany przez <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
-
-#: NOT FOUND IN SOURCE
-msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
-msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
-
-#: NOT FOUND IN SOURCE
-msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
-msgstr "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
-
-#: html/Admin/index.html:46 html/Admin/index.html:47
-msgid "RT Administration"
-msgstr "Administracja RT"
-
-#: NOT FOUND IN SOURCE
-msgid "RT Authentication error."
-msgstr "BÅ‚Ä…d autoryzacji w RT"
-
-#: NOT FOUND IN SOURCE
-msgid "RT Bounce: %1"
-msgstr "Odbicie zgłoszenia przez RT: %1"
-
-#: NOT FOUND IN SOURCE
-msgid "RT Configuration error"
-msgstr "BÅ‚Ä…d konfiguracji RT"
-
-#: NOT FOUND IN SOURCE
-msgid "RT Critical error. Message not recorded!"
-msgstr "Błąd krytyczny RT. Nie udało się zapisać wiadomości!"
-
-#: html/Elements/Error:65 html/SelfService/Error.html:62
-msgid "RT Error"
-msgstr "BÅ‚Ä…d RT"
-
-#: NOT FOUND IN SOURCE
-msgid "RT Received mail (%1) from itself."
-msgstr "RT otrzymał e-mail (%1) z RT"
-
-#: NOT FOUND IN SOURCE
-msgid "RT Recieved mail (%1) from itself."
-msgstr "RT a reçu du courrier (%1) de lui même"
-
-#: NOT FOUND IN SOURCE
-msgid "RT Self Service"
-msgstr "Samoobsługa RT"
-
-#: NOT FOUND IN SOURCE
-msgid "RT Self Service / Closed Tickets"
-msgstr "RT Self Service / Tickets rĂŠsolus"
-
-#: html/Admin/Tools/Configuration.html:73
-msgid "RT Variables"
-msgstr "Zmienne RT"
-
-#: html/index.html:72 html/index.html:75
-msgid "RT at a glance"
-msgstr "RT - przeglÄ…d podstawowych informacji"
-
-#: NOT FOUND IN SOURCE
-msgid "RT couldn't authenticate you"
-msgstr "Nieudana autoryzacja w RT"
-
-#: NOT FOUND IN SOURCE
-msgid "RT couldn't find requestor via its external database lookup"
-msgstr "Nie udało się wyszukać zgłaszającego przez przejrzenie zewnętrznej bazy"
-
-#: NOT FOUND IN SOURCE
-msgid "RT couldn't find the queue: %1"
-msgstr "Nie udało się wyszukać kolejki: %1"
-
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "RT couldn't validate this PGP signature. \\n"
-msgstr "Nie udało się zatwierdzić tego podpisu PGP.\\n"
-
-#: html/Elements/PageLayout:108
-#. ($RT::rtname)
-msgid "RT for %1"
-msgstr "RT dla %1"
-
-#: NOT FOUND IN SOURCE
-msgid "RT for %1: %2"
-msgstr "RT dla %1: %2"
-
-#: NOT FOUND IN SOURCE
-msgid "RT has proccessed your commands"
-msgstr "RT wykonał twoje polecenia"
-
-#: NOT FOUND IN SOURCE
-msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
-msgstr "RT &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Jest dystrybuowane jako <a href=\"http://www.gnu.org/copyleft/gpl.html\">Wersja 2 GNU General Public License.</a>"
-
-#: NOT FOUND IN SOURCE
-msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
-msgstr "RT est &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;. DistribuĂŠ sous <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 de la licence gĂŠnĂŠrale GNU.</a>"
-
-#: NOT FOUND IN SOURCE
-msgid "RT thinks this message may be a bounce"
-msgstr "Wg RT ta wiadomość może być informacją odbitą"
-
-#: NOT FOUND IN SOURCE
-msgid "RT will process this message as if it were unsigned.\\n"
-msgstr "RT będzie postępował z tą wiadomością tak, jakby była niepodpisana.\\n"
-
-#: NOT FOUND IN SOURCE
-msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
-msgstr "Email w RT wymaga autoryzacji podpisu PGP. Albo nie podpisałeś wiadomości, albo Twój podpis nie może być zweryfikowany."
-
-#: NOT FOUND IN SOURCE
-msgid "RTFM Error"
-msgstr "BÅ‚Ä…d RTFM"
-
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
-msgid "Real Name"
-msgstr "ImiÄ™ i nazwisko"
-
-#: NOT FOUND IN SOURCE
-msgid "RealName"
-msgstr "RealName"
-
-#: lib/RT/Transaction_Overlay.pm:714
-#. ($value)
-msgid "Reference by %1 added"
-msgstr "PowiÄ…zanie %1 dodane"
-
-#: lib/RT/Transaction_Overlay.pm:754
-#. ($value)
-msgid "Reference by %1 deleted"
-msgstr "Powiązanie %1 usunięte"
-
-#: lib/RT/Transaction_Overlay.pm:711
-#. ($value)
-msgid "Reference to %1 added"
-msgstr "PowiÄ…zanie z %1 dodane"
-
-#: lib/RT/Transaction_Overlay.pm:751
-#. ($value)
-msgid "Reference to %1 deleted"
-msgstr "Powiązanie z %1 usunięte"
-
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
-msgid "Referred to by"
-msgstr "Zgłoszenia powiązane"
-
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
-msgid "Refers to"
-msgstr "PowiÄ…zane z"
-
-#: NOT FOUND IN SOURCE
-msgid "RefersTo"
-msgstr "PowiÄ…zaneZ"
-
-#: NOT FOUND IN SOURCE
-msgid "Refine"
-msgstr "Popraw"
-
-#: NOT FOUND IN SOURCE
-msgid "Refine search"
-msgstr "Wprowadź szczegółowe kryteria wyszukiwania"
-
-#: html/Elements/Refresh:57
-#. ($value/60)
-msgid "Refresh this page every %1 minutes."
-msgstr "Odświeżaj tę stronę co %1 minut."
-
-#: NOT FOUND IN SOURCE
-msgid "Relationships"
-msgstr "PowiÄ…zania"
-
-#: html/Search/Bulk.html:116
-msgid "Remove AdminCc"
-msgstr "Usuń AdminCc"
-
-#: html/Search/Bulk.html:112
-msgid "Remove Cc"
-msgstr "Usuń Cc"
-
-#: html/Search/Bulk.html:108
-msgid "Remove Requestor"
-msgstr "Usuń zgłaszającego"
-
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
-msgid "Reply"
-msgstr "Odpowiedz"
-
-#: html/Admin/Queues/Modify.html:72
-msgid "Reply Address"
-msgstr "Adres odpowiedzi"
-
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
-msgid "Reply to requestors"
-msgstr "Odpowiedz zgłaszającym"
-
-#: lib/RT/Queue_Overlay.pm:111
-msgid "Reply to tickets"
-msgstr "Odpowiedz na zgłoszenia"
-
-#: lib/RT/Queue_Overlay.pm:111
-msgid "ReplyToTicket"
-msgstr "ReplyToTicket"
-
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
-msgid "Requestor"
-msgstr "Zgłaszający"
-
-#: NOT FOUND IN SOURCE
-msgid "Requestor email address"
-msgstr "Adres e-mail zgłaszającego"
-
-#: NOT FOUND IN SOURCE
-msgid "Requestor(s)"
-msgstr "Zgłaszający"
-
-#: NOT FOUND IN SOURCE
-msgid "RequestorAddresses"
-msgstr "AdresZgłaszającego"
-
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
-msgid "Requestors"
-msgstr "Zgłaszający"
-
-#: html/Admin/Queues/Modify.html:96
-msgid "Requests should be due in"
-msgstr "Zgłoszenia powinny być zrealizowane w ciągu"
-
-#: lib/RT/Attribute_Overlay.pm:146
-#. ('Object')
-msgid "Required parameter '%1' not specified"
-msgstr "Wymagany atrybut '%1' nie został określony"
-
-#: html/Elements/Submit:104
-msgid "Reset"
-msgstr "Zresetuj"
-
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
-msgid "Residence"
-msgstr "Tel. domowy"
-
-#: html/Ticket/Elements/Tabs:155
-msgid "Resolve"
-msgstr "Zamknij"
-
-#: html/Ticket/Update.html:154
-#. ($TicketObj->id, $TicketObj->Subject)
-msgid "Resolve ticket #%1 (%2)"
-msgstr "Zamknij zgłoszenie nr %1 (%2)"
-
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
-msgid "Resolved"
-msgstr "Zamknięte"
-
-#: NOT FOUND IN SOURCE
-msgid "Response to requestors"
-msgstr "Odpowiedź dla zgłaszających"
-
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
-msgid "Results"
-msgstr "Wyniki"
-
-#: NOT FOUND IN SOURCE
-msgid "Results per page"
-msgstr "Wyniki - liczba na stronÄ™"
-
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
-msgid "Retype Password"
-msgstr "Wpisz ponownie hasło"
-
-#: html/Search/Elements/EditSearches:61
-msgid "Revert"
-msgstr "Przywróć"
-
-#: NOT FOUND IN SOURCE
-msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
-msgstr "Uprawnienie %1 nie zostało wyszukane dla %2 %3 w zakresie %4 (%5)\\n"
-
-#: lib/RT/ACE_Overlay.pm:631
-msgid "Right Delegated"
-msgstr "Uprawnienie zostało przekazane"
-
-#: lib/RT/ACE_Overlay.pm:321
-msgid "Right Granted"
-msgstr "Uprawnienie zostało przyznane"
-
-#: lib/RT/ACE_Overlay.pm:179
-msgid "Right Loaded"
-msgstr "Uprawnienie zostało załadowane"
-
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
-msgid "Right could not be revoked"
-msgstr "Uprawnienie nie może być odebrane"
-
-#: html/User/Delegation.html:85
-msgid "Right not found"
-msgstr "Nie udało się wyszukać uprawnienia"
-
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
-msgid "Right not loaded."
-msgstr "Nie udało się załadować uprawnienia"
-
-#: lib/RT/ACE_Overlay.pm:713
-msgid "Right revoked"
-msgstr "Uprawnienie zostało odebrane"
-
-#: html/Admin/Elements/UserTabs:67
-msgid "Rights"
-msgstr "Uprawnienia"
-
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
-#. ($object_type)
-msgid "Rights could not be granted for %1"
-msgstr "Nie udało się przydzielić uprawnień dla %1"
-
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
-#. ($object_type)
-msgid "Rights could not be revoked for %1"
-msgstr "Nie udało się odebrać uprawnień dla %1"
-
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
-msgid "Roles"
-msgstr "Role"
-
-#: NOT FOUND IN SOURCE
-msgid "RootApproval"
-msgstr "RootApproval"
-
-#: html/Search/Elements/DisplayOptions:83
-msgid "Rows per page"
-msgstr "Linii na stronie"
-
-#: lib/RT/Date.pm:418
-msgid "Sat."
-msgstr "Sob."
-
-#: html/Search/Elements/EditSearches:70
-msgid "Save"
-msgstr "Zapisz"
-
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
-msgid "Save Changes"
-msgstr "Zapisz zmiany"
-
-#: html/User/Prefs.html:179
-msgid "Save Preferences"
-msgstr "Zapisz"
-
-#: html/Ticket/Elements/PreviewScrips:124
-msgid "Save changes"
-msgstr "Zapisz zmiany"
-
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
-msgid "Saved searches"
-msgstr "Zapisane zapytania"
-
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
-#. ($id)
-#. ($ARGS{'id'})
-msgid "Scrip #%1"
-msgstr "Skrypt #%1"
-
-#: lib/RT/Scrip_Overlay.pm:205
-msgid "Scrip Created"
-msgstr "Skrypt został utworzony"
-
-#: html/Admin/Elements/EditScrip:52
-msgid "Scrip Fields"
-msgstr "Atrybuty skryptu"
-
-#: html/Admin/Elements/EditScrips:107
-msgid "Scrip deleted"
-msgstr "Skrypt został usunięty"
-
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
-msgid "Scrips"
-msgstr "Skrypty"
-
-#: NOT FOUND IN SOURCE
-msgid "Scrips for %1\\n"
-msgstr "Skrypty dla %1\\n"
-
-#: html/Admin/Queues/Scrips.html:55
-msgid "Scrips which apply to all queues"
-msgstr "Skrypty, które dotyczą wszystkich kolejek"
-
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
-msgid "Search"
-msgstr "Wyszukaj"
-
-#: NOT FOUND IN SOURCE
-msgid "Search Criteria"
-msgstr "Kryteria wyszukiwania"
-
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
-
-# nie jestem pewien!
-#: html/Approvals/Elements/PendingMyApproval:60
-msgid "Search for approvals"
-msgstr "Wyszukaj oczekujÄ…ce potwierdzenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Search for articles"
-msgstr "Wyszukaj artykuły"
-
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Searches can't be associated with that kind of object"
-msgstr "Les recherches ne peuvent ĂŞtre associĂŠes Ă  ce type d'objet"
-
-#: bin/rt-crontool:213
-msgid "Security:"
-msgstr "Zabezpieczenie:"
-
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "See custom fields"
-msgstr "Voir les champs personnalisĂŠs"
-
-#: lib/RT/Queue_Overlay.pm:107
-msgid "See exact outgoing email messages and their recipeients"
-msgstr "Zobacz dosłowne wiadomości wychodzące i ich odbiorców"
-
-#: lib/RT/Queue_Overlay.pm:105
-msgid "See ticket private commentary"
-msgstr "Zobacz prywatne komentarze do zgłoszenia"
-
-#: lib/RT/Queue_Overlay.pm:104
-msgid "See ticket summaries"
-msgstr "Zobacz podsumowania zgłoszeń"
-
-#: lib/RT/CustomField_Overlay.pm:100
-msgid "SeeCustomField"
-msgstr "DostDoPólUżytk"
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:92
-msgid "SeeQueue"
-msgstr "SeeQueue"
-
-#: NOT FOUND IN SOURCE
-msgid "Select"
-msgstr "Selectionner"
-
-#: NOT FOUND IN SOURCE
-msgid "Select a Class"
-msgstr "Wybierz klasÄ™"
-
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
-msgid "Select a Custom Field"
-msgstr "Wybierz pole definiowane przez użytkownika"
-
-#: NOT FOUND IN SOURCE
-msgid "Select a Custom Fields"
-msgstr "Wybierz pole definiowane przez użytkownika"
-
-#: html/Admin/Groups/index.html:78
-msgid "Select a group"
-msgstr "Wybierz grupÄ™"
-
-#: html/Admin/Queues/index.html:54
-msgid "Select a queue"
-msgstr "Wybierz kolejkÄ™"
-
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr ""
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
-msgid "Select a user"
-msgstr "Wybierz użytkownika"
-
-#: NOT FOUND IN SOURCE
-msgid "Select class"
-msgstr "Wybierz klasÄ™"
-
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr "Wybierz pole"
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr ""
-
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
-msgid "Select group"
-msgstr "Wybierz grupÄ™"
-
-#: lib/RT/CustomField_Overlay.pm:59
-msgid "Select multiple values"
-msgstr "Wybór wielu wartości"
-
-#: lib/RT/CustomField_Overlay.pm:60
-msgid "Select one value"
-msgstr "Wybór jednej wartości"
-
-#: html/Admin/Elements/QueueTabs:92
-msgid "Select queue"
-msgstr "Wybierz kolejkÄ™"
-
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
-msgid "Select scrip"
-msgstr "Wybierz skrypt"
-
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
-msgid "Select template"
-msgstr "Wybierz szablon"
-
-#: lib/RT/CustomField_Overlay.pm:61
-msgid "Select up to %1 values"
-msgstr "Choisir un maximum de %1 valeurs "
-
-#: html/Admin/Elements/UserTabs:75
-msgid "Select user"
-msgstr "Wybierz użytkownika"
-
-#: NOT FOUND IN SOURCE
-msgid "SelectMultiple"
-msgstr "Wybór wielu wartości"
-
-#: NOT FOUND IN SOURCE
-msgid "SelectSingle"
-msgstr "Wybór jednej wartości"
-
-#: html/Admin/Elements/EditCustomFields:58
-msgid "Selected Custom Fields"
-msgstr "Champs personnalisĂŠs sĂŠlectionnĂŠs"
-
-#: html/Admin/CustomFields/Objects.html:59
-msgid "Selected objects"
-msgstr "Objets sĂŠlectionnĂŠs"
-
-#: NOT FOUND IN SOURCE
-msgid "Self Service"
-msgstr "Samoobsługa"
-
-#: etc/initialdata:121
-msgid "Send mail to all watchers"
-msgstr "Wyślij e-mail do wszystkich obserwatorów"
-
-#: etc/initialdata:117
-msgid "Send mail to all watchers as a \"comment\""
-msgstr "Wyślij e-mail do wszystkich obserwatorów jako \"komentarz\""
-
-#: etc/initialdata:112
-msgid "Send mail to requestors and Ccs"
-msgstr "Wyślij e-mail do zgłaszających i osób o uprawnieniach Cc""
-
-#: etc/initialdata:107
-msgid "Send mail to requestors and Ccs as a comment"
-msgstr "Wyślij e-mail do zgłaszających i osób o uprawnieniach Cc jako komentarz"
-
-#: etc/initialdata:78
-msgid "Sends a message to the requestors"
-msgstr "Wysyła wiadomość do zgłaszających"
-
-#: etc/initialdata:125 etc/initialdata:129
-msgid "Sends mail to explicitly listed Ccs and Bccs"
-msgstr "Wysyła e-mail do osób wymienionych w Cc i Bcc "
-
-#: etc/initialdata:94 etc/upgrade/3.1.17/content:7
-msgid "Sends mail to the Ccs"
-msgstr "Wysyła e-mail do użytkowników o uprawnieniach CC"
-
-#: etc/initialdata:90 etc/upgrade/3.1.17/content:3
-msgid "Sends mail to the Ccs as a comment"
-msgstr "Wysyła e-mail jako komentarz do użytkowników o uprawnieniach CC"
-
-#: etc/initialdata:102
-msgid "Sends mail to the administrative Ccs"
-msgstr "Wysyła e-mail do osób wymienionych w administracyjnym Cc"
-
-#: etc/initialdata:98
-msgid "Sends mail to the administrative Ccs as a comment"
-msgstr "Wysyła e-mail do osób wymienionych w administracyjnym Cc jako komentarz"
-
-#: etc/initialdata:82 etc/initialdata:86
-msgid "Sends mail to the owner"
-msgstr "Wysyła e-mail do właściciela"
-
-#: lib/RT/Date.pm:445
-msgid "Sep."
-msgstr "Wrz."
-
-#: NOT FOUND IN SOURCE
-msgid "Seperate multiple URLs with spaces"
-msgstr "Oddziel spacjami adresy URL"
-
-#: NOT FOUND IN SOURCE
-msgid "September"
-msgstr "Wrzesień"
-
-#: html/Ticket/Elements/ShowTransaction:150
-msgid "Show"
-msgstr "Pokaż"
-
-#: html/Approvals/index.html:52
-msgid "Show Approvals"
-msgstr "Pokazuj potwierdzenia"
-
-#: html/Search/Elements/EditFormat:56
-msgid "Show Columns"
-msgstr "Wyświetlane kolumny"
-
-#: html/Ticket/Elements/Tabs:201
-msgid "Show Results"
-msgstr "Wyświetl wyniki"
-
-#: NOT FOUND IN SOURCE
-msgid "Show advanced search options..."
-msgstr "Wyświetl zaawansowane opcje wyszukiwania..."
-
-#: html/Approvals/Elements/PendingMyApproval:65
-msgid "Show approved requests"
-msgstr "Wyświetl zatwierdzone zgłoszenia"
-
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
-msgid "Show basics"
-msgstr "Wyświetl podstawowe informacje"
-
-#: html/Approvals/Elements/PendingMyApproval:66
-msgid "Show denied requests"
-msgstr "Wyświetl odrzucone zgłoszenia"
-
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
-msgid "Show details"
-msgstr "Wyświetl szczegóły"
-
-#: html/Approvals/Elements/PendingMyApproval:64
-msgid "Show pending requests"
-msgstr "Wyświetl zgłoszenia oczekujące na zatwierdzenie"
-
-#: html/Approvals/Elements/PendingMyApproval:67
-msgid "Show requests awaiting other approvals"
-msgstr "Wyświetl zgłoszenia oczekujące na pozostałe zatwierdzenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Show ticket private commentary"
-msgstr "Wyświetl prywatny komentarz do zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Show ticket summaries"
-msgstr "Wyświetl streszczenia zgłoszeń"
-
-#: lib/RT/Queue_Overlay.pm:94
-msgid "ShowACL"
-msgstr "ShowACL"
-
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
-msgid "ShowOutgoingEmail"
-msgstr "PodglÄ…dPocztyWychodz"
-
-#: lib/RT/Group_Overlay.pm:176
-msgid "ShowSavedSearches"
-msgstr "PodglądZapytańZapis"
-
-#: lib/RT/Queue_Overlay.pm:103
-msgid "ShowScrips"
-msgstr "ShowScrips"
-
-#: lib/RT/Queue_Overlay.pm:100
-msgid "ShowTemplate"
-msgstr "ShowTemplate"
-
-#: lib/RT/Queue_Overlay.pm:104
-msgid "ShowTicket"
-msgstr "ShowTicket"
-
-#: lib/RT/Queue_Overlay.pm:105
-msgid "ShowTicketComments"
-msgstr "ShowTicketComments"
-
-#: lib/RT/Queue_Overlay.pm:108
-msgid "Sign up as a ticket Requestor or ticket or queue Cc"
-msgstr "Podpisz jako zgłaszający lub osoba o uprawnieniach Cc dla zgłoszenia lub kolejki"
-
-#: lib/RT/Queue_Overlay.pm:109
-msgid "Sign up as a ticket or queue AdminCc"
-msgstr "Podpisz jako osoba o uprawnieniach AdminCc dla zgłoszenia lub kolejki"
-
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
-msgid "Signature"
-msgstr "Podpis"
-
-#: NOT FOUND IN SOURCE
-msgid "Signed in as %1"
-msgstr "Wpisany jako %1"
-
-#: html/Admin/Elements/SelectSingleOrMultiple:47
-msgid "Single"
-msgstr "Pojedynczy"
-
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
-msgid "Skip Menu"
-msgstr "Pomiń menu"
-
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr ""
-
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
-msgid "Sort"
-msgstr "Sortuj"
-
-#: NOT FOUND IN SOURCE
-msgid "Sort Order"
-msgstr "Kryterium sortowania"
-
-#: NOT FOUND IN SOURCE
-msgid "Sort key"
-msgstr "Klucz sortowania"
-
-#: NOT FOUND IN SOURCE
-msgid "Sort results by"
-msgstr "Sortuj wyniki wg"
-
-#: NOT FOUND IN SOURCE
-msgid "SortOrder"
-msgstr "SortOrder"
-
-#: html/Admin/Elements/EditScrip:87
-msgid "Stage"
-msgstr "Etap"
-
-#: NOT FOUND IN SOURCE
-msgid "Stalled"
-msgstr "Zamrożone"
-
-#: NOT FOUND IN SOURCE
-msgid "Start page"
-msgstr "Strona powitalna"
-
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
-msgid "Started"
-msgstr "Realizacja rozpoczęta"
-
-#: NOT FOUND IN SOURCE
-msgid "Started date '%1' could not be parsed"
-msgstr "Data rozpoczęcia realizacji '%1' nie może być rozpoznana"
-
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
-msgid "Starts"
-msgstr "PoczÄ…tek realizacji"
-
-#: NOT FOUND IN SOURCE
-msgid "Starts By"
-msgstr "PoczÄ…tek realizacji od"
-
-#: NOT FOUND IN SOURCE
-msgid "Starts date '%1' could not be parsed"
-msgstr "Data rozpoczęcia realizacji '%1' nie może być rozpoznana"
-
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
-msgid "State"
-msgstr "Województwo"
-
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
-msgid "Status"
-msgstr "Status "
-
-#: etc/initialdata:309
-msgid "Status Change"
-msgstr "Zmiana statusu"
-
-#: NOT FOUND IN SOURCE
-msgid "Status changed from %1 to %2"
-msgstr "Status zmieniony z %1 na %2"
-
-#: NOT FOUND IN SOURCE
-msgid "StatusChange"
-msgstr "Zmiana statusu"
-
-#: html/Ticket/Elements/Tabs:170
-msgid "Steal"
-msgstr "Przejmij"
-
-#: lib/RT/Queue_Overlay.pm:118
-msgid "Steal tickets"
-msgstr "Przejmij zgłoszenia"
-
-#: lib/RT/Queue_Overlay.pm:118
-msgid "StealTicket"
-msgstr "PrzejecieZgloszen"
-
-#: lib/RT/Transaction_Overlay.pm:667
-#. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "Przejęte od %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Stolen from %1 "
-msgstr "Przejęte od %1 "
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
-
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
-msgid "Subject"
-msgstr "Temat"
-
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
-#. ($self->Data)
-msgid "Subject changed to %1"
-msgstr "Temat został zmieniony na %1"
-
-#: html/Elements/Submit:97
-msgid "Submit"
-msgstr "Zastosuj"
-
-#: NOT FOUND IN SOURCE
-msgid "Submit Query"
-msgstr "Wykonaj zapytanie"
-
-#: NOT FOUND IN SOURCE
-msgid "Submit Workflow"
-msgstr "Wprowadź obieg (Workflow)"
-
-#: lib/RT/Group_Overlay.pm:782
-msgid "Succeeded"
-msgstr "Powiodło się"
-
-#: NOT FOUND IN SOURCE
-msgid "Summary"
-msgstr "Streszczenie"
-
-#: NOT FOUND IN SOURCE
-msgid "Summary matches"
-msgstr "Streszczenie zgadza siÄ™ z"
-
-#: lib/RT/Date.pm:419
-msgid "Sun."
-msgstr "Nie."
-
-#: lib/RT/System.pm:76
-msgid "SuperUser"
-msgstr "SuperUser"
-
-#: html/User/Elements/DelegateRights:98
-msgid "System"
-msgstr "System"
-
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
-msgid "System Configuration"
-msgstr "Konfiguracja systemu"
-
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
-msgid "System Error"
-msgstr "BÅ‚Ä…d systemowy"
-
-#: NOT FOUND IN SOURCE
-msgid "System Error. Right not granted."
-msgstr "Erreur Système. Droit non dÊlÊguÊ."
-
-#: NOT FOUND IN SOURCE
-msgid "System Error. right not granted"
-msgstr "Erreur Système. Droit non dÊlÊguÊ"
-
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr ""
-
-#: html/Admin/Tools/index.html:47
-msgid "System Tools"
-msgstr "Narzędzia systemowe"
-
-#: lib/RT/ACE_Overlay.pm:634
-msgid "System error. Right not delegated."
-msgstr "Błąd systemowy. Uprawnienie nie zostało przekazane"
-
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
-msgid "System error. Right not granted."
-msgstr "Błąd systemowy. Uprawnienie nie zostało przydzielone"
-
-#: NOT FOUND IN SOURCE
-msgid "System error. Unable to grant rights."
-msgstr "Erreur Système. Imposible de dÊlÊguer les droits"
-
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
-msgid "System groups"
-msgstr "Grupy systemowe"
-
-#: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
-msgid "SystemRolegroup for internal use"
-msgstr "Grupa ról systemowych do użytku wewnętrznego"
-
-#: lib/RT/CurrentUser.pm:358
-msgid "TEST_STRING"
-msgstr "TEST_STRING"
-
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
-msgid "Take"
-msgstr "Przyjmij"
-
-#: lib/RT/Queue_Overlay.pm:116
-msgid "Take tickets"
-msgstr "Przyjmij zgłoszenia"
-
-#: lib/RT/Queue_Overlay.pm:116
-msgid "TakeTicket"
-msgstr "PrzyjęcieZgłoszeń"
-
-#: lib/RT/Transaction_Overlay.pm:652
-msgid "Taken"
-msgstr "Przyjęty"
-
-#: NOT FOUND IN SOURCE
-msgid "Task"
-msgstr "Tâche"
-
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
-msgid "Template"
-msgstr "Szablon"
-
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
-#. ($TemplateObj->Id())
-msgid "Template #%1"
-msgstr "Szablon #%1"
-
-#: html/Admin/Elements/EditTemplates:110
-msgid "Template deleted"
-msgstr "Szablon został usunięty"
-
-#: lib/RT/Scrip_Overlay.pm:181
-msgid "Template not found"
-msgstr "Nie udało się wyszukać szablonu"
-
-#: NOT FOUND IN SOURCE
-msgid "Template not found\\n"
-msgstr "Nie udało się wyszukać szablonu\\n"
-
-#: lib/RT/Template_Overlay.pm:376
-msgid "Template parsed"
-msgstr "Szablon nie został rozpoznany"
-
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
-msgid "Templates"
-msgstr "Szablony"
-
-#: NOT FOUND IN SOURCE
-msgid "Templates for %1\\n"
-msgstr "Szablony dla %1\\n"
-
-#: NOT FOUND IN SOURCE
-msgid "Text"
-msgstr "Texte"
-
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
-msgid "That is already the current value"
-msgstr "To już jest aktualna wartość"
-
-#: lib/RT/CustomField_Overlay.pm:407
-msgid "That is not a value for this custom field"
-msgstr "To nie jest wartość tego pola"
-
-#: lib/RT/Ticket_Overlay.pm:1955
-msgid "That is the same value"
-msgstr "To jest ta sama wartość"
-
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
-msgid "That principal already has that right"
-msgstr "Ten użytkownik/ grupa już dysponują tym prawem"
-
-#: lib/RT/Queue_Overlay.pm:750
-#. ($args{'Type'})
-msgid "That principal is already a %1 for this queue"
-msgstr "Ten zarządzający jest już %1 dla tej kolejki"
-
-#: lib/RT/Ticket_Overlay.pm:1396
-#. ($self->loc($args{'Type'}))
-msgid "That principal is already a %1 for this ticket"
-msgstr "Ten zarządzający jest już %1 dla tego zgłoszenia"
-
-#: lib/RT/Queue_Overlay.pm:849
-#. ($args{'Type'})
-msgid "That principal is not a %1 for this queue"
-msgstr "Ten zarzÄ…dzajÄ…cy nie jest %1 dla tej kolejki"
-
-#: NOT FOUND IN SOURCE
-msgid "That principal is not a %1 for this ticket"
-msgstr "Ten zarządzający nie jest %1 dla tego zgłoszenia"
-
-#: lib/RT/Ticket_Overlay.pm:1951
-msgid "That queue does not exist"
-msgstr "Ta kolejka nie istnieje"
-
-#: lib/RT/Ticket_Overlay.pm:3189
-msgid "That ticket has unresolved dependencies"
-msgstr "To zgłoszenie ma niewykonane zgłoszenia zależne"
-
-#: NOT FOUND IN SOURCE
-msgid "That user already has that right"
-msgstr "Ten użytkownik już posiada to uprawnienie"
-
-#: lib/RT/Ticket_Overlay.pm:2993
-msgid "That user already owns that ticket"
-msgstr "Ten użytkownik już jest właścicielem tego zgłoszenia"
-
-#: lib/RT/Ticket_Overlay.pm:2965
-msgid "That user does not exist"
-msgstr "Taki użytkownik nie istnieje"
-
-#: lib/RT/User_Overlay.pm:390
-msgid "That user is already privileged"
-msgstr "Ten użytkownik już posiada to uprawnienie"
-
-#: lib/RT/User_Overlay.pm:411
-msgid "That user is already unprivileged"
-msgstr "Ten użytkownik nie jest uprawniony"
-
-#: lib/RT/User_Overlay.pm:403
-msgid "That user is now privileged"
-msgstr "Ten użytkownik jest już uprawniony"
-
-#: lib/RT/User_Overlay.pm:424
-msgid "That user is now unprivileged"
-msgstr "Ten użytkownik jest teraz nieuprawniony"
-
-#: NOT FOUND IN SOURCE
-msgid "That user is now unprivilegedileged"
-msgstr "Cet utilisateur a perdu ses droits"
-
-#: lib/RT/Ticket_Overlay.pm:2986
-msgid "That user may not own tickets in that queue"
-msgstr "Ten użytkownik może nie posiadać zgłoszeń w tej kolejce"
-
-#: lib/RT/Link_Overlay.pm:234
-msgid "That's not a numerical id"
-msgstr "To nie jest id typu liczbowego"
-
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
-msgid "The Basics"
-msgstr "Podstawowe informacje"
-
-#: lib/RT/ACE_Overlay.pm:113
-msgid "The CC of a ticket"
-msgstr "CC zgłoszenia"
-
-#: lib/RT/ACE_Overlay.pm:114
-msgid "The administrative CC of a ticket"
-msgstr "Administracyjne CC zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "The comment has been recorded"
-msgstr "Komentarz został zapisany"
-
-#: bin/rt-crontool:223
-msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
-msgstr "Następujące polecenie wyszuka wszystkie aktywne zgłoszenia w kolejce głównej i ustawi ich priorytet na 99, jeśli nie zostały zmodyfikowane w ciągu ostatnich 4 godzin:"
-
-#: NOT FOUND IN SOURCE
-msgid "The following commands were not proccessed:\\n\\n"
-msgstr "Następujące polecenia nie zostały wykonane:\\n\\n"
-
-#: lib/RT/Record.pm:934
-msgid "The new value has been set."
-msgstr "Ustawiono nową wartość."
-
-#: lib/RT/ACE_Overlay.pm:111
-msgid "The owner of a ticket"
-msgstr "Właściciel zgłoszenia"
-
-#: lib/RT/ACE_Overlay.pm:112
-msgid "The requestor of a ticket"
-msgstr "Zgłaszający"
-
-#: html/Admin/Elements/EditUserComments:47
-msgid "These comments aren't generally visible to the user"
-msgstr "Te komentarze nie są generalnie widoczne dla użytkownika"
-
-#: lib/RT/CustomField_Overlay.pm:912
-msgid "This custom field does not apply to that object"
-msgstr "Ce champ personnalisĂŠ ne s'applique pas Ă  cet objet"
-
-#: html/Admin/Tools/Configuration.html:50
-msgid "This feature is only available to system administrators"
-msgstr "Ta funkcja jest dostępna tylko dla administratora systemu"
-
-#: html/Ticket/Elements/PreviewScrips:93
-msgid "This message will be sent to..."
-msgstr "Ta wiadomość zostanie wysłana do..."
-
-#: NOT FOUND IN SOURCE
-msgid "This ticket %1 %2 (%3)\\n"
-msgstr "To zgłoszenie %1 %2 (%3)\\n"
-
-#: bin/rt-crontool:214
-msgid "This tool allows the user to run arbitrary perl modules from within RT."
-msgstr "Ta aplikacja pozwala użytkownikowi na przypadkowe uruchomienie tzw. perl modułów z RT"
-
-#: lib/RT/Transaction_Overlay.pm:288
-msgid "This transaction appears to have no content"
-msgstr "Nie określono zawartości tej transakcji"
-
-#: html/Ticket/Elements/ShowRequestor:70
-#. ($rows)
-msgid "This user's %1 highest priority tickets"
-msgstr "%1 zgłoszeń tego użytkownika o najwyższym priorytecie"
-
-#: NOT FOUND IN SOURCE
-msgid "This user's 25 highest priority tickets"
-msgstr "25 zgłoszeń tego użytkownika o najwyższym priorytecie"
-
-#: lib/RT/Date.pm:416
-msgid "Thu."
-msgstr "Czw."
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket # %1  %2"
-msgstr "Zgłoszenie nr %1  %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket # %1 Jumbo update: %2"
-msgstr "Ticket n°%1 Jumbo update: %2"
-
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
-#. ($Ticket->Id, $Ticket->Subject)
-msgid "Ticket #%1 Jumbo update: %2"
-msgstr "Pełna aktualizacja: %2 zgłoszenia nr %1"
-
-#: html/Approvals/Elements/ShowDependency:67
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
-msgid "Ticket #%1: %2"
-msgstr "Zgłoszenie nr %1  %2"
-
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
-#. ($T::Tickets{$template_id}->Id)
-#. ($T::Tickets{$template_id}->id)
-#. ($ticket->Id)
-msgid "Ticket %1"
-msgstr "Zgłoszenie %1"
-
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
-#. ($self->Id, $QueueObj->Name)
-msgid "Ticket %1 created in queue '%2'"
-msgstr "Zgłoszenie %1 zostało utworzone w kolejce '%2'"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket %1 loaded\\n"
-msgstr "Zgłoszenie %1 zostało załadowane\\n"
-
-#: html/Search/Bulk.html:269
-#. ($Ticket->Id,$_)
-msgid "Ticket %1: %2"
-msgstr "Zgłoszenie %1:  %2"
-
-#: html/Admin/Elements/QueueTabs:74
-msgid "Ticket Custom Fields"
-msgstr "Champs personnalisĂŠs du ticket"
-
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
-#. ($Ticket->Id, $Ticket->Subject)
-msgid "Ticket History # %1 %2"
-msgstr "Historia zgłoszenia nr %1  %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket Id"
-msgstr "Nr zgłoszenia"
-
-#: etc/initialdata:324
-msgid "Ticket Resolved"
-msgstr "Zgłoszenie zamknięte"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
-msgid "Ticket Transactions"
-msgstr "Transactions du ticket"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket attachment"
-msgstr "Załącznik do zgłoszenia, którego"
-
-#: lib/RT/Tickets_Overlay.pm:1648
-msgid "Ticket content"
-msgstr "Zawartość zgłoszenia"
-
-#: lib/RT/Tickets_Overlay.pm:1697
-msgid "Ticket content type"
-msgstr "Typ zawartości zgłoszenia"
-
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
-msgid "Ticket could not be created due to an internal error"
-msgstr "Nie udało się utworzyć zgłoszenia z powodu wewnętrznego błędu"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket created"
-msgstr "Zgłoszenie zostało utworzone"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket creation failed"
-msgstr "Nie udało się utworzyć zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket deleted"
-msgstr "Zgłoszenie zostało usunięte"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket id not found"
-msgstr "Nie udało się wyszukać numeru zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket killed"
-msgstr "Ticket effacĂŠ"
-
-#: html/Ticket/Display.html:55
-msgid "Ticket metadata"
-msgstr "Meta-dane zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket not found"
-msgstr "Nie udało się wyszukać zgłoszenia"
-
-#: etc/initialdata:310
-msgid "Ticket status changed"
-msgstr "Zmienił się status zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Ticket watchers"
-msgstr "Obserwatorzy zgłoszenia"
-
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
-msgid "Tickets"
-msgstr "Zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Tickets %1 %2"
-msgstr "Zgłoszenia %1 %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Tickets %1 by %2"
-msgstr "Zgłoszenia %1 do %2"
-
-#: NOT FOUND IN SOURCE
-msgid "Tickets from %1"
-msgstr "Zgłoszenia od %1"
-
-#: html/Approvals/Elements/ShowDependency:48
-msgid "Tickets which depend on this approval:"
-msgstr "Zgłoszenia, które zależą od tego zatwierdzenia:"
-
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
-msgid "Time Estimated"
-msgstr "Szacowany czas"
-
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
-msgid "Time Left"
-msgstr "Pozostały czas"
-
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
-msgid "Time Worked"
-msgstr "Czas realizacji"
-
-#: lib/RT/Tickets_Overlay.pm:1619
-msgid "Time left"
-msgstr "Pozostały czas"
-
-#: html/Elements/Footer:71
-msgid "Time to display"
-msgstr "Wyświetlany czas"
-
-#: lib/RT/Tickets_Overlay.pm:1594
-msgid "Time worked"
-msgstr "Czas realizacji"
-
-#: NOT FOUND IN SOURCE
-msgid "TimeLeft"
-msgstr "PozostałyCzas"
-
-#: lib/RT/Ticket_Overlay.pm:1143
-msgid "TimeWorked"
-msgstr "Czas realizacji"
-
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "To generate a diff of this commit:"
-msgstr "Aby wygenerować różnice tego zatwierdzenia:"
-
-#: NOT FOUND IN SOURCE
-msgid "To generate a diff of this commit:\\n"
-msgstr "Aby wygenerować różnice tego zatwierdzenia:\\n"
-
-#: html/Elements/Footer:61
-#. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
-msgid "To inquire about support, training, custom development or licensing, please contact %1."
-msgstr "Więcej o wsparciu, szkoleniach, rozwoju i licencjonowaniu dostępne jest w %1."
-
-#: lib/RT/Ticket_Overlay.pm:1146
-msgid "Told"
-msgstr "Wpłynęło"
-
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
-msgid "Tools"
-msgstr "Narzędzia"
-
-#: etc/initialdata:252
-msgid "Transaction"
-msgstr "Transakcja"
-
-#: lib/RT/Transaction_Overlay.pm:794
-#. ($self->Data)
-msgid "Transaction %1 purged"
-msgstr "Transakcja %1 została wyczyszczona"
-
-#: lib/RT/Transaction_Overlay.pm:174
-msgid "Transaction Created"
-msgstr "Transakcja została utworzona"
-
-#: html/Admin/Elements/QueueTabs:78
-msgid "Transaction Custom Fields"
-msgstr "Champs personnalisĂŠes de la transaction"
-
-#: NOT FOUND IN SOURCE
-msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
-msgstr "Transakcja-> Nie udało się utworzyć, ponieważ nie określono numeru zgłoszenia"
-
-#: lib/RT/Transaction_Overlay.pm:125
-msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr "Transation->Create a ĂŠchouĂŠ car vous n'avez pas spĂŠcifiĂŠ de type d'objet et d'id"
-
-#: lib/RT/Transaction_Overlay.pm:838
-msgid "Transactions are immutable"
-msgstr "Transakcje nie są możliwe do powielenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Trying to delete a right: %1"
-msgstr "Próba usunięcia uprawnienia: %1"
-
-#: lib/RT/Date.pm:414
-msgid "Tue."
-msgstr "Wto."
-
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
-msgid "Type"
-msgstr "Typ"
-
-#: NOT FOUND IN SOURCE
-msgid "Unable to load article"
-msgstr "Nie udało się załadować artykułu"
-
-#: lib/RT/ScripCondition_Overlay.pm:129
-msgid "Unimplemented"
-msgstr "Niezaimplementowane"
-
-#: html/Admin/Users/Modify.html:89
-msgid "Unix login"
-msgstr " Unix login"
-
-#: NOT FOUND IN SOURCE
-msgid "UnixUsername"
-msgstr "Nazwa użytkownika typu 'unix'"
-
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
-#. ($self->ContentEncoding)
-#. ($ContentEncoding)
-msgid "Unknown ContentEncoding %1"
-msgstr "Nieznany Typ Zawartości %1"
-
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
-msgid "Unlimited"
-msgstr "Nieograniczona"
-
-#: html/Search/Elements/SelectSearchesForObjects:63
-msgid "Unnamed search"
-msgstr "Zapytanie bezimienne"
-
-#: etc/initialdata:32
-msgid "Unprivileged"
-msgstr "Nieuprawnieni"
-
-#: html/Admin/Elements/EditCustomFields:60
-msgid "Unselected Custom Fields"
-msgstr "Champs personnalisĂŠs non sĂŠlectionnĂŠs"
-
-#: html/Admin/CustomFields/Objects.html:61
-msgid "Unselected objects"
-msgstr "Objets non sĂŠlectionnĂŠs"
-
-#: lib/RT/Transaction_Overlay.pm:648
-msgid "Untaken"
-msgstr "Niepobrany"
-
-#: NOT FOUND IN SOURCE
-msgid "Untitled search"
-msgstr "Recherche sans titre"
-
-#: html/Search/Bulk.html:54
-msgid "Update"
-msgstr "Zaktualizuj"
-
-#: html/Search/Bulk.html:178
-msgid "Update All"
-msgstr "Zaktualizuj wszystko"
-
-#: NOT FOUND IN SOURCE
-msgid "Update ID"
-msgstr "Zaktualizuj ID"
-
-#: html/Ticket/Update.html:133
-msgid "Update Ticket"
-msgstr "Zaktualizuj zgłoszenie"
-
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
-msgid "Update Type"
-msgstr "Zaktualizuj typ"
-
-#: NOT FOUND IN SOURCE
-msgid "Update all these tickets at once"
-msgstr "Zaktualizuj wszystkie te zgłoszenia jednocześnie"
-
-#: NOT FOUND IN SOURCE
-msgid "Update email"
-msgstr "Zaktualizuj e-mail"
-
-#: html/Search/Results.html:80
-msgid "Update multiple tickets"
-msgstr "Zaktualizuj wiele zgłoszeń jednocześnie"
-
-#: NOT FOUND IN SOURCE
-msgid "Update name"
-msgstr "Zaktualizuj nazwÄ™"
-
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
-msgid "Update not recorded."
-msgstr "Aktualizacja nie została zapisana."
-
-#: html/Search/Bulk.html:99
-msgid "Update selected tickets"
-msgstr "Zaktualizuj wybrane zgłoszenia"
-
-#: NOT FOUND IN SOURCE
-msgid "Update signature"
-msgstr "Zaktualizuj podpis"
-
-#: html/Ticket/ModifyAll.html:84
-msgid "Update ticket"
-msgstr "Zaktualizuj zgłoszenie"
-
-#: NOT FOUND IN SOURCE
-msgid "Update ticket # %1"
-msgstr "Zaktualizuj zgłoszenie nr %1"
-
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
-#. ($Ticket->id)
-msgid "Update ticket #%1"
-msgstr "Zaktualizuj zgłoszenie nr %1"
-
-#: html/Ticket/Update.html:156
-#. ($TicketObj->id, $TicketObj->Subject)
-msgid "Update ticket #%1 (%2)"
-msgstr "Zaktualizuj zgłoszenie nr %1 (%2)"
-
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
-msgid "Update type was neither correspondence nor comment."
-msgstr "Aktualizacja nie dotyczyła korespondencji ani komentarza."
-
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
-msgid "Updated"
-msgstr "Zaktualizowane"
-
-#: html/Tools/Offline.html:95
-msgid "Upload"
-msgstr "Zapisz"
-
-#: lib/RT/CustomField_Overlay.pm:84
-msgid "Upload multiple files"
-msgstr "Uploader plusieurs fichiers"
-
-#: lib/RT/CustomField_Overlay.pm:79
-msgid "Upload multiple images"
-msgstr "Uploader plusieurs images"
-
-#: lib/RT/CustomField_Overlay.pm:85
-msgid "Upload one file"
-msgstr "Uploader un fichier"
-
-#: lib/RT/CustomField_Overlay.pm:80
-msgid "Upload one image"
-msgstr "Uploader une image"
-
-#: lib/RT/CustomField_Overlay.pm:86
-msgid "Upload up to %1 files"
-msgstr "Uploader un maximum de %1 fichiers"
-
-#: lib/RT/CustomField_Overlay.pm:81
-msgid "Upload up to %1 images"
-msgstr "Uploader un maximum de %1 images"
-
-#: html/Tools/Offline.html:95
-msgid "Upload your changes"
-msgstr "Zapisz swoje zmiany"
-
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
-msgstr "Użyj rozwijalnych list, aby wybrać transakcje, z których chcesz utworzyć nowy artykuł RTFM"
-
-#: NOT FOUND IN SOURCE
-msgid "User %1 %2: %3\\n"
-msgstr "Użytkownik %1 %2: %3 \\n"
-
-#: NOT FOUND IN SOURCE
-msgid "User %1 Password: %2\\n"
-msgstr "Hasło użytkownika %1: %2\\n"
-
-#: lib/RT/Ticket_Overlay.pm:496
-#. ($args{'Owner'})
-msgid "User '%1' could not be found."
-msgstr "Nie można znaleźć użytkownika %1."
-
-#: NOT FOUND IN SOURCE
-msgid "User '%1' not found"
-msgstr "Nie udało się wyszukać użytkownika '%1'"
-
-#: NOT FOUND IN SOURCE
-msgid "User '%1' not found\\n"
-msgstr "Nie udało się wyszukać użytkownika '%1'\\n"
-
-#: etc/initialdata:132 etc/initialdata:206
-msgid "User Defined"
-msgstr "Definiowany przez użytkownika"
-
-#: html/Admin/Elements/EditScrip:98
-msgid "User Defined conditions and actions"
-msgstr "Warunki i operacje zdefiniowane przez użytkownika"
-
-#: NOT FOUND IN SOURCE
-msgid "User ID"
-msgstr "Id"
-
-#: NOT FOUND IN SOURCE
-msgid "User Id"
-msgstr "Id"
-
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
-msgid "User Rights"
-msgstr "Uprawnienia użytkowników"
-
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
-msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr "L'utilisateur a demandĂŠ un type de mise Ă  jour non connu pour le champ personnalisĂŠ %1 de l'objet %2Â%3"
-
-#: html/Admin/Users/Modify.html:293
-#. ($msg)
-msgid "User could not be created: %1"
-msgstr "Nie udało się utworzyć użytkownika: %1"
-
-#: lib/RT/User_Overlay.pm:331
-msgid "User created"
-msgstr "Użytkownik został utworzony"
-
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
-msgid "User defined groups"
-msgstr "Grupy def. przez użytkownika"
-
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
-msgid "User loaded"
-msgstr "Użytkownik załadowany"
-
-#: NOT FOUND IN SOURCE
-msgid "User notified"
-msgstr "Użytkownik został powiadomiony"
-
-#: NOT FOUND IN SOURCE
-msgid "User view"
-msgstr "Widok użytkownika"
-
-#: html/Admin/Groups/index.html:99
-msgid "User-defined groups"
-msgstr "Groupe dĂŠfinis par l'utilisateur"
-
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
-msgid "Username"
-msgstr "Nazwa"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
-msgid "Users"
-msgstr "Użytkownicy"
-
-#: html/Admin/Users/index.html:85
-msgid "Users matching search criteria"
-msgstr "Użytkownicy odpowiadający kryteriom wyszukiwania"
-
-#: lib/RT/Tickets_Overlay_SQL.pm:523
-msgid "Valid Query"
-msgstr "Sprawdź zapytanie"
-
-#: NOT FOUND IN SOURCE
-msgid "ValueOfQueue"
-msgstr "Wartość kolejki"
-
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
-msgid "Values"
-msgstr "Wartości"
-
-#: lib/RT/Queue_Overlay.pm:108
-msgid "Watch"
-msgstr "Obserwuj"
-
-#: lib/RT/Queue_Overlay.pm:109
-msgid "WatchAsAdminCc"
-msgstr "WatchAsAdminCc"
-
-#: NOT FOUND IN SOURCE
-msgid "Watcher loaded"
-msgstr "Observateur chargĂŠ"
-
-#: html/Admin/Elements/QueueTabs:63
-msgid "Watchers"
-msgstr "Obserwatorzy"
-
-#: NOT FOUND IN SOURCE
-msgid "WebEncoding"
-msgstr "Web-kodowanie"
-
-#: lib/RT/Date.pm:415
-msgid "Wed."
-msgstr "Åšro."
-
-#: etc/initialdata:521
-msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
-msgstr "Po zatwierdzeniu zgłoszenia przez wszystkich zatwierdzających, dodaj korespondencję do oryginalnego zgłoszenia"
-
-#: etc/initialdata:485
-msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
-msgstr "Po zatwierdzeniu zgłoszenia przez któregokolwiek z zatwierdzających, dodaj korespondencję do oryginalnego zgłoszenia"
-
-#: etc/initialdata:146
-msgid "When a ticket is created"
-msgstr "Po utworzeniu zgłoszenia"
-
-#: etc/initialdata:418
-msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
-msgstr "Po utworzeniu zgłoszenia podlegającego zatwierdzeniu, powiadom właściciela i osoby o uprawnieniach AdminCc o zadaniu oczekującym zatwierdzenie przez nich"
-
-#: etc/initialdata:151
-msgid "When anything happens"
-msgstr "Jeśli cokolwiek się wydarzy"
-
-#: etc/initialdata:199
-msgid "Whenever a ticket is resolved"
-msgstr "Zawsze gdy zgłoszenie będzie zamykane"
-
-#: etc/initialdata:185
-msgid "Whenever a ticket's owner changes"
-msgstr "Zawsze gdy zmieni się właściciel zgłoszenia"
-
-#: etc/initialdata:178 etc/upgrade/3.1.17/content:16
-msgid "Whenever a ticket's priority changes"
-msgstr "Zawsze gdy zmieni się priorytet zgłoszenia"
-
-#: etc/initialdata:193
-msgid "Whenever a ticket's queue changes"
-msgstr "Zawsze gdy zmieni się kolejka zgłoszenia"
-
-#: etc/initialdata:170
-msgid "Whenever a ticket's status changes"
-msgstr "Zawsze gdy zmieni się status zgłoszenia"
-
-#: etc/initialdata:207
-msgid "Whenever a user-defined condition occurs"
-msgstr "Zawsze gdy wystąpi warunek definiowany przez użytkownika"
-
-#: etc/initialdata:164
-msgid "Whenever comments come in"
-msgstr "Zawsze gdy wystÄ…piÄ… komentarze"
-
-#: etc/initialdata:157
-msgid "Whenever correspondence comes in"
-msgstr "Zawsze gdy wpłynie korespondencja"
-
-#: NOT FOUND IN SOURCE
-msgid "Which are referred to by "
-msgstr "Które są zgłoszeniami powiązanymi"
-
-#: NOT FOUND IN SOURCE
-msgid "Which refer to"
-msgstr "Które dotyczą"
-
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
-msgid "Work"
-msgstr "Praca"
-
-#: html/Search/Results.html:84
-msgid "Work offline"
-msgstr "Praca zdalna"
-
-#: NOT FOUND IN SOURCE
-msgid "WorkPhone"
-msgstr "Tel. do pracy"
-
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
-msgid "Worked"
-msgstr "Czas pracy"
-
-#: NOT FOUND IN SOURCE
-msgid "XXX CHANGEME You are not an authorized user"
-msgstr "XXX CHANGEME Nie jesteś użytkownikiem z uprawnieniami"
-
-#: NOT FOUND IN SOURCE
-msgid "Yes"
-msgstr "Tak"
-
-#: lib/RT/Ticket_Overlay.pm:3096
-msgid "You already own this ticket"
-msgstr "Jesteś już właścicielem tego zgłoszenia"
-
-#: html/autohandler:158 html/autohandler:166
-msgid "You are not an authorized user"
-msgstr "Nie jesteś autoryzowanym użytkownikiem"
-
-#: lib/RT/Ticket_Overlay.pm:2978
-msgid "You can only reassign tickets that you own or that are unowned"
-msgstr "Możesz ponownie przydzielić tylko te zgłoszenia, których jesteś właścicielem lub te, które nie mają właściciela"
-
-#: NOT FOUND IN SOURCE
-msgid "You don't have permission to view that ticket.\\n"
-msgstr "Nie masz uprawnień do przeglądania tego zgłoszenia.\\n"
-
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
-#. ($num, $queue)
-msgid "You found %1 tickets in queue %2"
-msgstr "Wyszukałeś zgłoszenia %1 w kolejce %2"
-
-#: html/NoAuth/Logout.html:52
-msgid "You have been logged out of RT."
-msgstr "Zostałeś wylogowany z RT"
-
-#: html/SelfService/Display.html:109
-msgid "You have no permission to create tickets in that queue."
-msgstr "Nie masz uprawnień do rejestrowania zgłoszeń w tej kolejce."
-
-#: lib/RT/Ticket_Overlay.pm:1964
-msgid "You may not create requests in that queue."
-msgstr "Nie możesz rejestrować zgłoszeń w tej kolejce."
-
-#: html/NoAuth/Logout.html:56
-msgid "You're welcome to login again"
-msgstr "Proszę zalogować się ponownie"
-
-#: NOT FOUND IN SOURCE
-msgid "Your %1 requests"
-msgstr "Twoje zgłoszenia %1"
-
-#: NOT FOUND IN SOURCE
-msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
-msgstr "Administrator RT niewłaściwie skonfigurował aliasy maila, które wywołują RT"
-
-#: etc/initialdata:502
-msgid "Your request has been approved by %1. Other approvals may still be pending."
-msgstr "Twoje zgłoszenie zostało zatwierdzone przez %1. Może nadal oczekiwać na inne zatwierdzenia."
-
-#: etc/initialdata:540
-msgid "Your request has been approved."
-msgstr "Twoje zgłoszenie zostało zatwierdzone."
-
-#: NOT FOUND IN SOURCE
-msgid "Your request was rejected"
-msgstr "Twoje zgłoszenie zostało odrzucone"
-
-#: etc/initialdata:445
-msgid "Your request was rejected."
-msgstr "Twoje zgłoszenie zostało odrzucone"
-
-#: html/autohandler:193
-msgid "Your username or password is incorrect"
-msgstr "Nazwa użytkownika lub hasło jest nieprawidłowe"
-
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
-msgid "Zip"
-msgstr "Kod pocztowy"
-
-#: NOT FOUND IN SOURCE
-msgid "[no subject]"
-msgstr "[Pas de sujet]"
-
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
-msgstr ""
-
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "and is not"
-msgstr "i nie jest"
-
-#: NOT FOUND IN SOURCE
-msgid "and not"
-msgstr "i nie"
-
-#: html/User/Elements/DelegateRights:80
-#. ($right->PrincipalObj->Object->SelfDescription)
-msgid "as granted to %1"
-msgstr "tak jak przydzielone dla %1"
-
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
-msgid "closed"
-msgstr "zamknięte"
-
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
-msgid "contains"
-msgstr "zawiera"
-
-#: NOT FOUND IN SOURCE
-msgid "content"
-msgstr "zawartość"
-
-#: NOT FOUND IN SOURCE
-msgid "content-type"
-msgstr "typ zawartości"
-
-#: NOT FOUND IN SOURCE
-msgid "correspondence (probably) not sent"
-msgstr "korespondencja (prawdopodobnie) nie została wysłana"
-
-#: NOT FOUND IN SOURCE
-msgid "correspondence sent"
-msgstr "korespondencja została wysłana"
-
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
-msgid "days"
-msgstr "dniami"
-
-#: NOT FOUND IN SOURCE
-msgid "dead"
-msgstr "effacĂŠ"
-
-#: NOT FOUND IN SOURCE
-msgid "delete"
-msgstr "usuń"
-
-#: lib/RT/Queue_Overlay.pm:88
-msgid "deleted"
-msgstr "usunięte"
-
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
-msgid "does not match"
-msgstr "nie zgadza siÄ™ z"
-
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
-msgid "doesn't contain"
-msgstr "nie zawiera"
-
-#: NOT FOUND IN SOURCE
-msgid "email address"
-msgstr "adresse email"
-
-#: html/Elements/SelectEqualityOperator:59
-msgid "equal to"
-msgstr "równy"
-
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr ""
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr ""
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
-msgid "false"
-msgstr "faux"
-
-#: NOT FOUND IN SOURCE
-msgid "filename"
-msgstr "nazwa pliku"
-
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
-msgid "greater than"
-msgstr "większy od"
-
-#: lib/RT/Group_Overlay.pm:222
-#. ($self->Name)
-msgid "group '%1'"
-msgstr "grupy '%1'"
-
-#: lib/RT/Date.pm:338
-msgid "hours"
-msgstr "godz."
-
-#: html/Search/Elements/PickBasics:48
-msgid "id"
-msgstr "Numer"
-
-#: NOT FOUND IN SOURCE
-msgid "in class %1"
-msgstr "w ramach klasy %1"
-
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
-msgid "is"
-msgstr "jest"
-
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
-msgid "isn't"
-msgstr "nie jest"
-
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
-msgid "less than"
-msgstr "mniejszy od"
-
-#: html/Search/Elements/PickBasics:60
-msgid "matches"
-msgstr "zgadza siÄ™ z"
-
-#: lib/RT/Date.pm:334
-msgid "min"
-msgstr "min."
-
-#: html/Ticket/Update.html:64
-msgid "minutes"
-msgstr "minuty"
-
-#: NOT FOUND IN SOURCE
-msgid "modifications\\n\\n"
-msgstr "modyfikacje\\n\\n"
-
-#: lib/RT/Date.pm:350
-msgid "months"
-msgstr "miesiÄ…cami"
-
-#: lib/RT/Queue_Overlay.pm:83
-msgid "new"
-msgstr "nowe"
-
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
-msgid "no name"
-msgstr "bez nazwy"
-
-#: html/Admin/Elements/EditScrips:64
-msgid "no value"
-msgstr "brak wartości"
-
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
-msgid "none"
-msgstr "żaden"
-
-#: html/Elements/SelectEqualityOperator:59
-msgid "not equal to"
-msgstr "różny od"
-
-#: NOT FOUND IN SOURCE
-msgid "notlike"
-msgstr "necontientpas"
-
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
-msgid "open"
-msgstr "otwarte"
-
-#: lib/RT/Group_Overlay.pm:227
-#. ($self->Name, $user->Name)
-msgid "personal group '%1' for user '%2'"
-msgstr "prywatna grupa '%1' użytkownika '%2'"
-
-#: lib/RT/Group_Overlay.pm:235
-#. ($queue->Name, $self->Type)
-msgid "queue %1 %2"
-msgstr "kolejka %1 %2"
-
-#: lib/RT/Queue_Overlay.pm:87
-msgid "rejected"
-msgstr "odrzucone"
-
-#: lib/RT/Queue_Overlay.pm:86
-msgid "resolved"
-msgstr "zamknięte"
-
-#: lib/RT/Date.pm:330
-msgid "sec"
-msgstr "sek."
-
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
-msgid "spreadsheet"
-msgstr "Arkusz kalk."
-
-#: lib/RT/Queue_Overlay.pm:85
-msgid "stalled"
-msgstr "zamrożone"
-
-#: lib/RT/Group_Overlay.pm:230
-#. ($self->Type)
-msgid "system %1"
-msgstr "system %1"
-
-#: lib/RT/Group_Overlay.pm:241
-#. ($self->Type)
-msgid "system group '%1'"
-msgstr "grupy systemowej '%1'"
-
-#: html/Elements/Error:66 html/SelfService/Error.html:63
-msgid "the calling component did not specify why"
-msgstr "przywoływany komponent nie określił powodu"
-
-#: NOT FOUND IN SOURCE
-msgid "ticket #%1"
-msgstr "ticket n°%1"
-
-#: lib/RT/Group_Overlay.pm:238
-#. ($self->Instance, $self->Type)
-msgid "ticket #%1 %2"
-msgstr "zgłoszenie #%1 %2"
-
-#: NOT FOUND IN SOURCE
-msgid "till"
-msgstr "do"
-
-#: NOT FOUND IN SOURCE
-msgid "true"
-msgstr "vrai"
-
-#: lib/RT/Group_Overlay.pm:244
-#. ($self->Id)
-msgid "undescribed group %1"
-msgstr "nieopisana grupa %1"
-
-#: NOT FOUND IN SOURCE
-msgid "undescripbed group %1"
-msgstr "nieopisana grupa %1"
-
-#: lib/RT/Group_Overlay.pm:219
-#. ($user->Object->Name)
-msgid "user %1"
-msgstr "użytkownika %1"
-
-#: lib/RT/Date.pm:346
-msgid "weeks"
-msgstr "tygodniami"
-
-#: NOT FOUND IN SOURCE
-msgid "with template %1"
-msgstr "wg szablonu %1"
-
-#: lib/RT/Date.pm:354
-msgid "years"
-msgstr "rokiem/latami"
-
diff --git a/rt/lib/RT/I18N/pt_br.po b/rt/lib/RT/I18N/pt_br.po
index cbf92c5..a4892b0 100644
--- a/rt/lib/RT/I18N/pt_br.po
+++ b/rt/lib/RT/I18N/pt_br.po
@@ -1,4 +1,4 @@
-# $Id: pt_br.po,v 1.1.1.4 2005-10-15 09:10:38 ivan Exp $
+# $Id: pt_br.po,v 1.1.1.3 2004-12-03 20:39:09 ivan Exp $
 msgid ""
 msgstr ""
 "Project-Id-Version: RT 2.1.x\n"
@@ -14,58 +14,64 @@ msgstr ""
 msgid "#"
 msgstr "#"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr "#%1: %2"
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%1 %2 %3 %4:%5:%6 %7"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "%1 %2 adicionado"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "%1 %2 atrás"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 %2 alterado para %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
@@ -75,25 +81,50 @@ msgstr "%1 %2 removido"
 msgid "%1 %2 of group %3"
 msgstr "%1 %2 do grupo %3"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "%1 %2 com modelo %3"
 
 #: NOT FOUND IN SOURCE
+msgid "%1 %2 הוסף"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 שונה ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 este tíquete\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
 msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
 msgstr ""
 
@@ -101,68 +132,57 @@ msgstr ""
 msgid "%1 - %2 shown"
 msgstr "%1 - %2 apresentados"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr "%1 - Um argumento para passar para %2"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr "%1 - Mostra atualizações de estado no STDOUT"
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr "%1 - Especifica o módulo de ação que você quer usar"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr "%1 - Especifica o módulo de condição que você quer usar"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - Especifica o módulo de busca que você quer usar"
 
+#: NOT FOUND IN SOURCE
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
+
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "ScripAction %1 carregado"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "%1 usado como um valor de %2"
@@ -179,31 +199,32 @@ msgstr "Aliases %1 requerem um TicketId no qual trabalhar "
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
 msgstr "Aliases %1 requerem um TicketId no qual trabalhar (de %2) %3"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 parece ser um objeto local, mas não pode ser encontrado no banco de dados"
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 por %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 alterado de %2 para %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
 msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "%1 não pôde ser alterado para %2"
 
@@ -211,22 +232,20 @@ msgstr "%1 não pôde ser alterado para %2"
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 não pôde iniciar uma transação (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 não pôde alterar estado para resolvido.  O banco de dados do RT pode estar inconsistente."
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
 msgstr ""
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
 msgstr ""
@@ -235,16 +254,17 @@ msgstr ""
 msgid "%1 highest priority tickets I own..."
 msgstr "%1 tíquetes de mais alta prioridade que eu possuo..."
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "%1 tíquetes de mais alta prioridade que eu requeri..."
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr "%1 é uma ferramenta para modificar tíquetes a partir de uma ferramenta de agenda externa, como o cron."
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 não é mais um %2 para esta fila."
@@ -253,7 +273,8 @@ msgstr "%1 não é mais um %2 para esta fila."
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 não é mais um %2 para este tíquete."
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 não é mais um valor para o campo personalizado %2"
 
@@ -261,7 +282,11 @@ msgstr "%1 não é mais um valor para o campo personalizado %2"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 não é um identificador de fila válido."
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -270,7 +295,15 @@ msgstr "%1 não é um identificador de fila válido."
 msgid "%1 min"
 msgstr "%1 min"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
 msgstr ""
@@ -279,11 +312,11 @@ msgstr ""
 msgid "%1 not shown"
 msgstr "%1 não mostrado"
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "%1 direitos"
@@ -304,7 +337,7 @@ msgstr "Tipo %1 desconhecido para %2"
 msgid "%1 was created without a CurrentUser\\n"
 msgstr "%1 foi criado sem um CurrentUser\\n"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 resolverá todos os membros de um grupo de tíquetes resolvidos."
@@ -313,36 +346,72 @@ msgstr "%1 resolverá todos os membros de um grupo de tíquetes resolvidos."
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "%1 colocará como pendente uma BASE [local] se for dependente [ou membro] de uma requisição ligada."
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 על ידי %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
 msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: nenhum arquivo anexo especificado"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1b"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1k"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' é um valor inválido para o estado"
@@ -359,7 +428,7 @@ msgstr "(Assinale para remover o membro do grupo)"
 msgid "(Check box to delete scrip)"
 msgstr "(Assinale para remover o scrip)"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(Assinale para remover)"
 
@@ -367,49 +436,53 @@ msgstr "(Assinale para remover)"
 msgid "(Check boxes to delete)"
 msgstr "(Assinale para remover)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
 msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
+msgstr "(Entre com identificadores de tíquetes ou URLs, separados por espaços)"
+
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(Se deixado em branco, será entendido como %)"
+msgid "(If left blank, will default to %1"
+msgstr "(Se deixado em branco, será entendido como %1"
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
 msgstr "(Sem Valor)"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(Nenhum campo personalizado)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(Sem membros)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "(Sem scrips)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr "(Nenhum esquema)"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
 msgstr ""
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Envia uma cópia-cega (Bcc) desta atualização para uma lista de endereços de email separados por vírgula.  <b>Não</b> altera quem vai receber atualizações futuras.)"
 
@@ -417,11 +490,11 @@ msgstr "(Envia uma cópia-cega (Bcc) desta atualização para uma lista de ender
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Envia uma cópia-cega (Bcc) desta atualização para uma lista de endereços eletrônicos separados por vírgulas. <b>Não</b> altera o destinatário de atualizações futuras.)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Envia uma cópia-cega (Bcc) desta atualização para uma lista de endereços eletrônicos separados por vírgulas. <b>Não</b> altera o destinatário de atualizações futuras.)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(Envia uma cópia-cega (Bcc) desta atualização para uma lista de endereços eletrônicos separados por vírgulas. <b>Não</b> altera o destinatário de atualizações futuras.)"
 
@@ -429,43 +502,51 @@ msgstr "(Envia uma cópia-cega (Bcc) desta atualização para uma lista de ender
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(Envia uma cópia desta atualização para uma lista de endereços eletrônicos separados por vírgulas. <b>Não</b> altera o destinatário de atualizações futuras.)"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(Envia uma cópia desta atualização para uma lista de endereços eletrônicos separados por vírgulas. Estas pessoas <b>receberão</b> as atualizações futuras.)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
 msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(vazio)"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr "(nenhum nome listado)"
 
 #: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "(no subject)"
 msgstr "(Sem assunto)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(sem valor)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
 msgstr ""
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(somente um tíquete)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(aguardando aprovação)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
 msgstr ""
 
@@ -477,15 +558,19 @@ msgstr "(aguardando outros tíquetes)"
 msgid "(requestor's group)"
 msgstr "(grupo do requisitante)"
 
-#: html/Admin/Users/Modify.html:71
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(requerido)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(sem título)"
 
 #: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I own..."
 msgstr "25 tíquetes mais prioritários que possuo..."
 
@@ -493,35 +578,35 @@ msgstr "25 tíquetes mais prioritários que possuo..."
 msgid "25 highest priority tickets I requested..."
 msgstr "25 tíquetes mais prioritários que requisitei..."
 
-#: html/Ticket/Elements/ShowBasics:53
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr "<% $Ticket->Status%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr "<% $_ %>"
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"Novo tíquete em\">&nbsp;%1"
 
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
 #: etc/initialdata:218
 msgid "A blank template"
 msgstr "Um modelo vazio"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "ACE Deleted"
 msgstr "ACE Removida"
@@ -538,72 +623,60 @@ msgstr "ACE não pôde ser removida"
 msgid "ACE could not be found"
 msgstr "ACE não pode ser encontrada"
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE não encontrado"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "ACEs só podem ser criados e removidos."
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "Abortando para evitar modificações indesejadas no tíquete.\\n"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "Sobre mim"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "Controle de acesso"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Ação"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "Ação %1 não encontrada"
 
-#: NOT FOUND IN SOURCE
+#: bin/rt-crontool:119
 msgid "Action committed."
 msgstr "Ação confirmada."
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr ""
-
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "Ação preparada..."
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
 msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "Adicionar AdminCc"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "Adicionar Cc"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
 msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "Adicionar Mais Arquivos"
 
@@ -611,11 +684,11 @@ msgstr "Adicionar Mais Arquivos"
 msgid "Add Next State"
 msgstr "Adicionar Próximo Estado"
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "Adicionar Requisitante"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr ""
 
@@ -639,53 +712,49 @@ msgstr "Adicionar um novo scrip global"
 msgid "Add a scrip to this queue"
 msgstr "Adicionar um scrip a esta fila"
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr "Adicionar um scrip que se aplicará a todas as filas"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
 msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "Adicionar comentários ou respostas aos tíquetes selecionados"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "Adicionar membros"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Adicionar novos observadores"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "AddNextState"
 msgstr "AddNextState"
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "Principal adicionado como um %1 para esta fila"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "Principal adicionado como um %1 para este tíquete"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "Endereço 1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "Endereço 2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "Admin Cc"
 
@@ -697,7 +766,7 @@ msgstr "Comentário do Administrador"
 msgid "Admin Correspondence"
 msgstr "Correspondência do Administrador"
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "Administração de filas"
 
@@ -705,7 +774,7 @@ msgstr "Administração de filas"
 msgid "Admin users"
 msgstr "Administração de usuários"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "Administração da configuração global"
 
@@ -721,7 +790,7 @@ msgstr "Administração de uma fila"
 msgid "AdminAllPersonalGroups"
 msgstr "AdminAllPersonalGroups"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "AdminCc"
 
@@ -733,35 +802,35 @@ msgstr "AdminComment"
 msgid "AdminCorrespondence"
 msgstr "AdminCorrespondence"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Queue_Overlay.pm:73
 msgid "AdminCustomFields"
 msgstr "AdminCustomFields"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "AdminGroup"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "AdminGroupMembership"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr "AdminOwnPersonalGroups"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr "AdminQueue"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr "AdminUsers"
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "Cc Administrativo"
 
@@ -769,7 +838,7 @@ msgstr "Cc Administrativo"
 msgid "Admins"
 msgstr "Administradores"
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
 msgstr ""
 
@@ -777,7 +846,11 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Busca avançada"
 
-#: html/Elements/SelectDateRelation:57
+#: NOT FOUND IN SOURCE
+msgid "Advanced Search Criteria"
+msgstr ""
+
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "Depois"
 
@@ -785,8 +858,8 @@ msgstr "Depois"
 msgid "Age"
 msgstr "Idade"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
+#: NOT FOUND IN SOURCE
+msgid "Alias"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -798,10 +871,14 @@ msgid "All Approvals Passed"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "Todos os Campos Personalizados"
 
-#: html/Admin/Queues/index.html:75
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "Todas as filas"
 
@@ -809,39 +886,35 @@ msgstr "Todas as filas"
 msgid "Always sends a message to the requestors independent of message sender"
 msgstr "Sempre envia uma mensagem para os requisitantes independentemente do remetente"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr ""
-
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
 msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
 msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "Aprovação"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "Aprovação #%1: %2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr "Aprovação #%1: Notas não registradas devido a um erro de sistema"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr "Aprovação #%1: Notas registradas"
@@ -862,7 +935,7 @@ msgstr ""
 msgid "Approval diagram"
 msgstr "Diagrama da aprovação"
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "Aprove"
 
@@ -870,7 +943,7 @@ msgstr "Aprove"
 msgid "Approver's notes: %1"
 msgstr "Notas do aprovador: %1"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "Abr."
 
@@ -878,52 +951,72 @@ msgstr "Abr."
 msgid "April"
 msgstr "Abril"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
 msgstr ""
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "Anexar"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "Arquivo anexado"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "Arquivo anexo '%1' não pôde ser carregado"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "Arquivo anexo criado"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "Nome do arquivo anexo"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Arquivos anexos"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
 msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "Ago."
 
@@ -947,6 +1040,10 @@ msgstr "Autoreply para Requisitantes"
 msgid "AutoreplyToRequestors"
 msgstr "AutoreplyToRequestors"
 
+#: html/Search/Elements/EditFormat:4
+msgid "Available Columns"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
 msgstr "Assinatura PGP inválida: %1\\n"
@@ -963,19 +1060,19 @@ msgstr "Dados inválidos em %1"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "Número inválido de transação para o arquivo anexo.  %1 deveria ser %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "Básicos"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "Não se esqueça de salvar suas alterações"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "Antes"
 
@@ -983,117 +1080,128 @@ msgstr "Antes"
 msgid "Begin Approval"
 msgstr "Incício da Aprovação"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
+#: NOT FOUND IN SOURCE
+msgid "Binary"
 msgstr ""
 
 #: etc/initialdata:217
 msgid "Blank"
 msgstr "Vazio"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
 msgstr "URL para guardar esta busca em seus marcadores"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
 msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "Cabeçalhos resumidos"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "Atualização de tíquetes em lote"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "Não posso modificar os usuários do sistema"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr "Este principal pode ver esta fila"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "Não posso adicionar um valor de campo personalizado sem um nome"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
 msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "Não posso ligar um tíquete a ele mesmo"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "Não posso unir a um tíquete já unido.  Você nunca deve obter este erro"
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
 msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "Não especifique origem e destino simultaneamente"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "Não posso criar o usuário: %1"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Cc"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "Mudar a senha"
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
 msgstr ""
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "Assinale para remover"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "Assinalar para revogar o direito de acesso"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "Filhos"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "Cidade"
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
 msgstr ""
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "Fechado"
 
+#: html/SelfService/Closed.html:24
+msgid "Closed Tickets"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Closed requests"
 msgstr "Requisições fechadas"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr ""
 
@@ -1105,11 +1213,11 @@ msgstr "Código"
 msgid "Command not understood!\\n"
 msgstr "Comando não entendido!\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Comentário"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "Endereço de Comentário"
 
@@ -1117,11 +1225,11 @@ msgstr "Endereço de Comentário"
 msgid "Comment not recorded"
 msgstr "Comentário não registrado"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr "Comente sobre os tíquetes"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr "CommentOnTicket"
 
@@ -1129,11 +1237,11 @@ msgstr "CommentOnTicket"
 msgid "Comments"
 msgstr "Comentários"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "Comentários (não enviados aos requisitantes)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "Comentários (não enviados aos requisitantes)"
 
@@ -1141,15 +1249,15 @@ msgstr "Comentários (não enviados aos requisitantes)"
 msgid "Comments about %1"
 msgstr "Comentários sobre %1"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "Comentários sobre este usuário"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "Comentários adicionados"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr ""
 
@@ -1157,23 +1265,23 @@ msgstr ""
 msgid "Compile Restrictions"
 msgstr "Compilar restrições"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "Condição"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr "Condição satisfeita..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "Condição não encontrada"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "Configuração"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1185,11 +1293,11 @@ msgstr "Informação de contato"
 msgid "Contacted date '%1' could not be parsed"
 msgstr "Data de contato '%1' não pôde ser entendida"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "Conteúdo"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr ""
 
@@ -1197,7 +1305,7 @@ msgstr ""
 msgid "Coould not create group"
 msgstr "Não pude criar o grupo"
 
-#: html/Search/Elements/EditSearches:64
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
 msgstr ""
 
@@ -1209,7 +1317,7 @@ msgstr "Correspondência"
 msgid "Correspondence Address"
 msgstr "Endereço de correspondência"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "Correspondência adicionada"
 
@@ -1217,7 +1325,7 @@ msgstr "Correspondência adicionada"
 msgid "Correspondence not recorded"
 msgstr "Correspondência não registrada"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
 msgstr "Não pude adicionar novo valor de campo personalizado para o tíquete. "
 
@@ -1225,43 +1333,29 @@ msgstr "Não pude adicionar novo valor de campo personalizado para o tíquete. "
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "Não pude adicionar novo valor de campo personalizado para o tíquete. %1"
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr ""
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "Não pude alterar o proprietário. "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "Não pude criar CampoPersonalizado"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
-
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "Não pude criar o grupo"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "Não pude criar o modelo: %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "Não pude criar o tíquete. Fila não selecionada"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "Não pude criar o usuário"
 
@@ -1277,11 +1371,11 @@ msgstr "Não pude encontrar um tíquete com identificador %1"
 msgid "Could not find group %1."
 msgstr "Não pude encontrar o grupo %1."
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "Não pude encontrar ou criar o usuário"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "Não pude encontrar este principal"
 
@@ -1289,34 +1383,25 @@ msgstr "Não pude encontrar este principal"
 msgid "Could not find user %1."
 msgstr "Não pude encontrar o usuário %1."
 
-#: html/Admin/CustomFields/Objects.html:69
+#: NOT FOUND IN SOURCE
 msgid "Could not load CustomField %1"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "Não pude carregar o grupo"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "Não pude fazer este principal um %1 para esta fila"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "Não pude fazer este principal um %1 para este tíquete"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "Não pude remover este principal como um %1 para esta fila"
@@ -1325,15 +1410,15 @@ msgstr "Não pude remover este principal como um %1 para esta fila"
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "Não pude remover este principal como um %1 para este tíquete"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "Não pude adicionar o membro no grupo"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "Não pude criar uma transação: %1"
@@ -1346,15 +1431,15 @@ msgstr "Não sei o que fazer com a resposta do gpg\\n"
 msgid "Couldn't find group\\n"
 msgstr "Não encontrei o grupo\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr "Não pude encontrar o registro"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "Não encontrei este principal"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "Não encontrei este valor"
 
@@ -1366,18 +1451,16 @@ msgstr "Não pude encontrar este observador"
 msgid "Couldn't find user\\n"
 msgstr "Não pude encontrar o usuário\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "Não pude carregar %1 do banco de dados de usuários.\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr ""
 
@@ -1393,26 +1476,25 @@ msgstr "Não pude carregar o arquivo de configuração do RT '%1' %2"
 msgid "Couldn't load Scrips."
 msgstr "Não pude carregar os Scrips."
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "Não pude carregar o grupo %1"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "Não pude carregar a ligação"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
 msgstr ""
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "Não pude carregar a fila"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "Não pude carregar a fila %1"
@@ -1429,26 +1511,16 @@ msgstr "Não pude carregar o modelo"
 msgid "Couldn't load that user (%1)"
 msgstr "Não pude carregar este usuário (%1)"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "Não pude carregar o tíquete '%1'"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "País"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "Criar"
 
@@ -1456,16 +1528,20 @@ msgstr "Criar"
 msgid "Create Tickets"
 msgstr "Criar Tíquetes"
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "Criar um CampoPersonalizado"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr "Criar um Campo Personalizado para a fila %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:47
 msgid "Create a CustomField which applies to all queues"
 msgstr "Criar um Campo Personalizado para todas as filas"
 
@@ -1474,6 +1550,10 @@ msgid "Create a new Custom Field"
 msgstr "Criar um novo Campo Personalizado"
 
 #: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create a new global Scrip"
 msgstr "Criar um novo Scrip global"
 
@@ -1481,11 +1561,11 @@ msgstr "Criar um novo Scrip global"
 msgid "Create a new global scrip"
 msgstr "Criar um novo scrip global"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "Criar um novo grupo"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "Criar um novo grupo pessoal"
 
@@ -1501,15 +1581,15 @@ msgstr "Criar um novo scrip"
 msgid "Create a new template"
 msgstr "Criar um novo modelo"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "Criar um novo tíquete"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "Criar um novo usuário"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "Criar uma fila"
 
@@ -1521,20 +1601,28 @@ msgstr "Criar uma fila chamada"
 msgid "Create a request"
 msgstr "Criar uma requisição"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr "Criar um scrip para a fila %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "Criar um modelo"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create failed: %1 / %2 / %3 "
 msgstr "Criação falhou: %1 / %2 / %3 "
 
@@ -1546,19 +1634,19 @@ msgstr "Criação falhou: %1/%2/%3"
 msgid "Create new tickets based on this scrip's template"
 msgstr "Criar novos tíquetes baseados no esquema deste scrip"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "Criar um tíquete"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr "Criar tíquetes nesta fila"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "Criar, remover e modificar campos personalizados"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr "Criar, remover e modificar filas"
 
@@ -1566,52 +1654,60 @@ msgstr "Criar, remover e modificar filas"
 msgid "Create, delete and modify the members of any user's personal groups"
 msgstr "Criar, remover e modificar os membros dos grupos pessoais de qualquer usuário"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "Criar, remover e modificar os membros de grupos pessoais"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "Criar, remover e modificar usuários"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr "CreateTicket"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "Criado"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "CampoPersonalizado %1 criado"
 
 #: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr "Modelo %1 criado"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
 msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "Relações atuais"
 
-#: html/Admin/Elements/EditScrips:51
+#: NOT FOUND IN SOURCE
+msgid "Current Relationships"
+msgstr ""
+
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "Scrips correntes"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "Membros atuais"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Direitos de acesso atuais"
 
@@ -1619,63 +1715,68 @@ msgstr "Direitos de acesso atuais"
 msgid "Current search criteria"
 msgstr "Critério de busca atual"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "Observadores atuais"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
 msgid "Custom Field #%1"
 msgstr "Campo Personalizado #%1"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "Campos Personalizados"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr "Código de finalização da ação customizada"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "Código de preparação da ação customizada"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "Condição customizada"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "Campo personalizado %1 %2 %3"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: NOT FOUND IN SOURCE
+msgid "Custom field %1 does not apply to this object"
+msgstr ""
+
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "O campo personalizado %1 tem um valor."
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "O campo personalizado %1 não tem valor."
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "Campo personalizado %1 não encontrado"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
 msgstr "Campo personalizado removido"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "Campo personalizado não encontrado"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "O valor de campo %1 não pôde ser encontrado para o campo personalizado %2"
@@ -1684,19 +1785,19 @@ msgstr "O valor de campo %1 não pôde ser encontrado para o campo personalizado
 msgid "Custom field value changed from %1 to %2"
 msgstr "O valor do campo personalizado foi alterado de %1 para %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "O valor do campo personalizado não pôde ser removido"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "O valor de campo personalizado não pôde ser encontrado"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "Valor do campo personalizado removido"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr ""
 
@@ -1704,11 +1805,11 @@ msgstr ""
 msgid "Data error"
 msgstr "Erro de dado"
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Datas"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "Dez."
 
@@ -1724,11 +1825,11 @@ msgstr "Esquema Padrão de Autoresposta"
 msgid "Default Autoresponse template"
 msgstr "Esquema padrão de Autoresposta"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
 msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
 msgstr ""
 
@@ -1748,64 +1849,60 @@ msgstr "Esquema padrão de correspondência"
 msgid "Default transaction template"
 msgstr "Esquema padrão de transação"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "Padrão: %1/%2 mudou de %3 para %4"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
 msgstr "Delegar direitos de acesso"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr "Delegar direitos específicos que foram outorgados a você."
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr "DelegateRights"
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "Delegação"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "Remover"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr "Remover tíquetes"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr "DeleteTicket"
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "Ao remover este objeto você pode quebrar a integridade referencial"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "Ao remover este objeto você quebra a integridade referencial"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "Ao remover este objeto você viola a integridade referencial"
 
@@ -1817,11 +1914,11 @@ msgstr "Remover este objeto violaria a integridade referencial"
 msgid "Deleting this object would violate referential integrity. That's bad."
 msgstr "Remover este objeto violaria a integridade referencial.  Isto é mau."
 
-#: html/Approvals/Elements/Approve:66
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "Negue"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "Dependem deste tíquete"
 
@@ -1829,27 +1926,27 @@ msgstr "Dependem deste tíquete"
 msgid "Dependencies: \\n"
 msgstr "Dependências: \\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "Depende de"
 
@@ -1857,15 +1954,15 @@ msgstr "Depende de"
 msgid "DependsOn"
 msgstr "DependsOn"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "Descendente"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "Descreva o problema abaixo"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Descrição"
 
@@ -1873,31 +1970,31 @@ msgstr "Descrição"
 msgid "Details"
 msgstr "Detalhes"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "Apresentação"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr "Mostrar Lista de Controle de Acesso"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr "Mostras os esquemas de Scrip para esta fila"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr "Mostrar os Scrips para esta fila"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "Modo de apresentação"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
 msgstr ""
 
@@ -1905,19 +2002,15 @@ msgstr ""
 msgid "Display ticket #%1"
 msgstr "Apresentar o tíquete #%1"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "Fazer qualquer coisa"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "Não recarregar esta página."
 
@@ -1925,15 +2018,19 @@ msgstr "Não recarregar esta página."
 msgid "Don't show search results"
 msgstr "Não mostrar resultados da busca"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "Baixar"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
 msgstr ""
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "Vencido"
 
@@ -1953,32 +2050,28 @@ msgstr "Editar"
 msgid "Edit Conditions"
 msgstr "Editar Condições"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "Editar Campos Personalizados para %1"
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
 msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "Editar Relacionamentos"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
 msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: NOT FOUND IN SOURCE
+msgid "Edit Relationships"
+msgstr ""
+
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr "Editar Esquemas para a fila %1"
@@ -1987,7 +2080,7 @@ msgstr "Editar Esquemas para a fila %1"
 msgid "Edit keywords"
 msgstr "Editar palavras chave"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr ""
 
@@ -1995,7 +2088,7 @@ msgstr ""
 msgid "Edit scrips"
 msgstr "Editar scrips"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "Editar os modelos do sistema"
 
@@ -2003,11 +2096,15 @@ msgstr "Editar os modelos do sistema"
 msgid "Edit templates for %1"
 msgstr "Editar os modelos para %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr "Editando a configuração para a fila %1"
@@ -2016,17 +2113,17 @@ msgstr "Editando a configuração para a fila %1"
 msgid "Editing Configuration for user %1"
 msgstr "Editando a configuração para o usuário %1"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "Editando o campo %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "Editando os membros do grupo %1"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "Editando os membros do grupo pessoal %1"
@@ -2035,15 +2132,15 @@ msgstr "Editando os membros do grupo pessoal %1"
 msgid "Editing template %1"
 msgstr "Editando o modelo %1"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "Você deve especificar a origem ou o destinatário"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "Email"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "O endereço de email já está em uso"
 
@@ -2055,61 +2152,76 @@ msgstr "Correio Eletrônico"
 msgid "EmailEncoding"
 msgstr "Codificação de Email"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr "Habilitado (Deselecionando este ítem desabilita este campo personalizado)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "Habilitado (Deselecionando este ítem desabilita este grupo)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "Habilitado (desassinalando desabilita esta fila)"
 
 #: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
 msgstr "Campos Personalizados Habilitados"
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr "Filas Habilitadas"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "Estado %1 habilitado"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "Entre com múltiplos valores"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "Entre com um valor"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
 msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
+msgstr ""
+
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "Entre com identificadores de tíquete ou URIs que levam ao tíquete.  Separe entradas múltiplas com espaços."
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
 msgstr ""
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Erro"
 
@@ -2117,7 +2229,7 @@ msgstr "Erro"
 msgid "Error adding watcher"
 msgstr "Erro ao adicionar um observador"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "Erro nos parâmetros para Queue->AddWatcher"
 
@@ -2125,11 +2237,11 @@ msgstr "Erro nos parâmetros para Queue->AddWatcher"
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "Erro nos parâmetros para Queue->DelWatcher"
 
-#: lib/RT/Queue_Overlay.pm:830
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "Erro nos parâmetros para Ticket->AddWatcher"
 
@@ -2137,15 +2249,19 @@ msgstr "Erro nos parâmetros para Ticket->AddWatcher"
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "Erro nos parâmetros para Ticket->DelWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
 msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: NOT FOUND IN SOURCE
+msgid "Estimate"
+msgstr ""
+
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
 msgstr ""
 
@@ -2153,7 +2269,7 @@ msgstr ""
 msgid "Everyone"
 msgstr "Todos"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "Exemplo:"
 
@@ -2165,33 +2281,32 @@ msgstr "ExternalAuthId"
 msgid "ExternalContactInfoId"
 msgstr "ExternalContactInfoId"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "Informação adicional"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "Não pude encontrar o pseudogrupo de usuários 'Privileged'."
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "Não pude encontrar o pseudogrupo de usuários 'Unprivileged'"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr "Falhou ao carregar o módulo %1. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "Fev."
 
@@ -2199,51 +2314,39 @@ msgstr "Fev."
 msgid "February"
 msgstr "Fevereiro"
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:69
+#: NOT FOUND IN SOURCE
 msgid "Fill in multiple text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
+#: NOT FOUND IN SOURCE
 msgid "Fill in one text area"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Fin"
 msgstr "Fin"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "Prioridade Final"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr "FinalPriority"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
 msgid "Find group whose"
 msgstr "Encontrar o grupo cujo"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
 msgstr ""
 
@@ -2251,11 +2354,11 @@ msgstr ""
 msgid "Find new/open tickets"
 msgstr "Encontrar tíquetes novos/abertos"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "Encontrar pessoas que"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "Encontrar tíquetes"
 
@@ -2263,7 +2366,7 @@ msgstr "Encontrar tíquetes"
 msgid "Finish Approval"
 msgstr "Terminar Aprovação"
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "Primeiro"
 
@@ -2271,52 +2374,52 @@ msgstr "Primeiro"
 msgid "First page"
 msgstr "Primeira página"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "Foo Bar Baz"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "Foo!"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "Force alteração"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "Encontrado %quant(%1,tíquete)"
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "Objeto Encontrado"
 
 #: NOT FOUND IN SOURCE
+msgid "Freeform"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "FreeformContactInfo"
 msgstr "FreeformContactInfo"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:37
 msgid "FreeformMultiple"
 msgstr "FreeformMultiple"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:36
 msgid "FreeformSingle"
 msgstr "FreeformSingle"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "Sex."
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "Cabeçalhos completos"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
 msgstr ""
 
@@ -2324,16 +2427,16 @@ msgstr ""
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "Obtendo o usuário corrente a partir de uma assinatura pgp\\n"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "Dado a %1"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Global"
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
 msgstr ""
 
@@ -2345,20 +2448,16 @@ msgstr "Seleções de Palavras Chave Globais"
 msgid "Global Scrips"
 msgstr "Scrips Globais"
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr ""
-
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "Esquema global: %1"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
 msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "Ir!"
 
@@ -2370,11 +2469,15 @@ msgstr "Assinatura pgp válida de %1\\n"
 msgid "Goto page"
 msgstr "Ir para a página"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "Ir para o tíquete"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Grupo"
 
@@ -2382,11 +2485,11 @@ msgstr "Grupo"
 msgid "Group %1 %2: %3"
 msgstr "Grupo %1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "Direitos de Acesso do Grupo"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "O grupo já tem um membro"
 
@@ -2394,20 +2497,20 @@ msgstr "O grupo já tem um membro"
 msgid "Group could not be created."
 msgstr "O grupo não pôde ser criado."
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "O grupo não pôde ser criado: %1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "Grupo criado"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "O grupo não contém este membro"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Grupo não encontrado"
 
@@ -2419,42 +2522,44 @@ msgstr "Grupo não encontrado.\\n"
 msgid "Group not specified.\\n"
 msgstr "Grupo não especificado.\\n"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Grupos"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "Grupos não podem ser membros de seus próprios membros"
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
 msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:77
+#: NOT FOUND IN SOURCE
 msgid "Groups this user belongs to"
 msgstr ""
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "Olá!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "Olá, %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "Histórico"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
 msgstr ""
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
 msgstr ""
 
@@ -2462,11 +2567,11 @@ msgstr ""
 msgid "HomePhone"
 msgstr "Telefone Residencial"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "Homepage"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "Eu tenho %quant(%1,concrete mixer)."
@@ -2475,15 +2580,11 @@ msgstr "Eu tenho %quant(%1,concrete mixer)."
 msgid "I have [quant,_1,concrete mixer]."
 msgstr "Tenho [quant,_1,concrete mixer]."
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr ""
-
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "Identificador"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Identidade"
 
@@ -2491,63 +2592,63 @@ msgstr "Identidade"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "Se uma aprovação é rejeitada, rejeite a original e remova as aprovações pendentes"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
 msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
 msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr "Se esta ferramenta fosse setgid, um usuário local mal-intencionado poderia usá-la para obter acesso administrativo ao RT."
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "Se você alterou qualquer coisa acima, não se esqueça de"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "Valor ilegal para %1"
 
-#: lib/RT/Record.pm:936
+#: NOT FOUND IN SOURCE
+msgid "Image"
+msgstr ""
+
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "Campo imutável"
 
 #: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "Incluir campoas personalizados desabilitados na listagem."
 
-#: html/Admin/Groups/index.html:65
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
 msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
 msgstr "Incluir filas desabilitadas na listagem."
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "Incluir usuários desabilitados na busca."
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "Prioridade Inicial"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr "InitialPriority"
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "Erro de entrada"
 
@@ -2555,20 +2656,20 @@ msgstr "Erro de entrada"
 msgid "Interest noted"
 msgstr "Interesse notado"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "Erro Interno"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "Erro Interno: %1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "Tipo Inválido de Grupo"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "Direito Inválido"
 
@@ -2576,7 +2677,7 @@ msgstr "Direito Inválido"
 msgid "Invalid Type"
 msgstr "Tipo Inválido"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "Dado inválido"
 
@@ -2584,48 +2685,44 @@ msgstr "Dado inválido"
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "Proprietário inválido.  Usando 'nobody'."
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "Fila inválida"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "Direito de acesso inválido"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "Valor inválido para %1"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "Valor inválido para o campo personalizado"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "Valor inválido para o estado"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr "É extremamente importante que usuários não privilegiados não possam executar esta ferramenta."
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr "Sugere-se que você crie um usuário UNIX não privilegiado com o grupo e acesso RT corretos para executar esta ferramenta."
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr "Requer vários argumentos:"
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Items pending my approval"
 msgstr "Itens requerendo minha aprovação"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "Jan."
 
@@ -2633,11 +2730,11 @@ msgstr "Jan."
 msgid "January"
 msgstr "Janeiro"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "Entre ou deixe este grupo"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "Jul."
 
@@ -2645,11 +2742,11 @@ msgstr "Jul."
 msgid "July"
 msgstr "Julho"
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "Jumbo"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "Jun."
 
@@ -2665,23 +2762,23 @@ msgstr "Palavra chave"
 msgid "Lang"
 msgstr "Líng"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr ""
-
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "Último"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "Último Contato"
 
-#: html/Elements/SelectDateType:50
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
+
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "Contactado em"
 
@@ -2689,7 +2786,7 @@ msgstr "Contactado em"
 msgid "Last Notified"
 msgstr "Notificado em"
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "Atualizado em"
 
@@ -2697,19 +2794,19 @@ msgstr "Atualizado em"
 msgid "LastUpdated"
 msgstr "LastUpdated"
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
 msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "Resta"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "Deixar este usuário acessar RT"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "Deixar este usuário receber direitos de acesso adicionais"
 
@@ -2721,33 +2818,29 @@ msgstr "Limitando proprietário a %1 %2"
 msgid "Limiting queue to %1 %2"
 msgstr "Limitando fila a %1 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "A ligação já existe"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "A ligação não pôde ser criada"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "Ligação criada (%1)"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "Ligação removida (%1)"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Ligação não encontrada"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "Ligar o tíquete #%1"
@@ -2756,122 +2849,113 @@ msgstr "Ligar o tíquete #%1"
 msgid "Link ticket %1"
 msgstr "Ligar o tíquete %1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Ligações"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
 msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "Localização"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "O diretório de log %1 não foi encontrado ou não pôde ser alterado.\\n RT não pode funcionar desta maneira."
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "Assinado como %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "Entrar"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "Sair"
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
 msgstr ""
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "Definir como proprietário"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "Definir o estado"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "Definir o prazo final"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "Definir a data de resolução"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "Definir a data de iniciado"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "Definir a data início"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "Definir a data de última alteração"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "Definir a prioridade"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "Definir a fila"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "Definir o assunto"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
 msgstr ""
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
 msgstr ""
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "Administrar grupos e seus membros"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "Administrar propriedades e configurações aplicáveis a todas as filas"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr "Administrar filas e suas propriedades específicas"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "Administrar usuários e senhas"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "Mar."
 
@@ -2883,33 +2967,33 @@ msgstr "Março"
 msgid "May"
 msgstr "Maio"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "Mai."
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "Membro adicionado"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "Membro removido"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "Membro não removido"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "Membro de"
 
@@ -2917,75 +3001,74 @@ msgstr "Membro de"
 msgid "MemberOf"
 msgstr "MemberOf"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "Membros"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
 msgstr ""
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "União bem sucedida"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "União falhou. Não pude definir o EffectiveId"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "Unir a"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
 msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: NOT FOUND IN SOURCE
+msgid "Message body not shown because it is too large or is not plain text."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
-msgid "Message recorded"
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
-msgid "Messages about this ticket will not be sent to..."
+#: lib/RT/Ticket_Overlay.pm:2517
+msgid "Message recorded"
 msgstr ""
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
+#: html/Ticket/Elements/PreviewScrips:70
+msgid "Messages about this ticket will not be sent to..."
 msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "Faltando uma chave primária?: %1"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "Móvel"
 
@@ -2993,7 +3076,15 @@ msgstr "Móvel"
 msgid "MobilePhone"
 msgstr "Celular"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "Modificar Lista de Controle de Acesso"
 
@@ -3001,37 +3092,31 @@ msgstr "Modificar Lista de Controle de Acesso"
 msgid "Modify Custom Field %1"
 msgstr "Modificar o campo personalizado %1"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr ""
-
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
+#: NOT FOUND IN SOURCE
 msgid "Modify Custom Fields which apply to all %1"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "Modificar Campos Personalizados que se aplicam a todas as filas"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
 msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
 msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr "Modificar esquemas de Scrip para esta fila"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "Modificar Scrips para esta fila"
 
@@ -3043,30 +3128,33 @@ msgstr "Modificar ACLs do Sistema"
 msgid "Modify Template %1"
 msgstr "Modificar Esquema %1"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
 msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
 msgstr "Modificar um Campo Personalizado para a fila %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:52
 msgid "Modify a CustomField which applies to all queues"
 msgstr "Modificar um Campo Personalizado que se aplica a todas as filas"
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr "Modificar um scrip para a fila %1"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "Modificar um scrip aplicável a todas as filas"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
 msgstr ""
 
@@ -3074,25 +3162,21 @@ msgstr ""
 msgid "Modify dates for # %1"
 msgstr "Modificar datas para # %1"
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "Modificar as datas para #%1"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "Modificar as datas para o tíquete # %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "Modificar direitos de acesso globais de grupo"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "Modificar direitos de acesso globais de grupo."
 
@@ -3108,110 +3192,108 @@ msgstr "Modificar direitos globais para usuários"
 msgid "Modify global scrips"
 msgstr "Modificar scrips globais"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "Modificar direitos de acesso globais de usuário"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "Modificar direitos de acesso globais de usuário."
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "Modificar metadados do grupo ou removê-lo"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "Modificar os direitos de acesso do grupo %1"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "Modificar os direitos de acesso de grupo para a fila %1"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "Modificar lista de membros deste grupo"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr "Modificar sua própria conta RT"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr "Modificar as pessoas relacionadas à fila %1"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "Modificar as pessoas relacionadas ao tíquete #%1"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "Modificar os scrips da fila %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr "Modificar scrips aplicáveis a todas as filas"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "Modificar o modelo %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "Modificar esquemas que se aplicam a todas as filas"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "Modificar o grupo %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "Modificar os observadores da fila"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "Modificar o usuário %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "Modificar o tíquete # %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "Modificar o tíquete #%1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "Modificar tíquetes"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
 msgstr ""
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "Modificar os direitos de acesso de usuário para o grupo %1"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr "Modificar os direitos de acesso de usuário para a fila %1"
@@ -3220,64 +3302,64 @@ msgstr "Modificar os direitos de acesso de usuário para a fila %1"
 msgid "Modify watchers for queue '%1'"
 msgstr "Modificar os observadores para a fila '%1'"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr "ModifyACL"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "ModifyOwnMembership"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr "ModifyQueueWatchers"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr "ModifyScrips"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr "ModifySelf"
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr "ModifyTemplate"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr "ModifyTicket"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "Seg."
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "Mais sobre %1"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: NOT FOUND IN SOURCE
+msgid "Move"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr "Descer"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr "Subir"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "Múltiplo"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "O atributo 'Name' deve ser especificado"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr ""
@@ -3286,39 +3368,47 @@ msgstr ""
 msgid "My Approvals"
 msgstr "Minhas Aprovações"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "Minhas aprovações"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Nome"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "Nome em uso"
 
 #: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Need approval from system administrator"
 msgstr "Precisa de aprovação do administrador do sistema"
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "Nunca"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "Novo"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "Novos Relacionamentos"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "Nova Senha"
 
@@ -3326,31 +3416,39 @@ msgstr "Nova Senha"
 msgid "New Pending Approval"
 msgstr "Nova Aprovação Pendente"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "New Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "New Search"
 msgstr "Nova busca"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "Novo campo personalizado"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "Novo grupo"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "Nova senha"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "Notificação de nova senha enviada"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "Nova fila"
 
@@ -3358,11 +3456,11 @@ msgstr "Nova fila"
 msgid "New request"
 msgstr "Nova requisição"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "Novos direitos de acesso"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "Novo scrip"
 
@@ -3370,27 +3468,27 @@ msgstr "Novo scrip"
 msgid "New search"
 msgstr "Nova busca"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "Novo esquema"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "O novo tíquete não existe"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "Novo usuário"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "Novo usuário chamado"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "Novos observadores"
 
@@ -3398,11 +3496,11 @@ msgstr "Novos observadores"
 msgid "New window setting"
 msgstr "Abrir nova janela"
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "Próximo"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
 msgstr ""
 
@@ -3414,39 +3512,43 @@ msgstr "Próxima página"
 msgid "NickName"
 msgstr "Apelido"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "Apelido"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
+msgid "No"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "Não há Campo Personalizado"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
 msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "Não há Grupo definido"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
 msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "Não há Fila definida"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr "Nenhum usuário RT foi encontrado. Favor consultar o administrador do RT.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "Não há Modelo"
 
@@ -3458,11 +3560,11 @@ msgstr "Não há Tíquete especificado.  Abortando o tíquete "
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
 msgstr "Não há Tíquete especificado. Abortando modificações no tíquete\\n\\n"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "Não há ação"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr "Não há coluna especificada"
 
@@ -3470,7 +3572,7 @@ msgstr "Não há coluna especificada"
 msgid "No command found\\n"
 msgstr "Comando não encontrado\\n"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "Não há comentário sobre este usuário"
 
@@ -3478,77 +3580,72 @@ msgstr "Não há comentário sobre este usuário"
 msgid "No correspondence attached"
 msgstr "Não há nenhum arquivo anexado"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "Não há descrição para %1"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "Não há grupo especificado"
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "Não há senha especificada"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr "Não há permissão para criar filas"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "Sem permissão para criar tíquetes na fila '%1'"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "Sem permissão para criar usuários"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "Sem permissão para mostrar o tíquete"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "sem permissão para ver modificar o tíquete"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "Não há principal especificado"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "Não há principal selecionado."
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr "Não há fila satisfazendo o critério de busca."
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "Nenhum direito encontrado"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "Nenhum direito outorgado."
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "Não há busca a realizar"
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
 msgstr ""
 
@@ -3556,7 +3653,7 @@ msgstr ""
 msgid "No ticket id specified"
 msgstr "Não há identificador de tíquete especificado"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "Não há tipo de transação especificada"
 
@@ -3564,7 +3661,7 @@ msgstr "Não há tipo de transação especificada"
 msgid "No user or email address specified"
 msgstr "Não há usuário ou endereço de email especificado"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "Nenhum usuário satisfazendo o critério de busca foi encontrado."
 
@@ -3572,15 +3669,15 @@ msgstr "Nenhum usuário satisfazendo o critério de busca foi encontrado."
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "Nenhum usuário RT válido foi encontrado. O tratador de CVS do RT está desabilitado. Por favor, consulte o administrador do RT.\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr "Nenhum valor enviado a _Set!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "Ninguém"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr "Campo inexistente?"
 
@@ -3588,15 +3685,15 @@ msgstr "Campo inexistente?"
 msgid "Not logged in"
 msgstr "Não logado"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "Não entrou."
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "Não definido"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "Ainda não implementado."
 
@@ -3604,11 +3701,11 @@ msgstr "Ainda não implementado."
 msgid "Not yet implemented...."
 msgstr "Ainda não implementado..."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "Notas"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "A notificação não pôde ser enviada"
 
@@ -3680,7 +3777,7 @@ msgstr "Notificar Requisitantes, Ccs e AdminCcs"
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "Notificar Requisitantes, Ccs e AdminCcs como Comentário"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "Nov."
 
@@ -3688,37 +3785,23 @@ msgstr "Nov."
 msgid "November"
 msgstr "Novembro"
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr ""
-
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr "Objeto não pôde ser criado"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr "Objeto criado"
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
 msgstr ""
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "Out."
 
@@ -3726,19 +3809,19 @@ msgstr "Out."
 msgid "October"
 msgstr "Outubro"
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
 msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
 msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "Em"
 
@@ -3778,21 +3861,21 @@ msgstr "Sobre Mudança de Estado"
 msgid "On Transaction"
 msgstr "Sobre Transação"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "Só mostrar aprovações para requisições criadas depois de %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "Só mostrar aprovações para requisições criadas antes de %1"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Aberto"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Abrir"
 
@@ -3800,7 +3883,7 @@ msgstr "Abrir"
 msgid "Open requests"
 msgstr "Requisições abertas"
 
-#: html/SelfService/Elements/Tabs:63
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr ""
 
@@ -3816,7 +3899,7 @@ msgstr "Abrir tíquetes (da listagem) em outra janela"
 msgid "Open tickets on correspondence"
 msgstr "Abrir tíquetes na correspondência"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
 msgstr ""
 
@@ -3824,36 +3907,40 @@ msgstr ""
 msgid "Ordering and sorting"
 msgstr "Requisitando e ordenando"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Organização"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "Tíquete originador: #%1"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "Após a data, a prioridade tende a"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: NOT FOUND IN SOURCE
+msgid "Overview"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr "Próprios tíquetes"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr "OwnTicket"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "Proprietário"
 
@@ -3861,11 +3948,11 @@ msgstr "Proprietário"
 msgid "Owner changed from %1 to %2"
 msgstr "Proprietário mudou de %1 para %2"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "Proprietário alterado à força de %1 para %2"
@@ -3874,12 +3961,12 @@ msgstr "Proprietário alterado à força de %1 para %2"
 msgid "Owner is"
 msgstr "O proprietário é"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "Pager"
 
@@ -3891,53 +3978,36 @@ msgstr "Telefone do Pager"
 msgid "Parent"
 msgstr "Pai"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "Pais"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "Senha"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "Lembrete de Senha"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "Senha muito curta"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "Senha: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
 msgstr ""
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr ""
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "Pessoas"
 
@@ -3945,31 +4015,39 @@ msgstr "Pessoas"
 msgid "Perform a user-defined action"
 msgstr "Realizar uma ação definida pelo usuário"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "Permissão Negada"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "Grupoas Pessoais"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Grupos pessoais"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Grupos pessoais:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "Telefones"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: NOT FOUND IN SOURCE
+msgid "Placeholder"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr ""
+
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -3977,15 +4055,15 @@ msgstr "Preferências"
 msgid "Prefs"
 msgstr "Prefs"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "Anterior"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
 msgstr ""
 
@@ -3997,20 +4075,20 @@ msgstr "Página anterior"
 msgid "Pri"
 msgstr "Pri"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "Principal %1 não encontrado."
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Prioridade"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "A prioridade inicia em"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
 msgstr ""
 
@@ -4018,32 +4096,36 @@ msgstr ""
 msgid "Privileged"
 msgstr "Privilegiado"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "Estado privilegiado: %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "Usuários privilegiados"
 
+#: NOT FOUND IN SOURCE
+msgid "Projects"
+msgstr ""
+
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr "Falso-grupo para uso interno"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
 msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
 msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "Fila"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
@@ -4057,7 +4139,7 @@ msgstr "A fila '%1' não foi encontrada\\n"
 msgid "Queue Keyword Selections"
 msgstr "Seleções de Palavras-chave da Fila"
 
-#: html/Admin/Queues/Modify.html:64
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "Nome da Fila"
 
@@ -4065,19 +4147,19 @@ msgstr "Nome da Fila"
 msgid "Queue Scrips"
 msgstr "Scrips da Fila"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "A fila já existe"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr "A fila não pôde ser criada"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr "A fila não pôde ser carregada"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "Fila criada"
 
@@ -4085,32 +4167,32 @@ msgstr "Fila criada"
 msgid "Queue is not specified."
 msgstr "A fila não foi especificada."
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "Fila não encontrada"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "Filas"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr ""
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
 msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 para %2"
@@ -4127,7 +4209,7 @@ msgstr "RT %1. Direitos reservados 1996-%1 Jesse Vincent <jesse\\@bestpractical.
 msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1. Direitos reservados 1996-2002 Jesse Vincent <jesse\\\\@bestpractical.com>\\\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "Adiministração do RT"
 
@@ -4147,7 +4229,7 @@ msgstr "Erro de configuração do RT"
 msgid "RT Critical error. Message not recorded!"
 msgstr "Erro crítico no RT.  A mensagem não foi registrada!"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "Erro no RT"
 
@@ -4160,14 +4242,18 @@ msgid "RT Recieved mail (%1) from itself."
 msgstr "O RT recebeu email (%1) de si próprio."
 
 #: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT Self Service / Closed Tickets"
 msgstr "Auto-serviço do RT / Tíquetes Fechados"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
 msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "RT por alto"
 
@@ -4183,15 +4269,11 @@ msgstr "O RT não pôde encontrar o requisitante através de consulta ao banco d
 msgid "RT couldn't find the queue: %1"
 msgstr "O RT não pôde encontrar a fila: %1"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "O RT não pôde validar esta assinatura PGP. \\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "RT para %1"
@@ -4209,6 +4291,10 @@ msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&
 msgstr "RT tem &copy; Direitos Reservados 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Ele é distribuído sob a <a href=\"http://www.gnu.org/copyleft/gpl.html\">Versão 2 da Licença Pública Geral GNU (GPL).</a>"
 
 #: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
 msgstr "RT tem &copy; Direitos Reservados 1996-%1 por Jesse Vincent &lt;jesse@bestpractical.com&gt;.  Ele é distribuído sob a <a href=\\\"http://www.gnu.org/copyleft/gpl.html\\\">Versão 2 da Licença Pública Geral GNU (GPL).</a>"
 
@@ -4224,7 +4310,11 @@ msgstr "O RT vai processar esta mensagem como se não fosse assinada.\\n"
 msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
 msgstr "O modo de comandos por email do RT requer autenticação PGP. Ou você não assinou sua mensagem ou sua assinatura não pôde ser verificada."
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "Nome real"
 
@@ -4232,31 +4322,31 @@ msgstr "Nome real"
 msgid "RealName"
 msgstr "Nome real"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "Referenciado por"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "Faz referência a"
 
@@ -4272,44 +4362,48 @@ msgstr "Refinar"
 msgid "Refine search"
 msgstr "Refinar a Busca"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Recarregar esta página a cada %1 minutos."
 
-#: html/Search/Bulk.html:116
+#: NOT FOUND IN SOURCE
+msgid "Relationships"
+msgstr ""
+
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "Remover AdminCc"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Remover Cc"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "Remover Requisitante"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Responder"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
 msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "Responder aos tíquetes"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "ReplyToTicket"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "Requisitante"
 
@@ -4325,37 +4419,37 @@ msgstr "Requisitante(s)"
 msgid "RequestorAddresses"
 msgstr "RequestorAddresses"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "Requisitantes"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "A requisições vencem em"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
 msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Restaurar"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Residência"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "Resolver"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "Resolver tíquete #%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "Resolvido"
 
@@ -4363,7 +4457,7 @@ msgstr "Resolvido"
 msgid "Response to requestors"
 msgstr "Resposta aos requisitantes"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "Resultados"
 
@@ -4371,11 +4465,11 @@ msgstr "Resultados"
 msgid "Results per page"
 msgstr "Resultados por página"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "Confirmar a Senha"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
 msgstr ""
 
@@ -4383,49 +4477,49 @@ msgstr ""
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "Direito de acesso %1 não encontrado para %2  %3 referente a %4 (%5)\\n"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "Direito de Acesso Delegado"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "Direito de Acesso Outorgado"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "Direito de Acesso Carregado"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "Direito de acesso não pôde ser revogado"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "Direito de acesso não encontrado"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "Direito de acesso não carregado."
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "Direito de acesso revogado"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Direitos de Acesso"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "Direitos de acesso não puderam ser outorgados a %1"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "Direitos de acesso não puderam ser revogados de %1"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "Papéis"
 
@@ -4433,59 +4527,53 @@ msgstr "Papéis"
 msgid "RootApproval"
 msgstr "RootApproval"
 
-#: html/Search/Elements/DisplayOptions:83
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
 msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "Sáb."
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
 msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "Salvar as Alterações"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "Salvar as alterações"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
 msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr "Scrip #%1"
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "Scrip Criado"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "Scrip removido"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "Scrips"
 
@@ -4493,11 +4581,11 @@ msgstr "Scrips"
 msgid "Scrips for %1\\n"
 msgstr "Scrips para %1\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr "Scrips aplicáveis a todas as filas"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "Buscar"
 
@@ -4505,136 +4593,127 @@ msgstr "Buscar"
 msgid "Search Criteria"
 msgstr "Critérios de Busca"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
-
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr "Buscar por aprovações"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Searches can't be associated with that kind of object"
 msgstr ""
 
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr "Segurança:"
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
 msgstr "SeeQueue"
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Select"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Select a Custom Field"
 msgstr ""
 
-#: html/Admin/Groups/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
+msgstr ""
+
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "Selecionar um grupo"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "Selecionar uma fila"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr ""
-
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "Selecionar um usuário"
 
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr "Selecionar um campo personalizado"
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr ""
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "Selecionar um campo personalizado"
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "Selecionar um grupo"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr "Selecionar múltiplos valores"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr "Selecionar um valor"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr "Selecionar uma fila"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr "Selecionar um scrip"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr "Selecionar um esquema"
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
 msgstr ""
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr "Selecionar um usuário"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectMultiple"
 msgstr "SelectMultiple"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:34
 msgid "SelectSingle"
 msgstr "SelectSingle"
 
-#: html/Admin/Elements/EditCustomFields:58
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
 msgstr ""
 
@@ -4686,51 +4765,59 @@ msgstr "Envia uma mensagem aos Ccs administrativos como um comentário"
 msgid "Sends mail to the owner"
 msgstr "Envia uma mensagem ao proprietário"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "Set."
 
 #: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "September"
 msgstr "Setembro"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
 msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "Mostrar os Resultados"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "Mostrar requisições aprovadas"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "Mostrar o sumário"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "Mostrar requisições negadas"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "Mostrar os detalhes"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "Mostrar requisições pendentes"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "Mostrar requisições aguardando outras aprovações"
 
@@ -4742,47 +4829,43 @@ msgstr "Mostrar comentário privado do tíquete"
 msgid "Show ticket summaries"
 msgstr "Mostrar sumários do tíquete"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
 msgstr "ShowACL"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
 msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr "ShowScrips"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr "ShowTemplate"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr "ShowTicket"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr "ShowTicketComments"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr "Cadastrar como um Requisitante de tíquete ou um Cc de tíquete ou fila"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "Cadastrar como um AdminCC de tíquete ou fila"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "Assinatura"
 
@@ -4790,24 +4873,20 @@ msgstr "Assinatura"
 msgid "Signed in as %1"
 msgstr "Assinado como %1"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "Único"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr "Saltar Menu"
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
+#: html/Admin/Elements/AddCustomFieldValue:27
+msgid "Sort"
 msgstr ""
 
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
-msgid "Sort"
+#: NOT FOUND IN SOURCE
+msgid "Sort Order"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -4822,7 +4901,11 @@ msgstr "Ordenar os resultados por"
 msgid "SortOrder"
 msgstr "Ordenação"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr ""
 
@@ -4834,7 +4917,7 @@ msgstr "Pendente"
 msgid "Start page"
 msgstr "Página inicial"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "Iniciado"
 
@@ -4842,7 +4925,7 @@ msgstr "Iniciado"
 msgid "Started date '%1' could not be parsed"
 msgstr "A data de iníciado '%1' não pôde ser compreendida"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "Inicia"
 
@@ -4854,11 +4937,11 @@ msgstr "Inicia Por"
 msgid "Starts date '%1' could not be parsed"
 msgstr "A data de início '%1' não pôde ser compreendida"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Estado"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Estado"
 
@@ -4866,7 +4949,8 @@ msgstr "Estado"
 msgid "Status Change"
 msgstr "Mudança de Estado"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "Estado alterado de %1 para %2"
 
@@ -4874,69 +4958,73 @@ msgstr "Estado alterado de %1 para %2"
 msgid "StatusChange"
 msgstr "StatusChange"
 
-#: html/Ticket/Elements/Tabs:170
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "Roubar"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "Roubado de %1"
-
-#: NOT FOUND IN SOURCE
 msgid "Stolen from %1 "
 msgstr "Roubado de %1 "
 
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
-
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Assunto"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "Assunto modou para %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "Enviar"
 
 #: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Submit Workflow"
 msgstr "Enviar Workflow"
 
-#: lib/RT/Group_Overlay.pm:782
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "Deu certo"
 
-#: lib/RT/Date.pm:419
+#: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "Dom."
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "SuperUser"
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "Sistema"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "Erro do Sistema"
 
@@ -4948,20 +5036,15 @@ msgstr "Erro de sistema.  Direito não outorgado."
 msgid "System Error. right not granted"
 msgstr "Erro de sistema.  direito não outorgado"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr ""
-
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
 msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "Erro do sistema. Direito de acesso não delegado."
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "Erro do sistema. Direito de acesso não outorgado."
 
@@ -4969,7 +5052,7 @@ msgstr "Erro do sistema. Direito de acesso não outorgado."
 msgid "System error. Unable to grant rights."
 msgstr "Erro de sistema.  Não posso outorgar direitos de acesso."
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "Grupos do sistema"
 
@@ -4977,40 +5060,44 @@ msgstr "Grupos do sistema"
 msgid "SystemRolegroup for internal use"
 msgstr "SystemRolegroup para uso interno"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "Tomar"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "Tomado"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: NOT FOUND IN SOURCE
+msgid "Task"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Modelo"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "Esquema #%1"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "Esquema removido"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Modelo não encontrado"
 
@@ -5018,11 +5105,11 @@ msgstr "Modelo não encontrado"
 msgid "Template not found\\n"
 msgstr "Modelo não encontrado\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Modelo processado"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Modelos"
 
@@ -5030,33 +5117,37 @@ msgstr "Modelos"
 msgid "Templates for %1\\n"
 msgstr "Modelos de %1\\n"
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: NOT FOUND IN SOURCE
+msgid "Text"
+msgstr ""
+
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "Este já é o valor atual"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "Este não é um valor para este campo personalizado"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "Este é o mesmo valor"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "Este principal já é um %1 para esta fila"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "Este principal já é um %1 para este tíquete"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "Este principal não é um %1 para esta fila"
@@ -5065,11 +5156,11 @@ msgstr "Este principal não é um %1 para esta fila"
 msgid "That principal is not a %1 for this ticket"
 msgstr "Este principal não é um %1 para este tíquete"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr "Esta fila não existe"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "Este tíquete tem dependências não resolvidas"
 
@@ -5077,27 +5168,27 @@ msgstr "Este tíquete tem dependências não resolvidas"
 msgid "That user already has that right"
 msgstr "Este usuário já tem este direito de acesso"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr "Este usuário já possui este tíquete"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "Este usuário não existe"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "Este usuário já tem privilégios"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr "Este usuário já não tem privilégios"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "Este usuário agora tem privilégios"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr "Este usuário agora não tem privilégios"
 
@@ -5105,23 +5196,23 @@ msgstr "Este usuário agora não tem privilégios"
 msgid "That user is now unprivilegedileged"
 msgstr "Este usuário agora é não privilegiado"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr "Este usuário não pode possuir tíquetes nesta fila"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "Este não é um identificador numérico"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "Sumário"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr "O CC de um tíquete"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr "O CC administrativo de um tíquete"
 
@@ -5129,7 +5220,7 @@ msgstr "O CC administrativo de um tíquete"
 msgid "The comment has been recorded"
 msgstr "O comentário foi registrado"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr "O seguinte comando procurará por todos os tíquetes ativos na fila 'geral' e alterar sua prioridade para 99 se eles não tiverem sido alterados em 4 horas:"
 
@@ -5137,31 +5228,31 @@ msgstr "O seguinte comando procurará por todos os tíquetes ativos na fila 'ger
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "Os seguintes comandos não foram processados:\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "O novo valor foi atribuído."
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr "O proprietário de um tíquete"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "O requisitante de um tíquete"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "Estes comandos geralmente não estão visíveis para o usuário"
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
 msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
 msgstr ""
 
@@ -5169,15 +5260,15 @@ msgstr ""
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "Este tíquete %1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "Esta ferramenta permite o usuário invocar módulos Perl arbitrários de dentro do RT."
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "Parece que esta transação não tem conteúdo"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
 msgstr "Os %1 tíquetes mais prioritários deste usuário"
@@ -5186,7 +5277,7 @@ msgstr "Os %1 tíquetes mais prioritários deste usuário"
 msgid "This user's 25 highest priority tickets"
 msgstr "Os 25 tíquetes de mais alta prioridade deste usuário"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "Qui."
 
@@ -5202,24 +5293,24 @@ msgstr "Tíquete # %1  %2"
 msgid "Ticket # %1 Jumbo update: %2"
 msgstr "Tíquete # %1 atualização jumbo: %2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "Tíquete #%1 Atualização jumbo: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "Tíquete #%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "Tíquete %1 criado na fila '%2'"
@@ -5228,16 +5319,16 @@ msgstr "Tíquete %1 criado na fila '%2'"
 msgid "Ticket %1 loaded\\n"
 msgstr "Tíquete %1 carregado\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "Tíquete %1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
 msgstr ""
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr "Histórico do Tíquete # %1 %2"
@@ -5250,7 +5341,7 @@ msgstr "Identificador do tíquete"
 msgid "Ticket Resolved"
 msgstr "Tíquete Resolvido"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
 msgstr ""
 
@@ -5258,19 +5349,19 @@ msgstr ""
 msgid "Ticket attachment"
 msgstr "Arquivo anexo do tíquete"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "Conteúdo do tíquete"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "Tipo do conteúdo do tíquete"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "O tíquete não pôde ser criado devido a um erro interno"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "Tíquete criado"
 
@@ -5278,7 +5369,7 @@ msgstr "Tíquete criado"
 msgid "Ticket creation failed"
 msgstr "A criação do tíquete falhou"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "Tíquete removido"
 
@@ -5290,7 +5381,7 @@ msgstr "Id de tíquete não encontrado"
 msgid "Ticket killed"
 msgstr "Tíquete destruído"
 
-#: html/Ticket/Display.html:55
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
 msgstr ""
 
@@ -5306,20 +5397,17 @@ msgstr "O estado do tíquete mudou"
 msgid "Ticket watchers"
 msgstr "Observadores do tíquete"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "Tíquetes"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "Tíquetes %1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "Tíquetes %1 por %2"
 
@@ -5327,31 +5415,31 @@ msgstr "Tíquetes %1 por %2"
 msgid "Tickets from %1"
 msgstr "Tíquetes de %1"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr "Tíquetes dependentes desta aprovação:"
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
 msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "Tempo Restante"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "Tempo Trabalhado"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "Tempo restante"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "Tempo de apresentação"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "Tempo trabalhado"
 
@@ -5359,14 +5447,10 @@ msgstr "Tempo trabalhado"
 msgid "TimeLeft"
 msgstr "TimeLeft"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
 msgstr "TimeWorked"
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:"
 msgstr "Para gerar as diferenças desta transação"
@@ -5375,16 +5459,16 @@ msgstr "Para gerar as diferenças desta transação"
 msgid "To generate a diff of this commit:\\n"
 msgstr "Para gerar as diferenças desta transação:\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
 msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "Última atualização"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
 msgstr ""
 
@@ -5392,28 +5476,28 @@ msgstr ""
 msgid "Transaction"
 msgstr "Transação"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "Transação %1 removida"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "Transação Criada"
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:92
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "Transaction->Create não pôde, já que você não especificou um id de tíquete"
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "Transações são imutáveis"
 
@@ -5421,19 +5505,23 @@ msgstr "Transações são imutáveis"
 msgid "Trying to delete a right: %1"
 msgstr "Tentando remover um direito de acesso: %1"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "Ter."
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "Tipo"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "Não implementado"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Usuário Unix"
 
@@ -5441,21 +5529,16 @@ msgstr "Usuário Unix"
 msgid "UnixUsername"
 msgstr "Usuário Unix"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "Codificação de conteúdo desconhecida %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
 msgstr ""
 
@@ -5463,23 +5546,27 @@ msgstr ""
 msgid "Unprivileged"
 msgstr "Não privilegiado"
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
 msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
 msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "Não tomado"
 
-#: html/Search/Bulk.html:54
+#: NOT FOUND IN SOURCE
+msgid "Untitled search"
+msgstr ""
+
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Atualizar"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
 msgstr ""
 
@@ -5487,11 +5574,11 @@ msgstr ""
 msgid "Update ID"
 msgstr "Identificador de atualização"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
 msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "Tipo de atualização"
 
@@ -5503,7 +5590,7 @@ msgstr "Atualizar todos estes tíquetes de uma vez"
 msgid "Update email"
 msgstr "Atualizar email"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
 msgstr ""
 
@@ -5511,11 +5598,11 @@ msgstr ""
 msgid "Update name"
 msgstr "Atualizar nome"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "Atualização não registrada."
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "Atualizar os tíquetes selecionados"
 
@@ -5523,7 +5610,7 @@ msgstr "Atualizar os tíquetes selecionados"
 msgid "Update signature"
 msgstr "Atualizar assinatura"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "Atualizar o tíquete"
 
@@ -5531,58 +5618,58 @@ msgstr "Atualizar o tíquete"
 msgid "Update ticket # %1"
 msgstr "Atualizar o tíquete # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "Atualizar o tíquete #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "Atualizar tíquete #%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "O tipo da atualização não foi nem correspondência e nem comentário."
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "Atualizado"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
 msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
 msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5593,7 +5680,7 @@ msgstr "Usuário %1 %2: %3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "Usuário %1 Senha: %2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
 msgstr ""
@@ -5610,7 +5697,7 @@ msgstr "Usuário '%1' não encontrado\\n"
 msgid "User Defined"
 msgstr "Definido pelo Usuário"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
 msgstr ""
 
@@ -5618,33 +5705,32 @@ msgstr ""
 msgid "User ID"
 msgstr "Identificador de usuário"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "Identificador do usuário"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "Direitos de Acesso de Usuário"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "O usuário não pôde ser criado: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "Usuário criado"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Grupos definidos pelo usuário"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
 msgstr ""
 
@@ -5656,23 +5742,23 @@ msgstr "Usuário notificado"
 msgid "User view"
 msgstr "Visualização de usuário"
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Usuários"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "Usuários que satisfazem o critério de busca"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
 msgstr ""
 
@@ -5680,15 +5766,19 @@ msgstr ""
 msgid "ValueOfQueue"
 msgstr "Valor da fila"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Valores"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr "Observar"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr "WatchAsAdminCc"
 
@@ -5696,7 +5786,7 @@ msgstr "WatchAsAdminCc"
 msgid "Watcher loaded"
 msgstr "Observador carregado"
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "Observadores"
 
@@ -5704,7 +5794,7 @@ msgstr "Observadores"
 msgid "WebEncoding"
 msgstr "Codificação de Web"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "Qua."
 
@@ -5760,11 +5850,19 @@ msgstr "Sempre que um novo comentário é adicionado"
 msgid "Whenever correspondence comes in"
 msgstr "Sempre que uma nova correspondência é adicionada"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Trabalho"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr ""
 
@@ -5772,19 +5870,31 @@ msgstr ""
 msgid "WorkPhone"
 msgstr "Telefone de trabalho"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "Trabalhado"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Yes"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "Você já é proprietário deste tíquete"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "Você não é um usuário autorizado"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: NOT FOUND IN SOURCE
+msgid "You can access it with the Download button on the right."
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "Você só pode reatribuir seus próprios tíquetes ou aqueles que não têm dono"
 
@@ -5792,24 +5902,24 @@ msgstr "Você só pode reatribuir seus próprios tíquetes ou aqueles que não t
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "Você não tem permissão para ver este tíquete.\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "Você encontrou %1 tíquetes na fila %2"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "Você foi desconectado do RT."
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "Você não tem permissão para criar tíquetes nesta fila."
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "Você não pode criar requisições nesta fila."
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "Volte sempre"
 
@@ -5837,11 +5947,11 @@ msgstr "Sua requisição foi rejeitada"
 msgid "Your request was rejected."
 msgstr "Sua requisição foi rejeitada."
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "Nome de usuário ou senha incorretos"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "CEP"
 
@@ -5849,28 +5959,24 @@ msgstr "CEP"
 msgid "[no subject]"
 msgstr "[sem assunto]"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and is not"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and not"
 msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "como outorgado a %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "contém"
 
@@ -5890,7 +5996,7 @@ msgstr "correspondência (provavelmente) não enviada"
 msgid "correspondence sent"
 msgstr "correspondência enviada"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "dias"
 
@@ -5902,49 +6008,25 @@ msgstr "morto"
 msgid "delete"
 msgstr "remover"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "removido"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "não satisfaz"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "não contém"
 
-#: html/Elements/SelectEqualityOperator:59
-msgid "equal to"
-msgstr "igual a"
-
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr ""
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
+#: NOT FOUND IN SOURCE
+msgid "email address"
 msgstr ""
 
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr ""
+#: html/Elements/SelectEqualityOperator:37
+msgid "equal to"
+msgstr "igual a"
 
 #: NOT FOUND IN SOURCE
 msgid "false"
@@ -5954,44 +6036,48 @@ msgstr "falso"
 msgid "filename"
 msgstr "filename"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "maior que"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "grupo '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "horas"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "identificador"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "é"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "não é"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "menor que"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "satisfaz"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "min"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "minutos"
 
@@ -5999,27 +6085,27 @@ msgstr "minutos"
 msgid "modifications\\n\\n"
 msgstr "modificações\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "meses"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "novo"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "sem valor"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "nenhum"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "diferente de"
 
@@ -6027,68 +6113,72 @@ msgstr "diferente de"
 msgid "notlike"
 msgstr "diferente"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "aberto"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "grupo pessoal '%1' para o usuário '%2'"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "fila %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "rejeitado"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "resolvido"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "seg"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "pendente"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "sistema %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "grupo do sistema '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "o componente chamador não especificou por que"
 
-#: lib/RT/Group_Overlay.pm:238
+#: NOT FOUND IN SOURCE
+msgid "ticket #%1"
+msgstr ""
+
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "tíquete #%1 %2"
 
 #: NOT FOUND IN SOURCE
+msgid "till"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "true"
 msgstr "verdadeiro"
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "grupo %1 não descrito"
@@ -6097,12 +6187,12 @@ msgstr "grupo %1 não descrito"
 msgid "undescripbed group %1"
 msgstr "grupo sem descrição %1"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "usuário %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "semanas"
 
@@ -6110,7 +6200,11 @@ msgstr "semanas"
 msgid "with template %1"
 msgstr "com modelo %1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "anos"
 
+#: NOT FOUND IN SOURCE
+msgid "ニック�ーム"
+msgstr ""
+
diff --git a/rt/lib/RT/I18N/ru.po b/rt/lib/RT/I18N/ru.po
index cd93e04..981b9cd 100644
--- a/rt/lib/RT/I18N/ru.po
+++ b/rt/lib/RT/I18N/ru.po
@@ -1,254 +1,289 @@
-# translation of ru-nortfm.po to Russian
-# translation of ru.po to Russian
-# Andrew Kornilov <andy@eva.dp.ua>, 2004, 2005.
 msgid ""
 msgstr ""
-"Last-Translator: Andrew Kornilov <andy@eva.dp.ua>\n"
-"PO-Revision-Date: 2005-03-11 15:38+0200\n"
+"Last-Translator: Kirill Pushkin <kirill@mns.ru>\n"
+"PO-Revision-Date: 2002-10-04 19:28+0400\n"
 "Language-Team: Russian <ru@li.org>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-"Project-Id-Version: ru\n"
-"MIME-Version: 1.0\n"
+"X-Generator: KBabel 0.9.6\n"
 
 #: NOT FOUND IN SOURCE
 msgid "#"
 msgstr "&#8470;"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: NOT FOUND IN SOURCE
+msgid "#%1"
+msgstr ""
+
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr ""
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
 msgstr ""
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr ""
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr ""
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
+msgid "%1 %2 %3"
+msgstr ""
+
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%1 %2 %3 %4:%5:%6 %7"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
-msgstr "%1 %2 добавлен"
+msgstr ""
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "%1 %2 назад"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 %2 изменено на %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
-msgstr "%1 %2 удален"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 %2 of group %3"
-msgstr "%1 %2 of group %3"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
-msgstr "%1 %2 � шаблоном %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 הוסף"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 שונה ל %3"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 (%2) %3 this ticket\\n"
-msgstr "%1 (%2) %3 �та за�вка\\n"
+msgstr "%1 (%2) %3 �тот тикет\\n"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
 msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
-msgstr "%1 (�е мен�ть)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 - %2 shown"
-msgstr "%1 - %2 показано"
+msgstr ""
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
-msgstr "%1 - �ргумент дл� передачи в %2"
+msgstr ""
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr ""
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr ""
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr ""
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr ""
 
+#: NOT FOUND IN SOURCE
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
+
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
-msgstr "%1 Скриплет�аДей�твие загружен"
+msgstr "%1 �крипт загружен"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "%1 добавлено как значение дл� %2"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 aliases require a TicketId to work on"
-msgstr "%1 п�евдонимы требуют идентификатор за�вки дл� продолжени� работы"
+msgstr "%1 алиа�ы требуют идентификатор тикета дл� продолжени� работы"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 aliases require a TicketId to work on "
-msgstr "%1 п�евдонимы требуют идентификатор за�вки дл� продолжени� работы "
+msgstr "%1 алиа�ы требуют идентификатор тикета дл� продолжени� работы "
 
 #: NOT FOUND IN SOURCE
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
-msgstr "%1 п�евдонимы требуют идентификатор за�вки дл� продолжени� работы над (от %2) %3"
+msgstr "%1 алиа�ы требуют идентификатор тикета дл� продолжени� работы над (от %2) %3"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
-msgstr "%1 �вл�ет�� локальным объектом, но не найден в базе данных"
+msgstr ""
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 пользователем %2"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
-msgstr "%1 изменена � %2 на %3"
+msgstr "%1 изменило�ь � %2 на %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
-msgstr "%1 копи�"
+msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
-msgstr "%1 невозможно у�тановить в %2."
+msgstr "�ельз� у�тановить %1 в %2."
 
 #: NOT FOUND IN SOURCE
 msgid "%1 couldn't init a transaction (%2)\\n"
-msgstr "%1 не может инициировать транзакцию (%2)\\n"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
-msgstr "%1 не может изменить �тату� на Решено. Возможно, база данных RT и�порчена."
+msgstr "%1 не могу закрыть тикет. Возможно, база данных RT и�порчена."
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
-msgstr "%1 �оздана"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
-msgstr "%1 удалена"
+msgstr ""
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
-msgstr "%1 ваших за�вок � наивы�шими приоритетами"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 highest priority tickets I own..."
-msgstr "%1 ваших за�вок � наивы�шими приоритетами..."
+msgstr "%1 �амых приоритетных моих тикетов..."
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
-msgstr "%1 за�вок � наивы�шими приоритетами, �озданных вами..."
+msgstr "%1 �амых приоритетных тикетов, запрошенных мной..."
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 больше не �вл�ет�� %2 дл� �той очереди."
 
 #: NOT FOUND IN SOURCE
 msgid "%1 is no longer a %2 for this ticket."
-msgstr "%1 больше не �вл�ет�� %2 дл� �той за�вки."
+msgstr "%1 больше не �вл�ет�� %2 дл� �того тикета."
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
-msgstr "%1 больше не �вл�ет�� значением дл� дополнительного пол� %2"
+msgstr "%1 больше не �вл�ет�� значением дл� не�тандартного пол� %2"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 isn't a valid Queue id."
-msgstr "%1 неверный идентификатор очереди."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 matches"
-msgstr "%1 �овпадений"
+msgstr ""
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -257,23 +292,31 @@ msgstr "%1 �овпадений"
 msgid "%1 min"
 msgstr "%1 мин"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
-msgstr "%1 по�ледних неназначенных за�вок"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 not shown"
 msgstr "%1 не отображает��"
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
-msgstr "%1 объектов"
+msgstr ""
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
-msgstr "Права %1"
+msgstr "%1 права"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 succeeded\\n"
@@ -289,403 +332,438 @@ msgstr "%1 тип не изве�тен дл� %2"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 was created without a CurrentUser\\n"
-msgstr "%1 была �оздана без ТекущегоПользовател�\\n"
+msgstr ""
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
-msgstr "%1 решит в�е за�вки, вход�щие в групповой запро�"
+msgstr "%1 закроет в�е тикеты, вход�щие в групповой запро�"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
-msgstr "%1 прио�тановит за�вки, которые зави��т от запро�а или включены в него"
+msgstr "%1 отложит тикеты, которые зави��т запро�а или включены в него"
+
+#: NOT FOUND IN SOURCE
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 על ידי %2"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
-msgstr "%1 %2 объектов"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
 msgstr ""
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
-msgstr "%1 �охраненных запро�ов"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1: без вложений"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
-msgstr "%1б"
+msgstr ""
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
-msgstr "%1к"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' �вл�ет�� неверным значением �тату�а"
 
 #: NOT FOUND IN SOURCE
 msgid "'%1' not a recognized action. "
-msgstr "'%1' не �вл�ет�� зареги�трированным дей�твием."
+msgstr "Что делать ? : '%1'"
 
 #: NOT FOUND IN SOURCE
 msgid "(Check box to delete group member)"
-msgstr "(Выделите пользователей дл� и�ключени� из группы)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "(Check box to delete scrip)"
-msgstr "(Выделите �криплеты дл� удалени�)"
+msgstr ""
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
-msgstr "(Выделите пункты дл� удалени�)"
+msgstr "(Пометьте то, что хотите удалить)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Check boxes to delete)"
-msgstr "(Выделите пункты дл� удалени�)"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
-msgstr "(Выделите получателей дл� и�ключени� из �пи�ка уведомл�емых)"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
-msgstr "(Выделите получателей дл� включени� в �пи�ок уведомл�емых)"
+msgstr ""
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
-msgstr "(Введите идентификаторы или ��ылки на за�вки, разделенные пробелами)"
+msgstr "(Введите номера или ��ылки на тикеты. �е�колько тикетов раздел�ют�� пробелами.)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Enter ticket ids or URLs, seperated with spaces)"
-msgstr "(Введите идентификаторы или ��ылки на за�вки, разделенные пробелами)"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
-msgstr "(Е�ли пу�тое, то по-умолчанию равно %1)"
+msgid "(If left blank, will default to %1"
+msgstr "(Е�ли пу�тое, то по умолчанию равно %1"
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
-msgstr "(�ет значени�)"
+msgstr ""
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(�ет дополнительных полей)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(�ет пользователей)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
-msgstr "(�ет �криплетов)"
+msgstr "(�ет �криптов)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr "(�ет шаблонов)"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
-msgstr "(�ет)"
+msgstr ""
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(Отправить �крытую копию �ообщени� об �том обновлении на �ти адре�а [раздел�ют�� зап�той]. Спи�ок получателей, которые в дальнейшем будут получать �крытые копии �ообщени� об обновлени�х, <b>не</b> будет изменен.)"
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. �дре�а <b>не</b> �охран�ют�� дл� по�ледующих уведомлений.)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
-msgstr "(Отправить �крытую копию �ообщени� об �том обновлении на �ти адре�а [раздел�ют�� зап�той]. Спи�ок получателей, которые в дальнейшем будут получать �крытые копии �ообщени� об обновлени�х, <b>не</b> будет изменен.)"
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. Спи�ок �тих адре�атов в пи�ьме не виден. �дре�а <b>не</b> �охран�ют�� дл� по�ледующих уведомлений.)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Отправить копию �ообщени� об �том обновлении на �ти адре�а [раздел�ют�� зап�той]. Эти получатели в дальнейшем <b>будут</b> получать копии �ообщени� об обновлени�х.)"
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. �дре�а <b>�охран�ют��</b> дл� по�ледующих уведомлений.)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(Отправить копию �ообщени� об �том обновлении на �ти адре�а [раздел�ют�� зап�той]. Спи�ок получателей, которые в дальнейшем будут получать копии �ообщени� об обновлени�х, <b>не</b> будет изменен.)"
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. �дре�а <b>не</b> �охран�ют�� дл� по�ледующих уведомлений.)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
-msgstr "(Отправить копию �ообщени� об �том обновлении на �ти адре�а [раздел�ют�� зап�той]. Спи�ок получателей, которые в дальнейшем будут получать копии �ообщени� об обновлени�х, <b>не</b> будет изменен.)"
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. �дре�а не �охран�ют�� дл� по�ледующих уведомлений.)"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Отправить копию �ообщени� об �том обновлении на �ти адре�а [раздел�ют�� зап�той]. Эти получатели в дальнейшем <b>будут</b> получать копии �ообщени� об обновлени�х.)"
+msgstr "(�а �ти адре�а [разделенные зап�той] отправл�ют�� копии �ообщени�. �дре�а <b>�охран�ют��</b> дл� по�ледующих уведомлений.)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
-msgstr "(И�пользуйте �ти пол� при выборе 'Задано пользователем' дл� уловий или дей�твий)"
+msgstr ""
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(пу�то)"
 
 #: NOT FOUND IN SOURCE
 msgid "(no Summary)"
-msgstr "(нет �водной информации)"
+msgstr ""
 
-#: html/Admin/Users/index.html:60
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
-msgstr "(имена не указаны)"
+msgstr "(не указано имен)"
 
 #: NOT FOUND IN SOURCE
 msgid "(no name)"
-msgstr "(нет имени)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "(no subject)"
-msgstr "(нет темы)"
+msgstr "(без темы)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(нет значени�)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
-msgstr "(нет значений)"
+msgstr ""
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
-msgstr "(только одна за�вка)"
+msgstr "(только один тикет)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
-msgstr "(в ожидании подтверждени�)"
+msgstr "(в ожидании визы)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
-msgstr "(в ожидании решени� �в�занных за�вок)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "(pending other tickets)"
-msgstr "(в ожидании других за�вок)"
+msgstr "(в ожидании других тикетов)"
 
 #: NOT FOUND IN SOURCE
 msgid "(requestor's group)"
-msgstr "(группа автора за�вки)"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:71
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(требует��)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(без названи�)"
 
 #: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I own..."
-msgstr "25 ваших за�вок � наивы�шими приоритетами..."
+msgstr "25 важнейших моих тикетов..."
 
 #: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I requested..."
-msgstr "25 за�вок � наивы�шими приоритетами, �озданные ваши..."
+msgstr "25 �амых важных моих запро�ов..."
 
-#: html/Ticket/Elements/ShowBasics:53
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr "<% $Ticket->Status%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr ""
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr ""
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr ""
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
-msgstr "<input type=\"submit\" value=\"Создать за�вку в очереди\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Создать тикет в очереди\">&nbsp;%1"
+
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
 
 #: etc/initialdata:218
 msgid "A blank template"
 msgstr "Пу�той шаблон"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
+#: NOT FOUND IN SOURCE
+msgid "ACE Deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "ACE Loaded"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "ACE could not be deleted"
-msgstr "�евозможно удалить ACE"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "ACE could not be found"
-msgstr "�евозможно найти ACE"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "ACE не найден"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "ACEы можно только �оздавать и удал�ть"
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
-msgstr "Прекращаем работу во избежание нежелательного изменени� за�вки.\\n"
+msgstr "Прекращаем работу во избежание нежелательного изменени� тикета.\\n"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "Обо мне"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "Права до�тупа"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "Дей�твие"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
-msgstr "Дей�твие %1 не найдено"
+msgstr "дей�твие %1 не найдено"
 
-#: NOT FOUND IN SOURCE
+#: bin/rt-crontool:119
 msgid "Action committed."
 msgstr "Дей�твие прин�то."
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr ""
-
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "Дей�твие подготовлено..."
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
-msgstr "Добавить"
+msgstr ""
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
-msgstr "Добавить �дмини�тративнуюКопию"
+msgstr "Добавить админи�тративную копию"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
-msgstr "Добавить Копию"
-
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
+msgstr "Добавить копию"
 
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
-msgstr "Добавить критерий"
+msgstr ""
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "Добавить еще файлы"
 
 #: NOT FOUND IN SOURCE
 msgid "Add Next State"
-msgstr "Добавить �ледующее �о�то�ние"
+msgstr ""
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
-msgstr "Добавить автора за�вки"
+msgstr "Добавить про�ител�"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
-msgstr "Добавить значение"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Add a Scrip to this queue"
-msgstr "Добавить �криплет дл� �той очереди"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Add a Scrip which will apply to all queues"
-msgstr "Добавить �криплет, который будет дей�твовать на в�е очереди"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Add a keyword selection to this queue"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Add a new a global scrip"
-msgstr "Добавить новый глобальный �криплет"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Add a scrip to this queue"
-msgstr "Добавить �криплет дл� �той очереди"
+msgstr ""
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
-msgstr "Добавить �криплет, который будет дей�твовать на в�е очереди"
+msgstr "Добавить �крипт, который будет дей�твовать на в�е очереди"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
-msgstr "Добавить дополнительный критерий"
+msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
-msgstr "Добавить комментарии или ответы на выбранные за�вки"
+msgstr "Добавить комментарии или ответы на выбранные тикеты"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "Добавить пользователей"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "Добавить наблюдателей"
 
-# Manual merge by Andrew Kornilov <andy@eva.dp.ua>
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr "Добавить, удалить или изменить значени� дополнительных полей дл� объектов"
-
 #: NOT FOUND IN SOURCE
 msgid "AddNextState"
-msgstr "Добавл�тьСледующееСо�то�ние"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
-msgstr "Пользователь добавлен как %1 дл� �той очереди"
+msgstr "Добавить пользовател� как %1 дл� �той очереди"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
-msgstr "Пользователь добавлен как %1 дл� �той за�вки"
+msgstr "Добавить пользовател� как %1 дл� �того тикета"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "�дре�1"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "�дре�2"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
-msgstr "�дмини�тративна� Копи�"
+msgstr "�дмини�тративна� копи�"
 
 #: etc/initialdata:295
 msgid "Admin Comment"
-msgstr "�дмини�тративный Комментарий"
+msgstr "Комментарий админа"
 
 #: etc/initialdata:274
 msgid "Admin Correspondence"
-msgstr "�дмини�тративна� Корре�понденци�"
+msgstr ""
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "Управление очеред�ми"
 
@@ -693,239 +771,255 @@ msgstr "Управление очеред�ми"
 msgid "Admin users"
 msgstr "Управление пользовател�ми"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "Общие на�тройки"
 
 #: NOT FOUND IN SOURCE
 msgid "Admin/Groups"
-msgstr "Управление группами"
+msgstr "Группы"
 
 #: NOT FOUND IN SOURCE
 msgid "Admin/Queue/Basics"
-msgstr "О�новные параметры очереди"
+msgstr "Параметры очереди"
 
 #: NOT FOUND IN SOURCE
 msgid "AdminAllPersonalGroups"
-msgstr "�дмини�трироватьВ�еПер�ональныеГруппы"
+msgstr ""
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
-msgstr "�дмини�тративна�Копи�"
+msgstr "�дмини�тративна� копи�"
 
 #: NOT FOUND IN SOURCE
 msgid "AdminComment"
-msgstr "�дмини�трироватьКомментарий"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "AdminCorrespondence"
-msgstr "�дмини�трироватьКорре�понденцию"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
-msgstr "�дмини�трироватьДополнительноеПоле"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Queue_Overlay.pm:73
 msgid "AdminCustomFields"
-msgstr "�дмини�трироватьДополнительныеПол�"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
-msgstr "�дмини�трироватьГруппу"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
-msgstr "�дмини�трироватьЧлен�твоВГруппах"
+msgstr ""
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
-msgstr "�дмини�трироватьСоб�твенныеГруппы"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
-msgstr "�дмини�трироватьОчередь"
+msgstr ""
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
-msgstr "�дмини�трироватьПользователей"
+msgstr ""
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
-msgstr "�дмини�тративна� Копи�"
+msgstr "�дмини�тративна� копи�"
 
 #: NOT FOUND IN SOURCE
 msgid "Admins"
-msgstr "�дмини�траторы"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
-msgstr "Дополнительно"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Advanced Search"
-msgstr "Ра�ширенный пои�к"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Advanced Search Criteria"
-msgstr "Критерии ра�ширенного пои�ка"
+msgstr ""
 
-#: html/Elements/SelectDateRelation:57
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "По�ле"
 
 #: NOT FOUND IN SOURCE
 msgid "Age"
-msgstr "Возра�т"
-
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Alias"
-msgstr "П�евдоним"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Alias for"
-msgstr "П�евдоним дл�"
+msgstr ""
 
 #: etc/initialdata:363
 msgid "All Approvals Passed"
-msgstr "В�е подтверждени� получены"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "В�е дополнительные пол�"
 
-#: html/Admin/Queues/index.html:75
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "В�е очереди"
 
 #: NOT FOUND IN SOURCE
 msgid "Always sends a message to the requestors independent of message sender"
-msgstr "В�егода отправл�ть �ообщени� авторам за�вок незави�имо от отправител� �ообщени�"
-
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
-msgstr "Примен�ет�� к"
+msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
-msgstr "Применить"
+msgstr ""
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
-msgstr "Применить ваши изменени�"
+msgstr ""
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
-msgstr "Подтверждени�"
+msgstr "Виза"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
-msgstr "Подтверждение #%1: %2"
+msgstr "Виза #%1: %2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
-msgstr "Подтверждение #%1: Примечани� не �охранены из-за �и�темной ошибки"
+msgstr "Виза #%1: Примечани� не �охранены из-за ошибки �и�темы"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
-msgstr "Подтверждение #%1: Примечани� запи�аны"
+msgstr "Виза #%1: Примечани� запи�аны"
 
 #: NOT FOUND IN SOURCE
 msgid "Approval Details"
-msgstr "Детали подтверждени�"
+msgstr ""
 
 #: etc/initialdata:351
 msgid "Approval Passed"
-msgstr "Подтверждение получено"
+msgstr ""
 
 #: etc/initialdata:374
 msgid "Approval Rejected"
-msgstr "Подтверждение отклонено"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Approval diagram"
-msgstr "Диаграмма подтверждений"
+msgstr ""
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
-msgstr "Подтвердить"
+msgstr "Завизировать"
 
 #: etc/initialdata:504
 msgid "Approver's notes: %1"
-msgstr "Примечани� подтвердившего: %1"
+msgstr ""
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "�пр."
 
 #: NOT FOUND IN SOURCE
 msgid "April"
-msgstr "�прель"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "В пор�дке возра�тани�"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
-msgstr "�азначение и удаление дополнительных полей"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
-msgstr "�азначатьДополнительныеПол�"
+msgstr ""
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "Вложение"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "Вложить файл"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "Вложенный файл"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "Вложение '%1' не может быть загружено"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
-msgstr "Вложение �оздано"
+msgstr "Создано вложение"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
-msgstr "Им� файла дл� вложени�"
+msgstr "Им� файла"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "Вложени�"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
-msgstr "�трибут удален"
+msgstr ""
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "�вг."
 
 #: NOT FOUND IN SOURCE
 msgid "August"
-msgstr "�вгу�т"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "AuthSystem"
@@ -937,15 +1031,15 @@ msgstr "�втоответ"
 
 #: etc/initialdata:72
 msgid "Autoreply To Requestors"
-msgstr "�втоответ �вторам За�вки"
+msgstr "�втоответ инициатору запро�а"
 
 #: NOT FOUND IN SOURCE
 msgid "AutoreplyToRequestors"
-msgstr "�втоответ�вторатЗа�вки"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Elements/EditFormat:4
 msgid "Available Columns"
-msgstr "До�тупные колонки"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Bad PGP Signature: %1\\n"
@@ -953,7 +1047,7 @@ msgstr "�еправильна� подпи�ь PGP: %1\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Bad attachment id. Couldn't find attachment '%1'\\n"
-msgstr "�еверный идентификатор вложени�. �евозможно найти вложение '%1'\\n"
+msgstr "�еверный идентификатор вложени�. От�ут�твует вложение '%1'\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Bad data in %1"
@@ -963,161 +1057,164 @@ msgstr "�еправильна� дата в %1"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "�еправильный номер транзакции дл� вложени�. %1 должен быть %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
-msgstr "О�новное"
+msgstr "Главное"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "Скрыта� копи�"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "�е забудьте �охранить на�тройки"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "До"
 
 #: NOT FOUND IN SOURCE
 msgid "Begin Approval"
-msgstr "�ачать подтверждение"
-
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Binary"
-msgstr "Двоичный"
+msgstr ""
 
 #: etc/initialdata:217
 msgid "Blank"
-msgstr "Пу�той"
-
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
-msgstr "С�ылка на �тот запро� дл� добавлени� в избранное"
+msgstr "Получить URL дл� �того пои�ка"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
-msgstr "С�ылка дл� добавлени� в избранное"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
-msgstr "Сокращенные заголовки"
+msgstr "Сокращенный"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
-msgstr "Множе�твенное обновление за�вки"
+msgstr "Изменение одним махом"
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
-msgstr "�евомзожно изменить �и�темных пользователей"
+msgstr "�е могу измен�ть �и�темных пользователей"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
-msgstr "Может ли данный пользователь про�матривать �ту очередь"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
-msgstr "�евозможно добавление значени� допольнительного пол� без наименовани�"
-
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
+msgstr "�е могу добавить значение пол� без имени"
 
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
-msgstr "�евозможно найти �охраненный запро� дл� работы � ним"
+msgstr ""
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
-msgstr "�евозможно �в�зать за�вку �аму � �обой"
+msgstr "Тикет не может быть �в�зан � �амим �обой"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
-msgstr "�евозможно объединить � объединенной за�вкой (�та ошибка никогда не должна прои�ходить)."
+msgstr "�е могу �оединить � объединенным тикетом (�та ошибка никогда не должна прои�ходить)."
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
-msgstr "�евозможно �охранить �тот запро�"
+msgstr ""
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
-msgstr "�евозможно указывать одновременно и и�точник и адре� назначени�"
+msgstr "�е могу указать одновременно и и�точник, и адре� назначени�"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
-msgstr "�евозможно �оздать пользовател�: %1"
+msgstr "�е могу �оздать пользовател�: %1"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "Копи�"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
-msgstr "Изменить пароль"
+msgstr "Сменить пароль"
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
-msgstr "Выбрать в�е"
+msgstr ""
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
-msgstr "Выделите пункты дл� удалени�"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
-msgstr "Выделите права, которые хотите отозвать"
+msgstr "Выберите права, которые хотите отозвать"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "Потомки"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "Город"
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
-msgstr "Очи�тить в�е"
+msgstr ""
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
-msgstr "Закрыто"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/SelfService/Closed.html:24
 msgid "Closed Tickets"
-msgstr "Закрытые за�вки"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Closed requests"
 msgstr "Закрытые запро�ы"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
-msgstr "Закрытые за�вки"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Code"
-msgstr "Код"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Command not understood!\\n"
-msgstr "Команда не ра�познана!\\n"
+msgstr "Чего-чего?\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "Комментировать"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "�дре� дл� комментариев"
 
@@ -1125,63 +1222,63 @@ msgstr "�дре� дл� комментариев"
 msgid "Comment not recorded"
 msgstr "Комментарий не запи�ан"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
-msgstr "Комментарии за�вки"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
-msgstr "КомментироватьЗа�вку"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Comments"
 msgstr "Комментарии"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
-msgstr "Комментарии (�е отправл�ют�� авторам за�вки)"
+msgstr "Комментарии (�е отправл�ют�� про�ител�м)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
-msgstr "Комментарии (�е отправл�ют�� авторам за�вки)"
+msgstr "Комментарии (не отправл�ют�� про�ителю)"
 
 #: NOT FOUND IN SOURCE
 msgid "Comments about %1"
-msgstr "Комментарии о %1"
+msgstr "Информаци� о %1"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
-msgstr "Комментарии об �том пользователе"
+msgstr "Дополнительна� информаци� об �том пользователе"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
-msgstr "Комментарии добавлены"
+msgstr "Добавлены комментарии"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
-msgstr ""
+msgstr "Дей�твие не реализовано"
 
 #: NOT FOUND IN SOURCE
 msgid "Compile Restrictions"
 msgstr "Применить ограничени�"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "У�ловие"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr "Подход�щее у�ловие..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "У�ловие не найдено"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
-msgstr "Конфигураци�"
+msgstr "�а�тройка"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "Подтвердить"
 
@@ -1191,329 +1288,305 @@ msgstr "Контактна� информаци�"
 
 #: NOT FOUND IN SOURCE
 msgid "Contacted date '%1' could not be parsed"
-msgstr "�евезможно идентифицировать дату по�леднего контакта '%1'"
+msgstr "�е могу разобрать дату по�леднего контакта '%1'"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
-msgstr "Содержимое"
+msgstr "Тек�т"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
-msgstr "Тип-Содержани�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Coould not create group"
-msgstr "�евозможно �оздать группу"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:64
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
-msgstr "Копи�"
+msgstr ""
 
 #: etc/initialdata:286
 msgid "Correspondence"
-msgstr "Корре�понденци�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Correspondence Address"
-msgstr "�дре� дл� корре�понденции"
+msgstr "�дре� дл� �ообщений"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
-msgstr "Корре�понденци� добавлена"
+msgstr "Добавлено �ообщение"
 
 #: NOT FOUND IN SOURCE
 msgid "Correspondence not recorded"
-msgstr "Корре�понденци� не запи�ана"
+msgstr "Сообщение не запи�ано"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
-msgstr "�евозможно добавить новое значение дополнительного пол� за�вки."
+msgstr "�е могу добавить новое поле � таким значением."
 
 #: NOT FOUND IN SOURCE
 msgid "Could not add new custom field value for ticket. %1 "
-msgstr "�евозможно добавить новое значение дополнительного пол� за�вки. %1"
-
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
 msgstr ""
 
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr "Ошибка добавлени� нового значени� дл� дополнительного пол�. %1"
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
-msgstr "�евозможно изменить ответ�твенного."
+msgstr "�е могу �менить владельца. "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
-msgstr "�евозможно �оздать дополнительное поле"
-
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
+msgstr "�е могу добавить поле"
 
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
-msgstr "�евозможно �оздать группу"
+msgstr "�е могу �оздать группу"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
-msgstr "�евозможно �оздать шаблон: %1"
+msgstr "�е могу �оздать шаблон: %1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
-msgstr "�евозможно �оздать за�вку. �е задана очередь."
+msgstr "�е могу �оздать тикет. Очередь не определена."
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
-msgstr "�евозможно �оздать пользовател�"
+msgstr "�е могу �оздать пользовател�"
 
 #: NOT FOUND IN SOURCE
 msgid "Could not create watcher for requestor"
-msgstr "�евозможно �оздать наблюдател� дл� автора за�вки"
+msgstr "�е могу �оздать наблюдател� дл� инициатора запро�а"
 
 #: NOT FOUND IN SOURCE
 msgid "Could not find a ticket with id %1"
-msgstr "�евозможно найти за�вку � идентификатором %1"
+msgstr "�е могу найти тикет по идентификатору %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Could not find group %1."
-msgstr "�евозможно найти группу %1."
+msgstr "�е найдена группа %1."
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
-msgstr "�евозможно найти или �оздать �того пользовател�"
+msgstr "�е могу найти или �оздать �того пользовател�"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
-msgstr "�евозможно найти �того пользовател�"
+msgstr "�е могу найти �того пользовател�"
 
 #: NOT FOUND IN SOURCE
 msgid "Could not find user %1."
-msgstr "�евозможно найти пользовател� %1."
+msgstr "�е найден пользователь %1."
 
-#: html/Admin/CustomFields/Objects.html:69
+#: NOT FOUND IN SOURCE
 msgid "Could not load CustomField %1"
-msgstr "�евозможно загрузить дополнительное поле %1"
-
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
-msgid "Could not load group"
-msgstr "�евозможно загрузить группу"
-
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
 msgstr ""
 
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
+msgid "Could not load group"
+msgstr "�е могу загрузить группу"
 
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
-msgstr "�евозможно назначить �того пользовател� %1 дл� �той очереди"
+msgstr "�е могу назначить �того пользовател� %1 дл� �той очереди"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
-msgstr "�евозможно назначить �того пользовател� %1 дл� �той за�вки"
+msgstr "�е могу назначить �того пользовател� %1 дл� �того тикета"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
-msgstr "�евозможно отозвать функции у пользовател� как %1 дл� �той очереди"
+msgstr "�е могу отобрать функции у пользовател� как %1 в �той очереди"
 
 #: NOT FOUND IN SOURCE
 msgid "Could not remove that principal as a %1 for this ticket"
-msgstr "�евозможно отозвать функции у пользовател� как %1 дл� �той за�вки"
+msgstr "�е могу отобрать функции у пользовател� как %1 дл� �того тикета"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
-msgstr "�евозможно у�тановить информацию о пользователе"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
-msgstr "�евозможно добавить пользовател� в группу"
+msgstr "�е могу добавить пользовател� в группу"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
-msgstr "�евозможно �оздать транзакцию: %1"
+msgstr "�е могу �оздать транзакцию: %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't figure out what to do from gpg's reply\\n"
-msgstr "�евозможно определить дальнейшие дей�тви� из ответа gpg\\n"
+msgstr "�е пойму что делать из ответа gpg\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find group\\n"
-msgstr "�евезможно найти группу\\n"
+msgstr "�е найти группу\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
-msgstr "�евозможно найти �троку"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
-msgstr "�евозможно найти �того пользовател�"
+msgstr "�е найти �того пользовател�"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
-msgstr "�евозможно найти �то значение"
+msgstr "�е найти �того значени�"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find that watcher"
-msgstr "�евозможно найти �того наблюдател�"
+msgstr "�е могу найти данного наблюдател�"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find user\\n"
-msgstr "�евозможно найти пользовател�\\n"
+msgstr "Пользователь не найден\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
-msgstr "�евозможно загрузить %1 из базы пользователей.\\n"
+msgstr "�е загрузить %1 из базы пользователей.\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
-msgstr "�евозможно загрузить дополнительное поле %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Couldn't load KeywordSelects."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load RT config file '%1' %2"
-msgstr "�евозможно загрузить файл на�троек RT '%1' %2"
+msgstr "�е загрузить файл на�троек RT '%1' %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load Scrips."
-msgstr "�евозможно загрузить �криплеты."
+msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
-msgstr "�евозможно загрузить группу %1"
+msgstr "�е загрузить группу %1"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
-msgstr "�евозможно загрузить ��ылку"
+msgstr "�е загрузить ��ылку"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
-msgstr "�евозможно загрузить объект %1"
+msgstr ""
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
-msgstr "�евозможно загрузить очередь"
+msgstr "�е загрузить очередь"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
-msgstr "�евозможно загрузить очередь %1"
+msgstr "�е загрузить очередь %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load scrip"
-msgstr "�евозможно загрузить �криплет"
+msgstr "�е загрузить �крипт"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load template"
-msgstr "�евозможно загрузить шаблон"
+msgstr "�е загрузить шаблон"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load that user (%1)"
-msgstr "�евозможно загрузить �того пользовател� (%1)"
+msgstr "�е загрузить �того пользовател� (%1)"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
-msgstr "�евозможно загрузить за�вку '%1'"
-
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
+msgstr "�е загрузить тикет '%1'"
 
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "Страна"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "Создать"
 
 #: etc/initialdata:135
 msgid "Create Tickets"
-msgstr "Создать за�вки"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
-msgstr "Создать дополнительное поле"
+msgstr "Добавить поле"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr "Создать дополнительное поле дл� очереди 1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:47
 msgid "Create a CustomField which applies to all queues"
 msgstr "Создать дополнительное поле дл� в�ех очередей"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new Custom Field"
-msgstr "Добавить новое дополнительное поле"
+msgstr "Добавить новое поле"
+
+#: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new global Scrip"
-msgstr "Создать новый глобальный �криплет"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new global scrip"
-msgstr "Создать новый глобальный �криплет"
+msgstr ""
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
-msgstr "Создать новую группу"
+msgstr "Добавить новую группу"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
-msgstr "Создать новую личную группу"
+msgstr "Добавить новую личную группу"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new queue"
-msgstr "Создать новую очередь"
+msgstr "Добавить новую очередь"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new scrip"
-msgstr "Создать новый �криплет"
+msgstr "Добавить новый �крипт"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new template"
-msgstr "Создать новый шаблон"
+msgstr "Добавить новый шаблон"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
-msgstr "Создать новую за�вку"
+msgstr "Добавить новый тикет"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
-msgstr "Создать нового пользовател�"
+msgstr "Добавить нового пользовател�"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "Создать очередь"
 
@@ -1525,109 +1598,113 @@ msgstr "Создать очередь � именем"
 msgid "Create a request"
 msgstr "Создать запро�"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
-msgstr "Создать �криплет дл� очереди %1"
+msgstr "Создать �крипт дл� очереди %1"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
-msgstr "Создать шаблон"
+msgstr "Создать запро�"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
-msgstr "Создать за�вку"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Create failed: %1 / %2 / %3 "
-msgstr "Ошибка �оздани�: %1 / %2 / %3 "
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Create failed: %1/%2/%3"
-msgstr "Ошибка �оздани�: %1/%2/%3"
+msgstr ""
 
 #: etc/initialdata:137
 msgid "Create new tickets based on this scrip's template"
-msgstr "Создать новые за�вки на о�нове �того шаблона �криплета"
+msgstr ""
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
-msgstr "Создать за�вку"
+msgstr "Создать тикет"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
-msgstr "Создать за�вки в �той очереди"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
-msgstr "Создать, удалить или изменить дополнительные пол�"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
-msgstr "Создать, удалить или изменить очереди"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Create, delete and modify the members of any user's personal groups"
-msgstr "Создать, удалить или изменить членов любой пользователь�кой пер�ональной группы"
+msgstr ""
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
-msgstr "Создать, удалить или изменить членов пер�ональных групп"
+msgstr ""
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
-msgstr "Создать, удалить или изменить пользователей"
-
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
-msgstr "Создать За�вку"
+msgstr "Создать тикет"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
-msgstr "Создана"
+msgstr "Создан"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
-msgstr "Создано дополнительное поле %1"
+msgstr "Добавлено поле %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Created by"
-msgstr "Создано пользователем"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Created during"
-msgstr "Создано во врем�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr "Создан шаблон %1"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
-msgstr "�втор за�вки"
+msgstr ""
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "Текущие �в�зи"
 
 #: NOT FOUND IN SOURCE
 msgid "Current Relationships"
-msgstr "Текущие взаимо�в�зи"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:51
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
-msgstr "Текущие �криплеты"
+msgstr "Текущие �крипты"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "Текущие пользователи"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "Текущие права"
 
@@ -1635,257 +1712,254 @@ msgstr "Текущие права"
 msgid "Current search criteria"
 msgstr "Текущие критерии пои�ка"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "Текущие наблюдатели"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
 msgid "Custom Field #%1"
 msgstr "Дополнительное поле #%1"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "Дополнительные пол�"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
-msgstr "Дополнительные пол� дл� %1"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
-msgstr "Пользователь�кий код очи�тки дей�тви�"
+msgstr "Пользователь�кий код очи�тки"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
-msgstr "Пользователь�кий код подготовки дей�тви�"
+msgstr "Пользователь�кий подготовительный код"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "Пользователь�кое у�ловие"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "Дополнительное поле %1 %2 %3"
 
 #: NOT FOUND IN SOURCE
 msgid "Custom field %1 does not apply to this object"
-msgstr "Дополнительное поле %1 не отно�ит�� к �тому объекту"
+msgstr ""
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "Дополнительное поле %1 имеет значение."
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "Дополнительное поле %1 не имеет значени�."
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
-msgstr "�евозможно найти дополнительное поле %1"
+msgstr "Дополнительное поле %1 не найдено"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
-msgstr "Дополнительное поле удалено"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
-msgstr "�евозможно найти дополнительное поле"
+msgstr "Дополнительное поле не найдено"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
-msgstr "�евозможно найти значение %1 дополнительного пол� %2"
+msgstr "Значение %1 не может быть найдено дл� пол� %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Custom field value changed from %1 to %2"
-msgstr "Значение дополнительного пол� изменено � %1 на %2"
+msgstr "Значение пол� изменено � %1 на %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
-msgstr "�евозможно удалить значение дополнительного пол�"
+msgstr "Значение дополнительного пол� не может быть удалено"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
-msgstr "�евозможно найти значение дополнительного пол� "
+msgstr "Значение дополнительного пол� не найдено"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
-msgstr "Значение дополнительного пол� удалено"
+msgstr "Значение дополнительного пол� было удалено"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
-msgstr "ДополнительноеПоле"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Data error"
-msgstr "Ошибка данных"
+msgstr ""
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "Даты"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "Дек."
 
 #: NOT FOUND IN SOURCE
 msgid "December"
-msgstr "Декабрь"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Default Autoresponse Template"
-msgstr "Шаблон автоответа по умолчанию"
+msgstr ""
 
 #: etc/initialdata:222
 msgid "Default Autoresponse template"
 msgstr "Шаблон автоответа по умолчанию"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
-msgstr "Очередь по умолчанию"
+msgstr ""
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
-msgstr "�втор за�вки по умолчанию"
+msgstr ""
 
 #: etc/initialdata:296
 msgid "Default admin comment template"
-msgstr "Шаблон админи�тративного комментари� по умолчанию"
+msgstr "Шаблон ответа админа по умолчанию"
 
 #: etc/initialdata:275
 msgid "Default admin correspondence template"
-msgstr "Шаблон админи�тративной корре�понденции по умолчанию"
+msgstr ""
 
 #: etc/initialdata:287
 msgid "Default correspondence template"
-msgstr "Шаблон корре�понденции по умолчанию"
+msgstr ""
 
 #: etc/initialdata:253
 msgid "Default transaction template"
 msgstr "Шаблон транзакции по умолчанию"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
-msgstr "Умолчание: %1/%2 изменено � %3 на %4"
+msgstr ""
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
-msgstr "Делегирование прав"
+msgstr "Передача прав"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
-msgstr "Делегирование отдельных прав, которые выданы вам."
+msgstr "Делегирование отдельных прав, которые вам даны."
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
-msgstr "ДелегироватьПрава"
+msgstr ""
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "Делегирование прав"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
-msgstr "Удалить"
+msgstr ""
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
-msgstr "Удалить шаблон"
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
-msgstr "Удалить выбранные �криплеты"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
-msgstr "Удалить за�вки"
+msgstr "Удаление тикетов"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
-msgstr "Удал�тьЗа�вку"
-
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
 msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "Удаление �того объекта может нарушить ��ылочную цело�тно�ть"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "Удаление �того объекта нарушит ��ылочную цело�тно�ть"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "Удаление �того объекта нарушит ��ылочную цело�тно�ть"
 
 #: NOT FOUND IN SOURCE
 msgid "Deleting this object would violate referential integrity."
-msgstr "Удаление �того объекта нарушит ��ылочную цело�тно�ть."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Deleting this object would violate referential integrity. That's bad."
-msgstr "Удаление �того объекта нарушит ��ылочную цело�тно�ть."
+msgstr ""
 
-#: html/Approvals/Elements/Approve:66
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "Отказать"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
-msgstr "От неё зави��т"
+msgstr "От него зави��т"
 
 #: NOT FOUND IN SOURCE
 msgid "Dependencies: \\n"
 msgstr "Зави�имо�ти: \\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
-msgstr "Добавлено требование за�вкой %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
-msgstr "Удалено требование за�вкой %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
-msgstr "Добавлена зави�имо�ть от %1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
-msgstr "Удалена зави�имо�ть от %1"
+msgstr ""
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "Зави�ит от"
 
 #: NOT FOUND IN SOURCE
 msgid "DependsOn"
-msgstr "Зави�ит от"
+msgstr ""
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "В пор�дке убывани�"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "Опишите проблему"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "Опи�ание"
 
@@ -1893,51 +1967,47 @@ msgstr "Опи�ание"
 msgid "Details"
 msgstr "Подробно�ти"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "Показать"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
-msgstr "Показать �пи�ок прав до�тупа"
+msgstr ""
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
-msgstr "Показать колонки"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
-msgstr "Показать шаблоны �криплетов дл� �той очереди"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
-msgstr "Показать �криплеты дл� �той очереди"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
-msgstr "Режим отображени�"
+msgstr "Режим показа"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
-msgstr "Показать �охраненные запро�ы дл� �той группы"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Display ticket #%1"
-msgstr "Показать за�вку #%1"
+msgstr "Показать тикет #%1"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
-msgstr "Ра�про�тран�ет�� по вер�ии 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> GNU GPL.</a>"
+msgstr ""
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
-msgstr "Делать в�е и везде"
-
-#: html/Search/Build.html:112
-msgid "Do the Search"
 msgstr ""
 
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "�е обновл�ть �ту �траницу"
 
@@ -1945,135 +2015,131 @@ msgstr "�е обновл�ть �ту �траницу"
 msgid "Don't show search results"
 msgstr "�е показывать результаты пои�ка"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
-msgstr "Загрузить"
+msgstr "Скачать"
 
 #: NOT FOUND IN SOURCE
 msgid "Download all the tickets as a tab delimited file"
-msgstr "Загрузить в�е за�вки как файл �о значени�ми, разделенными табул�цией"
+msgstr ""
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
-msgstr "Загрузить как файл �о значени�ми, разделенными табул�цией"
+msgstr ""
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "Дан �рок"
 
 #: NOT FOUND IN SOURCE
 msgid "Due date '%1' could not be parsed"
-msgstr "�евозможно разобрать �рок решени� проблемы '%1'"
+msgstr "�е могу проче�ть �рок решени� проблемы '%1'"
 
 #: NOT FOUND IN SOURCE
 msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
-msgstr "ОШИБК�: �евозможно загрузить за�вку '%1': %2.\\n"
+msgstr "ОШИБК�: �е могу загрузить тикет '%1': %2.\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Edit"
-msgstr "Редактировать"
+msgstr "Изменить"
 
 #: NOT FOUND IN SOURCE
 msgid "Edit Conditions"
-msgstr "Редактировать у�лови�"
-
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
-msgid "Edit Custom Fields for %1"
-msgstr "Редактирование дополнительных полей дл� %1"
-
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
-msgstr ""
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
+msgid "Edit Custom Fields for %1"
+msgstr "Изменение дополнительных полей дл� %1"
 
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
 msgstr ""
 
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
-msgstr "Редактировать �в�зи"
+msgstr "Изменение �в�зей"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
-msgstr "Редактировать запро�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Edit Relationships"
-msgstr "Редактировать взаимо�в�зи"
+msgstr ""
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr "Редактировать шаблоны дл� очереди %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Edit keywords"
-msgstr "Редактировать ключевые �лова"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
-msgstr "Редактировать �охраненные запро�ы �той группы"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Edit scrips"
-msgstr "Редактировать �криплеты"
+msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
-msgstr "Редактировать �и�темные шаблоны"
+msgstr "Изменение �и�темных шаблонов"
 
 #: NOT FOUND IN SOURCE
 msgid "Edit templates for %1"
-msgstr "Редактирование шаблонов дл� %1"
+msgstr "Изменение шаблонов дл� %1"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
-msgstr "РедактироватьСохраненныеЗапро�ы"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
-msgstr "Редактирование на�троек очереди %1"
+msgstr "Изменение на�троек очереди %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Editing Configuration for user %1"
-msgstr "Редактирование на�троек пользовател� %1"
+msgstr "Изменение на�троек пользовател� %1"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
-msgstr "Редактирование пол� %1"
+msgstr "Изменение пол� %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
-msgstr "Редактирование �пи�ка пользователей группы %1"
+msgstr "Пользователи в группе %1"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
-msgstr "Редактирование �пи�ка пользователей пер�ональной группы %1"
+msgstr "Пользователи в личной группе %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Editing template %1"
-msgstr "Редактирование шаблона %1"
+msgstr "Изменение шаблона %1"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "�ужно указать либо и�точник, либо адре� назначени�"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "Email"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
-msgstr "Email адре� уже зан�т"
+msgstr "Email уже зан�т"
 
 #: NOT FOUND IN SOURCE
 msgid "EmailAddress"
@@ -2083,73 +2149,84 @@ msgstr "EmailAddress"
 msgid "EmailEncoding"
 msgstr "EmailEncoding"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
-msgstr "И�пользует�� (�н�тие отметки отключает и�пользование �того дополнительного пол�)"
+msgstr "Разрешено (�н�тие отметки запрещает данное дополнительное поле)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
-msgstr "И�пользует�� (�н�тие отметки отключает и�пользование �той группы)"
+msgstr "Разрешено (�н�тие отметки запрещает данную группу)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
-msgstr "И�пользует�� (�н�тие отметки отключает и�пользование �той очереди)"
+msgstr "Включена (Сн�та� галочка означает отключенную очередь)"
 
 #: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
-msgstr "И�пользуемые дополнительные пол�"
+msgstr "Разрешенные дополнительные пол�"
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
-msgstr "И�пользуемые очереди"
+msgstr "Включенные очереди"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
-msgstr "�ктивирован �тату� %1"
+msgstr "Включен �тату� %1"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
-msgstr "�ктивирован �тату�: %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "Введите не�колько значений"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
-msgstr "Введите объекты или ��ылки на объекты. Значени� раздел�ют�� пробелами."
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "Введите одно значение"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
-msgstr "Введите оxthtlb или ��ылки на оxthtlb. Значени� раздел�ют�� пробелами."
+msgstr ""
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
-msgstr "Введите за�вки или ��ылки на за�вки. Значени� раздел�ют�� пробелами."
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Bulk.html:142
 msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
-msgstr "Введите за�вки или ��ылки на за�вки. Значени� раздел�ют�� пробелами."
+msgstr "Введите номера или ��ылки на тикеты. �е�колько тикетов раздел�ют�� пробелами."
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
-msgstr "Введите до %1 значений"
+msgstr ""
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "Ошибка"
 
 #: NOT FOUND IN SOURCE
 msgid "Error adding watcher"
-msgstr "Ошибка добавлени� наблюдател�"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:669
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "Ошибка в параметрах Queue->AddWatcher"
 
@@ -2157,11 +2234,11 @@ msgstr "Ошибка в параметрах Queue->AddWatcher"
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "Ошибка в параметрах Queue->DelWatcher"
 
-#: lib/RT/Queue_Overlay.pm:830
+#: lib/RT/Queue_Overlay.pm:754
 msgid "Error in parameters to Queue->DeleteWatcher"
-msgstr "Ошибка в параметрах Queue->DeleteWatcher"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "Ошибка в параметрах Ticket->AddWatcher"
 
@@ -2169,27 +2246,27 @@ msgstr "Ошибка в параметрах Ticket->AddWatcher"
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "Ошибка в параметрах Ticket->DelWatcher"
 
-#: lib/RT/Ticket_Overlay.pm:1499
+#: lib/RT/Ticket_Overlay.pm:1630
 msgid "Error in parameters to Ticket->DeleteWatcher"
-msgstr "Ошибка в параметрах Ticket->DeleteWatcher"
+msgstr ""
 
-#: bin/rt-crontool:233
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
-msgstr "Ра�ширить за�вки"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Estimate"
-msgstr "Ра�четно"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:57
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
-msgstr "Ра�четное"
+msgstr ""
 
 #: etc/initialdata:20
 msgid "Everyone"
-msgstr "В�е"
+msgstr ""
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "Пример:"
 
@@ -2201,105 +2278,92 @@ msgstr "ExternalAuthId"
 msgid "ExternalContactInfoId"
 msgstr "ExternalContactInfoId"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
-msgstr "Дополнительна� информаци�"
+msgstr "Доп. информаци�"
+
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
-msgstr "�евозможно найти п�евдо-группу 'Привилегированные'"
+msgstr "�е могу найти п�евдо-группу 'Полномочных' пользователей"
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
-msgstr "�евозможно найти п�евдо-группу '�епривилегированные'"
+msgstr "�е могу найти п�евдо-группу '�еполномочных' пользователей"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
-msgstr "Ошибка загрузки модул� %1. (%2)"
-
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
 msgstr ""
 
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "Фев."
 
 #: NOT FOUND IN SOURCE
 msgid "February"
-msgstr "Февраль"
+msgstr ""
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
-msgstr "Им� файла"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:69
+#: NOT FOUND IN SOURCE
 msgid "Fill in multiple text areas"
-msgstr "Заполнить не�колько тек�товых полей"
-
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:70
+#: NOT FOUND IN SOURCE
 msgid "Fill in one text area"
-msgstr "Заполнить одно тек�товвое поле"
-
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
 msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
-msgstr "Заполнить до %1 тек�товых полей"
-
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Fin"
 msgstr "Конец"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "Конечный приоритет"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
-msgstr "Конечный приоритет"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
 msgid "Find group whose"
-msgstr "�айти группы, которые"
+msgstr "�айти группы, у которых"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
-msgstr "�айти группы, которые"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Find new/open tickets"
-msgstr "�айти новые/открытые за�вки"
+msgstr "Информаци� о тикетах"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
-msgstr "�айти пользователей, у которых"
+msgstr "�айти людей, у которых"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
-msgstr "Пои�к за�вок"
+msgstr "Пои�к тикетов"
 
 #: NOT FOUND IN SOURCE
 msgid "Finish Approval"
-msgstr "Подтвердить"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "�ачало"
 
@@ -2307,98 +2371,110 @@ msgstr "�ачало"
 msgid "First page"
 msgstr "Перва� �траница"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "Foo Bar Baz"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "Foo!"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
-msgstr "Изменить принудительно"
-
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
+msgstr "Изменить �илой"
 
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
-msgstr "�айдено %quant(%1,ticket)"
+msgstr ""
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
-msgstr "�айден объект"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Freeform"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "FreeformContactInfo"
 msgstr "FreeformContactInfo"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/CustomField_Overlay.pm:37
+msgid "FreeformMultiple"
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:36
+msgid "FreeformSingle"
+msgstr ""
+
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "Птн."
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
-msgstr "В�е заголовки"
+msgstr "Полный"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
-msgstr "Вз�ть шаблон из файла"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "Берем текущего пользовател� из pgp подпи�и\\n"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
-msgstr "�азначено %1"
+msgstr ""
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "Общие"
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
-msgstr "Общие дополнительные пол�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
-msgid "Global Scrips"
-msgstr "Общие �криплеты"
+msgid "Global Keyword Selections"
+msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
+#: NOT FOUND IN SOURCE
+msgid "Global Scrips"
 msgstr ""
 
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
-msgstr "Общий шаблон: %1"
+msgstr ""
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
-msgstr "Отправить"
+msgstr ""
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
-msgstr "Отправить!"
+msgstr "Поехали!"
 
 #: NOT FOUND IN SOURCE
 msgid "Good pgp sig from %1\\n"
-msgstr "Правильна� pgp подпи�ь от %1\\n"
+msgstr "Хороша� pgp подпи�ь от %1\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Goto page"
 msgstr "Перейти на �траницу"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
-msgstr "Показать за�вку"
+msgstr "Показать тикет"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: NOT FOUND IN SOURCE
+msgid "Grand"
+msgstr ""
+
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "Групповые"
 
@@ -2406,32 +2482,32 @@ msgstr "Групповые"
 msgid "Group %1 %2: %3"
 msgstr "Группа %1 %2: %3"
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "Права группы"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "Пользователь уже входит в группу"
 
 #: NOT FOUND IN SOURCE
 msgid "Group could not be created."
-msgstr "�евозможно �оздать группу."
+msgstr ""
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
-msgstr "�евозможно �оздать группу: %1"
+msgstr "�е могу �оздать группу: %1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
-msgstr "Группа �оздана"
+msgstr "Создана группа"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
-msgstr "В группе нет такого пользовател�"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "Группа не найдена"
 
@@ -2443,243 +2519,237 @@ msgstr "Группа не найдена.\\n"
 msgid "Group not specified.\\n"
 msgstr "�е задана группа.\\n"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "Группы"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "Группы не могут быть членами вход�щих в них пользователей"
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
-msgstr "Группы, удовлетвор�ющие у�ловию пои�ка"
+msgstr ""
 
-#: html/Ticket/Elements/ShowRequestor:77
+#: NOT FOUND IN SOURCE
 msgid "Groups this user belongs to"
-msgstr "Группы, в которых �о�тоит �тот пользователь"
+msgstr ""
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "Здрав�твуйте!"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
-msgstr "Здрав�твуйте, %1"
+msgstr "Hello, %1"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "И�тори�"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
-msgstr "И�тори� группы %1"
+msgstr ""
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
-msgstr "И�тори� пользовател� %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "HomePhone"
-msgstr "Домашний телефон"
+msgstr "HomePhone"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
-msgstr "В начало"
+msgstr "Домой"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
-msgstr "Имеет�� %quant(%1,concrete mixer)."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "I have [quant,_1,concrete mixer]."
-msgstr "Имеет�� [quant,_1,concrete mixer]."
-
-#: html/Search/Build.html:637
-msgid "I'm lost"
-msgstr ""
+msgstr "I have [quant,_1,concrete mixer]."
 
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
-msgstr "За�вка"
+msgstr "Тикет"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "Лично�ть"
 
 #: etc/initialdata:429
 msgid "If an approval is rejected, reject the original and delete pending approvals"
-msgstr "Е�ли подтверждение отклонено, отклонить за�вку-первои�точник и удалить ожидающие подтверждени�"
+msgstr ""
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "Е�ли не указан �втор, �оздать за�вки от имени �того �втора."
+msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
-msgstr "Е�ли очередь не указана, то �оздавать за�вки в �той очереди."
+msgstr ""
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr "Е�ли бы �та программа имела у�тановленный бит setgid, то зловредный пользователь мог бы во�пользовать�� �тим дл� получени� админи�тративных полномочий в RT."
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
-msgstr "По�ле любых изменений необходимо"
+msgstr "Е�ли вы что-либо изменили, то удо�товерьте�ь, что"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
-msgstr "�едопу�тимое значение дл� %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Image"
-msgstr "Изображение"
+msgstr ""
 
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
-msgstr "�еизмен�емое поле"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
-msgstr "Показывать неи�пользуемые дополнительные пол�."
+msgstr "Включать отключенные дополнительные пол� в �пи�ок."
 
-#: html/Admin/Groups/index.html:65
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
-msgstr "Показывать неи�пользуемые группы."
+msgstr ""
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
-msgstr "Показывать неи�пользуемые очереди."
+msgstr "Показывать отключенные очереди."
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
-msgstr "Показывать отключенных пользователей."
-
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
+msgstr "Показать отключенных пользователей."
 
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "�ачальный приоритет"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
-msgstr "�ачальный приоритет"
+msgstr ""
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "Ошибка ввода"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: NOT FOUND IN SOURCE
+msgid "Interest noted"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "Внутренн�� ошибка"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
-msgstr "Внутренн�� ошибка: %1"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
-msgstr "�едопу�тимый тип группы"
+msgstr "�еправильный тип группы"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
-msgstr "�едопу�тимое право"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Invalid Type"
-msgstr "�едопу�тимый тип"
+msgstr ""
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
-msgstr "�едопу�тимые данные"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Invalid owner. Defaulting to 'nobody'."
-msgstr "�е�уще�твующий ответ�твенный. И�пользуем 'nobody'."
+msgstr "Владелец от�ут�твует. Замен�ем его на 'nobody'."
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
-msgstr "�едопу�тима� очередь"
+msgstr "�еверна� очередь"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
-msgstr "�едопу�тимое право"
+msgstr "�еверные права"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
-msgstr "�едопу�тимое значение дл� %1"
+msgstr "�еправильное значение дл� %1"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
-msgstr "�едопу�тимое значение дополнительного пол�"
+msgstr "�еправильное значение дл� �того пол�"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
-msgstr "�едопу�тимое значение �тату�а"
+msgstr "Такого �тату�а не бывает"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
-msgstr "Обратите внимание, что непривилегированные пользователи не имеют права запу�кать �ту программу."
+msgstr "Обратите внимание, что обычные пользователи не имеют права запу�кать �ту программу."
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
-msgstr "Предполагает��, что дл� запу�ка �той программы вы должны �оздать непривилегированную учетную запи�ь пользовател� Unix � корректными у�тановками групп и до�тупом к RT."
+msgstr "Предполагает��, что дл� запу�ка �той программы вы должны �оздать учетную запи�ь пользовател� Unix � корректными у�тановками групп и до�тупом к RT."
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
-msgstr "Это требует не�колько параметров:"
-
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr ""
+msgstr "Она требует не�колько параметров:"
 
 #: NOT FOUND IN SOURCE
 msgid "Items pending my approval"
-msgstr "За�вки, ожидающие вашего подтверждени�"
+msgstr "Тикеты, ожидающие моей визы"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "Янв."
 
 #: NOT FOUND IN SOURCE
 msgid "January"
-msgstr "Январь"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
-msgstr "При�оединить�� или покинуть �ту группу"
+msgstr ""
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "Июл."
 
 #: NOT FOUND IN SOURCE
 msgid "July"
-msgstr "Июль"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
-msgstr "В�е данные"
+msgstr "В�е вме�те"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "Июн."
 
 #: NOT FOUND IN SOURCE
 msgid "June"
-msgstr "Июнь"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Keyword"
@@ -2689,724 +2759,693 @@ msgstr "Ключевое �лово"
 msgid "Lang"
 msgstr "Язык"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
-msgstr "Язык"
-
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
 msgstr ""
 
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "Конец"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
-msgstr "По�ледний контакт"
+msgstr "Контакт"
 
 #: NOT FOUND IN SOURCE
 msgid "Last Contact</a>"
-msgstr "По�ледний контакт</a>"
+msgstr ""
 
-#: html/Elements/SelectDateType:50
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
-msgstr "По�ледний контакт"
+msgstr "Контакт"
 
 #: NOT FOUND IN SOURCE
 msgid "Last Notified"
-msgstr "По�леднее уведомление"
+msgstr ""
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
-msgstr "По�леднее обновление"
+msgstr "Обновлен"
 
 #: NOT FOUND IN SOURCE
 msgid "LastUpdated"
-msgstr "По�леднее обновление"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
-msgstr "По�ледний раз обновлено"
+msgstr ""
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "О�тало�ь"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "Разрешить до�туп к RT"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
-msgstr "Предо�тавить пользователю права"
+msgstr "Пользователь может иметь права"
 
 #: NOT FOUND IN SOURCE
 msgid "Limiting owner to %1 %2"
-msgstr "Ограничиваем ответ�твенного дл� %1 %2"
+msgstr "Ограничиваем владельца %1 %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Limiting queue to %1 %2"
 msgstr "Ограничиваем очередь дл� %1 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "Св�зь уже �уще�твует"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
-msgstr "�евозможно �оздать �в�зь"
+msgstr "�е могу �в�зать тикеты"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
-msgstr "Св�зь �оздана (%1)"
+msgstr ""
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
-msgstr "Св�зь удалена (%1)"
+msgstr "Удалена �в�зь (%1)"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "Св�зь не найдена"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
-msgstr "Св�зать за�вку #%1"
+msgstr "Св�зываем тикет #%1"
 
 #: NOT FOUND IN SOURCE
 msgid "Link ticket %1"
-msgstr "Св�зать за�вку %1"
+msgstr ""
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "Св�зи"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
-msgstr "Загрузить"
+msgstr ""
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
-msgstr "Загрузить �охраненный запро�:"
-
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
 msgstr ""
 
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
-msgstr "Загруженные модули perl"
-
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
 msgstr ""
 
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "Ме�тонахождение"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "�е найден каталог дл� протоколировани� %1 или не до�тупен на запи�ь.\\n RT не может продолжить работу."
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "Зареги�трирован как %1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
-msgstr "Войти"
+msgstr "Логин"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "Выйти"
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
 msgstr ""
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
-msgstr "�азначить ответ�твенного"
+msgstr "�азначить владельцем"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
-msgstr "У�тановить �тату�"
+msgstr "�азначить �тату�"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
-msgstr "У�тановить конечный �рок"
+msgstr "�азначить �рок"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
-msgstr "У�тановить дату решени�"
+msgstr "Изменить дату решени�"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
-msgstr "У�тановить дату '�ачато'"
+msgstr "Изменить дату '�ачал��'"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
-msgstr "У�тановить дату '�ачинает��'"
+msgstr "Изменить дату '�ачинает��'"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
-msgstr "У�тановить дату по�леднего контакта"
+msgstr "Изменить дату по�леднего контакта"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
-msgstr "У�тановить приоритет"
+msgstr "�азначить приоритет"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "�азначить очередь"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
-msgstr "У�тановить тему"
+msgstr "Изменить тему"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
 msgstr ""
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
-msgstr "Управление дополнительными пол�ми и их значени�ми"
+msgstr ""
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
-msgstr "Управление группами и членами групп"
+msgstr "�а�тройка групп и их пользователей"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
-msgstr "Управление �вой�твами и на�тройками, которые примен�ют�� ко в�ем очеред�м"
+msgstr "�а�тройки дл� в�ех очередей"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
-msgstr "Управление очеред�ми и их параметрами"
+msgstr "�а�тройка очередей и их параметров"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
-msgstr "Управление пользовател�ми и парол�ми"
+msgstr "�а�тройка пользователей и их паролей"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "Мар."
 
 #: NOT FOUND IN SOURCE
 msgid "March"
-msgstr "Март"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "May"
-msgstr "Май"
+msgstr ""
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "Май"
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
-msgstr "Уча�тник %1 добавлен"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
-msgstr "Уча�тник %1 удален"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "Пользователь добавлен в группу"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "Пользователь удален из группы"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "Пользователь не удален из группы"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
-msgstr "Со�тоит в"
+msgstr "Входит в"
 
 #: NOT FOUND IN SOURCE
 msgid "MemberOf"
-msgstr "Со�тоит в"
+msgstr ""
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
-msgstr "Уча�тники"
+msgstr "Пользователи"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
-msgstr "Уча�тие в %1 добавлено"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
-msgstr "Уча�тие в %1 удалено"
+msgstr ""
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
-msgstr "Уча�тие в группах"
+msgstr ""
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
-msgstr "Уча�тие в группах данного пользовател� %1"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
-msgstr "За�вки у�пешно объединены"
+msgstr "Тикеты у�пешно �клеены"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
-msgstr "Ошибка объединени�. �евозможно у�тановить идентификатор за�вки."
-
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
+msgstr "Склейка не удала�ь. �е �могла у�тановить идентификатор тикета."
 
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
-msgstr "Объединить � за�вкой"
+msgstr "Приклеить к"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
-msgstr "Объединено в %1"
+msgstr ""
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
-msgstr "Сообщение"
+msgstr "Тек�т"
 
 #: NOT FOUND IN SOURCE
 msgid "Message body not shown because it is too large or is not plain text."
-msgstr "Тело �ообщени� не показано потому, что оно или �лишком большое или не �вл�ет�� тек�том."
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
-msgstr "�евозможно запи�ать �ообщение"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Message recipients"
-msgstr "Получатели �ообщени�"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2409
+#: lib/RT/Ticket_Overlay.pm:2517
 msgid "Message recorded"
-msgstr "Сообщение запи�ано"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:115
+#: html/Ticket/Elements/PreviewScrips:70
 msgid "Messages about this ticket will not be sent to..."
-msgstr "Сообщени� об �той за�вке не будет отправлены..."
-
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
 msgstr ""
 
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
-msgstr "Пропущен первичный ключ?: %1"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
-msgstr "Мобильный"
+msgstr "Мобильник"
 
 #: NOT FOUND IN SOURCE
 msgid "MobilePhone"
-msgstr "Мобильный телефон"
+msgstr "MobilePhone"
 
 #: NOT FOUND IN SOURCE
 msgid "Modified"
-msgstr "Изменено"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Modify"
-msgstr "Изменить"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "Изменить �пи�ок контрол� до�тупа"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify Custom Field %1"
-msgstr "Изменить дополнительное поле %1"
-
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
-msgstr ""
+msgstr "Изменение дополнительного пол� %1"
 
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
+#: NOT FOUND IN SOURCE
 msgid "Modify Custom Fields which apply to all %1"
-msgstr "Изменить дополнительные пол�, примен�емые ко в�ем %1"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
-msgstr "Изменить дополнительные пол�, примен�емые ко в�ем очеред�м"
+msgstr "Изменить дополнительные пол�, примен�емые кл в�ем очеред�м"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
-msgstr "Изменить права группы"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
-msgstr "Изменить уча�тников"
+msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
-msgstr "Изменить права"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr "Изменить шаблоны �криплетов дл� данной очереди"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "Изменить �криплеты дл� данной очереди"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify System ACLS"
-msgstr "Изменить �и�темные права до�тупа"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Modify Template %1"
-msgstr "Изменить шаблон %1"
+msgstr ""
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
-msgstr "Изменить права пользовател�"
+msgstr ""
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
-msgstr "Изменить дополнительное поле дл� очереди %1"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:52
 msgid "Modify a CustomField which applies to all queues"
-msgstr "Изменить дополнительное поле, которое примен�ет�� ко в�ем очеред�м"
+msgstr ""
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
-msgstr "Изменить �криплет дл� очереди %1"
+msgstr "Изменить �крипт дл� очереди %1"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
-msgstr "Изменить �криплет, который дей�твует дл� в�ех очередей"
+msgstr "Изменение �крипта, который дей�твует дл� в�ех очередей"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
-msgstr "Изменить а��оциированные объекты дл� %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Modify dates for # %1"
-msgstr "Изменить даты за�вки #%1"
+msgstr ""
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
-msgstr "Изменить даты за�вки #%1"
+msgstr "Изменение дат в тикете #%1"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
-msgstr "Изменить даты за�вки #%1"
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
+msgstr "Изменение дат в тикете #%1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
-msgstr "Изменить общие права группы"
+msgstr "Изменение глобальных прав группы"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
-msgstr "Изменить общие права группы."
+msgstr "Изменение глобальных прав группы"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify global rights for groups"
-msgstr "Изменить общие права дл� групп"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Modify global rights for users"
-msgstr "Изменить общие права дл� пользователей"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Modify global scrips"
-msgstr "Изменить общие �криплеты"
+msgstr ""
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
-msgstr "Изменить общие права пользовател�"
+msgstr "Изменение глобальных прав пользовател�"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
-msgstr "Изменить общие права пользовател�."
+msgstr "Изменение глобальных прав пользовател�."
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
-msgstr "Изменить метаданные группы или удалить ее"
+msgstr "Изменение метаданных группы или ее удаление"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
-msgstr "Изменить права группы на дополнительное поле %1"
+msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
-msgstr "Изменить права группы на группу %1"
+msgstr "Изменение прав групп дл� группе %1"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
-msgstr "Изменить права группы на очередь %1"
+msgstr "Изменение прав групп дл� очереди %1"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
-msgstr "Изменить �пи�ок уча�тников �той группы"
+msgstr ""
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
-msgstr "Изменить �об�твенную учетную запи�ь RT"
+msgstr ""
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
-msgstr "Изменить пользователей, отно��щих�� к очереди %1"
+msgstr "Изменение пользователей отно��щих�� к очереди %1"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
-msgstr "Изменить пользователей, отно��щих�� к за�вке #%1"
+msgstr "Изменение пользователей отно��щих�� к тикету #%1"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
-msgstr "Изменить �криплеты дл� очереди %1"
+msgstr "Изменить �крипты дл� очереди %1"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
-msgstr "Изменить �криплеты, которые дей�твуют на в�е очереди"
+msgstr "Изменение �криптов, которые дей�твуют на в�е очереди"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
-msgstr "Изменить шаблон %1"
+msgstr "Изменение шаблона %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "Изменить шаблоны, которые примен�ют�� ко в�ем очеред�м"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
-msgstr "Изменить группу %1"
+msgstr "�а�тройки дл� группы %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "Изменить очередь наблюдателей"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
-msgstr "Изменить пользовател� %1"
+msgstr "�а�тройки дл� пользовател� %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
-msgstr "Изменить за�вку # %1"
+msgstr "Изменение тикета # %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
-msgstr "Изменить за�вку # %1"
+msgstr "Изменение тикета # %1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
-msgstr "Изменить за�вки"
+msgstr "Изменить тикеты"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
-msgstr "Изменить права пользовател� на дополнительное поле %1"
+msgstr ""
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
-msgstr "Изменить права пользователей группы %1"
+msgstr "Изменение прав пользовател� дл� группы %1"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
-msgstr "Изменить права пользовател� на очередь %1"
+msgstr "Изменение прав пользовател� дл� очереди %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify watchers for queue '%1'"
-msgstr "Изменить наблюдателей очереди '%1'"
+msgstr "Изменение наблюдателей дл� очереди '%1'"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
-msgstr "Измен�тьПраваДо�тупа"
-
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr "Измен�тьДополнительноеПоле"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
-msgstr "Измен�тьСоб�твенноеУча�тиеВГруппах"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
-msgstr "Измен�ть�аблюдателейОчереди"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
-msgstr "Измен�тьСкриплеты"
+msgstr ""
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
-msgstr "Измен�тьСеб�"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
-msgstr "Измен�тьШаблон"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
-msgstr "Измен�тьЗа�вку"
+msgstr ""
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "Пнд."
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "Информаци� о %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Move"
-msgstr "Переме�тить"
+msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:83
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
-msgstr "Переме�тить вниз"
+msgstr ""
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
-msgstr "Переме�тить вверх"
+msgstr ""
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "�е�колько значений"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "Вы должны указать Им�"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
-msgstr "%1 ваших за�вок"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "My Approvals"
-msgstr "Ваши подтверждени�"
+msgstr "Мои визы"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
-msgstr "Ваши подтверждени�"
+msgstr "Мои визы"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
-msgstr "Ваши �охраненные запро�ы"
+msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "Им�"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "Им� уже и�пользует��"
 
 #: NOT FOUND IN SOURCE
 msgid "Name matches"
-msgstr "Совпадение имен"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Need approval from system administrator"
-msgstr "�еобходимо подтверждение �и�темного админи�тратора"
+msgstr ""
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
-msgstr "�икогда"
+msgstr ""
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "�овых"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "�овые �в�зи"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "�овый пароль"
 
 #: etc/initialdata:332
 msgid "New Pending Approval"
-msgstr "�овое ожидающее подтверждение"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
-msgstr "�овый запро�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "New Relationships"
-msgstr "�овые �в�зи"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "New Search"
 msgstr "�овый пои�к"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "�овое дополнительное поле"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "�ова� группа"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "�овый пароль"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "Отправлено �ообщение � новым паролем"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "�ова� очередь"
 
@@ -3414,11 +3453,11 @@ msgstr "�ова� очередь"
 msgid "New request"
 msgstr "�овый запро�"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "�овые права"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "�овый �криплет"
 
@@ -3426,27 +3465,27 @@ msgstr "�овый �криплет"
 msgid "New search"
 msgstr "�овый пои�к"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "�овый шаблон"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
-msgstr "�ова� за�вка"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
-msgstr "�ова� за�вка не �уще�твует"
+msgstr "�овый тикет не �уще�твует"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "�овый пользователь"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "Добавить пользовател� � именем"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "�овые наблюдатели"
 
@@ -3454,13 +3493,13 @@ msgstr "�овые наблюдатели"
 msgid "New window setting"
 msgstr "�овые на�тройки окна"
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "Вперед"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
-msgstr "Следующа� �траница"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Next page"
@@ -3470,193 +3509,188 @@ msgstr "Следующа� �траница"
 msgid "NickName"
 msgstr "П�евдоним"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "П�евдоним"
 
 #: NOT FOUND IN SOURCE
 msgid "No"
-msgstr "�ет"
+msgstr ""
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr ""
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
-msgstr "�ет дополнительного пол�"
+msgstr "�ет такого пол�"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
-msgstr "Дополнительное поле не указано"
+msgstr ""
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
-msgstr "Группа не указана"
+msgstr "�ет такой группы"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
-msgstr "�ет запро�а"
+msgstr ""
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
-msgstr "Очередь не указана"
+msgstr "�ет такой очереди"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr "Пользователь RT не найден. Пожалуй�та, обратите�ь к вашему админи�тратору RT.\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
-msgstr "�ет шаблона"
+msgstr "Шаблон не определен"
 
 #: NOT FOUND IN SOURCE
 msgid "No Ticket specified. Aborting ticket "
-msgstr "За�вка не указана. Отмена."
+msgstr "Тикет не задан. �ичего не делаем."
 
 #: NOT FOUND IN SOURCE
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
-msgstr "За�вка не указана. Отмен�ем изменени� за�вки\\n\\n"
+msgstr "Тикет не задан. Отмен�ем изменени� тикета\\n\\n"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "�ет дей�тви�"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
-msgstr "Колонка не указана"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "No command found\\n"
 msgstr "Команда не найдена\\n"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
-msgstr "�ет комментариев о пользователе"
+msgstr "Без комментариев"
 
 #: NOT FOUND IN SOURCE
 msgid "No correspondence attached"
 msgstr "Пу�тое �ообщение"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "�ет опи�ани� дл� %1"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "�е указана группа"
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
-msgstr "Группы, удовел�твор�ющие у�ловию пои�ка, не найдены."
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
-msgstr "�ет при�оединенных �ообщений"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
-msgstr "Пароль не у�тановлен"
+msgstr "От�ут�твует пароль"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
-msgstr "�ет прав дл� �оздани� очередей"
+msgstr "У ва� нет права на �оздание очереди"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
-msgstr "�ет прав дл� �оздани� за�вок в очереди '%1'"
+msgstr ""
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
-msgstr "�ет прав дл� �оздани� пользователей"
+msgstr "Вы не имеете права �оздавать пользователей"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
-msgstr "�ет прав дл� про�мотра �той за�вки"
+msgstr "Показ �того тикета запрещен"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
-msgstr "�ет прав дл� про�мотра обновлений �той за�вки"
+msgstr "Запрещен показ изменений �того тикета"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "Пользователь не указан"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "Пользователи не выбраны."
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
-msgstr "Очереди, удовел�твор�ющие у�ловию пои�ка, не найдены."
+msgstr "�ичего подход�щего не найдено."
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
-msgstr "Права не найдены"
+msgstr ""
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
-msgstr "Права не выданы."
+msgstr "�ет прав."
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
-msgstr "�ет запро�а дл� пои�ка."
+msgstr "�ечего делать."
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
-msgstr "�ет темы"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "No ticket id specified"
-msgstr "Идентификатор за�вки не указан"
+msgstr "�е указан номер тикета"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
-msgstr "Тип транзакции не указан"
+msgstr "�е указан тип транзакции"
 
 #: NOT FOUND IN SOURCE
 msgid "No user or email address specified"
-msgstr "Пользователь или адре� email не указан"
+msgstr ""
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
-msgstr "Пользователи, удовел�твор�ющие у�ловию пои�ка, не найдены."
+msgstr "�и одного подход�щего пользовател� не найдено."
 
 #: NOT FOUND IN SOURCE
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "�е найден пользователь RT. Обработчик CVS отключен. Обратите�ь к админи�тратору RT.\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
-msgstr "�икакое значение не отправлено _Set!\\n"
+msgstr ""
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
-msgstr "�икто"
+msgstr ""
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
-msgstr "�е�уще�твующее поле?"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Not logged in"
-msgstr "�е зареги�трирован"
+msgstr ""
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "�е зареги�трирован."
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "�е у�тановлено"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "Еще не реализовано."
 
@@ -3664,141 +3698,127 @@ msgstr "Еще не реализовано."
 msgid "Not yet implemented...."
 msgstr "Еще не реализовано..."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
-msgstr "Примечани�"
+msgstr "Примечание"
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
-msgstr "�евозможно отправить уведомление"
+msgstr "�е могу ото�лать уведомление"
 
 #: etc/initialdata:101
 msgid "Notify AdminCcs"
-msgstr "Уведомл�ть �дмини�тративныеКопии"
+msgstr ""
 
 #: etc/initialdata:97
 msgid "Notify AdminCcs as Comment"
-msgstr "Уведомл�ть �дмини�тративныеКопии как Комментарий"
+msgstr ""
 
 #: etc/initialdata:93 etc/upgrade/3.1.17/content:6
 msgid "Notify Ccs"
-msgstr "Уведомл�ть Копии"
+msgstr ""
 
 #: etc/initialdata:89 etc/upgrade/3.1.17/content:2
 msgid "Notify Ccs as Comment"
-msgstr "Уведомл�ть Копии как Комментарий"
+msgstr ""
 
 #: etc/initialdata:128
 msgid "Notify Other Recipients"
-msgstr "Уведомл�ть других Получателей"
+msgstr ""
 
 #: etc/initialdata:124
 msgid "Notify Other Recipients as Comment"
-msgstr "Уведомл�ть других Получателей как Комментарий"
+msgstr ""
 
 #: etc/initialdata:85
 msgid "Notify Owner"
-msgstr "Уведомл�ть Ответ�твенного"
+msgstr ""
 
 #: etc/initialdata:81
 msgid "Notify Owner as Comment"
-msgstr "Уведомл�ть Ответ�твенного как Комментарий"
+msgstr ""
 
 #: etc/initialdata:376
 msgid "Notify Owner of their rejected ticket"
-msgstr "Уведомл�ть Ответ�твенного об отклонении за�вки"
+msgstr ""
 
 #: etc/initialdata:365
 msgid "Notify Owner of their ticket has been approved by all approvers"
-msgstr "Уведомл�ть Ответ�твенного о подтверждении за�вки в�еми подтверждающими"
+msgstr ""
 
 #: etc/initialdata:353
 msgid "Notify Owner of their ticket has been approved by some approver"
-msgstr "Уведомл�ть Ответ�твенного о подтверждении за�вки одним из подтверждающих"
+msgstr ""
 
 #: etc/initialdata:334
 msgid "Notify Owners and AdminCcs of new items pending their approval"
-msgstr "Уведомл�ть Ответ�твенных и �дмини�тративныеКопии о новых, ожидающих их подтверждени�х"
+msgstr ""
 
 #: etc/initialdata:77
 msgid "Notify Requestors"
-msgstr "Уведомл�ть �второвЗа�вки"
+msgstr ""
 
 #: etc/initialdata:111
 msgid "Notify Requestors and Ccs"
-msgstr "Уведомл�ть �второвЗа�вки и Копии"
+msgstr ""
 
 #: etc/initialdata:106
 msgid "Notify Requestors and Ccs as Comment"
-msgstr "Уведомл�ть �второвЗа�вки и Копии как Комментарий"
+msgstr ""
 
 #: etc/initialdata:120
 msgid "Notify Requestors, Ccs and AdminCcs"
-msgstr "Уведомл�ть �второв за�вки, Копии и �дмини�тративныеКопии"
+msgstr ""
 
 #: etc/initialdata:116
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
-msgstr "Уведомл�ть �второв за�вки, Копии и �дмини�тративныеКопии как Комментарии"
+msgstr ""
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "�о�."
 
 #: NOT FOUND IN SOURCE
 msgid "November"
-msgstr "�о�брь"
-
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
 msgstr ""
 
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
-msgstr "�евозможно �оздать объект"
-
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
+msgstr "�е могу �оздать объект"
 
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
-msgstr "Объект �оздан"
-
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
+msgstr "Создан объект"
 
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
-msgstr "Тип объекта %1 не может �одержать дополнительные пол�"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
-msgstr "�е�овпадение типа объекта"
+msgstr ""
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "Окт."
 
 #: NOT FOUND IN SOURCE
 msgid "October"
-msgstr "Окт�брь"
+msgstr ""
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
-msgstr "�втономно"
+msgstr ""
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
-msgstr "�втономное редактирование"
+msgstr ""
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
-msgstr "�втономна� закачка"
+msgstr ""
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "�а"
 
@@ -3808,51 +3828,51 @@ msgstr "�а комментарий"
 
 #: etc/initialdata:156
 msgid "On Correspond"
-msgstr "При Корре�понденции"
+msgstr ""
 
 #: etc/initialdata:145
 msgid "On Create"
-msgstr "При Создании"
+msgstr "�а �оздание"
 
 #: etc/initialdata:184
 msgid "On Owner Change"
-msgstr "При Изменении Ответ�твенного"
+msgstr "�а изменение владельца"
 
 #: etc/initialdata:177 etc/upgrade/3.1.17/content:15
 msgid "On Priority Change"
-msgstr "При Изменении Приоритета"
+msgstr ""
 
 #: etc/initialdata:192
 msgid "On Queue Change"
-msgstr "При Изменении Очереди"
+msgstr "�а изменение очереди"
 
 #: etc/initialdata:198
 msgid "On Resolve"
-msgstr "При Решении"
+msgstr ""
 
 #: etc/initialdata:169
 msgid "On Status Change"
-msgstr "При Изменении Стату�а"
+msgstr "на изменение �тату�а"
 
 #: etc/initialdata:150
 msgid "On Transaction"
-msgstr "При Транзакции"
+msgstr "�а транзакцию"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
-msgstr "Показывать подтверждени� только дл� запро�ов, �озданных по�ле %1"
+msgstr "Показывать визы только дл� запро�ов �озданных по�ле %1"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
-msgstr "Показывать подтверждени� только дл� запро�ов �озданных до %1"
+msgstr "Показывать визы только дл� запро�ов �озданных до %1"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "Открытых"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "Открыть"
 
@@ -3860,90 +3880,90 @@ msgstr "Открыть"
 msgid "Open requests"
 msgstr "Открыть запро�ы"
 
-#: html/SelfService/Elements/Tabs:63
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
-msgstr "Открыть за�вки"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Open tickets (from listing) in a new window"
-msgstr "Открыть за�вки (из �пи�ка) в новом окне"
+msgstr "Открыть тикеты (из �пи�ка) в новом окне"
 
 #: NOT FOUND IN SOURCE
 msgid "Open tickets (from listing) in another window"
-msgstr "Открыть за�вки (из �пи�ка) в другом окне"
+msgstr "Открыть тикеты (из �пи�ка) в другом окне"
 
 #: etc/initialdata:140
 msgid "Open tickets on correspondence"
-msgstr "Открыть за�вки при корре�понденции"
+msgstr ""
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
-msgstr "Сортировать по"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ordering and sorting"
 msgstr "Пор�док и �ортировка"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "Организаци�"
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
-msgstr "За�вка-первои�точник: #%1"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
-msgstr "И�ход�ща� почта о комментарии запи�ана"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
-msgstr "И�ход�ща� почта запи�ана"
+msgstr ""
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "Со временем подн�ть приоритет до"
 
 #: NOT FOUND IN SOURCE
 msgid "Overview"
-msgstr "Обзор"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
-msgstr "�азначить �еб�"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
-msgstr "БытьОтвет�твеннымЗаЗа�вку"
+msgstr ""
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
-msgstr "Ответ�твенный"
+msgstr "Владелец"
 
 #: NOT FOUND IN SOURCE
 msgid "Owner changed from %1 to %2"
-msgstr "Ответ�твенный изменен � %1 на %2"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
-msgstr "Ответ�твенный не может быть назначен"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
-msgstr "Ответ�твенный принудительно изменен � %1 на %2"
+msgstr "Владелец �илой изменен � %1 на %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Owner is"
-msgstr "Ответ�твенный"
+msgstr "Владелец"
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
-msgstr "Страница %1 из %2"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "Пейджер"
 
@@ -3953,83 +3973,66 @@ msgstr "Телефон пейджера"
 
 #: NOT FOUND IN SOURCE
 msgid "Parent"
-msgstr "Предок"
+msgstr ""
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "Предки"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "Пароль"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "Под�казка к паролю"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "Пароль �лишком короткий"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "Пароль: %1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
-msgstr "Пароли не �овпадают"
+msgstr ""
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
-msgstr "Пароли не �овпадают. Ваш пароль не был изменен"
+msgstr ""
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
-msgstr "Пользователи"
+msgstr "Люди"
 
 #: etc/initialdata:133
 msgid "Perform a user-defined action"
-msgstr "Выволнить дей�твие, указанное пользователем"
+msgstr ""
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
-msgstr "Конфигураци� Perl"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
-msgstr "�ет до�тупа"
+msgstr "В до�тупе отказано"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "Личные группы"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "Личные группы"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "Личные группы:"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "�омера телефонов"
 
@@ -4037,25 +4040,29 @@ msgstr "�омера телефонов"
 msgid "Placeholder"
 msgstr "Заполнитель"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: NOT FOUND IN SOURCE
+msgid "Pref"
+msgstr ""
+
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
-msgstr "�а�тройки"
+msgstr "Предпочтени�"
 
 #: NOT FOUND IN SOURCE
 msgid "Prefs"
-msgstr "�а�тройки"
+msgstr "Предпочтени�"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "Подготовка не реализована"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "�азад"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
-msgstr "Предыдуща� �траница"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Previous page"
@@ -4065,120 +4072,124 @@ msgstr "Предыдуща� �траница"
 msgid "Pri"
 msgstr "Приоритет"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
-msgstr "Пользователь %1 не найден."
+msgstr ""
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "Приоритет"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "Приоритет начинает�� �"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
-msgstr "Конфиденциально�ть:"
+msgstr ""
 
 #: etc/initialdata:25
 msgid "Privileged"
 msgstr "Привилегированные"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
-msgstr "Со�то�ние привилегий: %1"
+msgstr "Со�то�ние полномочий: %1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
-msgstr "Привилегированные пользователи"
+msgstr "Полномочные пользователи"
 
 #: NOT FOUND IN SOURCE
 msgid "Projects"
-msgstr "Проекты"
+msgstr ""
 
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
-msgstr "П�евдогруппы дл� внутреннего и�пользовани�"
+msgstr ""
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
-msgstr "Запро�"
+msgstr ""
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
-msgstr "По�троитель запро�а"
+msgstr ""
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "Очередь"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
-msgstr "Очередь %1 не найдена"
+msgstr "�е найдена очередь %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Queue '%1' not found\\n"
-msgstr "Очередь '%1' не найдена\\n"
+msgstr "�е найдена очередь '%1'\\n"
 
-#: html/Admin/Queues/Modify.html:64
+#: NOT FOUND IN SOURCE
+msgid "Queue Keyword Selections"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
-msgstr "�аименование очереди"
+msgstr "Им� очереди"
 
 #: NOT FOUND IN SOURCE
 msgid "Queue Scrips"
-msgstr "Скриплеты очереди"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "Очередь уже �уще�твует"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
-msgstr "�евозможно �оздать очередь"
+msgstr "�е могу �оздать очередь"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
-msgstr "�евозможно загрузить очередь"
+msgstr "�е могу загрузить очередь"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
-msgstr "Очередь �оздана"
+msgstr "Создана очередь"
 
 #: NOT FOUND IN SOURCE
 msgid "Queue is not specified."
-msgstr "Очередь не указана."
+msgstr ""
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
-msgstr "Очередь не найдена"
+msgstr "�ет такой очереди"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "Очереди"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
-msgstr "Бы�трый пои�к"
+msgstr ""
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
-msgstr "Бы�трое �оздание за�вки"
+msgstr ""
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr ""
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "RT %1 дл� %2"
@@ -4191,7 +4202,11 @@ msgstr "RT %1 от <a href=\"http://bestpractical.com\">Best Practical Solutions
 msgid "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1. Copyright 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: NOT FOUND IN SOURCE
+msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
+msgstr ""
+
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "�а�тройка RT"
 
@@ -4211,7 +4226,7 @@ msgstr "Ошибка конфигурации RT"
 msgid "RT Critical error. Message not recorded!"
 msgstr "Критиче�ка� ошибка RT: Сообщение не было �охранено!"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "Ошибка RT"
 
@@ -4221,21 +4236,21 @@ msgstr "RT получил �вое �об�твенное �ообщение (%1
 
 #: NOT FOUND IN SOURCE
 msgid "RT Recieved mail (%1) from itself."
-msgstr "RT получил �вое �об�твенное �ообщение (%1)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "RT Self Service"
-msgstr "Самооб�луживание RT"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "RT Self Service / Closed Tickets"
-msgstr "Самооб�луживание RT / Закрытые за�вки"
+msgstr "Самооб�луживание RT / Закрытые тикеты"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
-msgstr "Переменные RT"
+msgstr ""
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "Обзор RT"
 
@@ -4245,28 +4260,24 @@ msgstr "RT не может зареги�трировать ва�"
 
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't find requestor via its external database lookup"
-msgstr "RT не �мог найти автора за�вки во внешней базе данных"
+msgstr "RT не �мог найти про�ител� во внешней базе данных"
 
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't find the queue: %1"
-msgstr "RT не может найти очередь: %1"
-
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
+msgstr "RT не �мог найти очередь: %1"
 
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
-msgstr "RT не может проверить �ту подпи�ь PGP. \\n"
+msgstr "RT не �мог проверить �ту подпи�ь PGP. \\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "RT дл� %1"
 
 #: NOT FOUND IN SOURCE
 msgid "RT for %1: %2"
-msgstr "RT дл� %1: %2"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "RT has proccessed your commands"
@@ -4278,11 +4289,11 @@ msgstr "Ð’Ñ�е права на RT защищены и охранÑ�ÑŽÑ‚Ñ�Ñ� заÐ
 
 #: NOT FOUND IN SOURCE
 msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
-msgstr "В�е права на RT защищены и охран�ют�� законом.  &copy; 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  ПО ра�про�тран�ет�� под <a href=\"http://www.gnu.org/copyleft/gpl.html\">Стандартной Обще�твенной Лицензией GNU Вер�ии 2.</a>"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
-msgstr "В�е права на RT защищены и охран�ют�� законом.  &copy; 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  ПО ра�про�тран�ет�� под <a href=\"http://www.gnu.org/copyleft/gpl.html\">Стандартной Обще�твенной Лицензией GNU Вер�ии 2.</a>"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "RT thinks this message may be a bounce"
@@ -4294,433 +4305,414 @@ msgstr "RT будет обрабатывать �то �ообщение как
 
 #: NOT FOUND IN SOURCE
 msgid "RT's email command mode requires PGP authentication.  Either you didn't sign your message, or your signature could not be verified."
-msgstr "Командный режим RT email требует и�пользовани� подпи�и .PGP. Вы либо не подпи�али �ообщение, либо ваша подпи�ь не может быть проверена."
+msgstr "Командный режим RT требует и�пользовани� подпи�и .PGP. Вы либо не подпи�али �ообщение, либо ваша подпи�ь не может быть проверена."
+
+#: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
-msgstr "Полное им�"
+msgstr "Им�"
 
 #: NOT FOUND IN SOURCE
 msgid "RealName"
-msgstr "Полное им�"
+msgstr "Им�"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
-msgstr "С�ылка на за�вку за�вки %1 добавлена"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
-msgstr "С�ылка на за�вку за�вки %1 удалена"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
-msgstr "С�ылка на %1 добавлена"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
-msgstr "С�ылка на %1 удалена"
+msgstr ""
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
-msgstr "�а неё ��ылают��"
+msgstr "�а него ��ылают��"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "С�ылает�� на"
 
 #: NOT FOUND IN SOURCE
 msgid "RefersTo"
-msgstr "С�ылает�� на"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Refine"
-msgstr "Очи�тить"
+msgstr "Улучшить"
 
 #: NOT FOUND IN SOURCE
 msgid "Refine search"
-msgstr "Очи�тить запро�"
+msgstr "Улучшить пои�к"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "Обновл�ть �ту �траницу каждые %1 минут."
 
 #: NOT FOUND IN SOURCE
 msgid "Relationships"
-msgstr "Св�зи"
+msgstr ""
 
-#: html/Search/Bulk.html:116
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "Удалить админи�тративную копию"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "Удалить копию"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
-msgstr "Удалить �втора За�вки"
+msgstr "Удалить про�ител�"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "Ответить"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
-msgstr "�дре� дл� ответа"
+msgstr ""
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
-msgstr "Отвечать авторам за�вки"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
-msgstr "Отвечать на за�вки"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
-msgstr "Отвечать�аЗа�вку"
+msgstr ""
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
-msgstr "�втор за�вки"
+msgstr "Про�итель"
 
 #: NOT FOUND IN SOURCE
 msgid "Requestor email address"
-msgstr "Email автора за�вки"
+msgstr "Email про�ител�"
 
 #: NOT FOUND IN SOURCE
 msgid "Requestor(s)"
-msgstr "�втор(-ы)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "RequestorAddresses"
-msgstr "�дре� �втора за�вки"
+msgstr ""
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
-msgstr "�вторы за�вок"
+msgstr "Про�ители"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "Запро�ы должны быть обработаны за"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
-msgstr "�еобходимый параметр '%1' не указан"
+msgstr ""
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "Очи�тить"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "Домашний"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
-msgstr "Решить"
+msgstr "Закрыть"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
-msgstr "Решить за�вка #%1 (%2)"
+msgstr ""
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
-msgstr "Решено"
+msgstr "Закрыт"
 
 #: NOT FOUND IN SOURCE
 msgid "Response to requestors"
-msgstr "Ответ авторам за�вки"
+msgstr "Ответ про�ител�м"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
-msgstr "Результаты"
+msgstr "Отчет"
 
 #: NOT FOUND IN SOURCE
 msgid "Results per page"
-msgstr "Результатов на �транице"
+msgstr "Тикетов на �траницу"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "Повторите пароль"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
-msgstr "Обратить"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "Право %1 не найдено дл� %2  %3 в рамках %4 (%5)\\n"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "Право делегировано"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "Право выдано"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "Право загружено"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
-msgstr "Право не может быть отозвано"
+msgstr "Право не может быть отобрано"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "Право не найдено"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "Право не загружено"
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
-msgstr "Право отозвано"
+msgstr "Право отобрано"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "Права"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
-msgstr "�евозможно выдать права дл� %1"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
-msgstr "�евозможно отозвать права %1"
+msgstr ""
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "П�евдо-группы"
 
-#: html/Search/Elements/DisplayOptions:83
+#: NOT FOUND IN SOURCE
+msgid "RootApproval"
+msgstr ""
+
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
-msgstr "Строк на �транице"
+msgstr ""
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "Суб."
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
-msgstr "Сохранить"
+msgstr ""
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "Сохранить изменени�"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
-msgstr "Сохранить на�тройки"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "Сохранить изменени�"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
-msgstr "Сохраненные запро�ы"
+msgstr ""
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
-msgstr "Скриплет #%1"
+msgstr ""
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
-msgstr "Скриплет �оздан"
+msgstr "Создан �крипт"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
-msgstr "Пол� �криплетов"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
-msgstr "Скриплет удален"
+msgstr "Удален �крипт"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
-msgstr "Скриплеты"
+msgstr "Скрипты"
 
 #: NOT FOUND IN SOURCE
 msgid "Scrips for %1\\n"
-msgstr "Скриплеты дл� %1\\n"
+msgstr "Скрипты дл� %1\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
-msgstr "Скриплеты, которые дей�твуют дл� в�ех очередей"
+msgstr "Скрипты, которые дей�твуют дл� в�ех очередей"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "Пои�к"
 
 #: NOT FOUND IN SOURCE
 msgid "Search Criteria"
-msgstr "Критерии пои�ка"
-
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
+msgstr "Параметры пои�ка"
 
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
-msgstr "Пои�к подтверждений"
+msgstr "И�кать визы"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Searches can't be associated with that kind of object"
-msgstr "Запро�ы не могут быть а��оциированы � таким типом объекта"
+msgstr ""
 
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr "Безопа�но�ть:"
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
-msgstr "Про�мотреть дополнительные пол�"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
-msgstr "Про�мотреть полно�тью и�ход�щую почту и ее получателей"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
-msgstr "Про�мотреть конфиденциальный комментарий за�вки"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
-msgstr "Про�мотреть �водную информацию за�вки"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
-msgstr "Про�матриватьДополнительныеПол�"
-
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
-msgstr "Про�мативатьОчередь"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Select"
-msgstr "Выбрать"
+msgstr ""
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Select a Custom Field"
-msgstr "Выберите дополнительное поле"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Select a Custom Fields"
-msgstr "Выберите дополнительные пол�"
+msgstr ""
 
-#: html/Admin/Groups/index.html:78
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
-msgstr "Выберите группу"
+msgstr "Выбор группы"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
-msgstr "Выберите очередь"
-
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr "Выберите очередь дл� вашей новой за�вки"
+msgstr "Выбор очереди"
 
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
-msgstr "Выберите пользовател�"
+msgstr "Выбор пользовател�"
 
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr "Выберите дополнительное поле"
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
 msgstr ""
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
-msgstr "Выберите группу"
+msgstr "Выбрать группу"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr "Выбрать не�колько значений"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr "Выбрать одно значение"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
-msgstr "Выберите очередь"
+msgstr "Выбрать очередь"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
-msgstr "Выберите �криплет"
+msgstr "Выбрать �криплет"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
-msgstr "Выберите шаблон"
+msgstr "Выбрать шаблон"
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
-msgstr "Выберите до %1 значений"
+msgstr ""
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
-msgstr "Выберите пользовател�"
+msgstr "Выбрать пользовател�"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectMultiple"
 msgstr "Выбрать не�колько"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:34
 msgid "SelectSingle"
 msgstr "Выбрать одно"
 
-#: html/Admin/Elements/EditCustomFields:58
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
-msgstr "Выбранные дополнительные пол�"
+msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
-msgstr "Выбранные объекты"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Self Service"
@@ -4736,175 +4728,163 @@ msgstr "Отправить �ообщение в�ем наблюдател�м
 
 #: etc/initialdata:112
 msgid "Send mail to requestors and Ccs"
-msgstr "Отправить �ообщение в�ем �вторам за�вки и Копи�м"
+msgstr "Отправить �ообщение в�ем инициаторам запро�а и CCs"
 
 #: etc/initialdata:107
 msgid "Send mail to requestors and Ccs as a comment"
-msgstr "Отправить �ообщение в�ем �вторам за�вки и Копи�м"
+msgstr ""
 
 #: etc/initialdata:78
 msgid "Sends a message to the requestors"
-msgstr "Отправл�ет �ообщение авторам за�вки"
+msgstr ""
 
 #: etc/initialdata:125 etc/initialdata:129
 msgid "Sends mail to explicitly listed Ccs and Bccs"
-msgstr "Отправл�ть почту �вно указанным Копи�м и СкрытымКопи�м"
+msgstr ""
 
 #: etc/initialdata:94 etc/upgrade/3.1.17/content:7
 msgid "Sends mail to the Ccs"
-msgstr "Отправл�ть почту Копи�м"
+msgstr ""
 
 #: etc/initialdata:90 etc/upgrade/3.1.17/content:3
 msgid "Sends mail to the Ccs as a comment"
-msgstr "Отправл�ть почту Копи�м как комментарий"
+msgstr ""
 
 #: etc/initialdata:102
 msgid "Sends mail to the administrative Ccs"
-msgstr "Отправл�ть почту �дмини�тративнымКопи�м"
+msgstr ""
 
 #: etc/initialdata:98
 msgid "Sends mail to the administrative Ccs as a comment"
-msgstr "Отправл�ть почту �дмини�тративнымКопи�м как комментарий"
+msgstr ""
 
 #: etc/initialdata:82 etc/initialdata:86
 msgid "Sends mail to the owner"
-msgstr "Отправл�ть почту Ответ�твенному"
+msgstr ""
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "Сен."
 
 #: NOT FOUND IN SOURCE
 msgid "Seperate multiple URLs with spaces"
-msgstr "Раздел�йте не�колько ��ылок пробелами"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "September"
-msgstr "Сент�брь"
+msgstr ""
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
-msgstr "Показать"
+msgstr ""
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
-msgstr "Показать подтверждени�"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
-msgstr "Показать колонки"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
-msgstr "Показать результаты"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Show advanced search options..."
-msgstr "Показать дополнительные параметры пои�ка..."
+msgstr ""
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
-msgstr "Показать подтвержденные запро�ы"
+msgstr "Показать завизированные запро�ы"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
-msgstr "Показать о�новное"
+msgstr "Показать главное"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
-msgstr "Показать отклоненные запро�ы"
+msgstr "Показать отвергнутые запро�ы"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
-msgstr "Показать подробно�ти"
+msgstr "Показать в�е"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "Показать ожидающие запро�ы"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
-msgstr "Показать запро�ы, ждущие других подтверждений"
+msgstr "Показать запро�ы, ждущие других виз"
 
 #: NOT FOUND IN SOURCE
 msgid "Show ticket private commentary"
-msgstr "Показать конфиденциальный комментарий за�вки"
+msgstr "Показать приватные комментарии по тикету"
 
 #: NOT FOUND IN SOURCE
 msgid "Show ticket summaries"
-msgstr "Показать �водную информацию за�вки"
+msgstr "Показать общую информацию по запро�у"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
-msgstr "ПоказыватьПраваДо�тупа"
-
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
 msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
-msgstr "ПоказыватьИ�ход�щуюПочту"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
-msgstr "ПоказыватьСохраненныеЗапро�ы"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
-msgstr "ПоказыватьСкриплеты"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
-msgstr "ПоказыватьШаблон"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
-msgstr "ПоказыватьЗа�вку"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
-msgstr "ПоказыватьКомментарииЗа�вки"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
-msgstr "Подпи�ать�� как �втор за�вки или Копи� за�вки или очереди"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
-msgstr "Подпи�ать�� как �дмини�тративна�Копи� за�вки или очереди"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "Подпи�ь"
 
 #: NOT FOUND IN SOURCE
 msgid "Signed in as %1"
-msgstr "Зареги�трирован как %1"
+msgstr ""
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "Одно значение"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
-msgstr "Пропу�тить меню"
-
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
 msgstr ""
 
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
-msgstr "Сортировка"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Sort Order"
-msgstr "Метод �ортировки"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Sort key"
@@ -4920,21 +4900,21 @@ msgstr "Пор�док �ортировки"
 
 #: NOT FOUND IN SOURCE
 msgid "Squelched message recipients"
-msgstr "Скрытые получатели �ообщени�"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:87
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
-msgstr "Стади�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Stalled"
-msgstr "Прио�тановленных"
+msgstr "Отложенных"
 
 #: NOT FOUND IN SOURCE
 msgid "Start page"
 msgstr "�ачальна� �траница"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "�ачал��"
 
@@ -4942,191 +4922,179 @@ msgstr "�ачал��"
 msgid "Started date '%1' could not be parsed"
 msgstr "�е могу разобрать дату '�ачал��': '%1'"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "�ачнет��"
 
 #: NOT FOUND IN SOURCE
 msgid "Starts By"
-msgstr "�ачато"
+msgstr "Запу�ки"
 
 #: NOT FOUND IN SOURCE
 msgid "Starts date '%1' could not be parsed"
-msgstr "�е могу разобрать дату '�ачато': '%1'"
+msgstr "�е могу разобрать дату 'Запу�ки': '%1'"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "Со�то�ние"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "Стату�"
 
 #: etc/initialdata:309
 msgid "Status Change"
-msgstr "Изменение �тату�а"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "Стату� изменен � %1 на %2"
 
 #: NOT FOUND IN SOURCE
 msgid "StatusChange"
-msgstr "Измен�тьСтату�"
+msgstr ""
 
-#: html/Ticket/Elements/Tabs:170
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
-msgstr "Переназначать �ебе"
+msgstr "Отобрать"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
-msgstr "Переназначить за�вки �ебе"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
-msgstr "ПереназначатьЗа�вкуСебе"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "Ответ�твенный переназначен � %1"
-
-#: NOT FOUND IN SOURCE
 msgid "Stolen from %1 "
-msgstr "Ответ�твенный переназначен � %1 "
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
+msgstr "Отобран у %1"
 
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "Тема"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "Тема изменена на %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
-msgstr "Отправить"
+msgstr "Готово"
 
 #: NOT FOUND IN SOURCE
 msgid "Submit Query"
-msgstr "Отправить запро�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Submit Workflow"
-msgstr "Отправить по�ледовательно�ть дей�твий"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:782
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
-msgstr "У�пешно"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Summary"
-msgstr "Сводна� информаци�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Summary matches"
-msgstr "В�его �овпадений"
+msgstr ""
 
-#: lib/RT/Date.pm:419
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "В�к."
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "�дмини�тратор"
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "Си�темные"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
-msgstr "Си�темна� конфигураци�"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
-msgstr "Си�темна� ошибка"
+msgstr "Ошибка �и�темы"
 
 #: NOT FOUND IN SOURCE
 msgid "System Error. Right not granted."
-msgstr "Си�темна� ошибка. Право не выдано"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "System Error. right not granted"
-msgstr "Си�темна� ошибка. Право не выдано"
-
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
 msgstr ""
 
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
-msgstr "Си�темные утилиты"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
-msgstr "Си�темна� ошибка. Право не делегировано."
+msgstr "Ошибка �и�темы. Право не было делегировано."
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
-msgstr "Cи�темна� ошибка. Право не выдано."
+msgstr "Ошибка �и�темы. Право не было выдано."
 
 #: NOT FOUND IN SOURCE
 msgid "System error. Unable to grant rights."
-msgstr "Си�темна� ошибка. �евозможно выдать права"
+msgstr ""
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "Си�темные группы"
 
 #: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
 msgid "SystemRolegroup for internal use"
-msgstr "Си�темна� п�евдо-группа дл� внутреннего и�пользовани�"
+msgstr "Си�темна� группа дл� внутреннего и�пользовани�"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
-msgstr "Вз�ть �ебе"
+msgstr "Вз�ть"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
-msgstr "Вз�ть за�вки �еб�"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
-msgstr "БратьЗа�вкуСебе"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
-msgstr "Вз�та"
+msgstr "Вз�т"
 
 #: NOT FOUND IN SOURCE
 msgid "Task"
-msgstr "Задача"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "Шаблон"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "Шаблон #%1"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "Шаблон удален"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "Шаблон не найден"
 
@@ -5134,11 +5102,11 @@ msgstr "Шаблон не найден"
 msgid "Template not found\\n"
 msgstr "Шаблон не найден\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "Шаблон обработан"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "Шаблоны"
 
@@ -5148,344 +5116,337 @@ msgstr "Шаблоны дл� %1\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Text"
-msgstr "Тек�т"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "Это уже текущее значение"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "Это поле не может иметь такого значени�"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "Значение не изменило�ь"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
-msgstr "Этот пользователь уже имеет �то право."
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "Этот пользователь уже %1 дл� �той очереди"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
-msgstr "Этот пользователь уже %1 дл� �той за�вки "
+msgstr "Этот пользователь уже %1 дл� �того тикета"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
-msgstr "Этот пользователь не %1 дл� �той очереди"
+msgstr "Этот пользователь не %1 �той очереди"
 
 #: NOT FOUND IN SOURCE
 msgid "That principal is not a %1 for this ticket"
-msgstr "Этот пользователь не %1 дл� �той за�вки"
+msgstr "Этот пользователь не %1 �тому тикету"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
-msgstr "Эта очередь не �уще�твует"
+msgstr "Этой очереди не �уще�твует"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
-msgstr "Эта за�вка имеет неразрешенные зави�имо�ти"
+msgstr "Этот тикет имеет неразрешенные зави�имо�ти"
 
 #: NOT FOUND IN SOURCE
 msgid "That user already has that right"
 msgstr "Пользователь уже имеет �то право"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
-msgstr "Пользователь уже ответ�твенен за �ту за�вку"
+msgstr "Пользователь уже владеет �тим тикетом"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "Пользователь не �уще�твует"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
-msgstr "Этот пользователь уже привилегированный"
+msgstr "Этот пользователь уже имеет в�е полномочи�"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
-msgstr "Этот пользователь уже непривилегированный"
+msgstr "Этот пользователь уже не имеет полномочий"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
-msgstr "Этот пользователь теперь привилегированный"
+msgstr "Этот пользователь теперь имеет в�е полномочи�"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
-msgstr "Этот пользователь теперь непривилегированный"
+msgstr "Этот пользователь теперь не имеет полномочий"
 
 #: NOT FOUND IN SOURCE
 msgid "That user is now unprivilegedileged"
-msgstr "Пользователь теперь непривилегированный"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
-msgstr "Этот пользователь не может быть ответ�твенным за за�вки в �той очереди"
+msgstr "Этот пользователь не может владеть тикетами из �той очереди"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "Это не чи�ловой идентификатор"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
-msgstr "О�новное"
+msgstr "Главное"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
-msgstr "Копи� за�вки"
+msgstr ""
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
-msgstr "�дмини�тративна� копи� за�вки"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "The comment has been recorded"
-msgstr "Комментарий запи�ан"
+msgstr "Запи�ан комментарий"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
-msgstr "�иже�ледующа� команда найдет в�е активные за�вки в очереди 'О�новна�' и у�тановит им приоритет 99, е�ли в них небыло активно�ти более 4-х ча�ов:"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "The following commands were not proccessed:\\n\\n"
-msgstr "Эти команды не были выполнены:\\n\\n"
+msgstr "Эти команды не были и�полнены:\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "�овое значение у�тановлено"
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
-msgstr "Ответ�твенный за за�вку"
+msgstr "Владелец тикета"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
-msgstr "�втор за�вки"
+msgstr "Кто отправил тикет"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "Эти комментарии не показывают�� обыкновенному пользователю"
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
-msgstr "Это дополнительное поле не отно�ит�� к �тому объекту"
+msgstr ""
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
-msgstr "Это возможно�ть до�тупна только дл� �и�темных админи�траторов."
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
-msgstr "Это �ообщение будет отправлено..."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "This ticket %1 %2 (%3)\\n"
-msgstr "Эта за�вка %1 %2 (%3)\\n"
+msgstr "Этот тикет %1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "Этот ин�трумент позвол�ет пользователю запу�кать некоторые модули Perl из RT."
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
-msgstr "Похоже, что �та транзакци� не имеет �одержимого"
+msgstr "Похоже, что �та транзакци� не имеет информации"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
-msgstr "%1 за�вок мак�имального приоритета �того пользовател�"
+msgstr "%1 тикетов мак�имального приоритета �того пользовател�"
 
 #: NOT FOUND IN SOURCE
 msgid "This user's 25 highest priority tickets"
-msgstr "25 важнейших за�вок пользовател�..."
+msgstr "25 важнейших тикетов пользовател�..."
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "Чтв."
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket"
-msgstr "За�вка"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket # %1  %2"
-msgstr "За�вка # %1  %2"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket # %1 Jumbo update: %2"
-msgstr "За�вка # %1 Изменение в�ех данных: %2"
+msgstr ""
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
-msgstr "За�вка #%1 Изменение в�ех данных: %2"
+msgstr "Тикет #%1 Обновление в�его: %2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
-msgstr "За�вка #%1: %2"
+msgstr ""
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
-msgstr "За�вка %1"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
-msgstr "За�вка %1 �оздана в очереди '%2'"
+msgstr "Тикет %1 �оздан в очереди '%2'"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket %1 loaded\\n"
-msgstr "За�вка %1 загружена\\n"
+msgstr "Загружен тикет %1\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
-msgstr "За�вка %1: %2"
+msgstr "Тикет %1: %2"
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
-msgstr "Дополнительные пол� за�вки"
+msgstr ""
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
-msgstr "И�тори� за�вки # %1 %2"
+msgstr "И�тори� тикета # %1 %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket Id"
-msgstr "За�вка #"
+msgstr "Тикет #"
 
 #: etc/initialdata:324
 msgid "Ticket Resolved"
-msgstr "За�вка решена"
+msgstr ""
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
-msgstr "Транзакции за�вки"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket attachment"
-msgstr "Вложени� за�вки"
+msgstr "Дл� вложений"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
-msgstr "Содержимое за�вки"
+msgstr "Тек�т тикета"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
-msgstr "Тип данных �одержимого за�вки"
+msgstr "Тип данных тикета"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
-msgstr "За�вка не может быть �оздана из-за внутренней ошибки"
+msgstr "Тикет не может быть �оздан из-за внутренней ошибки"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
-msgstr "За�вка �оздана"
+msgstr "Создан тикет"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket creation failed"
-msgstr "�евомзожно �оздать за�вку"
+msgstr "�е удало�ь �оздать тикет"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
-msgstr "За�вка удалена"
+msgstr "Тикет удален"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket id not found"
-msgstr "Идентификатор за�вки не найден"
+msgstr "Идентификатор тикета не найден"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket killed"
-msgstr "За�вка уничтожена"
+msgstr ""
 
-#: html/Ticket/Display.html:55
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
-msgstr "Метаданные за�вки"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket not found"
-msgstr "За�вка не найдена"
+msgstr "Тикет не найден"
 
 #: etc/initialdata:310
 msgid "Ticket status changed"
-msgstr "Стату� за�вки изменен"
+msgstr "Стату� тикета изменен"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket watchers"
-msgstr "�аблюдатели за за�вкой"
+msgstr "�аблюдатели дл� тикета"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
-msgstr "Пои�к за�вки"
+msgstr "Тикеты"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
-msgstr "За�вки %1 %2"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
-msgstr "За�вки %1 пользовател� %2"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Tickets from %1"
-msgstr "За�вки от %1"
+msgstr "Тикеты от %1"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
-msgstr "От �того подтверждени� зави��т �ледующие за�вки:"
+msgstr "От �той визы зави��т �ледующие тикеты:"
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
-msgstr "Ра�чётное врем�"
+msgstr ""
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
-msgstr "О�тало�ь времени"
+msgstr "О�тало�ь"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
-msgstr "Врем� в работе"
+msgstr "В работе"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
-msgstr "О�тало�ь времени"
+msgstr "О�тало�ь"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "Врем� дл� показа"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
-msgstr "Врем� в работе"
+msgstr "В работе"
 
 #: NOT FOUND IN SOURCE
 msgid "TimeLeft"
-msgstr "О�тало�ь времени"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
-msgstr "Врем� в работе"
-
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
+msgstr "В работе"
 
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:"
@@ -5495,65 +5456,69 @@ msgstr "Дл� генерации изменений �того коммита:"
 msgid "To generate a diff of this commit:\\n"
 msgstr "Дл� генерации изменений �того коммита:\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
-msgstr "Дл� запро�а поддержки, обучени�, разработки на заказ или лицензировани� обращайте�ь %1."
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "Контакт"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
-msgstr "Утилиты"
+msgstr ""
 
 #: etc/initialdata:252
 msgid "Transaction"
 msgstr "Транзакци�"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "Транзакци� %1 удалена"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
-msgstr "Транзакци� �оздана"
+msgstr "Создана транзакци�"
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
-msgstr "Дополнительные пол� транзакции"
+msgstr ""
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:92
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
-msgstr "Транзакци�->Создать невозможно, так как вы не указали идентификатор за�вки"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr "Транзакци�->Создать невозможно, так как вы не указали тип объекта и идентификатор"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
-msgstr "�еизмен�емые транзакции"
+msgstr "Транзакции не изменены"
 
 #: NOT FOUND IN SOURCE
 msgid "Trying to delete a right: %1"
 msgstr "Пытаем�� удалить право: %1"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "Ð’Ñ‚Ñ€."
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "Тип"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "�е реализовано"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "Логин UNIX"
 
@@ -5561,152 +5526,147 @@ msgstr "Логин UNIX"
 msgid "UnixUsername"
 msgstr "Им� пользовател� UNIX"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "�еизве�тна� кодировка %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "�е ограничено"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
-msgstr "Безым�нный запро�"
+msgstr ""
 
 #: etc/initialdata:32
 msgid "Unprivileged"
 msgstr "�епривилегированный"
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
-msgstr "�евыбранные дополнительные пол�"
+msgstr ""
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
-msgstr "�евыбранные объекты"
+msgstr ""
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
-msgstr "�е вз�та"
+msgstr "�ичей"
 
 #: NOT FOUND IN SOURCE
 msgid "Untitled search"
-msgstr "Безым�нный запро�"
+msgstr ""
 
-#: html/Search/Bulk.html:54
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "Обновить"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
-msgstr "Обновить в�е"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update ID"
 msgstr "Обновить идентификатор"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
-msgstr "Обновить за�вку"
+msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "Обновить тип"
 
 #: NOT FOUND IN SOURCE
 msgid "Update all these tickets at once"
-msgstr "Изменить в�е �ти за�вки одновременно"
+msgstr "Изменить одним махом"
 
 #: NOT FOUND IN SOURCE
 msgid "Update email"
 msgstr "Обновить e-mail"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
-msgstr "Обновить не�колько за�вок"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update name"
 msgstr "Обновить им�"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
-msgstr "Обновление не запи�ано."
+msgstr "Изменени� не �охранены."
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
-msgstr "Обновить выбранные за�вки"
+msgstr "Изменить выбранные тикеты"
 
 #: NOT FOUND IN SOURCE
 msgid "Update signature"
 msgstr "Обновить подпи�ь"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
-msgstr "Обновить за�вку"
+msgstr "Обновить тикет"
 
 #: NOT FOUND IN SOURCE
 msgid "Update ticket # %1"
-msgstr "Обновление за�вки # %1"
+msgstr "Обновить тикет # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
-msgstr "Обновление за�вки #%1"
+msgstr "Обновить тикет #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
-msgstr "Обновление за�вки #%1 (%2)"
+msgstr "Обновить тикет #%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "Обновление не было ни �ообщением, ни комментарием."
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
-msgstr "Обновлена"
+msgstr "Обновлен"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
-msgstr "Загрузить"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
-msgstr "Загрузить не�колько файлов"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
-msgstr "Загрузить не�колько изображений"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
-msgstr "Загрузить один файл"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
-msgstr "Загрузить одно изображение"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
-msgstr "Закачать до %1 файлов"
+msgstr ""
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
-msgstr "Закачать до %1 изображений"
+msgstr ""
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
-msgstr "Загрузить ваши изменени�."
+msgstr ""
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5717,10 +5677,10 @@ msgstr "Пользователь %1 %2: %3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "Пользователь %1 Пароль: %2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
-msgstr "Пользователь '%1' не найден."
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User '%1' not found"
@@ -5732,95 +5692,98 @@ msgstr "Пользователь '%1' не найден\\n"
 
 #: etc/initialdata:132 etc/initialdata:206
 msgid "User Defined"
-msgstr "Задано пользователем"
+msgstr ""
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
-msgstr "Заданные пользователем у�лови� и дей�тви�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User ID"
 msgstr "Логин"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "Логин"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "Права пользовател�"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr "Пользователь запро�ил обновление неизве�тного типа дл� дополнительного пол� %1 дл� объекта %2  #%3"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
-msgstr "�евозможно �оздать пользовател�: %1"
+msgstr "�е могу �оздать пользовател�: %1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
-msgstr "Пользователь �оздан"
+msgstr "Создан пользователь"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "Группы, определенные пользователем"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
-msgstr "Пользовать загружен"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User notified"
-msgstr "Пользователю отправлено напоминание"
+msgstr "Пользователю ото�лано напоминание"
 
 #: NOT FOUND IN SOURCE
 msgid "User view"
 msgstr "Пользователь�кие на�тройки"
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
-msgstr "Группы, заданные пользователем"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
-msgstr "Им� пользовател�"
+msgstr "Логин"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "Пользователи"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
-msgstr "Пользователи, удовлетвор�ющие критери�м пои�ка"
+msgstr "�айдены пользователи"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
-msgstr "Проверить запро�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "ValueOfQueue"
-msgstr "Значение запро�а"
+msgstr "ValueOfQueue"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "Значени�"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
-msgstr "�аблюдать"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
-msgstr "�аблюдать�дмини�тративнойКопией"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Watcher loaded"
-msgstr "�аблюдатель загружен"
+msgstr ""
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "�аблюдатели"
 
@@ -5828,128 +5791,132 @@ msgstr "�аблюдатели"
 msgid "WebEncoding"
 msgstr "WebEncoding"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "Срд."
 
 #: etc/initialdata:521
 msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
-msgstr "Когда за�вка подтверждена в�еми подтверждающими, добавить запи�ь в оригинальную за�вку"
+msgstr ""
 
 #: etc/initialdata:485
 msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
-msgstr "Когда за�вка подтверждена любым из подтверждающих, добавить запи�ь в оригинальную за�вку"
+msgstr ""
 
 #: etc/initialdata:146
 msgid "When a ticket is created"
-msgstr "Когда за�вка �оздана"
+msgstr ""
 
 #: etc/initialdata:418
 msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
-msgstr "При �оздании за�вки подтверждени� уведомл�ть Ответ�твенного и �дмини�тративнуюКопию за�вкиAdminCc of the item awaiting their approval, ожидающей подтверждени�"
+msgstr ""
 
 #: etc/initialdata:151
 msgid "When anything happens"
-msgstr "Когда что-либо произойдет"
+msgstr ""
 
 #: etc/initialdata:199
 msgid "Whenever a ticket is resolved"
-msgstr "Каждый раз при решении за�вки"
+msgstr ""
 
 #: etc/initialdata:185
 msgid "Whenever a ticket's owner changes"
-msgstr "Каждый раз при изменении ответ�твенного за�вки"
+msgstr ""
 
 #: etc/initialdata:178 etc/upgrade/3.1.17/content:16
 msgid "Whenever a ticket's priority changes"
-msgstr "Каждый раз при изменении приоритета за�вки"
+msgstr ""
 
 #: etc/initialdata:193
 msgid "Whenever a ticket's queue changes"
-msgstr "Каждый раз при изменении очереди очереди"
+msgstr ""
 
 #: etc/initialdata:170
 msgid "Whenever a ticket's status changes"
-msgstr "Каждый раз при изменении �тату�а за�вки"
+msgstr ""
 
 #: etc/initialdata:207
 msgid "Whenever a user-defined condition occurs"
-msgstr "Каждый раз при �рабатывании у�лови�, заданного пользователем"
+msgstr ""
 
 #: etc/initialdata:164
 msgid "Whenever comments come in"
-msgstr "Каждый раз при добавлении комментари�"
+msgstr ""
 
 #: etc/initialdata:157
 msgid "Whenever correspondence comes in"
-msgstr "Каждый раз при приходе корре�понденции"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Which are referred to by "
-msgstr "Котора� �в�зана пользователем"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Which refer to"
-msgstr "Котора� ��ылает�� на"
+msgstr ""
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "Рабочий"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
-msgstr "Работать автономно"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "WorkPhone"
 msgstr "Рабочий"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "В работе"
 
+#: html/autohandler:150
+msgid "XXX CHANGEME You are not an authorized user"
+msgstr ""
+
 #: NOT FOUND IN SOURCE
 msgid "Yes"
-msgstr "Да"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
-msgstr "Вы уже ответ�твенный за �ту за�вку"
+msgstr "Вы уже владеете �тим тикетом"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
-msgstr "Вы незареги�трированный пользователь"
+msgstr "Вам �юда запрещено"
 
 #: NOT FOUND IN SOURCE
 msgid "You can access it with the Download button on the right."
-msgstr "Вы можете получить �то, нажав �права кнопку Загрузить"
+msgstr ""
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
-msgstr "Вы можете назначать ответ�твенного только дл� �воих или ничьих за�вок."
+msgstr "Вы можете назначать владельца только дл� �воих или ничьих тикетов."
 
 #: NOT FOUND IN SOURCE
 msgid "You don't have permission to view that ticket.\\n"
-msgstr "У ва� нет права на про�мотр �той за�вки.\\n"
+msgstr "У ва� нет права на про�мотр �того тикета.\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
-msgstr "�айдено %1 за�вок в очереди %2"
+msgstr "You found %1 tickets in queue %2"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "Вы вышли из RT."
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
-msgstr "У ва� нет права �оздавать за�вки в �той очереди."
+msgstr "У ва� нет права �оздавать тикеты в �той очереди."
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
-msgstr "Вы не должны �оздавать запро�ы в �той очереди."
+msgstr "Вы не можете �оздавать запро�ы в �той очереди."
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "Заходите еще"
 
@@ -5971,60 +5938,48 @@ msgstr "Ваш запро� подтвержден."
 
 #: NOT FOUND IN SOURCE
 msgid "Your request was rejected"
-msgstr "Ваш запро� отклонен"
+msgstr ""
 
 #: etc/initialdata:445
 msgid "Your request was rejected."
-msgstr "Ваш запро� отклонен."
+msgstr "Ваш запро� был отвергнут."
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
-msgstr "Им� пользовател� или пароль неверные"
+msgstr "Вы ввели неверное им� или пароль"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "Индек�"
 
 #: NOT FOUND IN SOURCE
 msgid "[no subject]"
-msgstr "[нет темы]"
-
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
-msgstr ""
-
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "and is not"
-msgstr "и не �вл�ет��"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "and not"
-msgstr "и не"
+msgstr ""
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "� правами %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
-msgstr "закрыто"
+msgstr ""
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "�одержит"
 
 #: NOT FOUND IN SOURCE
 msgid "content"
-msgstr "�одержимое"
+msgstr "данные"
 
 #: NOT FOUND IN SOURCE
 msgid "content-type"
@@ -6032,114 +5987,94 @@ msgstr "тип данных"
 
 #: NOT FOUND IN SOURCE
 msgid "correspondence (probably) not sent"
-msgstr "корре�понденци� (возможно) не отправлена"
+msgstr "�ообщение (возможно) не отправлено"
 
 #: NOT FOUND IN SOURCE
 msgid "correspondence sent"
-msgstr "корре�понденци� отправлена"
+msgstr "отправлено �ообщение"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "дней"
 
 #: NOT FOUND IN SOURCE
+msgid "dead"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "delete"
 msgstr "удалить"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
-msgstr "удалена"
-
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
+msgstr "удален"
 
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "не �овпадает"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "не �одержит"
 
 #: NOT FOUND IN SOURCE
 msgid "email address"
-msgstr "адре� email"
+msgstr ""
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "equal to"
 msgstr "равн�ет��"
 
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr ""
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr ""
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "false"
-msgstr "ложь"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "filename"
 msgstr "им� файла"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "больше чем"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "группа '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "ча�ов"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "идентификатор"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "�вл�ет��"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "не �вл�ет��"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "меньше чем"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "�овпадает"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "мин"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "минут"
 
@@ -6147,118 +6082,114 @@ msgstr "минут"
 msgid "modifications\\n\\n"
 msgstr "изменени�\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "ме��цев"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
-msgstr "нова�"
+msgstr "новый"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
-msgstr "нет имени"
+msgstr ""
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
-msgstr "нет значени�"
+msgstr ""
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "нет"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
-msgstr "не равно"
+msgstr "не равен"
 
 #: NOT FOUND IN SOURCE
 msgid "notlike"
-msgstr "неравно"
+msgstr ""
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
-msgstr "открыта"
+msgstr "открыт"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "лична� группа '%1' дл� пользовател� '%2'"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "очередь %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
-msgstr "отклонена"
+msgstr "отклонен"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
-msgstr "решена"
+msgstr "решен"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "�ек"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
-msgstr "�лектронна� таблица (.xls)"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
-msgstr "прио�тановлена"
+msgstr "отложен"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "�и�тема %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "�и�темна� группа '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "вызывающий компонент не указал причину"
 
 #: NOT FOUND IN SOURCE
 msgid "ticket #%1"
-msgstr "за�вка #%1"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:238
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
-msgstr "за�вка #%1 %2"
+msgstr "тикет #%1 %2"
 
 #: NOT FOUND IN SOURCE
 msgid "till"
-msgstr "пока"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "true"
-msgstr "и�тина"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
-msgstr "группа без опи�ани�: %1"
+msgstr "неопи�анна� группа %1"
 
 #: NOT FOUND IN SOURCE
 msgid "undescripbed group %1"
-msgstr "группа без опи�ани�: %1"
+msgstr ""
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "пользователь %1"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "недель"
 
@@ -6266,7 +6197,11 @@ msgstr "недель"
 msgid "with template %1"
 msgstr "� шаблоном %1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "лет"
 
+#: NOT FOUND IN SOURCE
+msgid "ニック�ーム"
+msgstr ""
+
diff --git a/rt/lib/RT/I18N/zh_cn.po b/rt/lib/RT/I18N/zh_cn.po
index 1f87998..72e09fe 100644
--- a/rt/lib/RT/I18N/zh_cn.po
+++ b/rt/lib/RT/I18N/zh_cn.po
@@ -15,18 +15,18 @@ msgstr "#"
 msgid "#%1"
 msgstr "#%1"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr "#%1: %2"
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
-msgstr "$prefix %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%*(%1,group ticket)"
@@ -40,45 +40,47 @@ msgstr "%*(%1) 件�期完�的申请�"
 msgid "%*(%1,unresolved ticket)"
 msgstr "%*(%1) 件尚未解决的申请�"
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr "%1 #%2"
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%7-%2-%3 %4:%5:%6 %1"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "%2 已新增为 %1"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "%1 %2 之�"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 已从 %2 改为 %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
@@ -88,80 +90,103 @@ msgstr "%2 已自 %1 删除"
 msgid "%1 %2 of group %3"
 msgstr "%3 群组的 %1 %2"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "�件：%1 | 动作：%2 | 模�：%3"
 
 #: NOT FOUND IN SOURCE
+msgid "%1 %2 הוסף"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 שונה ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 这份申请�\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
-msgstr "%1 (%2) - %3"
+msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
-msgstr "%1 (未更改)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 - %2 shown"
 msgstr "显示第 %1 - %2 笔"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr "%1 - 传递给 %2 的一个�数"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr "%1 - 将更新状�输出到 STDOUT"
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr "%1 - 指定欲使用的动作模�"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr "%1 - 指定欲使用的�件模�"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - 指定欲使用的查询模�"
 
+#: NOT FOUND IN SOURCE
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
+
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr "%1 RT %2 版，%4 版�所有，1996-%3。"
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "加载手续 %1"
@@ -170,7 +195,7 @@ msgstr "加载手续 %1"
 msgid "%1 Total"
 msgstr "共 %1 笔"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "新增 %1 作为 %2 的值"
@@ -187,31 +212,32 @@ msgstr "别� %1 需��用的申请�编� "
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
 msgstr "别� %1 需��用的申请�编�以处� %3(出自 %2)"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 看�是个本地对象，��在数�库里"
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 (%2)"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 的值从 %2 改为 %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
-msgstr "%1 �制"
+msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "无法将 %1 设定为 %2。"
 
@@ -219,22 +245,20 @@ msgstr "无法将 %1 设定为 %2。"
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 无法�始更新 (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 无法将现况设�已解决。RT 数�库内容�能�一致。"
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
 msgstr "已建立 %1"
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
 msgstr "已删除 %1"
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
 msgstr "� %1 份待处�申请�"
@@ -243,7 +267,8 @@ msgstr "� %1 份待处�申请�"
 msgid "%1 highest priority tickets I own..."
 msgstr "� %1 份待处�申请�..."
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "� %1 份�出的申请�..."
 
@@ -251,12 +276,12 @@ msgstr "� %1 份�出的申请�..."
 msgid "%1 highest priority tickets pending my approval..."
 msgstr "� %1 份待签核申请�..."
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr "%1 是从外部排程程�(如 cron)�对申请�进行�作的工具。"
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 已��是此表�的 %2。"
@@ -265,7 +290,8 @@ msgstr "%1 已��是此表�的 %2。"
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 已��是此申请�的 %2。"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 已��是自订字段 %2 的值。"
 
@@ -273,7 +299,11 @@ msgstr "%1 已��是自订字段 %2 的值。"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 �是一个�法的表�编�。"
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -282,7 +312,15 @@ msgstr "%1 �是一个�法的表�编�。"
 msgid "%1 min"
 msgstr "%1 分钟"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
 msgstr "� %1 份待认领的申请�"
@@ -291,7 +329,7 @@ msgstr "� %1 份待认领的申请�"
 msgid "%1 not shown"
 msgstr "没有显示 %1"
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
 msgstr "%1 对象"
 
@@ -307,7 +345,7 @@ msgstr "最新 %1 份�出的申请�..."
 msgid "%1 result(s) found"
 msgstr "找到 %1 项结果"
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "%1��"
@@ -328,7 +366,7 @@ msgstr "�知� %2 的 %1 类别"
 msgid "%1 was created without a CurrentUser\\n"
 msgstr "%1 新增时未指定现行使用者"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 会解决在已解决群组里�员的申请�。"
@@ -337,31 +375,67 @@ msgstr "%1 会解决在已解决群组里�员的申请�。"
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "如果 %1 起始申请��赖于�个链接，或是�个链接的�员，它将会被延宕。"
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 על ידי %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
 msgstr "%1 内的 %2 对象"
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
 msgstr "%1 内的 %2 的 %3 对象"
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
 msgstr "%1 已储存的查询"
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1：未指定附件"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1 字节"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1k 字节"
@@ -370,7 +444,7 @@ msgstr "%1k 字节"
 msgid "%quant(%1,result) found"
 msgstr "找到 %1 项结果"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' �是一个�法的状�值"
@@ -387,7 +461,7 @@ msgstr "(点选欲删除的�员)"
 msgid "(Check box to delete scrip)"
 msgstr "(点选欲删除的手续)"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(点选欲删除的项目)"
 
@@ -395,41 +469,45 @@ msgstr "(点选欲删除的项目)"
 msgid "(Check boxes to delete)"
 msgstr "(点选欲删除的项目)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
 msgstr "(点选欲�用通知的收件人)"
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
 msgstr "(点选欲�用通知的收件人)"
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
 msgstr "(键入申请�编�或网�，以空白分隔)"
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
+msgid "(If left blank, will default to %1"
 msgstr "(如果留白, 则预设为 %1)"
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
 msgstr "(没有值)"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(没有自订字段)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(没有�员)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "(没有手续)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr "没有模�"
 
@@ -437,11 +515,11 @@ msgstr "没有模�"
 msgid "(No workflows)"
 msgstr "没有�程"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
 msgstr "(æ— )"
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(�出本份更新的密件副本给��上以逗�隔开的电�邮件地�。这<b>�会</b>更改�续的收件者��。)"
 
@@ -449,11 +527,11 @@ msgstr "(é€�出本份更新的密件副本给å��å�•ä¸Šä»¥é€—å�·éš”开的电å­�é‚
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(�出本份更新的密件副本给��上以逗�隔开的电�邮件地�。这<b>�会</b>更改�续的收件者��。)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(�出本份更新的副本给��上以逗�隔开的管�员电�邮件地�。这<b>将会</b>更改�续的收件者��。)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(�出本份更新的副本给��上以逗�隔开的电�邮件地�。这<b>�会</b>更改�续的收件者��。)"
 
@@ -461,13 +539,13 @@ msgstr "(é€�出本份更新的副本给å��å�•ä¸Šä»¥é€—å�·éš”开的电å­�邮件åœ
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(�出本份更新的副本给��上以逗�隔开的电�邮件地�。这<b>�会</b>更改�续的收件者��。)"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(�出本份更新的副本给��上以逗�隔开的电�邮件地�。这<b>将会</b>更改�续的收件者��。)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
-msgstr "(当�件或动作设为‘使用者自订’时，请填入这些字段)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "(default delegate)"
@@ -477,7 +555,7 @@ msgstr "(预设代�人)"
 msgid "(delete)"
 msgstr "(删除)"
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(空白)"
 
@@ -485,31 +563,39 @@ msgstr "(空白)"
 msgid "(new)"
 msgstr "(新增)"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr "(没有列出姓�)"
 
 #: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "(no subject)"
 msgstr "(没有主题)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(æ— )"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
 msgstr "(没有值)"
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(仅能指定一份申请�)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(等待签核)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
 msgstr "(等待其它集�)"
 
@@ -521,11 +607,11 @@ msgstr "(等待其它申请�)"
 msgid "(requestor's group)"
 msgstr "(申请人所属)"
 
-#: html/Admin/Users/Modify.html:71
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(å¿…å¡«)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(未命�)"
 
@@ -534,38 +620,50 @@ msgid "*"
 msgstr "★"
 
 #: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid ":"
 msgstr "："
 
-#: html/Ticket/Elements/ShowBasics:53
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr "<% $Ticket->Status%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr "<% $_ %>"
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr "<%$_%>"
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr "<%$field%>"
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"�出申请�\">&nbsp;%1"
 
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
 #: etc/initialdata:218
 msgid "A blank template"
 msgstr "空白模�"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "ACE Deleted"
 msgstr "ACE 已删除"
@@ -582,11 +680,11 @@ msgstr "无法删除 ACE"
 msgid "ACE could not be found"
 msgstr "找�到 ACE"
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "找�到 ACE 设定"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "祇能新增或删除 ACE 设定。"
 
@@ -594,10 +692,6 @@ msgstr "祇能新增或删除 ACE 设定。"
 msgid "ACLEquivalence"
 msgstr "ACLEquivalence"
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "离开以���心更改到申请�。\\n"
@@ -606,7 +700,7 @@ msgstr "离开以���心更改到申请�。\\n"
 msgid "About Me"
 msgstr "个人信�"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "个人信�"
 
@@ -614,28 +708,24 @@ msgstr "个人信�"
 msgid "Access Right"
 msgstr "系统使用登录��"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "存���"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "动作"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "动作 %1 找�到"
 
-#: NOT FOUND IN SOURCE
+#: bin/rt-crontool:119
 msgid "Action committed."
 msgstr "动作执行完毕"
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr ""
-
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "动作准备完毕..."
 
@@ -643,23 +733,19 @@ msgstr "动作准备完毕..."
 msgid "Activated Date"
 msgstr "申请激活时间"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
 msgstr "新增"
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "新增管�员副本收件人"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "新增副本收件人"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
 msgstr "新增�件"
 
@@ -667,7 +753,7 @@ msgstr "新增�件"
 msgid "Add Entry"
 msgstr "新增列"
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "新增更多附件"
 
@@ -675,11 +761,11 @@ msgstr "新增更多附件"
 msgid "Add Next State"
 msgstr "新增下一项关�"
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "新增申请人"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr "新增字段值"
 
@@ -703,40 +789,36 @@ msgstr "新增全域手续"
 msgid "Add a scrip to this queue"
 msgstr "新增一�手续到此表�"
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr "新增一�用于所有表�的手续"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
-msgstr "新增查询�件"
+msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "新增评论或回�到指定的申请�"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "新增�员"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "新增视察员"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "AddNextState"
 msgstr "新增下一项关�"
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "��已新增为此表�的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "��已新增为此申请�的 %1"
@@ -745,11 +827,11 @@ msgstr "��已新增为此申请�的 %1"
 msgid "Additional Hints"
 msgstr "�外�示"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "��"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "��(续)"
 
@@ -761,7 +843,7 @@ msgstr "调整闪�速度快慢"
 msgid "Admin"
 msgstr "管�员"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "管�员副本"
 
@@ -777,7 +859,7 @@ msgstr "管�员回�"
 msgid "Admin Rights"
 msgstr "管�员��"
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "表�管�"
 
@@ -785,7 +867,7 @@ msgstr "表�管�"
 msgid "Admin users"
 msgstr "使用者管�"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "管�/全域设定"
 
@@ -805,7 +887,7 @@ msgstr "管�员 Email"
 msgid "AdminAllPersonalGroups"
 msgstr "管�所有代�人群组"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "管�员副本"
 
@@ -817,15 +899,15 @@ msgstr "管�员评论"
 msgid "AdminCorrespondence"
 msgstr "管�员回�"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
 msgstr "管�自订字段"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Queue_Overlay.pm:73
 msgid "AdminCustomFields"
 msgstr "管�自订字段"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "管�群组"
 
@@ -833,7 +915,7 @@ msgstr "管�群组"
 msgid "AdminGroupDescription"
 msgstr "管�群组�述"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "管�群组�员"
 
@@ -849,15 +931,15 @@ msgstr "管�群组��"
 msgid "AdminGroupStatus"
 msgstr "管�群组状�"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr "管�代�人群组"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr "管�表�"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr "管�使用者"
 
@@ -865,7 +947,7 @@ msgstr "管�使用者"
 msgid "Administrative"
 msgstr "行政类"
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "管�员副本"
 
@@ -873,7 +955,7 @@ msgstr "管�员副本"
 msgid "Admins"
 msgstr "主管"
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
 msgstr "进阶"
 
@@ -883,9 +965,9 @@ msgstr "进阶查询"
 
 #: NOT FOUND IN SOURCE
 msgid "Advanced Search Criteria"
-msgstr "进阶查询�件"
+msgstr ""
 
-#: html/Elements/SelectDateRelation:57
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "晚于"
 
@@ -893,10 +975,6 @@ msgstr "晚于"
 msgid "Age"
 msgstr "�历时间"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Alias"
 msgstr "执行其它�程"
@@ -914,14 +992,18 @@ msgid "All Approvals Passed"
 msgstr "完�全部签核"
 
 #: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "All Condition"
 msgstr "所有�件"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "所有自订字段"
 
-#: html/Admin/Queues/index.html:75
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "所有表�"
 
@@ -945,10 +1027,6 @@ msgstr "无论寄件��为何，一律寄信给申请人"
 msgid "Amount"
 msgstr "数�"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Any Condition"
 msgstr "任��件"
@@ -957,11 +1035,11 @@ msgstr "任��件"
 msgid "Applies To"
 msgstr "套用于"
 
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
 msgstr "套用于"
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
 msgstr "套用"
 
@@ -969,27 +1047,27 @@ msgstr "套用"
 msgid "Apply Template"
 msgstr "引用模�"
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
 msgstr "套用更动"
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "签核"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "签核� #%1：%2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr "签核� #%1：系统错误，记录失败"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr "签核� #%1：记录完毕"
@@ -1030,7 +1108,7 @@ msgstr "签核�类"
 msgid "Approval diagram"
 msgstr "签核�程"
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "核准"
 
@@ -1050,7 +1128,7 @@ msgstr "签核备注：%1"
 msgid "Apr"
 msgstr "四月"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "04"
 
@@ -1062,48 +1140,68 @@ msgstr "四月"
 msgid "Are you sure to delete checked items?"
 msgstr "您确定�删除？"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "递增"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
 msgstr "指派�移除自订字段"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
 msgstr "指派自订字段"
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "附件"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "附加档案"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "现有附件"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "无法加载附件 '%1'"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "附件新增完毕"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "附件档�"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "附件"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
 msgstr "已删除该属性"
 
@@ -1115,7 +1213,7 @@ msgstr "属性"
 msgid "Aug"
 msgstr "八月"
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "08"
 
@@ -1147,7 +1245,7 @@ msgstr "自动对申请人回�"
 msgid "AutoreplyToRequestors"
 msgstr "自动对申请人回�"
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Elements/EditFormat:4
 msgid "Available Columns"
 msgstr "�用的字段："
 
@@ -1179,7 +1277,7 @@ msgstr "%1 的数�错误"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "附件的处���错误。%1 应为 %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "基本信�"
 
@@ -1187,15 +1285,15 @@ msgstr "基本信�"
 msgid "Batch Approval"
 msgstr "批次签核"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "密件副本"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "请别忘了储存修改。"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "早于"
 
@@ -1207,10 +1305,6 @@ msgstr "开始签核"
 msgid "Begin From "
 msgstr "起始日"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Binary"
 msgstr "档案"
@@ -1223,23 +1317,19 @@ msgstr "生日"
 msgid "Blank"
 msgstr "空白模�"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
 msgstr "将查询结果转为�放入书签的网�"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
-msgstr "�放入书签的网�"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "精简标头档"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "更新整批申请�"
 
@@ -1251,40 +1341,35 @@ msgstr "事业部"
 msgid "Business Unit:"
 msgstr "事业部："
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "无法更改系统使用者"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr "该��是�能查阅此表�"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "�能新增没有�称的自订字段值"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
 msgstr "找�到已储存的查询"
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "申请��能链接自己。"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "�能整�进已整�过的申请�。这个错误�该�生。"
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
 msgstr "无法储存此项查询"
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "�能�时指定起始申请�与目的申请�"
 
@@ -1292,7 +1377,7 @@ msgstr "�能�时指定起始申请�与目的申请�"
 msgid "Cancel"
 msgstr "�消"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "无法新增使用者：%1"
@@ -1313,7 +1398,7 @@ msgstr "分类管�"
 msgid "Category"
 msgstr "分类"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "副本"
 
@@ -1329,7 +1414,7 @@ msgstr "董事长室"
 msgid "Change Ticket"
 msgstr "修改申请�"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "更改�令"
 
@@ -1337,19 +1422,19 @@ msgstr "更改�令"
 msgid "ChangeOwnerUI"
 msgstr "��选择表�承办人"
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
 msgstr "全部选�"
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "选择欲删除的项目"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "选择欲撤消的�利"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "�申请�"
 
@@ -1361,27 +1446,47 @@ msgstr "中文姓�"
 msgid "Chinese/English"
 msgstr "中英文"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "所在城市"
 
 #: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "ClassicUI"
 msgstr "传统接�"
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
 msgstr "全部清除"
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "已解决"
 
-#: NOT FOUND IN SOURCE
+#: html/SelfService/Closed.html:24
 msgid "Closed Tickets"
 msgstr "已解决的申请�"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: NOT FOUND IN SOURCE
+msgid "Closed requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr "已解决的申请�"
 
@@ -1393,11 +1498,11 @@ msgstr "执行程��"
 msgid "Command not understood!\\n"
 msgstr "指令无法辨识�\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "评论"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "评论电�邮件地�"
 
@@ -1405,11 +1510,11 @@ msgstr "评论电�邮件地�"
 msgid "Comment not recorded"
 msgstr "评论未被纪录"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr "对申请��出评论"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr "评论申请�"
 
@@ -1417,11 +1522,11 @@ msgstr "评论申请�"
 msgid "Comments"
 msgstr "评论"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "评论(��给申请人)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "评论(��给申请人)"
 
@@ -1429,11 +1534,11 @@ msgstr "评论(��给申请人)"
 msgid "Comments about %1"
 msgstr "对 %1 的评论"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "使用者�述"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "新增评论完毕"
 
@@ -1441,7 +1546,7 @@ msgstr "新增评论完毕"
 msgid "Commit"
 msgstr "确认"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr "消除更动完毕"
 
@@ -1457,23 +1562,23 @@ msgstr "�公�独立显示"
 msgid "Compile Restrictions"
 msgstr "设定查询�件"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "�件"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr "符��件..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "未找到符�的现况"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "设定"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "确认�令"
 
@@ -1497,11 +1602,11 @@ msgstr "连络信�系统"
 msgid "Contacted date '%1' could not be parsed"
 msgstr "无法解读�络日期 '%1'"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "内容"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr "内容类型"
 
@@ -1509,7 +1614,7 @@ msgstr "内容类型"
 msgid "Coould not create group"
 msgstr "无法新增群组"
 
-#: html/Search/Elements/EditSearches:64
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
 msgstr "�制"
 
@@ -1525,7 +1630,7 @@ msgstr "回�"
 msgid "Correspondence Address"
 msgstr "申请�回�地�"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "新增申请�回�"
 
@@ -1533,7 +1638,7 @@ msgstr "新增申请�回�"
 msgid "Correspondence not recorded"
 msgstr "未纪录申请�回�"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
 msgstr "�能新增自订字段的值 "
 
@@ -1541,29 +1646,15 @@ msgstr "�能新增自订字段的值 "
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "�能新增自订字段的值。%1 "
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr ""
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "�能更改承办人。 "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "无法新增自订字段"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Could not create Scrip"
 msgstr "无法建立讯�通知"
@@ -1572,7 +1663,7 @@ msgstr "无法建立讯�通知"
 msgid "Could not create Template"
 msgstr "无法建立通知模�"
 
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "无法新增群组"
 
@@ -1580,16 +1671,16 @@ msgstr "无法新增群组"
 msgid "Could not create item"
 msgstr "无法新增项目"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "无法新增模�：%1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "无法新增申请�。尚未指定表�。"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "无法新增使用者"
 
@@ -1609,11 +1700,11 @@ msgstr "找�到编� %1 的申请�"
 msgid "Could not find group %1."
 msgstr "找�到群组 %1。"
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "找�到或无法新增该�使用者"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "找�到该��"
 
@@ -1621,34 +1712,25 @@ msgstr "找�到该��"
 msgid "Could not find user %1."
 msgstr "找�到使用者 %1。"
 
-#: html/Admin/CustomFields/Objects.html:69
+#: NOT FOUND IN SOURCE
 msgid "Could not load CustomField %1"
 msgstr "无法加载字段 %1"
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "无法加载群组"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "无法将该��设为此表�的 %1。"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "无法将该��设为此申请�的 %1。"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "无法将�� %1 从表�移除。"
@@ -1657,15 +1739,15 @@ msgstr "无法将�� %1 从表�移除。"
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "无法将�� %1 从申请�移除。"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
 msgstr "无法设定使用者信�"
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "无法新增�员至群组"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "无法新增更动报告"
@@ -1678,15 +1760,15 @@ msgstr "无法从 gpg 回函辨识出该采�的行动\\n"
 msgid "Couldn't find group\\n"
 msgstr "找�到群组\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr "找�到此列数�"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "找�到该��"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "找�到该值"
 
@@ -1698,18 +1780,16 @@ msgstr "找�到该视察员"
 msgid "Couldn't find user\\n"
 msgstr "找�到使用者\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "无法从使用者数�库加载 %1。\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr "无法加载类别 %1"
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr "无法加载自订字段 %1"
 
@@ -1725,26 +1805,25 @@ msgstr "无法加载 RT 设定档 '%1' %2"
 msgid "Couldn't load Scrips."
 msgstr "无法加载手续。"
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "无法加载手续 %1"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "无法加载链接。"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
 msgstr "无法加载对象 %1"
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "无法加载表�"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "无法加载表� %1"
@@ -1761,26 +1840,16 @@ msgstr "无法加载模�"
 msgid "Couldn't load that user (%1)"
 msgstr "无法加载该�使用者(%1)"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "无法加载申请� '%1'"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "国家"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "新增"
 
@@ -1796,16 +1865,20 @@ msgstr "新增申请�"
 msgid "Create User:"
 msgstr "新增�员："
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "新增自订字段"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr "为 %1 表�新增自订字段"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:47
 msgid "Create a CustomField which applies to all queues"
 msgstr "为 %1 表�新增自订字段"
 
@@ -1814,6 +1887,10 @@ msgid "Create a new Custom Field"
 msgstr "新增自订字段"
 
 #: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create a new global Scrip"
 msgstr "新增全域手续"
 
@@ -1821,11 +1898,11 @@ msgstr "新增全域手续"
 msgid "Create a new global scrip"
 msgstr "新增全域手续"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "新增群组"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "新增代�人群组"
 
@@ -1841,11 +1918,11 @@ msgstr "新增手续"
 msgid "Create a new template"
 msgstr "新增模�"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "新增申请�"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "新增使用者"
 
@@ -1853,7 +1930,7 @@ msgstr "新增使用者"
 msgid "Create a new workflow"
 msgstr "新增�程"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "新增表�"
 
@@ -1865,16 +1942,16 @@ msgstr "新增表��称"
 msgid "Create a request"
 msgstr "�出申请"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr "为 %1 表�新增手续"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "新增模�"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr "�出申请�"
 
@@ -1883,6 +1960,14 @@ msgid "Create a workflow"
 msgstr "新增�程"
 
 #: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create failed: %1 / %2 / %3 "
 msgstr "新增失败：%1 / %2 / %3"
 
@@ -1898,19 +1983,19 @@ msgstr "建立新项目"
 msgid "Create new tickets based on this scrip's template"
 msgstr "��此项手续内的模版，新增申请�"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "新增申请�"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr "在此表�中新增申请�"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "新增�删除�更改自订字段"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr "新增�删除�更改表�"
 
@@ -1918,32 +2003,36 @@ msgstr "新增�删除�更改表�"
 msgid "Create, delete and modify the members of any user's personal groups"
 msgstr "新增�删除�更改任何使用者的代�人群组"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "新增�删除�更改代�人群组"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "新增�删除�更改使用者"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr "新增申请�"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "新增日"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "自订字段 %1 新增�功"
 
 #: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr "模� %1 新增�功"
 
@@ -1951,7 +2040,7 @@ msgstr "模� %1 新增�功"
 msgid "Created workflow %1"
 msgstr "�程 %1 新增�功"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
 msgstr "建立者"
 
@@ -1971,15 +2060,19 @@ msgstr "现有自订字段"
 msgid "Current Groups:"
 msgstr "现有群组列表："
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "现有关系"
 
 #: NOT FOUND IN SOURCE
+msgid "Current Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Current Rights:"
 msgstr "现有��："
 
-#: html/Admin/Elements/EditScrips:51
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "现有手续"
 
@@ -1995,11 +2088,11 @@ msgstr "现有模�"
 msgid "Current Watchers"
 msgstr "现有视察员"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "现有�员"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "现有��"
 
@@ -2007,20 +2100,20 @@ msgstr "现有��"
 msgid "Current search criteria"
 msgstr "现有查询�件"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "现有视察员"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
 msgid "Custom Field #%1"
 msgstr "自订字段 #%1"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "自订字段"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
 msgstr "%1 的自订字段"
 
@@ -2028,19 +2121,20 @@ msgstr "%1 的自订字段"
 msgid "Custom Fields which apply to all queues"
 msgstr "适用于所有表�的自订字段"
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr "动作�执行程�"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "动作�执行程�"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "自订�件"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "自订字段 %1 %2 %3"
 
@@ -2048,30 +2142,30 @@ msgstr "自订字段 %1 %2 %3"
 msgid "Custom field %1 does not apply to this object"
 msgstr "自订字段 %1 �适用于此对象"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "自订字段 %1 已有值"
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "自订字段 %1 没有值"
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "找�到自订字段 %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
 msgstr "自订字段已删除"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "找�到自订字段"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "无法从自订字段 %2 中找到 %1 这个字段值"
@@ -2080,19 +2174,19 @@ msgstr "无法从自订字段 %2 中找到 %1 这个字段值"
 msgid "Custom field value changed from %1 to %2"
 msgstr "自订字段值从 %1 改为 %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "无法删除自订字段值"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "找�到自订字段值"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "自订字段值删除�功"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr "自订字段"
 
@@ -2112,7 +2206,7 @@ msgstr "MySQL数�库"
 msgid "Date of Departure"
 msgstr "出�日期"
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "日期"
 
@@ -2120,7 +2214,7 @@ msgstr "日期"
 msgid "Dec"
 msgstr "�二月"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "12"
 
@@ -2140,13 +2234,13 @@ msgstr "预设自动�应模�"
 msgid "Default Autoresponse template"
 msgstr "预设自动�应模�"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
 msgstr "预设表�"
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
-msgstr "预设申请人"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Default Value"
@@ -2168,7 +2262,8 @@ msgstr "预设回�模�"
 msgid "Default transaction template"
 msgstr "预设更动模�"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "预设：%1/%2 已自 %3 改为 %4"
 
@@ -2176,15 +2271,15 @@ msgstr "预设：%1/%2 已自 %3 改为 %4"
 msgid "DefaultApproval"
 msgstr "预设签核"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
-msgstr "代�人��"
+msgstr "代表团��"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr "将拥有的��委托他人代�"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr "设定代�人"
 
@@ -2236,7 +2331,7 @@ msgstr "代�人设定"
 msgid "Delegates Status"
 msgstr "代�状�"
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "代�人��"
 
@@ -2248,44 +2343,39 @@ msgstr "代�人群组"
 msgid "Delegation Rights"
 msgstr "代�人��"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "删除"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
-msgstr "删除模�"
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
 msgstr "删除指定的手续"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr "删除申请�"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr "删除申请�"
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "删除此对象�能破��考完整性"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "删除此对象�能破��考完整性"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "删除此对象会���考完整性"
 
@@ -2297,7 +2387,7 @@ msgstr "删除此对象会���考完整性"
 msgid "Deleting this object would violate referential integrity. That's bad."
 msgstr "删除此对象会���考完整性"
 
-#: html/Approvals/Elements/Approve:66
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "驳回"
 
@@ -2333,7 +2423,7 @@ msgstr "请��"
 msgid "Departure Until"
 msgstr "差旅截止日"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "�接续处�的申请�"
 
@@ -2341,27 +2431,27 @@ msgstr "�接续处�的申请�"
 msgid "Dependencies: \\n"
 msgstr "附属性：\\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr "已加入�接续处�的申请� %1"
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr "已移除�接续处�的申请� %1"
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr "已加入需先处�的申请� %1"
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr "已移除需先处�的申请� %1"
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "需先处�"
 
@@ -2369,15 +2459,15 @@ msgstr "需先处�"
 msgid "DependsOn"
 msgstr "需先处�"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "递�"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "在以下字段�述主题"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "�述"
 
@@ -2409,31 +2499,31 @@ msgstr "残障类别"
 msgid "Disabled"
 msgstr "�用"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "显示内容"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr "显示��控制清�"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
 msgstr "显示字段"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr "显示此表�的模�"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr "显示此表�的手续"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "显示模�"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
 msgstr "显示此群组已储存的查询"
 
@@ -2441,19 +2531,15 @@ msgstr "显示此群组已储存的查询"
 msgid "Display ticket #%1"
 msgstr "显示第%1�申请�"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr "� <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU 通用公共授�</a> 第二版散布。"
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "�许一切�作"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "�更新此页�。"
 
@@ -2469,11 +2555,15 @@ msgstr "完�"
 msgid "Down"
 msgstr "下一页"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "下载"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
 msgstr "下载以 Tab 分隔的档案"
 
@@ -2481,7 +2571,7 @@ msgstr "下载以 Tab 分隔的档案"
 msgid "Dr."
 msgstr "�士"
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "到期日"
 
@@ -2505,40 +2595,36 @@ msgstr "编辑"
 msgid "Edit Conditions"
 msgstr "编辑�置�件"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "编辑 %1 的自订字段"
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Edit Custom Fields for queue %1"
 msgstr "编辑表� %1 的自订字段"
 
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
-msgstr ""
-
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "编辑申请�关系"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
 msgstr "编辑查询"
 
 #: NOT FOUND IN SOURCE
+msgid "Edit Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Edit Subgroups"
 msgstr "新增/维护�群组"
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr "编辑表� %1 的模�"
@@ -2551,7 +2637,7 @@ msgstr "编辑表� %1 的�程"
 msgid "Edit keywords"
 msgstr "编辑关键�"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr "编辑此群组已储存的查询"
 
@@ -2559,7 +2645,7 @@ msgstr "编辑此群组已储存的查询"
 msgid "Edit scrips"
 msgstr "编辑手续"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "编辑全域模�"
 
@@ -2575,11 +2661,15 @@ msgstr "编辑 %1 的模�"
 msgid "Edit workflows for %1"
 msgstr "编辑 %1 的�程"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
 msgstr "编辑已储存的查询"
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr "编辑表� %1 的设定"
@@ -2588,17 +2678,17 @@ msgstr "编辑表� %1 的设定"
 msgid "Editing Configuration for user %1"
 msgstr "编辑使用者 %1 的设定"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "编辑自订字段 %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "编辑群组 %1 的�员信�"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "编辑代�人群组 %1 的�员信�"
@@ -2619,11 +2709,11 @@ msgstr "最高学历"
 msgid "EffectiveId"
 msgstr "有效编�"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "需�指定起始申请�或目的申请�"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "电�邮件信箱"
 
@@ -2631,7 +2721,7 @@ msgstr "电�邮件信箱"
 msgid "Email Address"
 msgstr "电�邮件信箱"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "此电�邮件信箱已被使用"
 
@@ -2659,19 +2749,27 @@ msgstr "抵达地点"
 msgid "Enable Delegates"
 msgstr "代�激活"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr "�用(�消勾选将�用此自订字段)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "�用(�消勾选将�用此群组)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "�用(�消勾选将�用此表�)"
 
 #: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
 msgstr "已�用的自订字段"
 
@@ -2683,7 +2781,7 @@ msgstr "�用日期"
 msgid "Enabled Date:"
 msgstr "激活日期："
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr "已�用的表�"
 
@@ -2691,13 +2789,12 @@ msgstr "已�用的表�"
 msgid "Enabled Status"
 msgstr "�用状�"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "�用状� %1"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
 msgstr "�用状�: %1"
 
@@ -2709,11 +2806,15 @@ msgstr "试用期满日"
 msgid "English Name"
 msgstr "英文姓�"
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "键入多�项目"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
 msgstr "键入欲将对象连结至的对象或 URI。项目之间请以空白隔开。"
 
@@ -2721,19 +2822,23 @@ msgstr "键入欲将对象连结至的对象或 URI。项目之间请以空白éš
 msgid "Enter one or more conditions below to search for users"
 msgstr "键入下列�一或���件，查询用户数�"
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "键入�一项目"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
 msgstr "键入欲将表�连结至的对象或 URI。项目之间请以空白隔开。"
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
+msgstr "键入欲将申请�连结至的对象或 URI。项目之间请以空白隔开。"
+
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "键入申请��链接到的申请�编�或网�。项目之间请以空白隔开。"
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
 msgstr "键入最多 %1 个值"
 
@@ -2769,7 +2874,7 @@ msgstr "�选填表"
 msgid "EntryTime"
 msgstr "时间填表"
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "错误"
 
@@ -2777,23 +2882,31 @@ msgstr "错误"
 msgid "Error adding watcher"
 msgstr "新增视察员失败"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "表�->新增视察员的�数有误"
 
-#: lib/RT/Queue_Overlay.pm:830
-msgid "Error in parameters to Queue->DeleteWatcher"
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Queue->DelWatcher"
 msgstr "表�->删除视察员的�数有误"
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Queue_Overlay.pm:754
+msgid "Error in parameters to Queue->DeleteWatcher"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "申请�->新增视察员的�数有误"
 
-#: lib/RT/Ticket_Overlay.pm:1499
-msgid "Error in parameters to Ticket->DeleteWatcher"
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "申请�->删除视察员的�数有误"
 
-#: bin/rt-crontool:233
+#: lib/RT/Ticket_Overlay.pm:1630
+msgid "Error in parameters to Ticket->DeleteWatcher"
+msgstr ""
+
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr "调整申请�优先等级"
 
@@ -2801,7 +2914,7 @@ msgstr "调整申请�优先等级"
 msgid "Estimate"
 msgstr "预计"
 
-#: html/Ticket/Elements/ShowBasics:57
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
 msgstr "预计"
 
@@ -2809,7 +2922,7 @@ msgstr "预计"
 msgid "Everyone"
 msgstr "所有人"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "范例："
 
@@ -2845,37 +2958,36 @@ msgstr "外部数�库用户"
 msgid "ExternalURL"
 msgstr "外部接�网�"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "备注"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
-msgstr "找�到‘内部�员’虚拟群组的使用者。"
+msgstr "找�到「内部�员�虚拟群组的使用者。"
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
-msgstr "找�到‘�内部�员’虚拟群组的使用者。"
+msgstr "找�到「�内部�员�虚拟群组的使用者。"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr "无法加载模� %1. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Feb"
 msgstr "二月"
 
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "02"
 
@@ -2903,34 +3015,22 @@ msgstr "字段�称"
 msgid "Field Type"
 msgstr "字段类别"
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
 msgstr "档�"
 
-#: lib/RT/CustomField_Overlay.pm:69
+#: NOT FOUND IN SOURCE
 msgid "Fill in multiple text areas"
 msgstr "填入多个文字框"
 
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
+#: NOT FOUND IN SOURCE
 msgid "Fill in one text area"
 msgstr "填入一个文字框"
 
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
 msgstr "填入最多 %1 个文字框"
 
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Filter"
 msgstr "筛选"
@@ -2947,11 +3047,11 @@ msgstr "筛选列表："
 msgid "Fin"
 msgstr "最终"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "最终顺�"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr "最终顺�"
 
@@ -2959,11 +3059,11 @@ msgstr "最终顺�"
 msgid "Financial Department:"
 msgstr "财务部："
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
 msgid "Find group whose"
 msgstr "寻找群组的"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
 msgstr "寻找群组的"
 
@@ -2971,7 +3071,7 @@ msgstr "寻找群组的"
 msgid "Find new/open tickets"
 msgstr "寻找/开�申请�"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "寻找人员的"
 
@@ -2979,7 +3079,7 @@ msgstr "寻找人员的"
 msgid "Find queues whose"
 msgstr "寻找表�的"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "寻找申请�"
 
@@ -2987,7 +3087,7 @@ msgstr "寻找申请�"
 msgid "Finish Approval"
 msgstr "签核完毕"
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "第一项"
 
@@ -3011,15 +3111,15 @@ msgstr "一阶主管员工"
 msgid "Fixed shift"
 msgstr "固定�"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "甲 乙 丙"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "甲�"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "强制更�"
 
@@ -3027,16 +3127,12 @@ msgstr "强制更�"
 msgid "Form Processing"
 msgstr "电�表�作业区"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "找到 %1 张申请�"
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "已找到对象"
 
@@ -3060,7 +3156,7 @@ msgstr "日期输入"
 msgid "FreeformExternal"
 msgstr "系统字段"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:37
 msgid "FreeformMultiple"
 msgstr "多�输入"
 
@@ -3072,7 +3168,7 @@ msgstr "数值输入"
 msgid "FreeformPassword"
 msgstr "�令输入"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:36
 msgid "FreeformSingle"
 msgstr "�一输入"
 
@@ -3084,11 +3180,11 @@ msgstr "时间输入"
 msgid "Fri"
 msgstr "星期五"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "星期五"
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "完整标头档"
 
@@ -3100,7 +3196,7 @@ msgstr "登入��"
 msgid "Gender"
 msgstr "性别"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
 msgstr "�出档案里的模�"
 
@@ -3108,12 +3204,12 @@ msgstr "�出档案里的模�"
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "�得目�使用者的 pgp 签章\\n"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "交予 %1"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "全域设定"
 
@@ -3121,7 +3217,7 @@ msgstr "全域设定"
 msgid "Global Approval"
 msgstr "全域签核"
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
 msgstr "全域自订字段"
 
@@ -3141,11 +3237,7 @@ msgstr "全域手续"
 msgid "Global Setup"
 msgstr "全域设定"
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr ""
-
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "全域模�：%1"
@@ -3154,11 +3246,11 @@ msgstr "全域模�：%1"
 msgid "GlobalApproval"
 msgstr "全域签核"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
 msgstr "执行"
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "执行"
 
@@ -3170,7 +3262,7 @@ msgstr "%1 的 pgp 签章是正确的\\n"
 msgid "Goto page"
 msgstr "到页�"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "跳到申请�"
 
@@ -3178,7 +3270,7 @@ msgstr "跳到申请�"
 msgid "Grand"
 msgstr "上"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "群组"
 
@@ -3210,7 +3302,7 @@ msgstr "群组�称"
 msgid "Group Name:"
 msgstr "群组�称："
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "群组��"
 
@@ -3226,7 +3318,7 @@ msgstr "群组设定"
 msgid "Group Status"
 msgstr "群组状�"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "群组内已有此�员"
 
@@ -3234,12 +3326,12 @@ msgstr "群组内已有此�员"
 msgid "Group could not be created."
 msgstr "无法新增群组"
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "无法新增群组：%1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "群组新增完毕"
 
@@ -3247,11 +3339,11 @@ msgstr "群组新增完毕"
 msgid "Group created: %1"
 msgstr "群组 %1 新增完毕"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "群组没有这个�员"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "找�到群组"
 
@@ -3283,19 +3375,19 @@ msgstr "群组之"
 msgid "Group:"
 msgstr "群组："
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "群组"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "�能将群组设为群组内�员"
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
 msgstr "符�查询�件的群组"
 
-#: html/Ticket/Elements/ShowRequestor:77
+#: NOT FOUND IN SOURCE
 msgid "Groups this user belongs to"
 msgstr "使用者所属的群组"
 
@@ -3315,11 +3407,11 @@ msgstr "HTML 属性"
 msgid "Health Insurance"
 msgstr "��补助身份"
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "嗨�"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "嗨，%1"
@@ -3336,17 +3428,19 @@ msgstr "�项业务窗�"
 msgid "Hidden"
 msgstr "��"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "纪录"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
 msgstr "群组 %1 的纪录"
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
 msgstr "使用者 %1 的纪录"
 
@@ -3354,7 +3448,7 @@ msgstr "使用者 %1 的纪录"
 msgid "HomePhone"
 msgstr "�处电�"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "主页"
 
@@ -3362,13 +3456,13 @@ msgstr "主页"
 msgid "Hotel Expense"
 msgstr "�宿费"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "我有 %quant(%1,份固体�拌器)。"
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -3379,11 +3473,11 @@ msgstr "身分��"
 msgid "ID Type"
 msgstr "身分类别"
 
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "编�"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "身份"
 
@@ -3391,23 +3485,23 @@ msgstr "身份"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "若签核��到驳回，则连带驳回原申请�，并删除其它相关的待签核事项"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "若没有指定申请者，则以此使用者作为申请者"
+msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
 msgstr "申请�若没有指定表�，则将它新增在此表�内"
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr "如果此工具程�为 setgid，��的本地端用户�能由此�得 RT 的管�员��。"
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "若您已更新以上数�，请记得按一下"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "%1 的值错误"
 
@@ -3415,7 +3509,7 @@ msgstr "%1 的值错误"
 msgid "Image"
 msgstr "图片"
 
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "此字段值��更动"
 
@@ -3424,42 +3518,38 @@ msgid "Import"
 msgstr "汇入"
 
 #: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "列出�用的自订字段"
 
-#: html/Admin/Groups/index.html:65
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
 msgstr "列出�用的群组"
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
 msgstr "列出�用的表�"
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "列出�用的使用者"
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Indirect Employee"
 msgstr "直接/间接员工"
 
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "�始优先顺�"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr "�始优先顺�"
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "输入错误"
 
@@ -3467,20 +3557,20 @@ msgstr "输入错误"
 msgid "Interest noted"
 msgstr "登记�功"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "内部错误：%1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "错误的群组类别"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "错误的��"
 
@@ -3488,32 +3578,32 @@ msgstr "错误的��"
 msgid "Invalid Type"
 msgstr "错误的类型"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "错误的数�"
 
 #: NOT FOUND IN SOURCE
 msgid "Invalid owner. Defaulting to 'nobody'."
-msgstr "错误的承办人。改为预设承办人‘nobody’。"
+msgstr "错误的承办人。改为预设承办人「nobody�。"
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "错误的表�"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "错误的��"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "%1 的值错误"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "错误的自订字段值"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "错误的状�值"
 
@@ -3521,22 +3611,18 @@ msgstr "错误的状�值"
 msgid "IssueStatement"
 msgstr "�出陈述"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr "请�对��让未具��的使用者执行此工具程�。"
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr "建议您新增一个隶属于正确群组的低��系统使用者，并以该身份执行此工具程�。"
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr "它接�下列�数："
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Item Name"
 msgstr "��"
@@ -3553,7 +3639,7 @@ msgstr "待签核项目"
 msgid "Jan"
 msgstr "一月"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "01"
 
@@ -3565,7 +3651,7 @@ msgstr "一月"
 msgid "Job"
 msgstr "�称"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "加入或离开此群组"
 
@@ -3573,7 +3659,7 @@ msgstr "加入或离开此群组"
 msgid "Jul"
 msgstr "七月"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "07"
 
@@ -3581,7 +3667,7 @@ msgstr "07"
 msgid "July"
 msgstr "七月"
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "全部信�"
 
@@ -3589,7 +3675,7 @@ msgstr "全部信�"
 msgid "Jun"
 msgstr "六月"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "06"
 
@@ -3621,23 +3707,23 @@ msgstr "链接�标"
 msgid "Lang"
 msgstr "使用语言"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
 msgstr "语言"
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr ""
-
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "上次更新"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "上次�络"
 
-#: html/Elements/SelectDateType:50
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
+
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "上次�络日期"
 
@@ -3645,7 +3731,7 @@ msgstr "上次�络日期"
 msgid "Last Notified"
 msgstr "上次通知"
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "上次更新"
 
@@ -3653,19 +3739,19 @@ msgstr "上次更新"
 msgid "LastUpdated"
 msgstr "上次更新"
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
 msgstr "上次更新者"
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "剩馀时间"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "�许这�使用者登入"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "内部�员（具有个人��）"
 
@@ -3677,37 +3763,33 @@ msgstr "�制承办人为 %1 到%2"
 msgid "Limiting queue to %1 %2"
 msgstr "�制表�为 %1 到 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Link a Queue"
 msgstr "申请表�连结"
 
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "此链接已存在"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "无法新增链接"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "链接(%1)新增完毕"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "链接(%1)删除完毕"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "找�到链接"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "链接申请� #%1"
@@ -3716,7 +3798,7 @@ msgstr "链接申请� #%1"
 msgid "Link ticket %1"
 msgstr "链接申请� %1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "链接"
 
@@ -3724,32 +3806,23 @@ msgstr "链接"
 msgid "List All Users"
 msgstr "列出所有用户数�"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
 msgstr "加载"
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
 msgstr "加载已储存的查询："
 
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr "已加载的 Perl 模�"
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "�置"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "登入目录 %1 找�到或无法写入\\n。无法执行 RT。"
@@ -3762,16 +3835,16 @@ msgstr "纪录等级"
 msgid "LogToFileNamed"
 msgstr "纪录档�"
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "使用者：%1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "登入"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "注销"
 
@@ -3779,75 +3852,75 @@ msgstr "注销"
 msgid "Long-term contractor"
 msgstr "长期契约员工"
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
 msgstr "对应的类别�符"
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "新增承办人"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "新增现况"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "新增到期日"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "新增解决日期"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "新增实际起始日期"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "新增应起始日期"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "新增报告日期"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "新增优先顺�"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "新增表�"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "新增主题"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Male"
 msgstr "ç”·"
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
 msgstr "管�自订字段�字段值"
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "管�群组�所属�员"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "管�适用于所有表�的属性与设定"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr "管��表��相关属性"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "管�使用者与�令"
 
@@ -3859,7 +3932,7 @@ msgstr "��"
 msgid "Mar"
 msgstr "三月"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "03"
 
@@ -3879,33 +3952,33 @@ msgstr "符�样�"
 msgid "May"
 msgstr "五月"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "05"
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr "�员 %1 新增完毕"
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr "�员 %1 删除完毕"
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "新增�员完毕"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "�员已删除"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "�员未删除"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "隶属于"
 
@@ -3917,51 +3990,46 @@ msgstr "注册日期"
 msgid "MemberOf"
 msgstr "隶属于"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "�员"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr "所属群组 %1 加入完毕"
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr "所属群组 %1 移除完毕"
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
 msgstr "所属群组"
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
 msgstr "使用者 %1 的所属群组"
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "整�完毕"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "整�失败。无法设定 EffectiveId"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "整�进"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
 msgstr "已整�进 %1"
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "讯�"
 
@@ -3969,15 +4037,19 @@ msgstr "讯�"
 msgid "Message body not shown because it is too large or is not plain text."
 msgstr "信件内文�是纯文字，因此无法显示。"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
 msgstr "无法纪录讯�"
 
-#: lib/RT/Ticket_Overlay.pm:2409
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2517
 msgid "Message recorded"
 msgstr "讯�纪录�功"
 
-#: html/Ticket/Elements/PreviewScrips:115
+#: html/Ticket/Elements/PreviewScrips:70
 msgid "Messages about this ticket will not be sent to..."
 msgstr "此申请�的相关讯��会寄�给..."
 
@@ -3985,11 +4057,7 @@ msgstr "此申请�的相关讯��会寄�给..."
 msgid "Misc. Expense"
 msgstr "�费"
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
-msgstr ""
-
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "缺少主键值？(%1)"
 
@@ -3997,7 +4065,7 @@ msgstr "缺少主键值？(%1)"
 msgid "Missing mandatory fields"
 msgstr "缺少必填字段"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "行动电�"
 
@@ -4005,41 +4073,47 @@ msgstr "行动电�"
 msgid "MobilePhone"
 msgstr "行动电�"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "更改��控制清�"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
 msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
+#: NOT FOUND IN SOURCE
 msgid "Modify Custom Fields which apply to all %1"
 msgstr "更改适用于所有%1的自订字段"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "更改适用于所有表�的自订字段"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
-msgstr "更改群组��"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
-msgstr "更改�员"
+msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
-msgstr "更改��"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr "更改此表�的模�"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "更改此表�的手续"
 
@@ -4051,34 +4125,37 @@ msgstr "更改系统��清�"
 msgid "Modify Template %1"
 msgstr "更改模� %1"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
-msgstr "更改使用者��"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Modify Workflow"
 msgstr "更改�程"
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
 msgstr "更改 %1 表�内的自订字段"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:52
 msgid "Modify a CustomField which applies to all queues"
 msgstr "更改适用于所有表�的自订字段"
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr "更改 %1 表�内的手续"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "更改适用于所有表�的手续"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
 msgstr "更改适用 %1 的对象"
 
@@ -4086,25 +4163,21 @@ msgstr "更改适用 %1 的对象"
 msgid "Modify dates for # %1"
 msgstr "更改 # %1 的日期"
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "更改 #%1 的日期"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "更改申请� # %1 的日期"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "更改全域设定的群组��"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "更改全域设定的群组��。"
 
@@ -4120,110 +4193,108 @@ msgstr "更改全域设定的使用者��"
 msgid "Modify global scrips"
 msgstr "更改全域手续"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "更改全域设定的使用者��"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "更改全域设定的使用者��。"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "更改群组数��删除群组"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
 msgstr "更改自订字段 %1 的群组��"
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "更改群组 %1 的群组��"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "更改表� %1 的群组��"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "更改此群组的�员��"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr "更改个人的��信�"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr "更改链接到表� %1 的人员"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "更改申请� #%1 链接到的人员"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "更改表� %1 的手续"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr "更改适用于所有表�的手续"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "更改模� %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "更改适用于所有表�的模�"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "更改群组 %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "更改表�视察员"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "更改使用者 %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "更改申请� # %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "更改申请� # %1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "更改申请�"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
 msgstr "更改自订字段 %1 的使用者��"
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "更改群组 %1 的使用者��"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr "更改表� %1 的使用者��"
@@ -4240,35 +4311,31 @@ msgstr "更改�程 %1"
 msgid "Modify workflows which apply to all queues"
 msgstr "更改适用于所有表�的�程"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr "更改��清�"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "更改自己是�属于�群组"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr "更改表�视察员"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr "更改手续"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr "更改个人��"
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr "更改模�"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr "更改申请�"
 
@@ -4276,7 +4343,7 @@ msgstr "更改申请�"
 msgid "Mon"
 msgstr "星期一"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "星期一"
 
@@ -4284,7 +4351,7 @@ msgstr "星期一"
 msgid "More"
 msgstr "更多"
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "关于 %1 的进一步信�"
@@ -4301,23 +4368,23 @@ msgstr "移动"
 msgid "Move All"
 msgstr "全移"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr "下移"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr "上移"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "多�"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "必须指定 'Name' 的属性"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr "我的 %1 申请�"
@@ -4334,23 +4401,27 @@ msgstr "表�申请追踪"
 msgid "My Tickets"
 msgstr "表�处�"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "表�签核"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
 msgstr "我已储存的查询"
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "�称"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "��已有人使用"
 
 #: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Nationality"
 msgstr "国�"
 
@@ -4358,19 +4429,23 @@ msgstr "国�"
 msgid "Need approval from system administrator"
 msgstr "需先由系统管�员进行批准"
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "从未更动"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "新建立"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "新增关系"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "新的�令"
 
@@ -4378,11 +4453,15 @@ msgstr "新的�令"
 msgid "New Pending Approval"
 msgstr "新的待签核事项"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
 msgstr "新增查询"
 
 #: NOT FOUND IN SOURCE
+msgid "New Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "New Request"
 msgstr "表�申请"
 
@@ -4394,23 +4473,27 @@ msgstr "新增查询"
 msgid "New Watchers"
 msgstr "新增视察员"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "新增自订字段"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "新增群组"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "新的�令"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "�出新�令通知"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "新增表�"
 
@@ -4418,11 +4501,11 @@ msgstr "新增表�"
 msgid "New request"
 msgstr "�出申请�"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "新增��"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "新增手续"
 
@@ -4430,27 +4513,27 @@ msgstr "新增手续"
 msgid "New search"
 msgstr "�新查询"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "新增模�"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr "�出申请�"
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "没有新申请�"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "新增使用者"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "新使用者�字"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "新视察员"
 
@@ -4462,11 +4545,11 @@ msgstr "更新窗�设定"
 msgid "New workflow"
 msgstr "新增�程"
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "下一项"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
 msgstr "下一页"
 
@@ -4478,7 +4561,7 @@ msgstr "下一页"
 msgid "NickName"
 msgstr "昵称"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "昵称"
 
@@ -4490,35 +4573,35 @@ msgstr "�夜�"
 msgid "No"
 msgstr "�"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr "尚未定义类别"
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "无自订字段"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
 msgstr "尚未定义自订字段"
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "尚未定义群组"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
 msgstr "没有查询"
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "尚未定义表�"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr "找�到 RT 使用者。请� RT 管�员查询。\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "没有模�"
 
@@ -4534,11 +4617,11 @@ msgstr "未指定申请�。退出申请�更改\\n\\n"
 msgid "No Workflow"
 msgstr "没有�程"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "暂�处�"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr "未指定字段"
 
@@ -4546,7 +4629,7 @@ msgstr "未指定字段"
 msgid "No command found\\n"
 msgstr "找�到命令"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "没有对这�使用者的评论"
 
@@ -4554,53 +4637,52 @@ msgstr "没有对这�使用者的评论"
 msgid "No correspondence attached"
 msgstr "没有附上申请�回�"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "没有对 %1 的�述"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "未指定群组"
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
 msgstr "找�到符�查询�件的群组。"
 
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr "没有附上讯�"
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "没有设定�令"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr "没有新增表�的��"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "没有在表� '%1' 新增申请�的��"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "没有新增使用者的��"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "没有显示该申请�的��"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "没有检视申请�更新的��"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "未指定��"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "未指定��。"
 
@@ -4608,27 +4690,23 @@ msgstr "未指定��。"
 msgid "No protocol specified in %1"
 msgstr "%1 内未指定�议"
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr "找�到符�查询�件的表�。"
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "找�到��"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "没有选定��"
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "没有�进行的查询"
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
 msgstr "没有标题"
 
@@ -4636,7 +4714,7 @@ msgstr "没有标题"
 msgid "No ticket id specified"
 msgstr "未指定申请�编�"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "未指定更动报告类别"
 
@@ -4644,7 +4722,7 @@ msgstr "未指定更动报告类别"
 msgid "No user or email address specified"
 msgstr "未指定使用者或电�邮件地�"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "找�到符�查询�件的使用者。"
 
@@ -4652,15 +4730,15 @@ msgstr "找�到符�查询�件的使用者。"
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "找�到�格的 RT 使用者。RT cvs 处�器已�用。请� RT 管�者询问。\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr "_Set 没有收到任何值!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "没有人"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr "字段�存在？"
 
@@ -4676,15 +4754,15 @@ msgstr "未设定�从 %2 内撷� %1"
 msgid "Not logged in"
 msgstr "尚未登入"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "尚未登入"
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "尚未设定"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "尚未完工。"
 
@@ -4692,7 +4770,7 @@ msgstr "尚未完工。"
 msgid "Not yet implemented...."
 msgstr "尚未完工..."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "备注"
 
@@ -4700,7 +4778,7 @@ msgstr "备注"
 msgid "Notes:"
 msgstr "备注："
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "无法�出通知"
 
@@ -4714,11 +4792,11 @@ msgstr "以评论方�通知管�员副本收件人"
 
 #: etc/initialdata:93 etc/upgrade/3.1.17/content:6
 msgid "Notify Ccs"
-msgstr "通知副本收件人"
+msgstr ""
 
 #: etc/initialdata:89 etc/upgrade/3.1.17/content:2
 msgid "Notify Ccs as Comment"
-msgstr "以评论方�通知副本收件人"
+msgstr ""
 
 #: etc/initialdata:128
 msgid "Notify Other Recipients"
@@ -4780,7 +4858,7 @@ msgstr "通知对象"
 msgid "Nov"
 msgstr "�一月"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "11"
 
@@ -4796,33 +4874,19 @@ msgstr "104eHRMS 接�"
 msgid "OK"
 msgstr "确定"
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr ""
-
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr "无法新增对象"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr "对象新增完毕"
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
 msgstr "自订字段�适用于类别为 %1 的对象"
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
 msgstr "对象类别�符"
 
@@ -4834,7 +4898,7 @@ msgstr "在�状�"
 msgid "Oct"
 msgstr "�月"
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "10"
 
@@ -4846,19 +4910,19 @@ msgstr "�月"
 msgid "Office Phone"
 msgstr "办公室电�"
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr "离线"
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
 msgstr "离线编辑"
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
 msgstr "离线上载"
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "等于"
 
@@ -4884,7 +4948,7 @@ msgstr "承办人改�时"
 
 #: etc/initialdata:177 etc/upgrade/3.1.17/content:15
 msgid "On Priority Change"
-msgstr "优先顺�改�时"
+msgstr ""
 
 #: etc/initialdata:192
 msgid "On Queue Change"
@@ -4902,25 +4966,29 @@ msgstr "现况改�时"
 msgid "On Transaction"
 msgstr "�生更动时"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "仅显示 %1 之�新增的申请�"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "仅显示 %1 之�新增的申请�"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "开�"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "开�"
 
-#: html/SelfService/Elements/Tabs:63
+#: NOT FOUND IN SOURCE
+msgid "Open requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr "开�的申请�"
 
@@ -4952,7 +5020,7 @@ msgstr "选项�述"
 msgid "Option Name"
 msgstr "选项�称"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
 msgstr "排�方�"
 
@@ -4960,7 +5028,7 @@ msgstr "排�方�"
 msgid "Ordering and sorting"
 msgstr "顺�与排�方�"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "组织�称"
 
@@ -4968,7 +5036,7 @@ msgstr "组织�称"
 msgid "Organization:"
 msgstr "组织："
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "原申请�：#%1"
@@ -4981,15 +5049,15 @@ msgstr "其它e-mail�� (仅e-mail通知;多笔��请用逗�','区隔)"
 msgid "Out of range"
 msgstr "期�外"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr "已纪录��的评论邮件"
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr "已纪录��的邮件"
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "优先顺��时间增加调整为"
 
@@ -5009,15 +5077,15 @@ msgstr "�代全域�� %1"
 msgid "Overview"
 msgstr "总览"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr "承办申请�"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr "承办申请�"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "承办人"
 
@@ -5025,11 +5093,11 @@ msgstr "承办人"
 msgid "Owner changed from %1 to %2"
 msgstr "承办人已从 %1 改为 %2"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
 msgstr "无法设定承办人。"
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "强制将承办人从 %1 改为 %2"
@@ -5046,12 +5114,12 @@ msgstr "承办人电�"
 msgid "Page #"
 msgstr " "
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
 msgstr "第 %1/%2 页"
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "呼�器"
 
@@ -5067,7 +5135,7 @@ msgstr "呼��数"
 msgid "Parent"
 msgstr "上级"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "�申请�"
 
@@ -5075,45 +5143,28 @@ msgstr "�申请�"
 msgid "Park Space"
 msgstr "�车�申请"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "�令"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "�令�示"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "�令太短"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "�令：%1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
 msgstr "�令确认失败。"
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr "�令确认失败。您的�令并未改�。"
 
@@ -5125,7 +5176,7 @@ msgstr "请选择表��称"
 msgid "Pending Approval"
 msgstr "等待签核"
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "人员"
 
@@ -5137,11 +5188,11 @@ msgstr "拥有表���人员"
 msgid "Perform a user-defined action"
 msgstr "执行使用者自订的动作"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
 msgstr "Perl 设定"
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "���足"
 
@@ -5157,7 +5208,7 @@ msgstr "拥有��表�列表："
 msgid "Personal"
 msgstr "代�人群组"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "代�人群组"
 
@@ -5169,11 +5220,11 @@ msgstr "个人首页"
 msgid "Personal Todo"
 msgstr "�人待办事项"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "代�人群组"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "代�人群组："
 
@@ -5205,7 +5256,7 @@ msgstr "电�"
 msgid "Phone number"
 msgstr "电���"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "电���"
 
@@ -5273,7 +5324,7 @@ msgstr "�级"
 msgid "Pref"
 msgstr "�好"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "�好"
 
@@ -5281,15 +5332,15 @@ msgstr "�好"
 msgid "Prefs"
 msgstr "个人信�"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "预备动作完毕"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "上一项"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
 msgstr "上一页"
 
@@ -5301,20 +5352,20 @@ msgstr "�一页"
 msgid "Pri"
 msgstr "优先顺�"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "找�到�� %1。"
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "优先顺�"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "优先顺�起始值"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
 msgstr "��设定："
 
@@ -5322,12 +5373,12 @@ msgstr "��设定："
 msgid "Privileged"
 msgstr "内部�员"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "内部�员状�：%1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "内部�员"
 
@@ -5367,19 +5418,19 @@ msgstr "公共事务区"
 msgid "Purging stale data: %1"
 msgstr "移除过期数�: %1"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
 msgstr "查询"
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
 msgstr "建立查询"
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "表�"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
@@ -5393,7 +5444,7 @@ msgstr "找�到表� '%1'\\n"
 msgid "Queue Keyword Selections"
 msgstr "表�关键�选�"
 
-#: html/Admin/Queues/Modify.html:64
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "表��称"
 
@@ -5417,19 +5468,19 @@ msgstr "表�手续"
 msgid "Queue Setup"
 msgstr "表�设定"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "表�已存在"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr "无法新增表�"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr "无法加载表�"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "表�新增完毕"
 
@@ -5437,11 +5488,11 @@ msgstr "表�新增完毕"
 msgid "Queue is not specified."
 msgstr "未指定表�。"
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "找�到表�"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "表�"
 
@@ -5449,24 +5500,24 @@ msgstr "表�"
 msgid "Quick Search"
 msgstr "表�现况"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr "表�一览"
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
 msgstr "快速建立申请�"
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr "RSS"
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "%2：RT %1 版"
@@ -5483,7 +5534,7 @@ msgstr "RT %1。版�所有 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\
 msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1。版�所有 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "RT 管�页�"
 
@@ -5503,7 +5554,7 @@ msgstr "RT 设定错误"
 msgid "RT Critical error. Message not recorded!"
 msgstr "RT 致命错误。讯�未被纪录。"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "RT 错误"
 
@@ -5516,14 +5567,18 @@ msgid "RT Recieved mail (%1) from itself."
 msgstr "RT 收到从自己寄出的邮件 (%1)。"
 
 #: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT Self Service / Closed Tickets"
 msgstr "RT 自助�务/已解决的申请�"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
 msgstr "RT 的�数"
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "RT 一览"
 
@@ -5539,15 +5594,11 @@ msgstr "RT 无法从外部数�库查询找到申请人信�"
 msgid "RT couldn't find the queue: %1"
 msgstr "RT 找�到表�：%1"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "RT 无法确认这个 PGP 签章。\\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "%1 专用�程系统"
@@ -5565,6 +5616,14 @@ msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&
 msgstr "RT 版�所有 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;。<br>本软体� <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU 通用公共授�第二版</a> 散布。"
 
 #: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT thinks this message may be a bounce"
 msgstr "RT 认为这�能是退信"
 
@@ -5589,6 +5648,10 @@ msgid "RT::Ticket-Role"
 msgstr "申请��行角色"
 
 #: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT_System"
 msgstr "系统讯�"
 
@@ -5596,7 +5659,7 @@ msgstr "系统讯�"
 msgid "Read Only"
 msgstr "�读"
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "真实姓�"
 
@@ -5608,31 +5671,31 @@ msgstr "真实姓�"
 msgid "Really reject this ticket?"
 msgstr "您确定�驳回这张申请��？"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr "已加入 %1 为�考本申请�"
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr "已移除 %1 为�考本申请�"
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr "已加入�考申请� %1"
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr "已移除�考申请� %1"
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "被�考"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "�考"
 
@@ -5652,44 +5715,48 @@ msgstr "调整查询�件"
 msgid "Refresh"
 msgstr "æ›´æ–°"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "� %1 分钟更新页�"
 
 #: NOT FOUND IN SOURCE
+msgid "Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Remove"
 msgstr "移除"
 
-#: html/Search/Bulk.html:116
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "移除管�员副本"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "移除副本"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "移除申请人"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "回�"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
 msgstr "回�地�"
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
 msgstr "回�申请人"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "对申请�进行回�"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "回�申请�"
 
@@ -5701,7 +5768,7 @@ msgstr "上下�刷�"
 msgid "Reported on"
 msgstr "到�日期"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "申请人"
 
@@ -5729,24 +5796,24 @@ msgstr "申请人"
 msgid "RequestorAddresses"
 msgstr "申请人地�"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "申请人"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "申请�处�期�"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
-msgstr "未指定必�的�数‘%1’"
+msgstr "未指定必�的�数「%1�"
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "�设"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "�处"
 
@@ -5754,16 +5821,16 @@ msgstr "�处"
 msgid "Resolution"
 msgstr "解决状�"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "解决"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "解决申请� #%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "已解决"
 
@@ -5775,7 +5842,7 @@ msgstr "回�申请人"
 msgid "Responsibility Type"
 msgstr "责任区分"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "结果"
 
@@ -5783,11 +5850,11 @@ msgstr "结果"
 msgid "Results per page"
 msgstr "�页列出几笔结果"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "�次输入�令"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
 msgstr "�原"
 
@@ -5795,44 +5862,44 @@ msgstr "�原"
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "在 %4 (%5) 的范围内找�到 %2 %3 的 %1 ��\\n"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "��代�完毕"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "��设定完毕"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "��加载完毕"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "无法撤消��"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "找�到��"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "��并未加载。"
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "��撤消完毕"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "���代�人"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "无法将��赋予 %1"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "无法撤消 %1 的��"
@@ -5845,7 +5912,7 @@ msgstr "角色�员"
 msgid "Role Name"
 msgstr "角色�称"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "角色"
 
@@ -5853,7 +5920,7 @@ msgstr "角色"
 msgid "RootApproval"
 msgstr "交由系统管�员签核"
 
-#: html/Search/Elements/DisplayOptions:83
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
 msgstr "�页笔数"
 
@@ -5877,37 +5944,31 @@ msgstr "SMTP �务器"
 msgid "Sat"
 msgstr "星期六"
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "星期六"
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
 msgstr "储存"
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "储存更改"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
-msgstr "储存�好"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "储存更改"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
 msgstr "已储存的查询"
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
@@ -5921,23 +5982,23 @@ msgstr "讯�通知动作"
 msgid "Scrip Condition"
 msgstr "讯�通知�件"
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "手续新增完毕"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
-msgstr "手续字段"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Scrip Name"
 msgstr "讯��称"
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "手续删除完毕"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "手续"
 
@@ -5949,11 +6010,11 @@ msgstr "讯�通知"
 msgid "Scrips for %1\\n"
 msgstr "%1 的手续\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr "适用于所有表�的手续"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "查询"
 
@@ -5961,17 +6022,12 @@ msgstr "查询"
 msgid "Search Criteria"
 msgstr "查询�件"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
-
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr "签核�查询"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5986,35 +6042,31 @@ msgstr "二"
 msgid "Second-level Users"
 msgstr "二阶主管员工"
 
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr "安全性："
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
 msgstr "查阅自订字段"
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
 msgstr "查阅�出的电�邮件�收件人"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr "查阅申请�内的�人评论"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
 msgstr "查阅申请�总览"
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
 msgstr "查阅自订字段"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
 msgstr "查阅表�"
 
@@ -6026,79 +6078,71 @@ msgstr "选择"
 msgid "Select All"
 msgstr "全选"
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Select a Custom Field"
 msgstr "选择自订字段"
 
-#: html/Admin/Groups/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
+msgstr ""
+
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "选择群组"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "选择表�"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Select a queue to link to"
 msgstr "请选择欲连结表�"
 
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "选择使用者"
 
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr "选择自订字段"
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr ""
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "选择自订字段"
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "选择群组"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr "选择多�项目"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr "选择�一项目"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr "选择表�"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr "选择手续"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr "选择模�"
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
 msgstr "选择最多 %1 个值"
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr "选择使用者"
 
@@ -6110,19 +6154,19 @@ msgstr "选择�程"
 msgid "SelectExternal"
 msgstr "系统选项"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectMultiple"
 msgstr "多�选项"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:34
 msgid "SelectSingle"
 msgstr "�一选项"
 
-#: html/Admin/Elements/EditCustomFields:58
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
 msgstr "已选�的自订字段"
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
 msgstr "已选�的对象"
 
@@ -6160,11 +6204,11 @@ msgstr "寄信给特定的副本�密件副本收件人"
 
 #: etc/initialdata:94 etc/upgrade/3.1.17/content:7
 msgid "Sends mail to the Ccs"
-msgstr "寄信给副本收件人"
+msgstr ""
 
 #: etc/initialdata:90 etc/upgrade/3.1.17/content:3
 msgid "Sends mail to the Ccs as a comment"
-msgstr "以评论方�寄信给副本收件人"
+msgstr ""
 
 #: etc/initialdata:102
 msgid "Sends mail to the administrative Ccs"
@@ -6182,59 +6226,67 @@ msgstr "寄信给申请人"
 msgid "Sep"
 msgstr "�月"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "09"
 
 #: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "September"
 msgstr "�月"
 
 #: NOT FOUND IN SOURCE
 msgid "Setting %1's 'Disabled' property to %2"
-msgstr "%1 的‘�用’属性已设为 %2"
+msgstr "%1 的「�用�属性已设为 %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Shift Type"
 msgstr "�别属性"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr "显示"
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
-msgstr "显示待签核申请�"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
 msgstr "显示字段"
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "显示结果"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "显示已批准的签核�"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "显示基本信�"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "显示已驳回的签核�"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "显示细节"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "显示待处�的签核�"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "显示尚待他人批准的签核�"
 
@@ -6246,47 +6298,43 @@ msgstr "显示申请�内的�人评论"
 msgid "Show ticket summaries"
 msgstr "显示申请�摘�"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
 msgstr "显示��清�"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
 msgstr "显示寄�邮件"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
 msgstr "显示已储存的查询"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr "显示手续"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr "显示模�"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr "显示申请�"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr "显示申请�的评论"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr "登记�为申请人或副本收件人"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "登记�为管�员副本收件人"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "签�档"
 
@@ -6294,27 +6342,23 @@ msgstr "签�档"
 msgid "Signed in as %1"
 msgstr "使用者：%1"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "�一"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr "略过选�"
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr ""
-
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
 msgstr "顺�"
 
 #: NOT FOUND IN SOURCE
+msgid "Sort Order"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Sort key"
 msgstr "排�方�"
 
@@ -6326,7 +6370,11 @@ msgstr "结果排�方�"
 msgid "SortOrder"
 msgstr "排�顺�"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr "关�"
 
@@ -6346,7 +6394,7 @@ msgstr "延宕"
 msgid "Start page"
 msgstr "首页"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "实际起始日"
 
@@ -6354,7 +6402,7 @@ msgstr "实际起始日"
 msgid "Started date '%1' could not be parsed"
 msgstr "无法解读起始日期 '%1"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "应起始日"
 
@@ -6366,11 +6414,11 @@ msgstr "应起始日"
 msgid "Starts date '%1' could not be parsed"
 msgstr "无法解读起始日期 '%1"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "å·ž"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "现况"
 
@@ -6378,7 +6426,8 @@ msgstr "现况"
 msgid "Status Change"
 msgstr "现况改�时"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "现况从 %1 改为 %2"
 
@@ -6386,65 +6435,69 @@ msgstr "现况从 %1 改为 %2"
 msgid "StatusChange"
 msgstr "现况改�时"
 
-#: html/Ticket/Elements/Tabs:170
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "强制更�承办人"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
 msgstr "强制承办申请�"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr "强制承办申请�"
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "承办人从 %1 强制更�"
-
-#: NOT FOUND IN SOURCE
 msgid "Stolen from %1 "
-msgstr "承办人从 %1 强制更� "
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
+msgstr "承办人从 %1 强制更�"
 
 #: NOT FOUND IN SOURCE
 msgid "Subgroup"
 msgstr "�群组"
 
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "主题"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "标题已改为 %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "�出"
 
 #: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Submit Workflow"
 msgstr "�出�程"
 
-#: lib/RT/Group_Overlay.pm:782
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "设定�功"
 
 #: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Sun"
 msgstr "星期日"
 
-#: lib/RT/Date.pm:419
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "星期日"
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "系统管�员"
 
@@ -6460,11 +6513,11 @@ msgstr "自动�步104HRMS"
 msgid "Synchronizing HRMS data.  This may take a while..."
 msgstr "正在�步化 HRMS 人事系统数�。请�待..."
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "系统"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
 msgstr "系统设定"
 
@@ -6472,7 +6525,7 @@ msgstr "系统设定"
 msgid "System Defined"
 msgstr "系统定义"
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "系统错误"
 
@@ -6484,24 +6537,19 @@ msgstr "系统错误。设定��失败。"
 msgid "System Error. right not granted"
 msgstr "系统错误。设定��失败。"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "System Rights"
 msgstr "系统��"
 
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
 msgstr "系统工具"
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "系统错误。��代�失败。"
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "系统错误。设定��失败。"
 
@@ -6509,7 +6557,7 @@ msgstr "系统错误。设定��失败。"
 msgid "System error. Unable to grant rights."
 msgstr "系统错误。无法设定��。"
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "系统群组"
 
@@ -6521,7 +6569,7 @@ msgstr "系统内部用"
 msgid "SystemRolegroup for internal use"
 msgstr "内部使用的系统角色群组"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
@@ -6529,19 +6577,19 @@ msgstr "TEST_STRING"
 msgid "TabbedUI"
 msgstr "页签接�"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "��"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
 msgstr "自行承办申请�"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr "自行承办申请�"
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "已��"
 
@@ -6549,11 +6597,11 @@ msgstr "已��"
 msgid "Task"
 msgstr "工作事项"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "模�"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "模� #%1"
@@ -6570,11 +6618,11 @@ msgstr "通知模��述"
 msgid "Template Name"
 msgstr "通知模��称"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "模�已删除"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "找�到模�"
 
@@ -6582,11 +6630,11 @@ msgstr "找�到模�"
 msgid "Template not found\\n"
 msgstr "找�到模�\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "模�剖�完毕"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "模�"
 
@@ -6602,33 +6650,33 @@ msgstr "找�到 %1 的模�\\n"
 msgid "Text"
 msgstr "文字"
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "已�是目�字段的值"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "这�是该自订字段的值"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "�样的值"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
 msgstr "这项��已�拥有该��"
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "这项��已�是这个表�的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "这项��已�是这份申请�的 %1"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "这项���是这个表�的 %1"
@@ -6637,11 +6685,11 @@ msgstr "这项���是这个表�的 %1"
 msgid "That principal is not a %1 for this ticket"
 msgstr "这项���是这份申请�的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr "此表��存在"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "这份申请�有尚未解决的附属申请�"
 
@@ -6649,27 +6697,27 @@ msgstr "这份申请�有尚未解决的附属申请�"
 msgid "That user already has that right"
 msgstr "使用者已具有该项��"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr "该使用者已�承办这份申请�"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "使用者�存在"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "这�使用者已�是内部�员"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr "这�使用者属于�内部�员群组"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "使用者加入内部�员群组完毕"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr "这�使用者已加入�内部�员群组"
 
@@ -6677,23 +6725,23 @@ msgstr "这�使用者已加入�内部�员群组"
 msgid "That user is now unprivilegedileged"
 msgstr "这�使用者已加入�内部�员群组"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr "使用者�能没有承办表�里的申请�"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "这�是一个数字编�"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "基本信�"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr "申请�的副本收件人"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr "申请�的管�员副本收件人"
 
@@ -6701,7 +6749,7 @@ msgstr "申请�的管�员副本收件人"
 msgid "The comment has been recorded"
 msgstr "评论已被纪录"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr "下列命令会找到 'general' 表�内所有�作中的申请�，并将其中 4 �时内未处�的申请�优先程度设为 99："
 
@@ -6709,19 +6757,19 @@ msgstr "下列命令会找到 'general' 表å�•å†…所有è¿�作中的申请å�•ï¼Œå
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "以下命令未被执行：\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "新的字段值设定完�。"
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr "申请�的承办人"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "申请�的申请人"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "该使用者�会看�这些评论"
 
@@ -6729,15 +6777,15 @@ msgstr "该使用者�会看�这些评论"
 msgid "Third-"
 msgstr "三"
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
 msgstr "此自订字段�适用于该对象"
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
 msgstr "此项功能仅�系统管�员使用"
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
 msgstr "此讯�会寄给..."
 
@@ -6745,15 +6793,15 @@ msgstr "此讯�会寄给..."
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "申请� %1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "此工具程�会让使用者�由 RT 执行任�命令。"
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "此项更动报告没有内容"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
 msgstr "使用者�出的� %1 份优先处�申请�"
@@ -6766,7 +6814,7 @@ msgstr "使用者�出的� 25 份优先处�申请�"
 msgid "Thu"
 msgstr "星期四"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "星期四"
 
@@ -6782,24 +6830,24 @@ msgstr "申请� # %1 %2"
 msgid "Ticket # %1 Jumbo update: %2"
 msgstr "更新申请� # %1 的全部信�：%2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "更新申请� #%1 的全部信�：%2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "申请� #%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
 msgstr "申请� %1"
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "申请� #%1 �功新增于 '%2' 表�"
@@ -6808,12 +6856,12 @@ msgstr "申请� #%1 �功新增于 '%2' 表�"
 msgid "Ticket %1 loaded\\n"
 msgstr "加载申请� %1\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "申请� %1：%2"
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
 msgstr "申请�的自订字段"
 
@@ -6821,7 +6869,7 @@ msgstr "申请�的自订字段"
 msgid "Ticket Due"
 msgstr "表�处�期�"
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr "申请�处�纪录 # %1 %2"
@@ -6842,7 +6890,7 @@ msgstr "表��行期�"
 msgid "Ticket Resolved"
 msgstr "申请�已解决"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
 msgstr "申请�的更动"
 
@@ -6854,19 +6902,19 @@ msgstr "表��类"
 msgid "Ticket attachment"
 msgstr "申请�附件"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "申请�内容"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "申请�内容类别"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "内部错误，无法新增申请�"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "申请�新增完毕"
 
@@ -6874,7 +6922,7 @@ msgstr "申请�新增完毕"
 msgid "Ticket creation failed"
 msgstr "申请�新增失败"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "申请�删除完毕"
 
@@ -6886,7 +6934,7 @@ msgstr "找�到申请�编�"
 msgid "Ticket killed"
 msgstr "申请�删除完毕"
 
-#: html/Ticket/Display.html:55
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
 msgstr "申请�的�述信�"
 
@@ -6902,20 +6950,17 @@ msgstr "申请�现况已改�"
 msgid "Ticket watchers"
 msgstr "申请�视察员"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "申请�"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "申请� %1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "申请� %1 (%2)"
 
@@ -6931,31 +6976,31 @@ msgstr "�出的申请�"
 msgid "Tickets from %1"
 msgstr "%1 的申请�"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr "批准之�，�接续处�："
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
 msgstr "预计时间"
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "剩馀时间"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "处�时间"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "剩馀时间"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "显示时间"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "已处�时间"
 
@@ -6963,14 +7008,10 @@ msgstr "已处�时间"
 msgid "TimeLeft"
 msgstr "剩馀时间"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
 msgstr "已处�时间"
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:"
 msgstr "产生这次更动的差异档："
@@ -6979,7 +7020,7 @@ msgstr "产生这次更动的差异档："
 msgid "To generate a diff of this commit:\\n"
 msgstr "产生这次更动的差异档：\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
 msgstr "如果有支��教育训练�定制开�的需�，请连络 %1。"
@@ -6988,11 +7029,11 @@ msgstr "如果有支��教育训练�定制开�的需�，请连络 %1。
 msgid "Todo"
 msgstr "待办事项"
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "告知日期"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
 msgstr "工具"
 
@@ -7004,24 +7045,24 @@ msgstr "页"
 msgid "Transaction"
 msgstr "更动"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "清除更动报告 %1"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "更动报告已新增"
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
 msgstr "更动的自订字段"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:92
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "未指定申请�编�，无法新增更动"
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
 msgstr "未指定对象类别�编�，无法新增更动"
 
@@ -7033,7 +7074,7 @@ msgstr "批次更动时"
 msgid "TransactionCreate"
 msgstr "新增更动时"
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "��更改更动报告"
 
@@ -7049,19 +7090,23 @@ msgstr "试图删除�项��：%1"
 msgid "Tue"
 msgstr "星期二"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "星期二"
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "类别"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "尚无实作"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "外部系统登入��"
 
@@ -7069,21 +7114,16 @@ msgstr "外部系统登入��"
 msgid "UnixUsername"
 msgstr "外部系统登入��"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "��解的内容文字编�方� %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "全数显示"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
 msgstr "未命�的查询"
 
@@ -7091,15 +7131,15 @@ msgstr "未命�的查询"
 msgid "Unprivileged"
 msgstr "�内部�员"
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
 msgstr "未选�的自订字段"
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
 msgstr "未选�的对象"
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "未被��"
 
@@ -7111,23 +7151,23 @@ msgstr "未命�的查询"
 msgid "Up"
 msgstr "上一页"
 
-#: html/Search/Bulk.html:54
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "处�"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
-msgstr "全部更新"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update ID"
 msgstr "更新编�"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
-msgstr "更新申请�"
+msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "更新类别"
 
@@ -7139,7 +7179,7 @@ msgstr "整批更新申请�"
 msgid "Update email"
 msgstr "更新电�邮件信箱"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
 msgstr "批次更新申请�"
 
@@ -7147,11 +7187,11 @@ msgstr "批次更新申请�"
 msgid "Update name"
 msgstr "更新��"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "更新未被记录"
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "更新选择的申请�"
 
@@ -7159,7 +7199,7 @@ msgstr "更新选择的申请�"
 msgid "Update signature"
 msgstr "更新签章"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "更新申请�"
 
@@ -7167,58 +7207,58 @@ msgstr "更新申请�"
 msgid "Update ticket # %1"
 msgstr "更新申请� # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "更新申请� #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "更新申请� #%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "更新的内容并�申请�回�也�是评论"
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "�次更新"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
 msgstr "上载"
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
 msgstr "上载多个档案"
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
 msgstr "上载多份图片"
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
 msgstr "上载一个档案"
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
 msgstr "上载一份图片"
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
 msgstr "上载最多 %1 个档案"
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
 msgstr "上载最多 %1 份图片"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
 msgstr "上载您的更动"
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -7233,7 +7273,7 @@ msgstr "使用者 %1 %2：%3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "使用者 %1 �令：%2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
 msgstr "找�到使用者 '%1'。"
@@ -7250,15 +7290,15 @@ msgstr "找�到使用者 '%1'\\n"
 msgid "User Defined"
 msgstr "使用者自订"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
-msgstr "使用者自订的�件�动作"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User ID"
 msgstr "使用者 ID"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "使用者 ID"
 
@@ -7266,7 +7306,7 @@ msgstr "使用者 ID"
 msgid "User Number"
 msgstr "员工编�"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "使用者��"
 
@@ -7278,17 +7318,16 @@ msgstr "使用者设定"
 msgid "User Shift"
 msgstr "员工�别"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
 msgstr "使用者试图在 %2 对象 #%3 的自订字段 %1 上执行未知的更新�作"
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "无法新增使用者：%1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "使用者新增完毕"
 
@@ -7300,11 +7339,11 @@ msgstr "使用者 %1 新增完毕"
 msgid "User created: %1 (%2)"
 msgstr "使用者 %1 (%2) 新增完毕"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "使用者定义的群组"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
 msgstr "已加载使用者"
 
@@ -7320,7 +7359,7 @@ msgstr "使用者 %1 已改�为 %2"
 msgid "User view"
 msgstr "使用者�人数�"
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
 msgstr "使用者自定群组"
 
@@ -7328,19 +7367,19 @@ msgstr "使用者自定群组"
 msgid "UserDefined"
 msgstr "使用者自定"
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "��"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "使用者"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "符�查询�件的使用者"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
 msgstr "��的查询"
 
@@ -7348,7 +7387,7 @@ msgstr "��的查询"
 msgid "ValueOfQueue"
 msgstr "选择表�"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "字段值"
 
@@ -7356,11 +7395,15 @@ msgstr "字段值"
 msgid "View log"
 msgstr "检视纪录档"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr "视察"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr "以管�员副本收件人身份视察"
 
@@ -7368,7 +7411,7 @@ msgstr "以管�员副本收件人身份视察"
 msgid "Watcher loaded"
 msgstr "�功加载视察员信�"
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "视察员"
 
@@ -7380,7 +7423,7 @@ msgstr "网页文字编�方�"
 msgid "Wed"
 msgstr "星期三"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "星期三"
 
@@ -7414,7 +7457,7 @@ msgstr "当申请�更�承办人时"
 
 #: etc/initialdata:178 etc/upgrade/3.1.17/content:16
 msgid "Whenever a ticket's priority changes"
-msgstr "当申请�的优先顺�改�时"
+msgstr ""
 
 #: etc/initialdata:193
 msgid "Whenever a ticket's queue changes"
@@ -7436,11 +7479,19 @@ msgstr "当评论�达时"
 msgid "Whenever correspondence comes in"
 msgstr "当回��达时"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "公�"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr "离线工作"
 
@@ -7448,7 +7499,7 @@ msgstr "离线工作"
 msgid "WorkPhone"
 msgstr "公�电�"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "处�时间"
 
@@ -7476,7 +7527,7 @@ msgstr "�程"
 msgid "Writable"
 msgstr "�读写"
 
-#: NOT FOUND IN SOURCE
+#: html/autohandler:150
 msgid "XXX CHANGEME You are not an authorized user"
 msgstr "XXX CHANGEME 您是未�授�的使用者"
 
@@ -7484,19 +7535,19 @@ msgstr "XXX CHANGEME 您是未�授�的使用者"
 msgid "Yes"
 msgstr "是"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "您已是这份申请�的承办人"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "您�是被授�的使用者"
 
 #: NOT FOUND IN SOURCE
 msgid "You can access it with the Download button on the right."
-msgstr "您�以按�方的‘下载’键��得。"
+msgstr "您�以按�方的「下载�键��得。"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "祇能�新指派您所承办或是没有承办人的申请�"
 
@@ -7504,20 +7555,20 @@ msgstr "祇能�新指派您所承办或是没有承办人的申请�"
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "您没有看那份申请�的��。\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "您会在表� %2 找到 %1 的申请�"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "您已注销 RT。"
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "您没有在该表�新增申请�的��。"
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "您�能在该表�中�出申请。"
 
@@ -7525,7 +7576,7 @@ msgstr "您�能在该表�中�出申请。"
 msgid "You need to restart the Request Tracker service for saved changes to take effect."
 msgstr "您必须�新激活 Request Tracker �务，储存的更动�会生效。"
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "欢迎下次��"
 
@@ -7557,11 +7608,11 @@ msgstr "您的申请�已被 %1 驳回。"
 msgid "Your request was rejected."
 msgstr "您的申请�已被驳回。"
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "您的��或�令有误"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "邮政编�"
 
@@ -7577,32 +7628,28 @@ msgstr "过期"
 msgid "alert"
 msgstr "急讯"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and is not"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and not"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "approving"
 msgstr "待签核"
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "��� %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr "已解决"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "包�"
 
@@ -7626,7 +7673,7 @@ msgstr "申请�回�已�出"
 msgid "critical"
 msgstr "严�"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "天"
 
@@ -7642,19 +7689,15 @@ msgstr "侦错"
 msgid "delete"
 msgstr "删除"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "已删除"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "�符�"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "�包�"
 
@@ -7666,7 +7709,7 @@ msgstr "电�邮件信箱"
 msgid "emergency"
 msgstr "�难"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "equal to"
 msgstr "等于"
 
@@ -7674,30 +7717,6 @@ msgstr "等于"
 msgid "error"
 msgstr "错误"
 
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr ""
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr ""
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "false"
 msgstr "�"
@@ -7706,36 +7725,40 @@ msgstr "�"
 msgid "filename"
 msgstr "档�"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "大于"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "群组 '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "�时"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "编�"
 
 #: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "info"
 msgstr "信�"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "是"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "�是"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "�于"
 
@@ -7743,15 +7766,15 @@ msgstr "�于"
 msgid "level Admin"
 msgstr "层主管"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "符�"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "分"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "分钟"
 
@@ -7759,27 +7782,27 @@ msgstr "分钟"
 msgid "modifications\\n\\n"
 msgstr "更改\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "月"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "新建立"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr "没有�称"
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "没有值"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "æ— "
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "�等于"
 
@@ -7795,7 +7818,7 @@ msgstr "�符�"
 msgid "number"
 msgstr "�"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "开�"
 
@@ -7803,21 +7826,21 @@ msgstr "开�"
 msgid "opened"
 msgstr "已开�"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
-msgstr "使用者‘%2’的‘%1’代�人群组"
+msgstr "使用者「%2�的「%1�代�人群组"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "表� %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "已驳回"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "已处�"
 
@@ -7825,33 +7848,29 @@ msgstr "已处�"
 msgid "rtname"
 msgstr "�务器�称"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "秒"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr "电�表格"
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "延宕"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "系统 %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "系统群组 '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "呼�组件未指明原因"
 
@@ -7859,7 +7878,7 @@ msgstr "呼�组件未指明原因"
 msgid "ticket #%1"
 msgstr "申请� #%1"
 
-#: lib/RT/Group_Overlay.pm:238
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "申请� #%1 %2"
@@ -7876,16 +7895,20 @@ msgstr "到"
 msgid "true"
 msgstr "真"
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "没有�述的群组 %1"
 
 #: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "unresolved"
 msgstr "未处�"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "使用者 %1"
@@ -7894,7 +7917,7 @@ msgstr "使用者 %1"
 msgid "warning"
 msgstr "警告"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "周"
 
@@ -7902,7 +7925,11 @@ msgstr "周"
 msgid "with template %1"
 msgstr "模�：%1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "å¹´"
 
+#: NOT FOUND IN SOURCE
+msgid "ニック�ーム"
+msgstr ""
+
diff --git a/rt/lib/RT/I18N/zh_tw.po b/rt/lib/RT/I18N/zh_tw.po
index 7fbda21..482d0c8 100644
--- a/rt/lib/RT/I18N/zh_tw.po
+++ b/rt/lib/RT/I18N/zh_tw.po
@@ -15,18 +15,18 @@ msgstr "#"
 msgid "#%1"
 msgstr "#%1"
 
-#: html/Approvals/Elements/Approve:48 html/Approvals/Elements/ShowDependency:71 html/SelfService/Display.html:46 html/Ticket/Display.html:47 html/Ticket/Display.html:51
+#: html/Approvals/Elements/Approve:26 html/Approvals/Elements/ShowDependency:49 html/SelfService/Display.html:24 html/Ticket/Display.html:25 html/Ticket/Display.html:29
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
-#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 #. ($ticket->Id, $ticket->Subject)
-#. ($TicketObj->Id, $TicketObj->Subject)
+#. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "#%1: %2"
 msgstr "#%1: %2"
 
-#: lib/RT/Record.pm:926
-#. ($label)
+#: lib/RT/Record.pm:737
+#. ($self->id)
 msgid "$prefix %1"
-msgstr "$prefix %1"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%*(%1,group ticket)"
@@ -40,45 +40,47 @@ msgstr "%*(%1) 件�期完�的申請單"
 msgid "%*(%1,unresolved ticket)"
 msgstr "%*(%1) 件尚未解決的申請單"
 
-#: lib/RT/URI/fsck_com_rt.pm:257
+#: lib/RT/URI/fsck_com_rt.pm:235
 #. ($self->ObjectType, $self->Object->Id)
 msgid "%1 #%2"
 msgstr "%1 #%2"
 
-#: lib/RT/Date.pm:361
+#: html/Search/Elements/SelectPersonType:30 lib/RT/Date.pm:337
 #. ($s, $time_unit)
+#. ($option, $subtype)
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:828
+#. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
 
-#: lib/RT/Date.pm:397
+#: lib/RT/Date.pm:373
 #. ($self->GetWeekday($wday), $self->GetMonth($mon), map {sprintf "%02d", $_} ($mday, $hour, $min, $sec), ($year+1900))
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%7-%2-%3 %4:%5:%6 %1"
 
-#: lib/RT/Record.pm:1671 lib/RT/Transaction_Overlay.pm:636 lib/RT/Transaction_Overlay.pm:679
+#: lib/RT/Ticket_Overlay.pm:3451 lib/RT/Transaction_Overlay.pm:550 lib/RT/Transaction_Overlay.pm:593
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
 msgstr "%2 已新增為 %1"
 
-#: lib/RT/Date.pm:358
+#: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
 msgstr "%1 %2 之�"
 
-#: lib/RT/Record.pm:1678 lib/RT/Transaction_Overlay.pm:643
-#. ($cf->Name, $old_content,                $new_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3457 lib/RT/Transaction_Overlay.pm:557
+#. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
 msgid "%1 %2 changed to %3"
 msgstr "%1 已從 %2 改為 %3"
 
-#: lib/RT/Record.pm:1675 lib/RT/Transaction_Overlay.pm:639 lib/RT/Transaction_Overlay.pm:685
-#. ($cf->Name, $old_value->Content)
+#: lib/RT/Ticket_Overlay.pm:3454 lib/RT/Transaction_Overlay.pm:553 lib/RT/Transaction_Overlay.pm:599
+#. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
@@ -88,80 +90,103 @@ msgstr "%2 已自 %1 刪除"
 msgid "%1 %2 of group %3"
 msgstr "%3 群組的 %1 %2"
 
-#: html/Admin/Elements/EditScrips:65 html/Admin/Elements/ListGlobalScrips:64 html/Ticket/Elements/PreviewScrips:98
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:53
+#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
 msgstr "�件：%1 | 動作：%2 | 範本：%3"
 
 #: NOT FOUND IN SOURCE
+msgid "%1 %2 הוסף"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 מקבוצה %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 נמחק"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 ע� תבנית %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 %2 שונה ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 這份申請單\\n"
 
-#: html/Ticket/Elements/ShowAttachments:72
+#: NOT FOUND IN SOURCE
+msgid "%1 (%2) %3 פנייה זו\\n"
+msgstr ""
+
+#: html/Ticket/Elements/ShowAttachments:51
 #. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
 msgid "%1 (%2) by %3"
-msgstr "%1 (%2) - %3"
+msgstr ""
 
-#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:87 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
-#. (loc($DefaultStatus))
-#. (loc($TicketObj->Status))
+#: html/SelfService/Update.html:30 html/Ticket/Elements/EditBasics:66 html/Ticket/Update.html:39 html/Ticket/Update.html:41 html/Tools/MyDay.html:20
+#. ($Ticket->Status())
+#. ($TicketObj->Status)
 #. ($TicketObj->OwnerObj->Name())
-#. (loc($Ticket->Status()))
+#. ($DefaultStatus)
 msgid "%1 (Unchanged)"
-msgstr "%1 (未更改)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "%1 - %2 shown"
 msgstr "顯示第 %1 - %2 筆"
 
-#: bin/rt-crontool:194 bin/rt-crontool:201 bin/rt-crontool:207
+#: bin/rt-crontool:165 bin/rt-crontool:172 bin/rt-crontool:178
 #. ("--search-argument", "--search")
 #. ("--condition-argument", "--condition")
 #. ("--action-argument", "--action")
 msgid "%1 - An argument to pass to %2"
 msgstr "%1 - 傳�給 %2 的一個�數"
 
-#: bin/rt-crontool:210
+#: bin/rt-crontool:181
 #. ("--verbose")
 msgid "%1 - Output status updates to STDOUT"
 msgstr "%1 - 將更新狀態輸出到 STDOUT"
 
-#: bin/rt-crontool:204
+#: bin/rt-crontool:175
 #. ("--action")
 msgid "%1 - Specify the action module you want to use"
 msgstr "%1 - 指定欲使用的動作模組"
 
-#: bin/rt-crontool:198
+#: bin/rt-crontool:169
 #. ("--condition")
 msgid "%1 - Specify the condition module you want to use"
 msgstr "%1 - 指定欲使用的�件模組"
 
-#: bin/rt-crontool:191
+#: bin/rt-crontool:162
 #. ("--search")
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - 指定欲使用的查詢模組"
 
+#: NOT FOUND IN SOURCE
+msgid "%1 - �רגומנט להעביר �ל %2"
+msgstr ""
+
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
      $RT::VERSION, 
      '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-     $RT::VERSION, 
-     '2005', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
-#: html/Elements/Footer:58
+#: html/Elements/Footer:36
 #. ('&#187;&#124;&#171;', 
      $RT::VERSION, 
-     '2005', 
+     '2004', 
     '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',)
 msgid "%1 RT %2 Copyright 1996-%3 %4."
 msgstr "%1 RT %2 版，%4 版權所有，1996-%3。"
 
-#: lib/RT/ScripAction_Overlay.pm:151
+#: lib/RT/ScripAction_Overlay.pm:114
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "載入手續 %1"
@@ -170,7 +195,7 @@ msgstr "載入手續 %1"
 msgid "%1 Total"
 msgstr "å…± %1 ç­†"
 
-#: lib/RT/Record.pm:1708
+#: lib/RT/Ticket_Overlay.pm:3484
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "新增 %1 作為 %2 的值"
@@ -187,31 +212,32 @@ msgstr "別� %1 需��用的申請單編號 "
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
 msgstr "別� %1 需��用的申請單編號以處� %3(出自 %2)"
 
-#: lib/RT/Link_Overlay.pm:145 lib/RT/Link_Overlay.pm:152
+#: lib/RT/Link_Overlay.pm:111 lib/RT/Link_Overlay.pm:118
 #. ($args{'Base'})
 #. ($args{'Target'})
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 看來是個本地物件，��在資料庫裡"
 
-#: html/Ticket/Elements/ShowDates:73 lib/RT/Transaction_Overlay.pm:520
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:458
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 (%2)"
 
-#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
+#: lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:688 lib/RT/Transaction_Overlay.pm:697 lib/RT/Transaction_Overlay.pm:700
+#. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
-#. ($self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'")
+#. ($self->Field, $self->OldValue, $self->NewValue)
 msgid "%1 changed from %2 to %3"
 msgstr "%1 的值從 %2 改為 %3"
 
-#: html/Search/Build.html:212
+#: html/Search/Build.html:161
 #. ($Description)
 msgid "%1 copy"
-msgstr "%1 複製"
+msgstr ""
 
-#: lib/RT/Record.pm:930
+#: lib/RT/Record.pm:739
 msgid "%1 could not be set to %2."
 msgstr "無法將 %1 設定為 %2。"
 
@@ -219,22 +245,20 @@ msgstr "無法將 %1 設定為 %2。"
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 無法�始更新 (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2743
+#: lib/RT/Ticket_Overlay.pm:2739
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 無法將��設�已解決。RT 資料庫內容�能�一致。"
 
-#: lib/RT/Transaction_Overlay.pm:560
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 created"
 msgstr "已建立 %1"
 
-#: lib/RT/Transaction_Overlay.pm:565
-#. ($obj_type)
+#: NOT FOUND IN SOURCE
 msgid "%1 deleted"
 msgstr "已刪除 %1"
 
-#: html/Elements/MyTickets:47
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own"
 msgstr "� %1 份待處�申請單"
@@ -243,7 +267,8 @@ msgstr "� %1 份待處�申請單"
 msgid "%1 highest priority tickets I own..."
 msgstr "� %1 份待處�申請單..."
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyTickets:26
+#. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "� %1 份�出的申請單..."
 
@@ -251,12 +276,12 @@ msgstr "� %1 份�出的申請單..."
 msgid "%1 highest priority tickets pending my approval..."
 msgstr "� %1 份待簽核申請單..."
 
-#: bin/rt-crontool:186
+#: bin/rt-crontool:157
 #. ($0)
 msgid "%1 is a tool to act on tickets from an external scheduling tool, such as cron."
 msgstr "%1 是從外部排程程�(如 cron)來�申請單進行�作的工具。"
 
-#: lib/RT/Queue_Overlay.pm:860
+#: lib/RT/Queue_Overlay.pm:784
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 已��是此表單的 %2。"
@@ -265,7 +290,8 @@ msgstr "%1 已��是此表單的 %2。"
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 已��是此申請單的 %2。"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3540
+#. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 已��是自訂欄� %2 的值。"
 
@@ -273,7 +299,11 @@ msgstr "%1 已��是自訂欄� %2 的值。"
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 �是一個�法的表單編號。"
 
-#: html/Ticket/Create.html:186 html/Ticket/Create.html:187 html/Ticket/Elements/ShowBasics:58 html/Ticket/Elements/ShowBasics:64 html/Ticket/Elements/ShowBasics:69
+#: NOT FOUND IN SOURCE
+msgid "%1 matches"
+msgstr ""
+
+#: html/Ticket/Create.html:155 html/Ticket/Create.html:156 html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
 #. ('<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">')
 #. ('<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">')
 #. ($Ticket->TimeEstimated)
@@ -282,7 +312,15 @@ msgstr "%1 �是一個�法的表單編號。"
 msgid "%1 min"
 msgstr "%1 分�"
 
-#: html/Elements/MyRequests:47
+#: NOT FOUND IN SOURCE
+msgid "%1 most recently updated articles"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 newest articles"
+msgstr ""
+
+#: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 newest unowned tickets"
 msgstr "� %1 份待�領的申請單"
@@ -291,7 +329,7 @@ msgstr "� %1 份待�領的申請單"
 msgid "%1 not shown"
 msgstr "沒有顯示 %1"
 
-#: lib/RT/CustomField_Overlay.pm:827
+#: NOT FOUND IN SOURCE
 msgid "%1 objects"
 msgstr "%1 物件"
 
@@ -307,7 +345,7 @@ msgstr "最新 %1 份�出的申請單..."
 msgid "%1 result(s) found"
 msgstr "找到 %1 項�果"
 
-#: html/User/Elements/DelegateRights:97
+#: html/User/Elements/DelegateRights:75
 #. (loc($ObjectType =~ /^RT::(.*)$/))
 msgid "%1 rights"
 msgstr "%1權�"
@@ -328,7 +366,7 @@ msgstr "�知� %2 的 %1 類別"
 msgid "%1 was created without a CurrentUser\\n"
 msgstr "%1 新增時未指定�行使用者"
 
-#: lib/RT/Action/ResolveMembers.pm:63
+#: lib/RT/Action/ResolveMembers.pm:41
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 會解決在已解決群組裡�員的申請單。"
@@ -337,31 +375,67 @@ msgstr "%1 會解決在已解決群組裡�員的申請單。"
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "如果 %1 起始申請單�賴於�個��，或是�個��的�員，它將會被延宕。"
 
-#: lib/RT/CustomField_Overlay.pm:828
+#: NOT FOUND IN SOURCE
+msgid "%1 הוסף כערך עבור %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 כינויי� דורשי� מזהה פנייה כדי לעבוד עליה� (מ %2) %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 לפני %2 ימי�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 נר�ה כמו �ובייקט מקומי, �בל הו� �ינו נמצ� במסד הנתוני�"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 על ידי %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 פעולת-סקריפ נטענה"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "%1 שונה מ %2 ל %3"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "%1's %2 objects"
 msgstr "%1 內的 %2 物件"
 
-#: lib/RT/CustomField_Overlay.pm:829
+#: NOT FOUND IN SOURCE
 msgid "%1's %2's %3 objects"
 msgstr "%1 內的 %2 的 %3 物件"
 
-#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
-#. ($object->Name)
+#: html/Search/Elements/SearchPrivacy:7 html/Search/Elements/SelectSearchObject:10 html/Search/Elements/SelectSearchesForObjects:11
 #. ($Object->Name)
+#. ($object->Name)
 msgid "%1's saved searches"
 msgstr "%1 已儲存的查詢"
 
-#: lib/RT/Transaction_Overlay.pm:470
+#: lib/RT/Transaction_Overlay.pm:408
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1：未指定附件"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:78
+#: html/Ticket/Elements/ShowTransactionAttachments:56
 #. ($size)
 msgid "%1b"
 msgstr "%1 �元組"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:75
+#: html/Ticket/Elements/ShowTransactionAttachments:53
 #. (int( $size / 102.4 ) / 10)
 msgid "%1k"
 msgstr "%1k �元組"
@@ -370,7 +444,7 @@ msgstr "%1k �元組"
 msgid "%quant(%1,result) found"
 msgstr "找到 %1 項�果"
 
-#: lib/RT/Ticket_Overlay.pm:1118
+#: lib/RT/Ticket_Overlay.pm:1252
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' �是一個�法的狀態值"
@@ -387,7 +461,7 @@ msgstr "(點�欲刪除的�員)"
 msgid "(Check box to delete scrip)"
 msgstr "(點�欲刪除的手續)"
 
-#: html/Admin/Elements/EditCustomFieldValues:50 html/Admin/Elements/EditQueueWatchers:50 html/Admin/Elements/EditScrips:56 html/Admin/Elements/EditTemplates:57 html/Admin/Groups/Members.html:73 html/Elements/EditLinks:54 html/Ticket/Elements/EditPeople:67 html/User/Groups/Members.html:76
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
 msgid "(Check box to delete)"
 msgstr "(點�欲刪除的項目)"
 
@@ -395,41 +469,45 @@ msgstr "(點�欲刪除的項目)"
 msgid "(Check boxes to delete)"
 msgstr "(點�欲刪除的項目)"
 
-#: html/Ticket/Elements/PreviewScrips:94
+#: html/Ticket/Elements/PreviewScrips:49
 msgid "(Check boxes to disable notifications to the listed recipients)"
 msgstr "(點�欲�用通知的收件人)"
 
-#: html/Ticket/Elements/PreviewScrips:116
+#: html/Ticket/Elements/PreviewScrips:71
 msgid "(Check boxes to enable notifications to the listed recipients)"
 msgstr "(點�欲啟用通知的收件人)"
 
-#: html/Ticket/Create.html:209
+#: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, separated with spaces)"
 msgstr "(�入申請單編號或網�，以空白分隔)"
 
-#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
+#: NOT FOUND IN SOURCE
+msgid "(Enter ticket ids or URLs, seperated with spaces)"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:53 html/Admin/Queues/Modify.html:59
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
-msgid "(If left blank, will default to %1)"
+msgid "(If left blank, will default to %1"
 msgstr "(如果留白, 則�設為 %1)"
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
 msgstr "(沒有值)"
 
-#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(沒有自訂欄�)"
 
-#: html/Admin/Groups/Members.html:71 html/User/Groups/Members.html:74
+#: html/Admin/Groups/Members.html:49 html/User/Groups/Members.html:52
 msgid "(No members)"
 msgstr "(沒有�員)"
 
-#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ListGlobalScrips:49
+#: html/Admin/Elements/EditScrips:31 html/Admin/Elements/ListGlobalScrips:31
 msgid "(No scrips)"
 msgstr "(沒有手續)"
 
-#: html/Admin/Elements/EditTemplates:52
+#: html/Admin/Elements/EditTemplates:30
 msgid "(No templates)"
 msgstr "沒有範本"
 
@@ -437,11 +515,11 @@ msgstr "沒有範本"
 msgid "(No workflows)"
 msgstr "沒有�程"
 
-#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
+#: NOT FOUND IN SOURCE
 msgid "(None)"
 msgstr "(ç„¡)"
 
-#: html/Ticket/Update.html:88
+#: html/Ticket/Update.html:66
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(�出本份更新的密件副本給�單上以逗號隔開的電�郵件��。這<b>�會</b>更改後續的收件者�單。)"
 
@@ -449,11 +527,11 @@ msgstr "(é€�出本份更新的密件副本給å��單上以逗號隔開的電å­�éƒ
 msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(�出本份更新的密件副本給�單上以逗號隔開的電�郵件��。這<b>�會</b>更改後續的收件者�單。)"
 
-#: html/Ticket/Create.html:100
+#: html/Ticket/Create.html:78
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(�出本份更新的副本給�單上以逗號隔開的管�員電�郵件��。這<b>將會</b>更改後續的收件者�單。)"
 
-#: html/Ticket/Update.html:84
+#: html/Ticket/Update.html:62
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
 msgstr "(�出本份更新的副本給�單上以逗號隔開的電�郵件��。這<b>�會</b>更改後續的收件者�單。)"
 
@@ -461,13 +539,13 @@ msgstr "(é€�出本份更新的副本給å��單上以逗號隔開的電å­�郵件ä½
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
 msgstr "(�出本份更新的副本給�單上以逗號隔開的電�郵件��。這<b>�會</b>更改後續的收件者�單。)"
 
-#: html/Ticket/Create.html:90
+#: html/Ticket/Create.html:68
 msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
 msgstr "(�出本份更新的副本給�單上以逗號隔開的電�郵件��。這<b>將會</b>更改後續的收件者�單。)"
 
-#: html/Admin/Elements/EditScrip:102
+#: html/Admin/Elements/EditScrip:80
 msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
-msgstr "(當�件或動作設為「使用者自訂�時，請填入這些欄�)"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "(default delegate)"
@@ -477,7 +555,7 @@ msgstr "(�設代�人)"
 msgid "(delete)"
 msgstr "(刪除)"
 
-#: html/Admin/Groups/index.html:57 html/User/Groups/index.html:54
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(空白)"
 
@@ -485,31 +563,39 @@ msgstr "(空白)"
 msgid "(new)"
 msgstr "(新增)"
 
-#: html/Admin/Users/index.html:60
+#: NOT FOUND IN SOURCE
+msgid "(no Summary)"
+msgstr ""
+
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr "(沒有列出姓�)"
 
 #: NOT FOUND IN SOURCE
+msgid "(no name)"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "(no subject)"
 msgstr "(沒有主題)"
 
-#: html/Admin/Elements/SelectRights:72 html/Elements/EditCustomFieldSelect:60 html/Elements/SelectCustomFieldValue:51 html/Elements/ShowCustomFields:65 lib/RT/Transaction_Overlay.pm:580
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:511
 msgid "(no value)"
 msgstr "(ç„¡)"
 
-#: html/Admin/Elements/EditCustomFieldValues:47
+#: NOT FOUND IN SOURCE
 msgid "(no values)"
 msgstr "(沒有值)"
 
-#: html/Elements/EditLinks:130 html/Ticket/Elements/BulkLinks:49
+#: html/Elements/EditLinks:105 html/Ticket/Elements/BulkLinks:27
 msgid "(only one ticket)"
 msgstr "(僅能指定一份申請單)"
 
-#: html/Elements/RT__Ticket/ColumnMap:146
+#: html/Elements/TicketList:167
 msgid "(pending approval)"
 msgstr "(等待簽核)"
 
-#: html/Elements/RT__Ticket/ColumnMap:149
+#: html/Elements/TicketList:170
 msgid "(pending other Collection)"
 msgstr "(等待其他集�)"
 
@@ -521,11 +607,11 @@ msgstr "(等待其他申請單)"
 msgid "(requestor's group)"
 msgstr "(申請人所屬)"
 
-#: html/Admin/Users/Modify.html:71
+#: html/Admin/Users/Modify.html:49
 msgid "(required)"
 msgstr "(å¿…å¡«)"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "(untitled)"
 msgstr "(未命�)"
 
@@ -534,38 +620,50 @@ msgid "*"
 msgstr "★"
 
 #: NOT FOUND IN SOURCE
+msgid "..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I own..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "25 highest priority tickets I requested..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid ":"
 msgstr "："
 
-#: html/Ticket/Elements/ShowBasics:53
+#: html/Ticket/Elements/ShowBasics:31
 msgid "<% $Ticket->Status%>"
 msgstr "<% $Ticket->Status%>"
 
-#: html/Elements/SelectTicketTypes:48
+#: html/Elements/SelectTicketTypes:26
 msgid "<% $_ %>"
 msgstr "<% $_ %>"
 
-#: html/Search/Elements/SelectLinks:48
+#: html/Search/Elements/SelectLinks:26
 msgid "<%$_%>"
 msgstr "<%$_%>"
 
-#: html/Search/Elements/DisplayOptions:65
+#: html/Search/Elements/PickBasics:132 html/Search/Elements/PickBasics:139 html/Search/Elements/PickBasics:88
 msgid "<%$field%>"
 msgstr "<%$field%>"
 
-#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 lib/RT/StyleGuide.pod:767
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
 msgstr "<input type=\"submit\" value=\"�出申請單\">&nbsp;%1"
 
+#: NOT FOUND IN SOURCE
+msgid "??????"
+msgstr ""
+
 #: etc/initialdata:218
 msgid "A blank template"
 msgstr "空白範本"
 
-#: html/Admin/Users/Modify.html:363
-msgid "A password was not set, so user won't be able to login."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "ACE Deleted"
 msgstr "ACE 已刪除"
@@ -582,11 +680,11 @@ msgstr "無法刪除 ACE"
 msgid "ACE could not be found"
 msgstr "找�到 ACE"
 
-#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
+#: lib/RT/ACE_Overlay.pm:156 lib/RT/Principal_Overlay.pm:180
 msgid "ACE not found"
 msgstr "找�到 ACE 設定"
 
-#: lib/RT/ACE_Overlay.pm:854
+#: lib/RT/ACE_Overlay.pm:830
 msgid "ACEs can only be created and deleted."
 msgstr "祇能新增或刪除 ACE 設定。"
 
@@ -594,10 +692,6 @@ msgstr "祇能新增或刪除 ACE 設定。"
 msgid "ACLEquivalence"
 msgstr "ACLEquivalence"
 
-#: html/Search/Elements/SelectAndOr:46
-msgid "AND"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "離開以���心更改到申請單。\\n"
@@ -606,7 +700,7 @@ msgstr "離開以���心更改到申請單。\\n"
 msgid "About Me"
 msgstr "個人資訊"
 
-#: html/User/Elements/Tabs:53
+#: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "個人資訊"
 
@@ -614,28 +708,24 @@ msgstr "個人資訊"
 msgid "Access Right"
 msgstr "系統使用登錄權�"
 
-#: html/Admin/Users/Modify.html:106
+#: html/Admin/Users/Modify.html:79
 msgid "Access control"
 msgstr "存�權�"
 
-#: html/Admin/Elements/EditScrip:71
+#: html/Admin/Elements/EditScrip:49
 msgid "Action"
 msgstr "動作"
 
-#: lib/RT/Scrip_Overlay.pm:173
+#: lib/RT/Scrip_Overlay.pm:148
 #. ($args{'ScripAction'})
 msgid "Action %1 not found"
 msgstr "動作 %1 找�到"
 
-#: NOT FOUND IN SOURCE
+#: bin/rt-crontool:119
 msgid "Action committed."
 msgstr "動作執行完畢"
 
-#: bin/rt-crontool:148
-msgid "Action committed.\\n"
-msgstr ""
-
-#: bin/rt-crontool:144
+#: bin/rt-crontool:115
 msgid "Action prepared..."
 msgstr "動作準備完畢..."
 
@@ -643,23 +733,19 @@ msgstr "動作準備完畢..."
 msgid "Activated Date"
 msgstr "申請啟動時間"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add"
 msgstr "新增"
 
-#: html/Search/Bulk.html:114
+#: html/Search/Bulk.html:93
 msgid "Add AdminCc"
 msgstr "新增管�員副本收件人"
 
-#: html/Search/Bulk.html:110
+#: html/Search/Bulk.html:89
 msgid "Add Cc"
 msgstr "新增副本收件人"
 
-#: html/Search/Elements/EditFormat:49
-msgid "Add Columns"
-msgstr ""
-
-#: html/Search/Elements/PickCriteria:46
+#: html/Search/Elements/PickCriteria:24
 msgid "Add Criteria"
 msgstr "新增�件"
 
@@ -667,7 +753,7 @@ msgstr "新增�件"
 msgid "Add Entry"
 msgstr "新增列"
 
-#: html/Ticket/Create.html:144 html/Ticket/Update.html:114
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:81
 msgid "Add More Files"
 msgstr "新增更多附件"
 
@@ -675,11 +761,11 @@ msgstr "新增更多附件"
 msgid "Add Next State"
 msgstr "新增下一項關�"
 
-#: html/Search/Bulk.html:106
+#: html/Search/Bulk.html:85
 msgid "Add Requestor"
 msgstr "新增申請人"
 
-#: html/Admin/Elements/AddCustomFieldValue:46
+#: html/Admin/Elements/AddCustomFieldValue:24
 msgid "Add Value"
 msgstr "新增欄�值"
 
@@ -703,40 +789,36 @@ msgstr "新增全域手續"
 msgid "Add a scrip to this queue"
 msgstr "新增一�手續到此表單"
 
-#: html/Admin/Global/Scrip.html:76
+#: html/Admin/Global/Scrip.html:54
 msgid "Add a scrip which will apply to all queues"
 msgstr "新增一�用於所有表單的手續"
 
-#: html/Search/Build.html:85
+#: html/Search/Build.html:43
 msgid "Add additional criteria"
-msgstr "新增查詢�件"
+msgstr ""
 
-#: html/Search/Bulk.html:146
+#: html/Search/Bulk.html:125
 msgid "Add comments or replies to selected tickets"
 msgstr "新增評論或回覆到指定的申請單"
 
-#: html/Admin/Groups/Members.html:63 html/User/Groups/Members.html:60
+#: html/Admin/Groups/Members.html:41 html/User/Groups/Members.html:38
 msgid "Add members"
 msgstr "新增�員"
 
-#: html/Admin/Queues/People.html:87 html/Ticket/Elements/AddWatchers:49
+#: html/Admin/Queues/People.html:65 html/Ticket/Elements/AddWatchers:27
 msgid "Add new watchers"
 msgstr "新增視察員"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "Add, delete and modify custom field values for objects"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "AddNextState"
 msgstr "新增下一項關�"
 
-#: lib/RT/Queue_Overlay.pm:760
+#: lib/RT/Queue_Overlay.pm:684
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "單�已新增為此表單的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1416
+#: lib/RT/Ticket_Overlay.pm:1547
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "單�已新增為此申請單的 %1"
@@ -745,11 +827,11 @@ msgstr "單�已新增為此申請單的 %1"
 msgid "Additional Hints"
 msgstr "�外�示"
 
-#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:133
+#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:111
 msgid "Address1"
 msgstr "��"
 
-#: html/Admin/Users/Modify.html:151 html/User/Prefs.html:137
+#: html/Admin/Users/Modify.html:124 html/User/Prefs.html:115
 msgid "Address2"
 msgstr "��(續)"
 
@@ -761,7 +843,7 @@ msgstr "調整閃�速度快慢"
 msgid "Admin"
 msgstr "管�員"
 
-#: html/Ticket/Create.html:95
+#: html/Ticket/Create.html:73
 msgid "Admin Cc"
 msgstr "管�員副本"
 
@@ -777,7 +859,7 @@ msgstr "管�員回覆"
 msgid "Admin Rights"
 msgstr "管�員權�"
 
-#: html/Admin/Queues/index.html:46 html/Admin/Queues/index.html:49
+#: html/Admin/Queues/index.html:24 html/Admin/Queues/index.html:27
 msgid "Admin queues"
 msgstr "表單管�"
 
@@ -785,7 +867,7 @@ msgstr "表單管�"
 msgid "Admin users"
 msgstr "使用者管�"
 
-#: html/Admin/Global/index.html:47 html/Admin/Global/index.html:49
+#: html/Admin/Global/index.html:25 html/Admin/Global/index.html:27
 msgid "Admin/Global configuration"
 msgstr "管�/全域設定"
 
@@ -805,7 +887,7 @@ msgstr "管�員 Email"
 msgid "AdminAllPersonalGroups"
 msgstr "管�所有代�人群組"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:60 lib/RT/ACE_Overlay.pm:114
+#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "管�員副本"
 
@@ -817,15 +899,15 @@ msgstr "管�員評論"
 msgid "AdminCorrespondence"
 msgstr "管�員回覆"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: NOT FOUND IN SOURCE
 msgid "AdminCustomField"
 msgstr "管�自訂欄�"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Queue_Overlay.pm:73
 msgid "AdminCustomFields"
 msgstr "管�自訂欄�"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "管�群組"
 
@@ -833,7 +915,7 @@ msgstr "管�群組"
 msgid "AdminGroupDescription"
 msgstr "管�群組�述"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "管�群組�員"
 
@@ -849,15 +931,15 @@ msgstr "管�群組權�"
 msgid "AdminGroupStatus"
 msgstr "管�群組狀態"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "AdminOwnPersonalGroups"
 msgstr "管�代�人群組"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "AdminQueue"
 msgstr "管�表單"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "AdminUsers"
 msgstr "管�使用者"
 
@@ -865,7 +947,7 @@ msgstr "管�使用者"
 msgid "Administrative"
 msgstr "行政類"
 
-#: html/Admin/Queues/People.html:69 html/Ticket/Elements/EditPeople:75
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
 msgid "Administrative Cc"
 msgstr "管�員副本"
 
@@ -873,7 +955,7 @@ msgstr "管�員副本"
 msgid "Admins"
 msgstr "主管"
 
-#: html/Ticket/Elements/Tabs:197
+#: html/Ticket/Elements/Tabs:174
 msgid "Advanced"
 msgstr "進階"
 
@@ -883,9 +965,9 @@ msgstr "進階查詢"
 
 #: NOT FOUND IN SOURCE
 msgid "Advanced Search Criteria"
-msgstr "進階查詢�件"
+msgstr ""
 
-#: html/Elements/SelectDateRelation:57
+#: html/Elements/SelectDateRelation:35
 msgid "After"
 msgstr "晚於"
 
@@ -893,10 +975,6 @@ msgstr "晚於"
 msgid "Age"
 msgstr "經歷時間"
 
-#: html/Search/Elements/PickCriteria:52
-msgid "Aggregator"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Alias"
 msgstr "執行其他�程"
@@ -914,14 +992,18 @@ msgid "All Approvals Passed"
 msgstr "完�全部簽核"
 
 #: NOT FOUND IN SOURCE
+msgid "All Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "All Condition"
 msgstr "所有�件"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "所有自訂欄�"
 
-#: html/Admin/Queues/index.html:75
+#: html/Admin/Queues/index.html:52
 msgid "All Queues"
 msgstr "所有表單"
 
@@ -945,10 +1027,6 @@ msgstr "無論寄件來�為何，一律寄信給申請人"
 msgid "Amount"
 msgstr "數�"
 
-#: html/Search/Elements/EditQuery:56
-msgid "And/Or"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Any Condition"
 msgstr "任��件"
@@ -957,11 +1035,11 @@ msgstr "任��件"
 msgid "Applies To"
 msgstr "套用於"
 
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
+#: NOT FOUND IN SOURCE
 msgid "Applies to"
 msgstr "套用於"
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply"
 msgstr "套用"
 
@@ -969,27 +1047,27 @@ msgstr "套用"
 msgid "Apply Template"
 msgstr "引用範本"
 
-#: html/Search/Edit.html:64
+#: html/Search/Edit.html:42
 msgid "Apply your changes"
 msgstr "套用更動"
 
-#: html/Elements/Tabs:74
+#: html/Elements/Tabs:58
 msgid "Approval"
 msgstr "簽核"
 
-#: html/Approvals/Display.html:67 html/Approvals/Elements/ShowDependency:63 html/Approvals/index.html:86
+#: html/Approvals/Display.html:45 html/Approvals/Elements/ShowDependency:41 html/Approvals/index.html:64
 #. ($Ticket->Id, $Ticket->Subject)
 #. ($ticket->id, $msg)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Approval #%1: %2"
 msgstr "簽核單 #%1：%2"
 
-#: html/Approvals/index.html:75
+#: html/Approvals/index.html:53
 #. ($ticket->Id)
 msgid "Approval #%1: Notes not recorded due to a system error"
 msgstr "簽核單 #%1：系統錯誤，記錄失敗"
 
-#: html/Approvals/index.html:73
+#: html/Approvals/index.html:51
 #. ($ticket->Id)
 msgid "Approval #%1: Notes recorded"
 msgstr "簽核單 #%1：記錄完畢"
@@ -1030,7 +1108,7 @@ msgstr "簽核種類"
 msgid "Approval diagram"
 msgstr "簽核�程"
 
-#: html/Approvals/Elements/Approve:65
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "核准"
 
@@ -1050,7 +1128,7 @@ msgstr "簽核備註：%1"
 msgid "Apr"
 msgstr "四月"
 
-#: lib/RT/Date.pm:440
+#: lib/RT/Date.pm:414
 msgid "Apr."
 msgstr "04"
 
@@ -1062,48 +1140,68 @@ msgstr "四月"
 msgid "Are you sure to delete checked items?"
 msgstr "您確定�刪除？"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
+#: NOT FOUND IN SOURCE
+msgid "Are you sure you want to delete this article?"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1 deleted"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article #%1: %2"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Article not found"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Articles"
+msgstr ""
+
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:52
 msgid "Ascending"
 msgstr "�增"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "Assign and remove custom fields"
 msgstr "指派�移除自訂欄�"
 
-#: lib/RT/Queue_Overlay.pm:97
+#: NOT FOUND IN SOURCE
 msgid "AssignCustomFields"
 msgstr "指派自訂欄�"
 
-#: html/Search/Bulk.html:164 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:114
+#: html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:81
 msgid "Attach"
 msgstr "附件"
 
-#: html/SelfService/Create.html:92 html/Ticket/Create.html:140
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
 msgid "Attach file"
 msgstr "附加檔案"
 
-#: html/SelfService/Update.html:75 html/Ticket/Create.html:128 html/Ticket/Update.html:92
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:70
 msgid "Attached file"
 msgstr "�有附件"
 
-#: html/Ticket/ShowEmailRecord.html:52 html/Ticket/ShowEmailRecord.html:56 html/Ticket/ShowEmailRecord.html:59
+#: html/Ticket/ShowEmailRecord.html:11 html/Ticket/ShowEmailRecord.html:14 html/Ticket/ShowEmailRecord.html:7
 #. ($Attachment)
 msgid "Attachment '%1' could not be loaded"
 msgstr "無法載入附件 '%1'"
 
-#: lib/RT/Transaction_Overlay.pm:478
+#: lib/RT/Transaction_Overlay.pm:416
 msgid "Attachment created"
 msgstr "附件新增完畢"
 
-#: lib/RT/Tickets_Overlay.pm:1673
+#: lib/RT/Tickets_Overlay.pm:1251
 msgid "Attachment filename"
 msgstr "附件檔�"
 
-#: html/Ticket/Elements/ShowAttachments:47
+#: html/Ticket/Elements/ShowAttachments:25
 msgid "Attachments"
 msgstr "附件"
 
-#: lib/RT/Attributes_Overlay.pm:172
+#: lib/RT/Attributes_Overlay.pm:158
 msgid "Attribute Deleted"
 msgstr "已刪除該屬性"
 
@@ -1115,7 +1213,7 @@ msgstr "屬性"
 msgid "Aug"
 msgstr "八月"
 
-#: lib/RT/Date.pm:444
+#: lib/RT/Date.pm:418
 msgid "Aug."
 msgstr "08"
 
@@ -1147,7 +1245,7 @@ msgstr "自動�申請人回覆"
 msgid "AutoreplyToRequestors"
 msgstr "自動�申請人回覆"
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Elements/EditFormat:4
 msgid "Available Columns"
 msgstr "�用的欄�："
 
@@ -1179,7 +1277,7 @@ msgstr "%1 的資料錯誤"
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "附件的處�號碼錯誤。%1 應為 %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:65 html/Admin/Elements/GroupTabs:60 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/UserTabs:58 html/Ticket/Elements/Tabs:113 html/User/Elements/GroupTabs:59
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Ticket/Elements/Tabs:91 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "基本資訊"
 
@@ -1187,15 +1285,15 @@ msgstr "基本資訊"
 msgid "Batch Approval"
 msgstr "批次簽核"
 
-#: html/Ticket/Update.html:86
+#: html/Ticket/Update.html:64
 msgid "Bcc"
 msgstr "密件副本"
 
-#: html/Admin/CustomFields/GroupRights.html:91 html/Admin/CustomFields/UserRights.html:74 html/Admin/Elements/EditScrip:95
+#: html/Admin/Elements/EditScrip:73
 msgid "Be sure to save your changes"
 msgstr "請別忘了儲存修改。"
 
-#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:336
 msgid "Before"
 msgstr "æ—©æ–¼"
 
@@ -1207,10 +1305,6 @@ msgstr "開始簽核"
 msgid "Begin From "
 msgstr "起始日"
 
-#: html/Elements/Header:80
-msgid "Best Practical Solutions, LLC corporate logo"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Binary"
 msgstr "檔案"
@@ -1223,23 +1317,19 @@ msgstr "生日"
 msgid "Blank"
 msgstr "空白範本"
 
-#: html/Search/Elements/EditFormat:84
-msgid "Bold"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Bookmarkable URL for this search"
 msgstr "將查詢�果轉為�放入書籤的網�"
 
-#: html/Search/Results.html:81
+#: html/Search/Results.html:47
 msgid "Bookmarkable link"
-msgstr "�放入書籤的網�"
+msgstr ""
 
-#: html/Ticket/Elements/ShowHistory:60 html/Ticket/Elements/ShowHistory:66
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "精簡標頭檔"
 
-#: html/Search/Bulk.html:46 html/Search/Bulk.html:47
+#: html/Search/Bulk.html:24 html/Search/Bulk.html:25
 msgid "Bulk ticket update"
 msgstr "更新整批申請單"
 
@@ -1251,40 +1341,35 @@ msgstr "事業部"
 msgid "Business Unit:"
 msgstr "事業部："
 
-#: lib/RT/User_Overlay.pm:1722
+#: lib/RT/User_Overlay.pm:1533
 msgid "Can not modify system users"
 msgstr "無法更改系統使用者"
 
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "Can this principal see this queue"
 msgstr "該單�是�能查閱此表單"
 
-#: lib/RT/CustomField_Overlay.pm:370
+#: lib/RT/CustomField_Overlay.pm:211
 msgid "Can't add a custom field value without a name"
 msgstr "�能新增沒有�稱的自訂欄�值"
 
-#: html/Admin/CustomFields/Objects.html:86
-#. ($Class)
-msgid "Can't find a collection class for '%1'"
-msgstr ""
-
-#: html/Search/Build.html:761
+#: html/Search/Build.html:694
 msgid "Can't find a saved search to work with"
 msgstr "找�到已儲存的查詢"
 
-#: lib/RT/Link_Overlay.pm:160
+#: lib/RT/Link_Overlay.pm:126
 msgid "Can't link a ticket to itself"
 msgstr "申請單�能��自己。"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2716
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "�能整�進已整��的申請單。這個錯誤�該發生。"
 
-#: html/Search/Build.html:766
+#: html/Search/Build.html:699
 msgid "Can't save this search"
 msgstr "無法儲存此項查詢"
 
-#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
+#: lib/RT/Record.pm:1060 lib/RT/Record.pm:1138
 msgid "Can't specifiy both base and target"
 msgstr "�能�時指定起始申請單與目的申請單"
 
@@ -1292,7 +1377,7 @@ msgstr "�能�時指定起始申請單與目的申請單"
 msgid "Cancel"
 msgstr "�消"
 
-#: html/autohandler:148
+#: html/autohandler:132
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "無法新增使用者：%1"
@@ -1313,7 +1398,7 @@ msgstr "分類管�"
 msgid "Category"
 msgstr "分類"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:85 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:81 lib/RT/ACE_Overlay.pm:113
+#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:59 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "副本"
 
@@ -1329,7 +1414,7 @@ msgstr "董事長室"
 msgid "Change Ticket"
 msgstr "修改申請單"
 
-#: html/SelfService/Prefs.html:52
+#: html/SelfService/Prefs.html:30
 msgid "Change password"
 msgstr "更改密碼"
 
@@ -1337,19 +1422,19 @@ msgstr "更改密碼"
 msgid "ChangeOwnerUI"
 msgstr "���擇表單承辦人"
 
-#: html/Elements/Submit:100
+#: NOT FOUND IN SOURCE
 msgid "Check All"
 msgstr "全部��"
 
-#: html/SelfService/Update.html:78 html/Ticket/Create.html:131 html/Ticket/Update.html:95
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:73
 msgid "Check box to delete"
 msgstr "�擇欲刪除的項目"
 
-#: html/Admin/Elements/SelectRights:55
+#: html/Admin/Elements/SelectRights:30
 msgid "Check box to revoke right"
 msgstr "�擇欲撤消的權利"
 
-#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+#: html/Elements/EditLinks:121 html/Elements/EditLinks:63 html/Elements/ShowLinks:56 html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42
 msgid "Children"
 msgstr "�申請單"
 
@@ -1361,27 +1446,47 @@ msgstr "中文姓�"
 msgid "Chinese/English"
 msgstr "中英文"
 
-#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
+#: html/Admin/Users/Modify.html:129 html/User/Prefs.html:119
 msgid "City"
 msgstr "所在城市"
 
 #: NOT FOUND IN SOURCE
+msgid "Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class Name"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Class is"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Classes"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "ClassicUI"
 msgstr "傳統介�"
 
-#: html/Elements/Submit:102
+#: NOT FOUND IN SOURCE
 msgid "Clear All"
 msgstr "全部清除"
 
-#: html/Ticket/Elements/ShowDates:68
+#: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
 msgstr "已解決"
 
-#: NOT FOUND IN SOURCE
+#: html/SelfService/Closed.html:24
 msgid "Closed Tickets"
 msgstr "已解決的申請單"
 
-#: html/SelfService/Closed.html:46 html/SelfService/Elements/Tabs:66
+#: NOT FOUND IN SOURCE
+msgid "Closed requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:44
 msgid "Closed tickets"
 msgstr "已解決的申請單"
 
@@ -1393,11 +1498,11 @@ msgstr "執行程�碼"
 msgid "Command not understood!\\n"
 msgstr "指令無法辨識�\\n"
 
-#: html/Ticket/Elements/ShowTransaction:182 html/Ticket/Elements/Tabs:176
+#: html/Ticket/Elements/ShowTransaction:152 html/Ticket/Elements/Tabs:154
 msgid "Comment"
 msgstr "è©•è«–"
 
-#: html/Admin/Queues/Modify.html:79
+#: html/Admin/Queues/Modify.html:57
 msgid "Comment Address"
 msgstr "評論電�郵件地�"
 
@@ -1405,11 +1510,11 @@ msgstr "評論電�郵件地�"
 msgid "Comment not recorded"
 msgstr "評論未被紀錄"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "Comment on tickets"
 msgstr "�申請單�出評論"
 
-#: lib/RT/Queue_Overlay.pm:112
+#: lib/RT/Queue_Overlay.pm:88
 msgid "CommentOnTicket"
 msgstr "評論申請單"
 
@@ -1417,11 +1522,11 @@ msgstr "評論申請單"
 msgid "Comments"
 msgstr "è©•è«–"
 
-#: html/Ticket/ModifyAll.html:91 html/Ticket/Update.html:73
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:51
 msgid "Comments (Not sent to requestors)"
 msgstr "評論(��給申請人)"
 
-#: html/Search/Bulk.html:150
+#: html/Search/Bulk.html:129
 msgid "Comments (not sent to requestors)"
 msgstr "評論(��給申請人)"
 
@@ -1429,11 +1534,11 @@ msgstr "評論(��給申請人)"
 msgid "Comments about %1"
 msgstr "å°� %1 çš„è©•è«–"
 
-#: html/Admin/Users/Modify.html:224 html/Ticket/Elements/ShowRequestor:67
+#: html/Admin/Users/Modify.html:182 html/Ticket/Elements/ShowRequestor:45
 msgid "Comments about this user"
 msgstr "使用者�述"
 
-#: lib/RT/Transaction_Overlay.pm:623
+#: lib/RT/Transaction_Overlay.pm:537
 msgid "Comments added"
 msgstr "新增評論完畢"
 
@@ -1441,7 +1546,7 @@ msgstr "新增評論完畢"
 msgid "Commit"
 msgstr "確�"
 
-#: lib/RT/Action/Generic.pm:176
+#: lib/RT/Action/Generic.pm:149
 msgid "Commit Stubbed"
 msgstr "消除更動完畢"
 
@@ -1457,23 +1562,23 @@ msgstr "�公��立顯示"
 msgid "Compile Restrictions"
 msgstr "設定查詢�件"
 
-#: html/Admin/Elements/EditScrip:63
+#: html/Admin/Elements/EditScrip:41
 msgid "Condition"
 msgstr "�件"
 
-#: bin/rt-crontool:131
+#: bin/rt-crontool:105
 msgid "Condition matches..."
 msgstr "符��件..."
 
-#: lib/RT/Scrip_Overlay.pm:189
+#: lib/RT/Scrip_Overlay.pm:164
 msgid "Condition not found"
 msgstr "未找到符�的��"
 
-#: html/Elements/Tabs:81
+#: html/Elements/Tabs:52
 msgid "Configuration"
 msgstr "設定"
 
-#: html/SelfService/Prefs.html:54
+#: html/SelfService/Prefs.html:32
 msgid "Confirm"
 msgstr "確�密碼"
 
@@ -1497,11 +1602,11 @@ msgstr "連絡資訊系統"
 msgid "Contacted date '%1' could not be parsed"
 msgstr "無法解讀�絡日期 '%1'"
 
-#: html/Admin/Elements/ModifyTemplate:65 html/Elements/SelectAttachmentField:48 html/Ticket/ModifyAll.html:119
+#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "內容"
 
-#: html/Elements/SelectAttachmentField:49
+#: html/Elements/SelectAttachmentField:27
 msgid "Content-Type"
 msgstr "內容類型"
 
@@ -1509,7 +1614,7 @@ msgstr "內容類型"
 msgid "Coould not create group"
 msgstr "無法新增群組"
 
-#: html/Search/Elements/EditSearches:64
+#: html/Search/Elements/EditSearches:16
 msgid "Copy"
 msgstr "複製"
 
@@ -1525,7 +1630,7 @@ msgstr "回覆"
 msgid "Correspondence Address"
 msgstr "申請單回覆地�"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:533
 msgid "Correspondence added"
 msgstr "新增申請單回覆"
 
@@ -1533,7 +1638,7 @@ msgstr "新增申請單回覆"
 msgid "Correspondence not recorded"
 msgstr "未紀錄申請單回覆"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3471
 msgid "Could not add new custom field value for ticket. "
 msgstr "�能新增自訂欄�的值 "
 
@@ -1541,29 +1646,15 @@ msgstr "�能新增自訂欄�的值 "
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "�能新增自訂欄�的值。%1 "
 
-#: lib/RT/Record.pm:1693
-msgid "Could not add new custom field value. "
-msgstr ""
-
-#: lib/RT/Record.pm:1646
-#. (, $value_msg)
-msgid "Could not add new custom field value. %1 "
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
+#: lib/RT/Ticket_Overlay.pm:2967 lib/RT/Ticket_Overlay.pm:2975 lib/RT/Ticket_Overlay.pm:2992
 msgid "Could not change owner. "
 msgstr "�能更改承辦人。 "
 
-#: html/Admin/CustomFields/Modify.html:119
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "無法新增自訂欄�"
 
-#: html/Admin/Elements/EditCustomField:113
-#. ($msg)
-msgid "Could not create CustomField: %1"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Could not create Scrip"
 msgstr "無法建立訊�通知"
@@ -1572,7 +1663,7 @@ msgstr "無法建立訊�通知"
 msgid "Could not create Template"
 msgstr "無法建立通知範本"
 
-#: html/User/Groups/Modify.html:98 lib/RT/Group_Overlay.pm:502 lib/RT/Group_Overlay.pm:509
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
 msgstr "無法新增群組"
 
@@ -1580,16 +1671,16 @@ msgstr "無法新增群組"
 msgid "Could not create item"
 msgstr "無法新增項目"
 
-#: html/Admin/Global/Template.html:96 html/Admin/Queues/Template.html:93
+#: html/Admin/Global/Template.html:74 html/Admin/Queues/Template.html:71
 #. ($msg)
 msgid "Could not create template: %1"
 msgstr "無法新增範本：%1"
 
-#: lib/RT/Ticket_Overlay.pm:1051 lib/RT/Ticket_Overlay.pm:396
+#: lib/RT/Ticket_Overlay.pm:1185 lib/RT/Ticket_Overlay.pm:364
 msgid "Could not create ticket. Queue not set"
 msgstr "無法新增申請單。尚未指定表單。"
 
-#: lib/RT/User_Overlay.pm:256 lib/RT/User_Overlay.pm:270 lib/RT/User_Overlay.pm:279 lib/RT/User_Overlay.pm:288 lib/RT/User_Overlay.pm:297 lib/RT/User_Overlay.pm:311 lib/RT/User_Overlay.pm:321 lib/RT/User_Overlay.pm:497
+#: lib/RT/User_Overlay.pm:226 lib/RT/User_Overlay.pm:240 lib/RT/User_Overlay.pm:249 lib/RT/User_Overlay.pm:258 lib/RT/User_Overlay.pm:267 lib/RT/User_Overlay.pm:281 lib/RT/User_Overlay.pm:291 lib/RT/User_Overlay.pm:462
 msgid "Could not create user"
 msgstr "無法新增使用者"
 
@@ -1609,11 +1700,11 @@ msgstr "找�到編號 %1 的申請單"
 msgid "Could not find group %1."
 msgstr "找�到群組 %1。"
 
-#: lib/RT/Queue_Overlay.pm:738 lib/RT/Ticket_Overlay.pm:1384
+#: lib/RT/Queue_Overlay.pm:662 lib/RT/Ticket_Overlay.pm:1515
 msgid "Could not find or create that user"
 msgstr "找�到或無法新增該�使用者"
 
-#: lib/RT/Queue_Overlay.pm:799 lib/RT/Ticket_Overlay.pm:1465
+#: lib/RT/Queue_Overlay.pm:723 lib/RT/Ticket_Overlay.pm:1596
 msgid "Could not find that principal"
 msgstr "找�到該單�"
 
@@ -1621,34 +1712,25 @@ msgstr "找�到該單�"
 msgid "Could not find user %1."
 msgstr "找�到使用者 %1。"
 
-#: html/Admin/CustomFields/Objects.html:69
+#: NOT FOUND IN SOURCE
 msgid "Could not load CustomField %1"
 msgstr "無法載入欄� %1"
 
-#: html/Admin/Groups/Members.html:109 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
+#: html/Admin/Groups/Members.html:87 html/User/Groups/Members.html:89 html/User/Groups/Modify.html:81
 msgid "Could not load group"
 msgstr "無法載入群組"
 
-#: lib/RT/SavedSearch.pm:120
-#. ($privacy)
-msgid "Could not load object for %1"
-msgstr ""
-
-#: lib/RT/SavedSearch.pm:188
-msgid "Could not load search attribute"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:758
+#: lib/RT/Queue_Overlay.pm:682
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "無法將該單�設為此表單的 %1。"
 
-#: lib/RT/Ticket_Overlay.pm:1405
+#: lib/RT/Ticket_Overlay.pm:1536
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "無法將該單�設為此申請單的 %1。"
 
-#: lib/RT/Queue_Overlay.pm:857
+#: lib/RT/Queue_Overlay.pm:781
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "無法將單� %1 從表單移除。"
@@ -1657,15 +1739,15 @@ msgstr "無法將單� %1 從表單移除。"
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "無法將單� %1 從申請單移除。"
 
-#: lib/RT/User_Overlay.pm:192
+#: lib/RT/User_Overlay.pm:162
 msgid "Could not set user info"
 msgstr "無法設定使用者資訊"
 
-#: lib/RT/Group_Overlay.pm:1011
+#: lib/RT/Group_Overlay.pm:977
 msgid "Couldn't add member to group"
 msgstr "無法新增�員至群組"
 
-#: lib/RT/Record.pm:1705 lib/RT/Record.pm:1757
+#: lib/RT/Ticket_Overlay.pm:3481 lib/RT/Ticket_Overlay.pm:3537
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "無法新增更動報告"
@@ -1678,15 +1760,15 @@ msgstr "無法從 gpg 回函辨識出該採�的行動\\n"
 msgid "Couldn't find group\\n"
 msgstr "找�到群組\\n"
 
-#: lib/RT/Record.pm:939
+#: lib/RT/Record.pm:748
 msgid "Couldn't find row"
 msgstr "找�到此列資料"
 
-#: lib/RT/Group_Overlay.pm:985
+#: lib/RT/Group_Overlay.pm:951
 msgid "Couldn't find that principal"
 msgstr "找�到該單�"
 
-#: lib/RT/CustomField_Overlay.pm:404
+#: lib/RT/CustomField_Overlay.pm:245
 msgid "Couldn't find that value"
 msgstr "找�到該值"
 
@@ -1698,18 +1780,16 @@ msgstr "找�到該視察員"
 msgid "Couldn't find user\\n"
 msgstr "找�到使用者\\n"
 
-#: lib/RT/CurrentUser.pm:146
+#: lib/RT/CurrentUser.pm:123
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "無法從使用者資料庫載入 %1。\\n"
 
-#: html/Admin/CustomFields/UserRights.html:149
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load Class %1"
 msgstr "無法載入類別 %1"
 
-#: html/Admin/CustomFields/GroupRights.html:107
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load CustomField %1"
 msgstr "無法載入自訂欄� %1"
 
@@ -1725,26 +1805,25 @@ msgstr "無法載入 RT 設定檔 '%1' %2"
 msgid "Couldn't load Scrips."
 msgstr "無法載入手續。"
 
-#: html/Admin/Groups/GroupRights.html:109 html/Admin/Groups/UserRights.html:96
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "無法載入手續 %1"
 
-#: lib/RT/Link_Overlay.pm:203 lib/RT/Link_Overlay.pm:212 lib/RT/Link_Overlay.pm:239
+#: lib/RT/Link_Overlay.pm:169 lib/RT/Link_Overlay.pm:178 lib/RT/Link_Overlay.pm:205
 msgid "Couldn't load link"
 msgstr "無法載入��。"
 
-#: html/Admin/Elements/ObjectCustomFields:83 html/Admin/Queues/CustomFields.html:59 html/Admin/Users/CustomFields.html:59
-#. ($id)
+#: NOT FOUND IN SOURCE
 msgid "Couldn't load object %1"
 msgstr "無法載入物件 %1"
 
-#: html/Admin/Queues/People.html:142
+#: html/Admin/Elements/EditCustomFields:145 html/Admin/Queues/CustomFields.html:35 html/Admin/Queues/People.html:120
 #. ($id)
 msgid "Couldn't load queue"
 msgstr "無法載入表單"
 
-#: html/Admin/Queues/GroupRights.html:122 html/Admin/Queues/UserRights.html:93
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "無法載入表單 %1"
@@ -1761,26 +1840,16 @@ msgstr "無法載入範本"
 msgid "Couldn't load that user (%1)"
 msgstr "無法載入該�使用者(%1)"
 
-#: html/SelfService/Display.html:156
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "無法載入申請單 '%1'"
 
-#: lib/RT/Ticket_Overlay.pm:2612
-#. ($args{'Base'})
-msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2611
-#. ($args{'Target'})
-msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
+#: html/Admin/Users/Modify.html:146 html/User/Prefs.html:131
 msgid "Country"
 msgstr "國家"
 
-#: html/Admin/Elements/CreateUserCalled:47 html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditScrip:132 html/Admin/Queues/Template.html:66 html/Elements/QuickCreate:68 html/Ticket/Create.html:165 html/Ticket/Create.html:226
+#: html/Admin/Elements/CreateUserCalled:25 html/Admin/Elements/EditCustomField:62 html/Admin/Elements/EditScrip:110 html/Admin/Groups/Modify.html:55 html/Admin/Queues/Template.html:44 html/Elements/QuickCreate:23 html/Ticket/Create.html:134 html/Ticket/Create.html:195 html/User/Groups/Modify.html:55
 msgid "Create"
 msgstr "新增"
 
@@ -1796,16 +1865,20 @@ msgstr "新增申請單"
 msgid "Create User:"
 msgstr "新增�員："
 
-#: html/Admin/CustomFields/Modify.html:109 html/Admin/Elements/EditCustomField:96
+#: NOT FOUND IN SOURCE
+msgid "Create a Class"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "新增自訂欄�"
 
-#: html/Admin/Queues/CustomField.html:69
+#: html/Admin/Queues/CustomField.html:47
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
 msgstr "為 %1 表單新增自訂欄�"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:47
 msgid "Create a CustomField which applies to all queues"
 msgstr "為 %1 表單新增自訂欄�"
 
@@ -1814,6 +1887,10 @@ msgid "Create a new Custom Field"
 msgstr "新增自訂欄�"
 
 #: NOT FOUND IN SOURCE
+msgid "Create a new article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create a new global Scrip"
 msgstr "新增全域手續"
 
@@ -1821,11 +1898,11 @@ msgstr "新增全域手續"
 msgid "Create a new global scrip"
 msgstr "新增全域手續"
 
-#: html/Admin/Groups/Modify.html:125 html/Admin/Groups/Modify.html:99
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "新增群組"
 
-#: html/User/Groups/Modify.html:113 html/User/Groups/Modify.html:88
+#: html/User/Groups/Modify.html:66 html/User/Groups/Modify.html:91
 msgid "Create a new personal group"
 msgstr "新增代�人群組"
 
@@ -1841,11 +1918,11 @@ msgstr "新增手續"
 msgid "Create a new template"
 msgstr "新增範本"
 
-#: html/Ticket/Create.html:46 html/Ticket/Create.html:49 html/Ticket/Create.html:57
+#: html/Ticket/Create.html:24 html/Ticket/Create.html:27 html/Ticket/Create.html:35
 msgid "Create a new ticket"
 msgstr "新增申請單"
 
-#: html/Admin/Users/Modify.html:251 html/Admin/Users/Modify.html:306
+#: html/Admin/Users/Modify.html:211 html/Admin/Users/Modify.html:268
 msgid "Create a new user"
 msgstr "新增使用者"
 
@@ -1853,7 +1930,7 @@ msgstr "新增使用者"
 msgid "Create a new workflow"
 msgstr "新增�程"
 
-#: html/Admin/Queues/Modify.html:125
+#: html/Admin/Queues/Modify.html:103
 msgid "Create a queue"
 msgstr "新增表單"
 
@@ -1865,16 +1942,16 @@ msgstr "新增表單�稱"
 msgid "Create a request"
 msgstr "�出申請"
 
-#: html/Admin/Queues/Scrip.html:80
+#: html/Admin/Queues/Scrip.html:58
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
 msgstr "為 %1 表單新增手續"
 
-#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:86
+#: html/Admin/Global/Template.html:68 html/Admin/Queues/Template.html:64
 msgid "Create a template"
 msgstr "新增範本"
 
-#: html/SelfService/Create.html:46 html/SelfService/CreateTicketInQueue.html:46
+#: html/SelfService/Create.html:24
 msgid "Create a ticket"
 msgstr "�出申請單"
 
@@ -1883,6 +1960,14 @@ msgid "Create a workflow"
 msgstr "新增�程"
 
 #: NOT FOUND IN SOURCE
+msgid "Create an article"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Create an article in class..."
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Create failed: %1 / %2 / %3 "
 msgstr "新增失敗：%1 / %2 / %3"
 
@@ -1898,19 +1983,19 @@ msgstr "建立新項目"
 msgid "Create new tickets based on this scrip's template"
 msgstr "�據此項手續內的模版，新增申請單"
 
-#: html/SelfService/Create.html:105
+#: html/SelfService/Create.html:77
 msgid "Create ticket"
 msgstr "新增申請單"
 
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "Create tickets in this queue"
 msgstr "在此表單中新增申請單"
 
-#: lib/RT/CustomField_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:73
 msgid "Create, delete and modify custom fields"
 msgstr "新增�刪除�更改自訂欄�"
 
-#: lib/RT/Queue_Overlay.pm:93
+#: lib/RT/Queue_Overlay.pm:69
 msgid "Create, delete and modify queues"
 msgstr "新增�刪除�更改表單"
 
@@ -1918,32 +2003,36 @@ msgstr "新增�刪除�更改表單"
 msgid "Create, delete and modify the members of any user's personal groups"
 msgstr "新增�刪除�更改任何使用者的代�人群組"
 
-#: lib/RT/System.pm:81
+#: lib/RT/System.pm:58
 msgid "Create, delete and modify the members of personal groups"
 msgstr "新增�刪除�更改代�人群組"
 
-#: lib/RT/System.pm:82
+#: lib/RT/System.pm:59
 msgid "Create, delete and modify users"
 msgstr "新增�刪除�更改使用者"
 
-#: lib/RT/System.pm:88
-msgid "CreateSavedSearch"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:110
+#: lib/RT/Queue_Overlay.pm:86
 msgid "CreateTicket"
 msgstr "新增申請單"
 
-#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1279
 msgid "Created"
 msgstr "新增日"
 
-#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "自訂欄� %1 新增�功"
 
 #: NOT FOUND IN SOURCE
+msgid "Created by"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Created during"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Created template %1"
 msgstr "範本 %1 新增�功"
 
@@ -1951,7 +2040,7 @@ msgstr "範本 %1 新增�功"
 msgid "Created workflow %1"
 msgstr "�程 %1 新增�功"
 
-#: html/Search/Elements/PickBasics:102
+#: html/Search/Elements/PickBasics:115
 msgid "Creator"
 msgstr "建立者"
 
@@ -1971,15 +2060,19 @@ msgstr "�有自訂欄�"
 msgid "Current Groups:"
 msgstr "�有群組列表："
 
-#: html/Elements/EditLinks:49
+#: html/Elements/EditLinks:27
 msgid "Current Links"
 msgstr "�有關係"
 
 #: NOT FOUND IN SOURCE
+msgid "Current Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Current Rights:"
 msgstr "�有權�："
 
-#: html/Admin/Elements/EditScrips:51
+#: html/Admin/Elements/EditScrips:29
 msgid "Current Scrips"
 msgstr "�有手續"
 
@@ -1995,11 +2088,11 @@ msgstr "�有範本"
 msgid "Current Watchers"
 msgstr "�有視察員"
 
-#: html/Admin/Groups/Members.html:60 html/User/Groups/Members.html:63
+#: html/Admin/Groups/Members.html:38 html/User/Groups/Members.html:41
 msgid "Current members"
 msgstr "�有�員"
 
-#: html/Admin/Elements/SelectRights:51
+#: html/Admin/Elements/SelectRights:28
 msgid "Current rights"
 msgstr "�有權�"
 
@@ -2007,20 +2100,20 @@ msgstr "�有權�"
 msgid "Current search criteria"
 msgstr "�有查詢�件"
 
-#: html/Admin/Queues/People.html:62 html/Ticket/Elements/EditPeople:66
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
 msgid "Current watchers"
 msgstr "�有視察員"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:54
+#. ($CustomField)
 msgid "Custom Field #%1"
 msgstr "自訂欄� #%1"
 
-#: html/Admin/Elements/SystemTabs:61 html/Admin/Elements/Tabs:62 html/Admin/Global/index.html:71 html/Admin/Users/Modify.html:208 html/Admin/index.html:77 html/Ticket/Elements/ShowSummary:57
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "自訂欄�"
 
-#: html/Admin/CustomFields/index.html:59
-#. ($lookup)
+#: NOT FOUND IN SOURCE
 msgid "Custom Fields for %1"
 msgstr "%1 的自訂欄�"
 
@@ -2028,19 +2121,20 @@ msgstr "%1 的自訂欄�"
 msgid "Custom Fields which apply to all queues"
 msgstr "�用於所有表單的自訂欄�"
 
-#: html/Admin/Elements/EditScrip:123
+#: html/Admin/Elements/EditScrip:101
 msgid "Custom action cleanup code"
 msgstr "動作後執行程�"
 
-#: html/Admin/Elements/EditScrip:115
+#: html/Admin/Elements/EditScrip:93
 msgid "Custom action preparation code"
 msgstr "動作�執行程�"
 
-#: html/Admin/Elements/EditScrip:107
+#: html/Admin/Elements/EditScrip:85
 msgid "Custom condition"
 msgstr "自訂�件"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1693
+#. ($CF->Name , $args{OPERATOR} , $args{VALUE})
 msgid "Custom field %1 %2 %3"
 msgstr "自訂欄� %1 %2 %3"
 
@@ -2048,30 +2142,30 @@ msgstr "自訂欄� %1 %2 %3"
 msgid "Custom field %1 does not apply to this object"
 msgstr "自訂欄� %1 ��用於此物件"
 
-#: lib/RT/Tickets_Overlay.pm:2147
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "自訂欄� %1 已有值"
 
-#: lib/RT/Tickets_Overlay.pm:2143
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "自訂欄� %1 沒有值"
 
-#: lib/RT/Record.pm:1579 lib/RT/Record.pm:1740
+#: lib/RT/Ticket_Overlay.pm:3373
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "找�到自訂欄� %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditCustomFields:195
 msgid "Custom field deleted"
 msgstr "自訂欄�已刪除"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:3523
 msgid "Custom field not found"
 msgstr "找�到自訂欄�"
 
-#: lib/RT/CustomField_Overlay.pm:1041
+#: lib/RT/CustomField_Overlay.pm:355
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "無法從自訂欄� %2 中找到 %1 這個欄�值"
@@ -2080,19 +2174,19 @@ msgstr "無法從自訂欄� %2 中找到 %1 這個欄�值"
 msgid "Custom field value changed from %1 to %2"
 msgstr "自訂欄�值從 %1 改為 %2"
 
-#: lib/RT/CustomField_Overlay.pm:414
+#: lib/RT/CustomField_Overlay.pm:255
 msgid "Custom field value could not be deleted"
 msgstr "無法刪除自訂欄�值"
 
-#: lib/RT/CustomField_Overlay.pm:1047
+#: lib/RT/CustomField_Overlay.pm:361
 msgid "Custom field value could not be found"
 msgstr "找�到自訂欄�值"
 
-#: lib/RT/CustomField_Overlay.pm:1049 lib/RT/CustomField_Overlay.pm:412
+#: lib/RT/CustomField_Overlay.pm:253 lib/RT/CustomField_Overlay.pm:363
 msgid "Custom field value deleted"
 msgstr "自訂欄�值刪除�功"
 
-#: html/Elements/SelectGroups:51 html/Elements/SelectUsers:51 lib/RT/Transaction_Overlay.pm:627
+#: lib/RT/Transaction_Overlay.pm:541
 msgid "CustomField"
 msgstr "自訂欄�"
 
@@ -2112,7 +2206,7 @@ msgstr "MySQL資料庫"
 msgid "Date of Departure"
 msgstr "出發日期"
 
-#: html/SelfService/Display.html:61 html/Ticket/Create.html:191 html/Ticket/Elements/ShowSummary:76 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:94 html/Ticket/ModifyAll.html:43
 msgid "Dates"
 msgstr "日期"
 
@@ -2120,7 +2214,7 @@ msgstr "日期"
 msgid "Dec"
 msgstr "�二月"
 
-#: lib/RT/Date.pm:448
+#: lib/RT/Date.pm:422
 msgid "Dec."
 msgstr "12"
 
@@ -2140,13 +2234,13 @@ msgstr "�設自動回應範本"
 msgid "Default Autoresponse template"
 msgstr "�設自動回應範本"
 
-#: html/Tools/Offline.html:61
+#: html/Tools/Offline.html:39
 msgid "Default Queue"
 msgstr "�設表單"
 
-#: html/Tools/Offline.html:70
+#: html/Tools/Offline.html:48
 msgid "Default Requestor"
-msgstr "�設申請人"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Default Value"
@@ -2168,7 +2262,8 @@ msgstr "�設回覆範本"
 msgid "Default transaction template"
 msgstr "�設更動範本"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:519
+#. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "�設：%1/%2 已自 %3 改為 %4"
 
@@ -2176,15 +2271,15 @@ msgstr "�設：%1/%2 已自 %3 改為 %4"
 msgid "DefaultApproval"
 msgstr "�設簽核"
 
-#: html/User/Delegation.html:46 html/User/Delegation.html:49
+#: html/User/Delegation.html:24 html/User/Delegation.html:27
 msgid "Delegate rights"
-msgstr "代�人權�"
+msgstr "代表團權�"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "Delegate specific rights which have been granted to you."
 msgstr "將�有的權�委託他人代�"
 
-#: lib/RT/System.pm:85
+#: lib/RT/System.pm:62
 msgid "DelegateRights"
 msgstr "設定代�人"
 
@@ -2236,7 +2331,7 @@ msgstr "代�人設定"
 msgid "Delegates Status"
 msgstr "代�狀態"
 
-#: html/User/Elements/Tabs:59
+#: html/User/Elements/Tabs:37
 msgid "Delegation"
 msgstr "代�人權�"
 
@@ -2248,44 +2343,39 @@ msgstr "代�人群組"
 msgid "Delegation Rights"
 msgstr "代�人權�"
 
-#: html/Admin/Elements/EditScrips:75 html/Search/Elements/EditFormat:103 html/Search/Elements/EditQuery:57 html/Search/Elements/EditSearches:63
+#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:66 html/Search/Elements/EditSearches:15
 msgid "Delete"
 msgstr "刪除"
 
-#: html/Admin/Elements/EditTemplates:79
+#: html/Admin/Elements/EditTemplates:57
 msgid "Delete Template"
-msgstr "刪除範本"
+msgstr ""
 
-#: lib/RT/SavedSearch.pm:211
-#. ($msg)
-msgid "Delete failed: %1"
+#: NOT FOUND IN SOURCE
+msgid "Delete article #%1"
 msgstr ""
 
-#: html/Admin/Elements/EditScrips:74
+#: html/Admin/Elements/EditScrips:52
 msgid "Delete selected scrips"
 msgstr "刪除指定的手續"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "Delete tickets"
 msgstr "刪除申請單"
 
-#: lib/RT/Queue_Overlay.pm:115
+#: lib/RT/Queue_Overlay.pm:91
 msgid "DeleteTicket"
 msgstr "刪除申請單"
 
-#: lib/RT/SavedSearch.pm:209
-msgid "Deleted search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:162
 msgid "Deleting this object could break referential integrity"
 msgstr "刪除此物件�能破壞�考完整性"
 
-#: lib/RT/Queue_Overlay.pm:391
+#: lib/RT/Queue_Overlay.pm:329
 msgid "Deleting this object would break referential integrity"
 msgstr "刪除此物件�能破壞�考完整性"
 
-#: lib/RT/User_Overlay.pm:513
+#: lib/RT/User_Overlay.pm:478
 msgid "Deleting this object would violate referential integrity"
 msgstr "刪除此物件會���考完整性"
 
@@ -2297,7 +2387,7 @@ msgstr "刪除此物件會���考完整性"
 msgid "Deleting this object would violate referential integrity. That's bad."
 msgstr "刪除此物件會���考完整性"
 
-#: html/Approvals/Elements/Approve:66
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "�回"
 
@@ -2333,7 +2423,7 @@ msgstr "請�單"
 msgid "Departure Until"
 msgstr "差旅截止日"
 
-#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
+#: html/Elements/EditLinks:113 html/Elements/EditLinks:44 html/Elements/ShowLinks:36 html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/ShowDependencies:31
 msgid "Depended on by"
 msgstr "�接續處�的申請單"
 
@@ -2341,27 +2431,27 @@ msgstr "�接續處�的申請單"
 msgid "Dependencies: \\n"
 msgstr "附屬性：\\n"
 
-#: lib/RT/Transaction_Overlay.pm:707
+#: lib/RT/Transaction_Overlay.pm:621
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr "已加入�接續處�的申請單 %1"
 
-#: lib/RT/Transaction_Overlay.pm:747
+#: lib/RT/Transaction_Overlay.pm:661
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr "已移除�接續處�的申請單 %1"
 
-#: lib/RT/Transaction_Overlay.pm:704
+#: lib/RT/Transaction_Overlay.pm:618
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr "已加入需先處�的申請單 %1"
 
-#: lib/RT/Transaction_Overlay.pm:744
+#: lib/RT/Transaction_Overlay.pm:658
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr "已移除需先處�的申請單 %1"
 
-#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
+#: html/Elements/EditLinks:109 html/Elements/EditLinks:35 html/Elements/SelectLinkType:26 html/Elements/ShowLinks:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/ShowDependencies:24
 msgid "Depends on"
 msgstr "需先處�"
 
@@ -2369,15 +2459,15 @@ msgstr "需先處�"
 msgid "DependsOn"
 msgstr "需先處�"
 
-#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
+#: html/Elements/SelectSortOrder:34 html/Search/Elements/DisplayOptions:57
 msgid "Descending"
 msgstr "�減"
 
-#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
+#: html/SelfService/Create.html:72 html/Ticket/Create.html:118
 msgid "Describe the issue below"
 msgstr "在以下欄��述主題"
 
-#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Elements/SelectGroups:26 html/Search/Elements/EditSearches:8 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "�述"
 
@@ -2409,31 +2499,31 @@ msgstr "殘障類別"
 msgid "Disabled"
 msgstr "�用"
 
-#: html/Search/Elements/EditFormat:71 html/Ticket/Elements/Tabs:108
+#: html/Ticket/Elements/Tabs:86
 msgid "Display"
 msgstr "顯示內容"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "Display Access Control List"
 msgstr "顯示權�控制清單"
 
-#: html/Search/Elements/DisplayOptions:46
+#: html/Search/Elements/DisplayOptions:25
 msgid "Display Columns"
 msgstr "顯示欄�"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "Display Scrip templates for this queue"
 msgstr "顯示此表單的範本"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "Display Scrips for this queue"
 msgstr "顯示此表單的手續"
 
-#: html/Ticket/Elements/ShowHistory:56
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "顯示模�"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "Display saved searches for this group"
 msgstr "顯示此群組已儲存的查詢"
 
@@ -2441,19 +2531,15 @@ msgstr "顯示此群組已儲存的查詢"
 msgid "Display ticket #%1"
 msgstr "顯示第%1號申請單"
 
-#: html/Elements/Footer:60
+#: html/Elements/Footer:38
 msgid "Distributed under version 2 <a href=\"http://www.gnu.org/copyleft/gpl.html\"> of the GNU GPL.</a>"
 msgstr "� <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU 通用公共授權</a> 第二版散布。"
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "Do anything and everything"
 msgstr "�許一切�作"
 
-#: html/Search/Build.html:112
-msgid "Do the Search"
-msgstr ""
-
-#: html/Elements/Refresh:51
+#: html/Elements/Refresh:29
 msgid "Don't refresh this page."
 msgstr "�更新此��。"
 
@@ -2469,11 +2555,15 @@ msgstr "完�"
 msgid "Down"
 msgstr "下一�"
 
-#: html/Ticket/Elements/ShowTransactionAttachments:82
+#: html/Ticket/Elements/ShowTransactionAttachments:60
 msgid "Download"
 msgstr "下載"
 
-#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
+#: NOT FOUND IN SOURCE
+msgid "Download all the tickets as a tab delimited file"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Download as a tab-delimited file"
 msgstr "下載以 Tab 分隔的檔案"
 
@@ -2481,7 +2571,7 @@ msgstr "下載以 Tab 分隔的檔案"
 msgid "Dr."
 msgstr "�士"
 
-#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1283
 msgid "Due"
 msgstr "到期日"
 
@@ -2505,40 +2595,36 @@ msgstr "編輯"
 msgid "Edit Conditions"
 msgstr "編輯�置�件"
 
-#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
-#. ($Object->Name)
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "編輯 %1 的自訂欄�"
 
-#: html/Admin/Global/CustomFields/Groups.html:9
-msgid "Edit Custom Fields for all groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/Users.html:9
-msgid "Edit Custom Fields for all users"
+#: NOT FOUND IN SOURCE
+msgid "Edit Custom Fields for Class %1"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Edit Custom Fields for queue %1"
 msgstr "編輯表單 %1 的自訂欄�"
 
-#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
-msgid "Edit Custom Fields for tickets in all queues"
-msgstr ""
-
-#: html/Search/Bulk.html:173 html/Ticket/ModifyLinks.html:57
+#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
 msgid "Edit Links"
 msgstr "編輯申請單關係"
 
-#: html/Search/Edit.html:68
+#: html/Search/Edit.html:46
 msgid "Edit Query"
 msgstr "編輯查詢"
 
 #: NOT FOUND IN SOURCE
+msgid "Edit Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Edit Subgroups"
 msgstr "新增/維護�群組"
 
-#: html/Admin/Queues/Templates.html:63
+#: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
 msgstr "編輯表單 %1 的範本"
@@ -2551,7 +2637,7 @@ msgstr "編輯表單 %1 的�程"
 msgid "Edit keywords"
 msgstr "編輯關�字"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "Edit saved searches for this group"
 msgstr "編輯此群組已儲存的查詢"
 
@@ -2559,7 +2645,7 @@ msgstr "編輯此群組已儲存的查詢"
 msgid "Edit scrips"
 msgstr "編輯手續"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:60 html/Admin/Global/index.html:67
+#: html/Admin/Global/index.html:45
 msgid "Edit system templates"
 msgstr "編輯全域範本"
 
@@ -2575,11 +2661,15 @@ msgstr "編輯 %1 的範本"
 msgid "Edit workflows for %1"
 msgstr "編輯 %1 的�程"
 
-#: lib/RT/Group_Overlay.pm:175
+#: lib/RT/Group_Overlay.pm:150
 msgid "EditSavedSearches"
 msgstr "編輯已儲存的查詢"
 
-#: html/Admin/Queues/Modify.html:140
+#: NOT FOUND IN SOURCE
+msgid "Editing Configuration for Class %1"
+msgstr ""
+
+#: html/Admin/Queues/Modify.html:118
 #. ($QueueObj->Name)
 msgid "Editing Configuration for queue %1"
 msgstr "編輯表單 %1 的設定"
@@ -2588,17 +2678,17 @@ msgstr "編輯表單 %1 的設定"
 msgid "Editing Configuration for user %1"
 msgstr "編輯使用者 %1 的設定"
 
-#: html/Admin/CustomFields/Modify.html:125 html/Admin/Elements/EditCustomField:120
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "編輯自訂欄� %1"
 
-#: html/Admin/Groups/Members.html:53
+#: html/Admin/Groups/Members.html:31
 #. ($Group->Name)
 msgid "Editing membership for group %1"
 msgstr "編輯群組 %1 的�員資訊"
 
-#: html/User/Groups/Members.html:150
+#: html/User/Groups/Members.html:128
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
 msgstr "編輯代�人群組 %1 的�員資訊"
@@ -2619,11 +2709,11 @@ msgstr "最高學歷"
 msgid "EffectiveId"
 msgstr "有效編號"
 
-#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
+#: lib/RT/Record.pm:1075 lib/RT/Record.pm:1152
 msgid "Either base or target must be specified"
 msgstr "需�指定起始申請單或目的申請單"
 
-#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
+#: html/Admin/Users/Modify.html:52 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
 msgid "Email"
 msgstr "電�郵件信箱"
 
@@ -2631,7 +2721,7 @@ msgstr "電�郵件信箱"
 msgid "Email Address"
 msgstr "電�郵件信箱"
 
-#: lib/RT/User_Overlay.pm:236
+#: lib/RT/User_Overlay.pm:206
 msgid "Email address in use"
 msgstr "此電�郵件信箱已被使用"
 
@@ -2659,19 +2749,27 @@ msgstr "抵�地點"
 msgid "Enable Delegates"
 msgstr "代�啟動"
 
-#: html/Admin/CustomFields/Modify.html:83 html/Admin/Elements/EditCustomField:72
+#: NOT FOUND IN SOURCE
+msgid "Enabled (Unchecking this box disables this Class)"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr "啟用(�消勾�將�用此自訂欄�)"
 
-#: html/Admin/Groups/Modify.html:84 html/User/Groups/Modify.html:74
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "啟用(�消勾�將�用此群組)"
 
-#: html/Admin/Queues/Modify.html:105
+#: html/Admin/Queues/Modify.html:83
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "啟用(�消勾�將�用此表單)"
 
 #: NOT FOUND IN SOURCE
+msgid "Enabled Classes"
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
 msgstr "已啟用的自訂欄�"
 
@@ -2683,7 +2781,7 @@ msgstr "啟用日期"
 msgid "Enabled Date:"
 msgstr "啟動日期："
 
-#: html/Admin/Queues/index.html:78
+#: html/Admin/Queues/index.html:55
 msgid "Enabled Queues"
 msgstr "已啟用的表單"
 
@@ -2691,13 +2789,12 @@ msgstr "已啟用的表單"
 msgid "Enabled Status"
 msgstr "啟用狀態"
 
-#: html/Admin/Elements/EditCustomField:136 html/Admin/Groups/Modify.html:150 html/Admin/Users/Modify.html:342 html/User/Groups/Modify.html:138
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:308 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "啟用狀態 %1"
 
-#: html/Admin/CustomFields/Modify.html:143 html/Admin/Queues/Modify.html:162
-#. (loc_fuzzy($msg))
+#: NOT FOUND IN SOURCE
 msgid "Enabled status: %1"
 msgstr "啟用狀態: %1"
 
@@ -2709,11 +2806,15 @@ msgstr "試用期滿日"
 msgid "English Name"
 msgstr "英文姓�"
 
-#: lib/RT/CustomField_Overlay.pm:64
+#: NOT FOUND IN SOURCE
+msgid "Enter Articles or URIs to link Articles to. Seperate multiple entries with spaces."
+msgstr ""
+
+#: lib/RT/CustomField_Overlay.pm:433
 msgid "Enter multiple values"
 msgstr "�入多�項目"
 
-#: html/Elements/EditLinks:124
+#: html/Elements/EditLinks:99
 msgid "Enter objects or URIs to link objects to. Separate multiple entries with spaces."
 msgstr "�入欲將物件連�至的物件或 URI。項目之間請以空白隔開。"
 
@@ -2721,19 +2822,23 @@ msgstr "é�µå…¥æ¬²å°‡ç‰©ä»¶é€£çµ�至的物件或 URI。項目之間請以空白éš
 msgid "Enter one or more conditions below to search for users"
 msgstr "�入下列單一或複��件，查詢用戶資料"
 
-#: lib/RT/CustomField_Overlay.pm:65
+#: lib/RT/CustomField_Overlay.pm:430
 msgid "Enter one value"
 msgstr "�入單一項目"
 
-#: html/Elements/EditLinks:121
+#: html/Elements/EditLinks:97
 msgid "Enter queues or URIs to link queues to. Separate multiple entries with spaces."
 msgstr "�入欲將表單連�至的物件或 URI。項目之間請以空白隔開。"
 
-#: html/Elements/EditLinks:117 html/Search/Bulk.html:174
+#: html/Elements/EditLinks:95
 msgid "Enter tickets or URIs to link tickets to. Separate multiple entries with spaces."
+msgstr "�入欲將申請單連�至的物件或 URI。項目之間請以空白隔開。"
+
+#: html/Search/Bulk.html:142
+msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "�入申請單���到的申請單編號或網�。項目之間請以空白隔開。"
 
-#: lib/RT/CustomField_Overlay.pm:66
+#: NOT FOUND IN SOURCE
 msgid "Enter up to %1 values"
 msgstr "�入最多 %1 個值"
 
@@ -2769,7 +2874,7 @@ msgstr "單�填表"
 msgid "EntryTime"
 msgstr "時間填表"
 
-#: html/Elements/Login:61 html/SelfService/Error.html:46 html/SelfService/Error.html:47
+#: html/Elements/Login:39 html/SelfService/Error.html:24 html/SelfService/Error.html:25
 msgid "Error"
 msgstr "錯誤"
 
@@ -2777,23 +2882,31 @@ msgstr "錯誤"
 msgid "Error adding watcher"
 msgstr "新增視察員失敗"
 
-#: lib/RT/Queue_Overlay.pm:669
+#: lib/RT/Queue_Overlay.pm:593
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "表單->新增視察員的�數有誤"
 
-#: lib/RT/Queue_Overlay.pm:830
-msgid "Error in parameters to Queue->DeleteWatcher"
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Queue->DelWatcher"
 msgstr "表單->刪除視察員的�數有誤"
 
-#: lib/RT/Ticket_Overlay.pm:1333
+#: lib/RT/Queue_Overlay.pm:754
+msgid "Error in parameters to Queue->DeleteWatcher"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:1468
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "申請單->新增視察員的�數有誤"
 
-#: lib/RT/Ticket_Overlay.pm:1499
-msgid "Error in parameters to Ticket->DeleteWatcher"
+#: NOT FOUND IN SOURCE
+msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "申請單->刪除視察員的�數有誤"
 
-#: bin/rt-crontool:233
+#: lib/RT/Ticket_Overlay.pm:1630
+msgid "Error in parameters to Ticket->DeleteWatcher"
+msgstr ""
+
+#: bin/rt-crontool:206
 msgid "Escalate tickets"
 msgstr "調整申請單優先等級"
 
@@ -2801,7 +2914,7 @@ msgstr "調整申請單優先等級"
 msgid "Estimate"
 msgstr "�計"
 
-#: html/Ticket/Elements/ShowBasics:57
+#: html/Ticket/Elements/ShowBasics:35
 msgid "Estimated"
 msgstr "�計"
 
@@ -2809,7 +2922,7 @@ msgstr "�計"
 msgid "Everyone"
 msgstr "所有人"
 
-#: bin/rt-crontool:219
+#: bin/rt-crontool:190
 msgid "Example:"
 msgstr "範例："
 
@@ -2845,37 +2958,36 @@ msgstr "外部資料庫用戶"
 msgid "ExternalURL"
 msgstr "外部介�網�"
 
-#: html/Admin/Users/Modify.html:99
+#: html/Admin/Users/Modify.html:72
 msgid "Extra info"
 msgstr "備註"
 
-#: lib/RT/SavedSearch.pm:165
-msgid "Failed to create search attribute"
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1"
 msgstr ""
 
-#: lib/RT/User_Overlay.pm:377
+#: NOT FOUND IN SOURCE
+msgid "Extract article from ticket #%1 into class %2"
+msgstr ""
+
+#: lib/RT/User_Overlay.pm:342
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "找�到「內部�員�虛擬群組的使用者。"
 
-#: lib/RT/User_Overlay.pm:384
+#: lib/RT/User_Overlay.pm:349
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "找�到「�內部�員�虛擬群組的使用者。"
 
-#: bin/rt-crontool:163
+#: bin/rt-crontool:134
 #. ($modname, $@)
 msgid "Failed to load module %1. (%2)"
 msgstr "無法載入模組 %1. (%2)"
 
-#: lib/RT/SavedSearch.pm:168
-#. ($privacy)
-msgid "Failed to load object for %1"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Feb"
 msgstr "二月"
 
-#: lib/RT/Date.pm:438
+#: lib/RT/Date.pm:412
 msgid "Feb."
 msgstr "02"
 
@@ -2903,34 +3015,22 @@ msgstr "欄��稱"
 msgid "Field Type"
 msgstr "欄�類別"
 
-#: html/Elements/SelectAttachmentField:50
+#: html/Elements/SelectAttachmentField:28
 msgid "Filename"
 msgstr "檔�"
 
-#: lib/RT/CustomField_Overlay.pm:69
+#: NOT FOUND IN SOURCE
 msgid "Fill in multiple text areas"
 msgstr "填入多個文字框"
 
-#: lib/RT/CustomField_Overlay.pm:74
-msgid "Fill in multiple wikitext areas"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:70
+#: NOT FOUND IN SOURCE
 msgid "Fill in one text area"
 msgstr "填入一個文字框"
 
-#: lib/RT/CustomField_Overlay.pm:75
-msgid "Fill in one wikitext area"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:71
+#: NOT FOUND IN SOURCE
 msgid "Fill in up to %1 text areas"
 msgstr "填入最多 %1 個文字框"
 
-#: lib/RT/CustomField_Overlay.pm:76
-msgid "Fill in up to %1 wikitext areas"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Filter"
 msgstr "篩�"
@@ -2947,11 +3047,11 @@ msgstr "篩�列表："
 msgid "Fin"
 msgstr "最終"
 
-#: html/Search/Elements/PickBasics:162 html/Ticket/Create.html:185 html/Ticket/Elements/EditBasics:79 lib/RT/Tickets_Overlay.pm:1569
+#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1153
 msgid "Final Priority"
 msgstr "最終順�"
 
-#: lib/RT/Ticket_Overlay.pm:1140
+#: lib/RT/Ticket_Overlay.pm:1274
 msgid "FinalPriority"
 msgstr "最終順�"
 
@@ -2959,11 +3059,11 @@ msgstr "最終順�"
 msgid "Financial Department:"
 msgstr "財務部："
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
 msgid "Find group whose"
 msgstr "尋找群組的"
 
-#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
+#: NOT FOUND IN SOURCE
 msgid "Find groups whose"
 msgstr "尋找群組的"
 
@@ -2971,7 +3071,7 @@ msgstr "尋找群組的"
 msgid "Find new/open tickets"
 msgstr "尋找/開啟申請單"
 
-#: html/Admin/Queues/People.html:78 html/Admin/Users/index.html:70 html/Ticket/Elements/EditPeople:51
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Ticket/Elements/EditPeople:29
 msgid "Find people whose"
 msgstr "尋找人員的"
 
@@ -2979,7 +3079,7 @@ msgstr "尋找人員的"
 msgid "Find queues whose"
 msgstr "尋找表單的"
 
-#: html/Search/Results.html:109
+#: html/Search/Results.html:72
 msgid "Find tickets"
 msgstr "尋找申請單"
 
@@ -2987,7 +3087,7 @@ msgstr "尋找申請單"
 msgid "Finish Approval"
 msgstr "簽核完畢"
 
-#: html/Ticket/Elements/Tabs:81
+#: html/Ticket/Elements/Tabs:59
 msgid "First"
 msgstr "第一項"
 
@@ -3011,15 +3111,15 @@ msgstr "一階主管員工"
 msgid "Fixed shift"
 msgstr "固定�"
 
-#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:766
+#: docs/design_docs/string-extraction-guide.txt:33 lib/RT/StyleGuide.pod:746
 msgid "Foo Bar Baz"
 msgstr "甲 乙 丙"
 
-#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:757
+#: docs/design_docs/string-extraction-guide.txt:24 lib/RT/StyleGuide.pod:737
 msgid "Foo!"
 msgstr "甲�"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:84
 msgid "Force change"
 msgstr "強制更�"
 
@@ -3027,16 +3127,12 @@ msgstr "強制更�"
 msgid "Form Processing"
 msgstr "電�表單作業�"
 
-#: html/Search/Elements/EditFormat:52
-msgid "Format"
-msgstr ""
-
-#: html/Search/Results.html:107
+#: html/Search/Results.html:70
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "找到 %1 張申請單"
 
-#: lib/RT/Record.pm:942
+#: lib/RT/Record.pm:750
 msgid "Found Object"
 msgstr "已找到物件"
 
@@ -3060,7 +3156,7 @@ msgstr "日期輸入"
 msgid "FreeformExternal"
 msgstr "系統欄�"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:37
 msgid "FreeformMultiple"
 msgstr "多�輸入"
 
@@ -3072,7 +3168,7 @@ msgstr "數值輸入"
 msgid "FreeformPassword"
 msgstr "密碼輸入"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:36
 msgid "FreeformSingle"
 msgstr "單一輸入"
 
@@ -3084,11 +3180,11 @@ msgstr "時間輸入"
 msgid "Fri"
 msgstr "星期五"
 
-#: lib/RT/Date.pm:417
+#: lib/RT/Date.pm:392
 msgid "Fri."
 msgstr "星期五"
 
-#: html/Ticket/Elements/ShowHistory:62 html/Ticket/Elements/ShowHistory:72
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "完整標頭檔"
 
@@ -3100,7 +3196,7 @@ msgstr "登入帳號"
 msgid "Gender"
 msgstr "性別"
 
-#: html/Tools/Offline.html:87
+#: html/Tools/Offline.html:65
 msgid "Get template from file"
 msgstr "�出檔案裡的範本"
 
@@ -3108,12 +3204,12 @@ msgstr "�出檔案裡的範本"
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "�得目�使用者的 pgp 簽章\\n"
 
-#: lib/RT/Transaction_Overlay.pm:673
+#: lib/RT/Transaction_Overlay.pm:587
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "交予 %1"
 
-#: html/Admin/Elements/Tabs:65 html/Admin/index.html:82
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "全域設定"
 
@@ -3121,7 +3217,7 @@ msgstr "全域設定"
 msgid "Global Approval"
 msgstr "全域簽核"
 
-#: html/Admin/Elements/EditCustomFields:55
+#: NOT FOUND IN SOURCE
 msgid "Global Custom Fields"
 msgstr "全域自訂欄�"
 
@@ -3141,11 +3237,7 @@ msgstr "全域手續"
 msgid "Global Setup"
 msgstr "全域設定"
 
-#: html/Admin/Global/CustomFields/index.html:59
-msgid "Global custom field configuration"
-msgstr ""
-
-#: html/Admin/Elements/SelectTemplate:59
+#: html/Admin/Elements/SelectTemplate:37
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "全域範本：%1"
@@ -3154,11 +3246,11 @@ msgstr "全域範本：%1"
 msgid "GlobalApproval"
 msgstr "全域簽核"
 
-#: html/Tools/Offline.html:91
+#: html/Tools/Offline.html:69
 msgid "Go"
 msgstr "執行"
 
-#: html/Admin/Groups/index.html:67 html/Admin/Groups/index.html:73 html/Admin/Queues/People.html:80 html/Admin/Queues/People.html:84 html/Admin/Queues/index.html:66 html/Admin/Users/index.html:73 html/Search/Results.html:76 html/Ticket/Elements/EditPeople:53 html/Ticket/Elements/EditPeople:57 html/index.html:91
+#: html/Admin/Elements/EditCustomFields:73 html/Admin/Groups/index.html:39 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:48 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:69
 msgid "Go!"
 msgstr "執行"
 
@@ -3170,7 +3262,7 @@ msgstr "%1 的 pgp 簽章是正確的\\n"
 msgid "Goto page"
 msgstr "到��"
 
-#: html/Elements/GotoTicket:46 html/SelfService/Elements/GotoTicket:46
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
 msgid "Goto ticket"
 msgstr "跳到申請單"
 
@@ -3178,7 +3270,7 @@ msgstr "跳到申請單"
 msgid "Grand"
 msgstr "上"
 
-#: html/Ticket/Elements/AddWatchers:67 html/Ticket/Elements/ShowGroupMembers:55 html/User/Elements/DelegateRights:99
+#: html/Ticket/Elements/AddWatchers:45 html/Ticket/Elements/ShowGroupMembers:33 html/User/Elements/DelegateRights:77
 msgid "Group"
 msgstr "群組"
 
@@ -3210,7 +3302,7 @@ msgstr "群組�稱"
 msgid "Group Name:"
 msgstr "群組�稱："
 
-#: html/Admin/Elements/CustomFieldTabs:68 html/Admin/Elements/GroupTabs:66 html/Admin/Elements/QueueTabs:82 html/Admin/Elements/SystemTabs:65 html/Admin/Global/index.html:76
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
 msgid "Group Rights"
 msgstr "群組權�"
 
@@ -3226,7 +3318,7 @@ msgstr "群組設定"
 msgid "Group Status"
 msgstr "群組狀態"
 
-#: lib/RT/Group_Overlay.pm:991
+#: lib/RT/Group_Overlay.pm:957
 msgid "Group already has member"
 msgstr "群組內已有此�員"
 
@@ -3234,12 +3326,12 @@ msgstr "群組內已有此�員"
 msgid "Group could not be created."
 msgstr "無法新增群組"
 
-#: html/Admin/Groups/Modify.html:109
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "無法新增群組：%1"
 
-#: lib/RT/Group_Overlay.pm:529
+#: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
 msgstr "群組新增完畢"
 
@@ -3247,11 +3339,11 @@ msgstr "群組新增完畢"
 msgid "Group created: %1"
 msgstr "群組 %1 新增完畢"
 
-#: lib/RT/Group_Overlay.pm:1163
+#: lib/RT/Group_Overlay.pm:1129
 msgid "Group has no such member"
 msgstr "群組沒有這個�員"
 
-#: lib/RT/Group_Overlay.pm:971 lib/RT/Queue_Overlay.pm:745 lib/RT/Queue_Overlay.pm:805 lib/RT/Ticket_Overlay.pm:1391 lib/RT/Ticket_Overlay.pm:1471
+#: lib/RT/Group_Overlay.pm:937 lib/RT/Queue_Overlay.pm:669 lib/RT/Queue_Overlay.pm:729 lib/RT/Ticket_Overlay.pm:1522 lib/RT/Ticket_Overlay.pm:1602
 msgid "Group not found"
 msgstr "找�到群組"
 
@@ -3283,19 +3375,19 @@ msgstr "群組之"
 msgid "Group:"
 msgstr "群組："
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
+#: html/Admin/Elements/SelectNewGroupMembers:34 html/Admin/Elements/Tabs:34 html/Admin/Groups/Members.html:63 html/Admin/Queues/People.html:82 html/Admin/index.html:31 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "群組"
 
-#: lib/RT/Group_Overlay.pm:997
+#: lib/RT/Group_Overlay.pm:963
 msgid "Groups can't be members of their members"
 msgstr "�能將群組設為群組內�員"
 
-#: html/Admin/Groups/index.html:82
+#: NOT FOUND IN SOURCE
 msgid "Groups matching search criteria"
 msgstr "符�查詢�件的群組"
 
-#: html/Ticket/Elements/ShowRequestor:77
+#: NOT FOUND IN SOURCE
 msgid "Groups this user belongs to"
 msgstr "使用者所屬的群組"
 
@@ -3315,11 +3407,11 @@ msgstr "HTML 屬性"
 msgid "Health Insurance"
 msgstr "��補助身份"
 
-#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
+#: lib/RT/Interface/CLI.pm:72 lib/RT/Interface/CLI.pm:72
 msgid "Hello!"
 msgstr "嗨�"
 
-#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
+#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:753
 #. ($name)
 msgid "Hello, %1"
 msgstr "嗨，%1"
@@ -3336,17 +3428,19 @@ msgstr "�項業務窗�"
 msgid "Hidden"
 msgstr "隱�"
 
-#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
 msgid "History"
 msgstr "紀錄"
 
-#: html/Admin/Groups/History.html:62
-#. ($GroupObj->Name)
+#: NOT FOUND IN SOURCE
+msgid "History for article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "History of the group %1"
 msgstr "群組 %1 的紀錄"
 
-#: html/Admin/Users/History.html:62
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "History of the user %1"
 msgstr "使用者 %1 的紀錄"
 
@@ -3354,7 +3448,7 @@ msgstr "使用者 %1 的紀錄"
 msgid "HomePhone"
 msgstr "�處電話"
 
-#: html/Elements/Tabs:65
+#: html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "主�"
 
@@ -3362,13 +3456,13 @@ msgstr "主�"
 msgid "Hotel Expense"
 msgstr "�宿費"
 
-#: lib/RT/Base.pm:110
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "我有 %quant(%1,份固體攪拌器)。"
 
-#: html/Search/Build.html:637
-msgid "I'm lost"
+#: NOT FOUND IN SOURCE
+msgid "I have [quant,_1,concrete mixer]."
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -3379,11 +3473,11 @@ msgstr "身分證號"
 msgid "ID Type"
 msgstr "身分類別"
 
-#: html/Ticket/Elements/ShowBasics:48 lib/RT/Tickets_Overlay.pm:1494
+#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1080
 msgid "Id"
 msgstr "編號"
 
-#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
 msgid "Identity"
 msgstr "身份"
 
@@ -3391,23 +3485,23 @@ msgstr "身份"
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "若簽核單�到�回，則連帶�回原申請單，並刪除其他相關的待簽核事項"
 
-#: html/Tools/Offline.html:74
+#: html/Tools/Offline.html:52
 msgid "If no Requestor is specified, create tickets with this requestor."
-msgstr "若沒有指定申請者，則以此使用者作為申請者"
+msgstr ""
 
-#: html/Tools/Offline.html:65
+#: html/Tools/Offline.html:43
 msgid "If no queue is specified, create tickets in this queue."
 msgstr "申請單若沒有指定表單，則將它新增在此表單內"
 
-#: bin/rt-crontool:215
+#: bin/rt-crontool:186
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
 msgstr "如果此工具程�為 setgid，惡�的本地端用戶�能由此�得 RT 的管�員權�。"
 
-#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
+#: html/Admin/Queues/People.html:104 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyPeople.html:37
 msgid "If you've updated anything above, be sure to"
 msgstr "若您已更新以上資料，請記得按一下"
 
-#: lib/RT/Record.pm:933
+#: lib/RT/Record.pm:742
 msgid "Illegal value for %1"
 msgstr "%1 的值錯誤"
 
@@ -3415,7 +3509,7 @@ msgstr "%1 的值錯誤"
 msgid "Image"
 msgstr "圖片"
 
-#: lib/RT/Record.pm:936
+#: lib/RT/Record.pm:745
 msgid "Immutable field"
 msgstr "此欄�值��更動"
 
@@ -3424,42 +3518,38 @@ msgid "Import"
 msgstr "匯入"
 
 #: NOT FOUND IN SOURCE
+msgid "Include disabled classes in listing."
+msgstr ""
+
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "列出�用的自訂欄�"
 
-#: html/Admin/Groups/index.html:65
+#: html/Admin/Groups/index.html:37
 msgid "Include disabled groups in listing."
 msgstr "列出�用的群組"
 
-#: html/Admin/Queues/index.html:65
+#: html/Admin/Queues/index.html:42
 msgid "Include disabled queues in listing."
 msgstr "列出�用的表單"
 
-#: html/Admin/Users/index.html:71
+#: html/Admin/Users/index.html:46
 msgid "Include disabled users in search."
 msgstr "列出�用的使用者"
 
-#: html/Search/Build.html:663
-msgid "Incomplete Query"
-msgstr ""
-
-#: html/Search/Build.html:660
-msgid "Incomplete query"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Indirect Employee"
 msgstr "直接/間接員工"
 
-#: html/Search/Elements/PickBasics:161 lib/RT/Tickets_Overlay.pm:1544
+#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1129
 msgid "Initial Priority"
 msgstr "�始優先順�"
 
-#: lib/RT/Ticket_Overlay.pm:1139 lib/RT/Ticket_Overlay.pm:1141
+#: lib/RT/Ticket_Overlay.pm:1273 lib/RT/Ticket_Overlay.pm:1275
 msgid "InitialPriority"
 msgstr "�始優先順�"
 
-#: lib/RT/ScripAction_Overlay.pm:134
+#: lib/RT/ScripAction_Overlay.pm:97
 msgid "Input error"
 msgstr "輸入錯誤"
 
@@ -3467,20 +3557,20 @@ msgstr "輸入錯誤"
 msgid "Interest noted"
 msgstr "登記�功"
 
-#: lib/RT/Ticket_Overlay.pm:3454
+#: lib/RT/Ticket_Overlay.pm:3797
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: lib/RT/Record.pm:305
+#: lib/RT/Record.pm:186
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "內部錯誤：%1"
 
-#: lib/RT/Group_Overlay.pm:676
+#: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
 msgstr "錯誤的群組類別"
 
-#: lib/RT/Principal_Overlay.pm:161
+#: lib/RT/Principal_Overlay.pm:127
 msgid "Invalid Right"
 msgstr "錯誤的權�"
 
@@ -3488,7 +3578,7 @@ msgstr "錯誤的權�"
 msgid "Invalid Type"
 msgstr "錯誤的類型"
 
-#: lib/RT/Record.pm:938
+#: lib/RT/Record.pm:747
 msgid "Invalid data"
 msgstr "錯誤的資料"
 
@@ -3496,24 +3586,24 @@ msgstr "錯誤的資料"
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "錯誤的承辦人。改為�設承辦人「nobody�。"
 
-#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
+#: lib/RT/Scrip_Overlay.pm:133 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
 msgstr "錯誤的表單"
 
-#: lib/RT/ACE_Overlay.pm:265 lib/RT/ACE_Overlay.pm:274 lib/RT/ACE_Overlay.pm:280 lib/RT/ACE_Overlay.pm:291
+#: lib/RT/ACE_Overlay.pm:243 lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:269 lib/RT/ACE_Overlay.pm:274
 msgid "Invalid right"
 msgstr "錯誤的權�"
 
-#: lib/RT/Record.pm:280
+#: lib/RT/Record.pm:161
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "%1 的值錯誤"
 
-#: lib/RT/Record.pm:1597
+#: lib/RT/Ticket_Overlay.pm:3380
 msgid "Invalid value for custom field"
 msgstr "錯誤的自訂欄�值"
 
-#: lib/RT/Ticket_Overlay.pm:413
+#: lib/RT/Ticket_Overlay.pm:385
 msgid "Invalid value for status"
 msgstr "錯誤的狀態值"
 
@@ -3521,22 +3611,18 @@ msgstr "錯誤的狀態值"
 msgid "IssueStatement"
 msgstr "�出陳述"
 
-#: bin/rt-crontool:216
+#: bin/rt-crontool:187
 msgid "It is incredibly important that nonprivileged users not be allowed to run this tool."
 msgstr "請絕���讓未具權�的使用者執行此工具程�。"
 
-#: bin/rt-crontool:217
+#: bin/rt-crontool:188
 msgid "It is suggested that you create a non-privileged unix user with the correct group membership and RT access to run this tool."
 msgstr "建議您新增一個隸屬於正確群組的低權�系統使用者，並以該身份執行此工具程�。"
 
-#: bin/rt-crontool:188
+#: bin/rt-crontool:159
 msgid "It takes several arguments:"
 msgstr "它接�下列�數："
 
-#: html/Search/Elements/EditFormat:85
-msgid "Italic"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Item Name"
 msgstr "��"
@@ -3553,7 +3639,7 @@ msgstr "待簽核項目"
 msgid "Jan"
 msgstr "一月"
 
-#: lib/RT/Date.pm:437
+#: lib/RT/Date.pm:411
 msgid "Jan."
 msgstr "01"
 
@@ -3565,7 +3651,7 @@ msgstr "一月"
 msgid "Job"
 msgstr "�稱"
 
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "加入或離開此群組"
 
@@ -3573,7 +3659,7 @@ msgstr "加入或離開此群組"
 msgid "Jul"
 msgstr "七月"
 
-#: lib/RT/Date.pm:443
+#: lib/RT/Date.pm:417
 msgid "Jul."
 msgstr "07"
 
@@ -3581,7 +3667,7 @@ msgstr "07"
 msgid "July"
 msgstr "七月"
 
-#: html/Ticket/Elements/Tabs:122
+#: html/Ticket/Elements/Tabs:100
 msgid "Jumbo"
 msgstr "全部資訊"
 
@@ -3589,7 +3675,7 @@ msgstr "全部資訊"
 msgid "Jun"
 msgstr "六月"
 
-#: lib/RT/Date.pm:442
+#: lib/RT/Date.pm:416
 msgid "Jun."
 msgstr "06"
 
@@ -3621,23 +3707,23 @@ msgstr "��標籤"
 msgid "Lang"
 msgstr "使用語言"
 
-#: html/Admin/Users/Modify.html:94 html/User/Prefs.html:76
+#: html/User/Prefs.html:54
 msgid "Language"
 msgstr "語言"
 
-#: html/Search/Elements/EditFormat:79
-msgid "Large"
-msgstr ""
-
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:74
 msgid "Last"
 msgstr "上次更新"
 
-#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
 msgid "Last Contact"
 msgstr "上次�絡"
 
-#: html/Elements/SelectDateType:50
+#: NOT FOUND IN SOURCE
+msgid "Last Contact</a>"
+msgstr ""
+
+#: html/Elements/SelectDateType:28
 msgid "Last Contacted"
 msgstr "上次�絡日期"
 
@@ -3645,7 +3731,7 @@ msgstr "上次�絡日期"
 msgid "Last Notified"
 msgstr "上次通知"
 
-#: html/Elements/SelectDateType:51
+#: html/Elements/SelectDateType:29
 msgid "Last Updated"
 msgstr "上次更新"
 
@@ -3653,19 +3739,19 @@ msgstr "上次更新"
 msgid "LastUpdated"
 msgstr "上次更新"
 
-#: html/Search/Elements/PickBasics:103
+#: html/Search/Elements/PickBasics:116
 msgid "LastUpdatedBy"
 msgstr "上次更新者"
 
-#: html/Ticket/Elements/ShowBasics:68
+#: html/Ticket/Elements/ShowBasics:46
 msgid "Left"
 msgstr "剩餘時間"
 
-#: html/Admin/Users/Modify.html:109
+#: html/Admin/Users/Modify.html:82
 msgid "Let this user access RT"
 msgstr "�許這�使用者登入"
 
-#: html/Admin/Users/Modify.html:113
+#: html/Admin/Users/Modify.html:86
 msgid "Let this user be granted rights"
 msgstr "內部�員（具有個人權�）"
 
@@ -3677,37 +3763,33 @@ msgstr "�制承辦人為 %1 到%2"
 msgid "Limiting queue to %1 %2"
 msgstr "�制表單為 %1 到 %2"
 
-#: html/Search/Elements/EditFormat:68
-msgid "Link"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Link a Queue"
 msgstr "申請表單連�"
 
-#: lib/RT/Record.pm:1292
+#: lib/RT/Record.pm:1086
 msgid "Link already exists"
 msgstr "此��已存在"
 
-#: lib/RT/Record.pm:1306
+#: lib/RT/Record.pm:1100
 msgid "Link could not be created"
 msgstr "無法新增��"
 
-#: lib/RT/Record.pm:1312
+#: lib/RT/Record.pm:1106
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "��(%1)新增完畢"
 
-#: lib/RT/Record.pm:1373
+#: lib/RT/Record.pm:1167
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "��(%1)刪除完畢"
 
-#: lib/RT/Record.pm:1379
+#: lib/RT/Record.pm:1173
 msgid "Link not found"
 msgstr "找�到��"
 
-#: html/Ticket/ModifyLinks.html:46 html/Ticket/ModifyLinks.html:50
+#: html/Ticket/ModifyLinks.html:24 html/Ticket/ModifyLinks.html:28
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
 msgstr "��申請單 #%1"
@@ -3716,7 +3798,7 @@ msgstr "��申請單 #%1"
 msgid "Link ticket %1"
 msgstr "��申請單 %1"
 
-#: html/Ticket/Create.html:205 html/Ticket/Elements/ShowSummary:83 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:56
 msgid "Links"
 msgstr "��"
 
@@ -3724,32 +3806,23 @@ msgstr "��"
 msgid "List All Users"
 msgstr "列出所有用戶資料"
 
-#: html/Search/Elements/EditSearches:76
+#: html/Search/Elements/EditSearches:26
 msgid "Load"
 msgstr "載入"
 
-#: html/Search/Elements/EditSearches:74
+#: html/Search/Elements/EditSearches:24
 msgid "Load saved search:"
 msgstr "載入已儲存的查詢："
 
-#: lib/RT/System.pm:87
-msgid "LoadSavedSearch"
-msgstr ""
-
-#: html/Admin/Tools/Configuration.html:64
+#: html/Admin/Tools/Configuration.html:19
 msgid "Loaded perl modules"
 msgstr "已載入的 Perl 模組"
 
-#: lib/RT/SavedSearch.pm:112
-#. ($self->Name)
-msgid "Loaded search %1"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
+#: html/Admin/Users/Modify.html:111 html/User/Prefs.html:104
 msgid "Location"
 msgstr "�置"
 
-#: lib/RT.pm:212
+#: lib/RT.pm:184
 #. ($RT::LogDir)
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "登入目錄 %1 找�到或無法寫入\\n。無法執行 RT。"
@@ -3762,16 +3835,16 @@ msgstr "紀錄等級"
 msgid "LogToFileNamed"
 msgstr "紀錄檔�"
 
-#: html/Elements/Header:94
+#: html/Elements/Header:69
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "使用者：%1"
 
-#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:54 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "登入"
 
-#: html/Elements/Header:91
+#: html/Elements/Header:66
 msgid "Logout"
 msgstr "登出"
 
@@ -3779,75 +3852,75 @@ msgstr "登出"
 msgid "Long-term contractor"
 msgstr "長期契約員工"
 
-#: lib/RT/CustomField_Overlay.pm:866
+#: NOT FOUND IN SOURCE
 msgid "Lookup type mismatch"
 msgstr "�應的類別�符"
 
-#: html/Search/Bulk.html:104
+#: html/Search/Bulk.html:83
 msgid "Make Owner"
 msgstr "新增承辦人"
 
-#: html/Search/Bulk.html:128
+#: html/Search/Bulk.html:107
 msgid "Make Status"
 msgstr "新增��"
 
-#: html/Search/Bulk.html:136
+#: html/Search/Bulk.html:115
 msgid "Make date Due"
 msgstr "新增到期日"
 
-#: html/Search/Bulk.html:138
+#: html/Search/Bulk.html:117
 msgid "Make date Resolved"
 msgstr "新增解決日期"
 
-#: html/Search/Bulk.html:132
+#: html/Search/Bulk.html:111
 msgid "Make date Started"
 msgstr "新增實際起始日期"
 
-#: html/Search/Bulk.html:130
+#: html/Search/Bulk.html:109
 msgid "Make date Starts"
 msgstr "新增應起始日期"
 
-#: html/Search/Bulk.html:134
+#: html/Search/Bulk.html:113
 msgid "Make date Told"
 msgstr "新增報告日期"
 
-#: html/Search/Bulk.html:124
+#: html/Search/Bulk.html:103
 msgid "Make priority"
 msgstr "新增優先順�"
 
-#: html/Search/Bulk.html:126
+#: html/Search/Bulk.html:105
 msgid "Make queue"
 msgstr "新增表單"
 
-#: html/Search/Bulk.html:122
+#: html/Search/Bulk.html:101
 msgid "Make subject"
 msgstr "新增主題"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "Make this group visible to user"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Male"
 msgstr "ç”·"
 
-#: html/Admin/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Malkovich Malkovich Malkovich Malkovich"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Manage custom fields and custom field values"
 msgstr "管�自訂欄��欄�值"
 
-#: html/Admin/index.html:69
+#: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "管�群組�所屬�員"
 
-#: html/Admin/index.html:85
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "管��用於所有表單的屬性與設定"
 
-#: html/Admin/index.html:74
+#: html/Admin/index.html:35
 msgid "Manage queues and queue-specific properties"
 msgstr "管��表單�相關屬性"
 
-#: html/Admin/index.html:64
+#: html/Admin/index.html:29
 msgid "Manage users and passwords"
 msgstr "管�使用者與密碼"
 
@@ -3859,7 +3932,7 @@ msgstr "經�"
 msgid "Mar"
 msgstr "三月"
 
-#: lib/RT/Date.pm:439
+#: lib/RT/Date.pm:413
 msgid "Mar."
 msgstr "03"
 
@@ -3879,33 +3952,33 @@ msgstr "符�樣�"
 msgid "May"
 msgstr "五月"
 
-#: lib/RT/Date.pm:441
+#: lib/RT/Date.pm:415
 msgid "May."
 msgstr "05"
 
-#: lib/RT/Transaction_Overlay.pm:720
+#: lib/RT/Transaction_Overlay.pm:634
 #. ($value)
 msgid "Member %1 added"
 msgstr "�員 %1 新增完畢"
 
-#: lib/RT/Transaction_Overlay.pm:760
+#: lib/RT/Transaction_Overlay.pm:674
 #. ($value)
 msgid "Member %1 deleted"
 msgstr "�員 %1 刪除完畢"
 
-#: lib/RT/Group_Overlay.pm:1008
+#: lib/RT/Group_Overlay.pm:974
 msgid "Member added"
 msgstr "新增�員完畢"
 
-#: lib/RT/Group_Overlay.pm:1170
+#: lib/RT/Group_Overlay.pm:1136
 msgid "Member deleted"
 msgstr "�員已刪除"
 
-#: lib/RT/Group_Overlay.pm:1174
+#: lib/RT/Group_Overlay.pm:1140
 msgid "Member not deleted"
 msgstr "�員未刪除"
 
-#: html/Elements/SelectLinkType:47
+#: html/Elements/SelectLinkType:25
 msgid "Member of"
 msgstr "隸屬於"
 
@@ -3917,51 +3990,46 @@ msgstr "註冊日期"
 msgid "MemberOf"
 msgstr "隸屬於"
 
-#: html/Admin/Elements/GroupTabs:63 html/User/Elements/GroupTabs:63
+#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "�員"
 
-#: lib/RT/Transaction_Overlay.pm:717
+#: lib/RT/Transaction_Overlay.pm:631
 #. ($value)
 msgid "Membership in %1 added"
 msgstr "所屬群組 %1 加入完畢"
 
-#: lib/RT/Transaction_Overlay.pm:757
+#: lib/RT/Transaction_Overlay.pm:671
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr "所屬群組 %1 移除完畢"
 
-#: html/Admin/Elements/UserTabs:61
+#: NOT FOUND IN SOURCE
 msgid "Memberships"
 msgstr "所屬群組"
 
-#: html/Admin/Users/Memberships.html:60
-#. ($UserObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Memberships of the user %1"
 msgstr "使用者 %1 的所屬群組"
 
-#: lib/RT/Ticket_Overlay.pm:2849
+#: lib/RT/Ticket_Overlay.pm:2813
 msgid "Merge Successful"
 msgstr "整�完畢"
 
-#: lib/RT/Ticket_Overlay.pm:2736
+#: lib/RT/Ticket_Overlay.pm:2733
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "整�失敗。無法設定 EffectiveId"
 
-#: lib/RT/Ticket_Overlay.pm:2744
-msgid "Merge failed. Couldn't set Status"
-msgstr ""
-
-#: html/Elements/EditLinks:129 html/Ticket/Elements/BulkLinks:48
+#: html/Elements/EditLinks:104 html/Ticket/Elements/BulkLinks:26
 msgid "Merge into"
 msgstr "整�進"
 
-#: lib/RT/Transaction_Overlay.pm:723
+#: lib/RT/Transaction_Overlay.pm:637
 #. ($value)
 msgid "Merged into %1"
 msgstr "已整�進 %1"
 
-#: html/Search/Bulk.html:165 html/Ticket/Update.html:116
+#: html/Search/Bulk.html:135 html/Ticket/Update.html:83
 msgid "Message"
 msgstr "訊�"
 
@@ -3969,15 +4037,19 @@ msgstr "訊�"
 msgid "Message body not shown because it is too large or is not plain text."
 msgstr "信件內文�是純文字，因此無法顯示。"
 
-#: lib/RT/Ticket_Overlay.pm:2406
+#: lib/RT/Ticket_Overlay.pm:2514
 msgid "Message could not be recorded"
 msgstr "無法紀錄訊�"
 
-#: lib/RT/Ticket_Overlay.pm:2409
+#: NOT FOUND IN SOURCE
+msgid "Message recipients"
+msgstr ""
+
+#: lib/RT/Ticket_Overlay.pm:2517
 msgid "Message recorded"
 msgstr "訊�紀錄�功"
 
-#: html/Ticket/Elements/PreviewScrips:115
+#: html/Ticket/Elements/PreviewScrips:70
 msgid "Messages about this ticket will not be sent to..."
 msgstr "此申請單的相關訊��會寄�給..."
 
@@ -3985,11 +4057,7 @@ msgstr "此申請單的相關訊��會寄�給..."
 msgid "Misc. Expense"
 msgstr "雜費"
 
-#: html/Search/Build.html:667
-msgid "Mismatched parentheses"
-msgstr ""
-
-#: lib/RT/Record.pm:940
+#: lib/RT/Record.pm:749
 msgid "Missing a primary key?: %1"
 msgstr "缺少主�值？(%1)"
 
@@ -3997,7 +4065,7 @@ msgstr "缺少主�值？(%1)"
 msgid "Missing mandatory fields"
 msgstr "缺少必填欄�"
 
-#: html/Admin/Users/Modify.html:193 html/User/Prefs.html:93
+#: html/Admin/Users/Modify.html:166 html/User/Prefs.html:71
 msgid "Mobile"
 msgstr "行動電話"
 
@@ -4005,41 +4073,47 @@ msgstr "行動電話"
 msgid "MobilePhone"
 msgstr "行動電話"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: NOT FOUND IN SOURCE
+msgid "Modified"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Modify"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Modify Access Control List"
 msgstr "更改權�控制清單"
 
-#: html/Admin/Elements/ObjectCustomFields:96
-#. (loc(lc($FriendlySubTypes)), loc(lc($Types)))
-msgid "Modify Custom Fields which apply to %1 for all %2"
+#: NOT FOUND IN SOURCE
+msgid "Modify Custom Field %1"
 msgstr ""
 
-#: html/Admin/Elements/ObjectCustomFields:98
-#. (loc(lc($Types)))
+#: NOT FOUND IN SOURCE
 msgid "Modify Custom Fields which apply to all %1"
 msgstr "更改�用於所有%1的自訂欄�"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "更改�用於所有表單的自訂欄�"
 
-#: html/Admin/Global/GroupRights.html:106 html/Admin/Groups/GroupRights.html:94 html/Admin/Queues/GroupRights.html:107
+#: html/Admin/Global/GroupRights.html:84 html/Admin/Groups/GroupRights.html:72 html/Admin/Queues/GroupRights.html:85
 msgid "Modify Group Rights"
-msgstr "更改群組權�"
+msgstr ""
 
-#: html/Admin/Groups/Members.html:102 html/User/Groups/Members.html:101
+#: html/Admin/Groups/Members.html:80 html/User/Groups/Members.html:79
 msgid "Modify Members"
-msgstr "更改�員"
+msgstr ""
 
-#: html/User/Delegation.html:58
+#: html/User/Delegation.html:36
 msgid "Modify Rights"
-msgstr "更改權�"
+msgstr ""
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "Modify Scrip templates for this queue"
 msgstr "更改此表單的範本"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "Modify Scrips for this queue"
 msgstr "更改此表單的手續"
 
@@ -4051,34 +4125,37 @@ msgstr "更改系統權�清單"
 msgid "Modify Template %1"
 msgstr "更改範本 %1"
 
-#: html/Admin/Global/UserRights.html:75 html/Admin/Groups/UserRights.html:76 html/Admin/Queues/UserRights.html:75
+#: html/Admin/Global/UserRights.html:53 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/UserRights.html:53
 msgid "Modify User Rights"
-msgstr "更改使用者權�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Modify Workflow"
 msgstr "更改�程"
 
-#: html/Admin/Queues/CustomField.html:66
+#: html/Admin/Queues/CustomField.html:44
 #. ($QueueObj->Name())
 msgid "Modify a CustomField for queue %1"
 msgstr "更改 %1 表單內的自訂欄�"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/CustomField.html:52
 msgid "Modify a CustomField which applies to all queues"
 msgstr "更改�用於所有表單的自訂欄�"
 
-#: html/Admin/Queues/Scrip.html:75
+#: html/Admin/Queues/Scrip.html:53
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
 msgstr "更改 %1 表單內的手續"
 
-#: html/Admin/Global/Scrip.html:69
+#: html/Admin/Global/Scrip.html:47
 msgid "Modify a scrip which applies to all queues"
 msgstr "更改�用於所有表單的手續"
 
-#: html/Admin/CustomFields/Objects.html:90
-#. ($CF->Name)
+#: NOT FOUND IN SOURCE
+msgid "Modify article #%1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Modify associated objects for %1"
 msgstr "更改�用 %1 的物件"
 
@@ -4086,25 +4163,21 @@ msgstr "更改�用 %1 的物件"
 msgid "Modify dates for # %1"
 msgstr "更改 # %1 的日期"
 
-#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
+#: html/Ticket/ModifyDates.html:24 html/Ticket/ModifyDates.html:28
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
 msgstr "更改 #%1 的日期"
 
-#: html/Ticket/ModifyDates.html:56
+#: html/Ticket/ModifyDates.html:34
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
 msgstr "更改申請單 # %1 的日期"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
-msgid "Modify global custom fields"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
+#: html/Admin/Global/GroupRights.html:24 html/Admin/Global/GroupRights.html:27 html/Admin/Global/index.html:55
 msgid "Modify global group rights"
 msgstr "更改全域設定的群組權�"
 
-#: html/Admin/Global/GroupRights.html:54
+#: html/Admin/Global/GroupRights.html:32
 msgid "Modify global group rights."
 msgstr "更改全域設定的群組權�。"
 
@@ -4120,110 +4193,108 @@ msgstr "更改全域設定的使用者權�"
 msgid "Modify global scrips"
 msgstr "更改全域手續"
 
-#: html/Admin/Global/UserRights.html:46 html/Admin/Global/UserRights.html:49 html/Admin/Global/index.html:81
+#: html/Admin/Global/UserRights.html:24 html/Admin/Global/UserRights.html:27 html/Admin/Global/index.html:59
 msgid "Modify global user rights"
 msgstr "更改全域設定的使用者權�"
 
-#: html/Admin/Global/UserRights.html:54
+#: html/Admin/Global/UserRights.html:32
 msgid "Modify global user rights."
 msgstr "更改全域設定的使用者權�。"
 
-#: lib/RT/Group_Overlay.pm:171
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "更改群組資料�刪除群組"
 
-#: html/Admin/CustomFields/GroupRights.html:164
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify group rights for custom field %1"
 msgstr "更改自訂欄� %1 的群組權�"
 
-#: html/Admin/Groups/GroupRights.html:46 html/Admin/Groups/GroupRights.html:50 html/Admin/Groups/GroupRights.html:56
+#: html/Admin/Groups/GroupRights.html:24 html/Admin/Groups/GroupRights.html:28 html/Admin/Groups/GroupRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify group rights for group %1"
 msgstr "更改群組 %1 的群組權�"
 
-#: html/Admin/Queues/GroupRights.html:46 html/Admin/Queues/GroupRights.html:50
+#: html/Admin/Queues/GroupRights.html:24 html/Admin/Queues/GroupRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify group rights for queue %1"
 msgstr "更改表單 %1 的群組權�"
 
-#: lib/RT/Group_Overlay.pm:173
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "更改此群組的�員�單"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "Modify one's own RT account"
 msgstr "更改個人的帳號資訊"
 
-#: html/Admin/Queues/People.html:46 html/Admin/Queues/People.html:50
+#: html/Admin/Queues/People.html:24 html/Admin/Queues/People.html:28
 #. ($QueueObj->Name)
 msgid "Modify people related to queue %1"
 msgstr "更改��到表單 %1 的人員"
 
-#: html/Ticket/ModifyPeople.html:46 html/Ticket/ModifyPeople.html:50 html/Ticket/ModifyPeople.html:56
+#: html/Ticket/ModifyPeople.html:24 html/Ticket/ModifyPeople.html:28 html/Ticket/ModifyPeople.html:34
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
 msgstr "更改申請單 #%1 ��到的人員"
 
-#: html/Admin/Queues/Scrips.html:67
+#: html/Admin/Queues/Scrips.html:45
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
 msgstr "更改表單 %1 的手續"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:56 html/Admin/Global/Scrips.html:65 html/Admin/Global/index.html:63
+#: html/Admin/Global/Scrips.html:43 html/Admin/Global/index.html:41
 msgid "Modify scrips which apply to all queues"
 msgstr "更改�用於所有表單的手續"
 
-#: html/Admin/Global/Template.html:102 html/Admin/Global/Template.html:46 html/Admin/Global/Template.html:51 html/Admin/Queues/Template.html:99
+#: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
 #. (loc($TemplateObj->Name()))
 #. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "更改範本 %1"
 
-#: html/Admin/Global/Templates.html:65
+#: html/Admin/Global/Templates.html:43
 msgid "Modify templates which apply to all queues"
 msgstr "更改�用於所有表單的範本"
 
-#: html/Admin/Groups/Modify.html:119 html/User/Groups/Modify.html:107
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "更改群組 %1"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "Modify the queue watchers"
 msgstr "更改表單視察員"
 
-#: html/Admin/Users/Modify.html:301
+#: html/Admin/Users/Modify.html:263
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "更改使用者 %1"
 
-#: html/Ticket/ModifyAll.html:58
+#: html/Ticket/ModifyAll.html:36
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
 msgstr "更改申請單 # %1"
 
-#: html/Ticket/Modify.html:46 html/Ticket/Modify.html:49 html/Ticket/Modify.html:55
+#: html/Ticket/Modify.html:24 html/Ticket/Modify.html:27 html/Ticket/Modify.html:33
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
 msgstr "更改申請單 # %1"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "Modify tickets"
 msgstr "更改申請單"
 
-#: html/Admin/CustomFields/UserRights.html:157
-#. ($CustomFieldObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "Modify user rights for custom field %1"
 msgstr "更改自訂欄� %1 的使用者權�"
 
-#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
+#: html/Admin/Groups/UserRights.html:24 html/Admin/Groups/UserRights.html:28 html/Admin/Groups/UserRights.html:34
 #. ($GroupObj->Name)
 msgid "Modify user rights for group %1"
 msgstr "更改群組 %1 的使用者權�"
 
-#: html/Admin/Queues/UserRights.html:46 html/Admin/Queues/UserRights.html:50
+#: html/Admin/Queues/UserRights.html:24 html/Admin/Queues/UserRights.html:28
 #. ($QueueObj->Name)
 msgid "Modify user rights for queue %1"
 msgstr "更改表單 %1 的使用者權�"
@@ -4240,35 +4311,31 @@ msgstr "更改�程 %1"
 msgid "Modify workflows which apply to all queues"
 msgstr "更改�用於所有表單的�程"
 
-#: lib/RT/Queue_Overlay.pm:95
+#: lib/RT/Queue_Overlay.pm:71
 msgid "ModifyACL"
 msgstr "更改權�清單"
 
-#: lib/RT/CustomField_Overlay.pm:103
-msgid "ModifyCustomField"
-msgstr ""
-
-#: lib/RT/Group_Overlay.pm:174
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "更改自己是�屬於�群組"
 
-#: lib/RT/Queue_Overlay.pm:96
+#: lib/RT/Queue_Overlay.pm:72
 msgid "ModifyQueueWatchers"
 msgstr "更改表單視察員"
 
-#: lib/RT/Queue_Overlay.pm:101
+#: lib/RT/Queue_Overlay.pm:77
 msgid "ModifyScrips"
 msgstr "更改手續"
 
-#: lib/RT/System.pm:83
+#: lib/RT/System.pm:60
 msgid "ModifySelf"
 msgstr "更改個人帳號"
 
-#: lib/RT/Queue_Overlay.pm:98
+#: lib/RT/Queue_Overlay.pm:74
 msgid "ModifyTemplate"
 msgstr "更改範本"
 
-#: lib/RT/Queue_Overlay.pm:114
+#: lib/RT/Queue_Overlay.pm:90
 msgid "ModifyTicket"
 msgstr "更改申請單"
 
@@ -4276,7 +4343,7 @@ msgstr "更改申請單"
 msgid "Mon"
 msgstr "星期一"
 
-#: lib/RT/Date.pm:413
+#: lib/RT/Date.pm:388
 msgid "Mon."
 msgstr "星期一"
 
@@ -4284,7 +4351,7 @@ msgstr "星期一"
 msgid "More"
 msgstr "更多"
 
-#: html/Ticket/Elements/ShowRequestor:62
+#: html/Ticket/Elements/ShowRequestor:40
 #. ($name)
 msgid "More about %1"
 msgstr "關於 %1 的進一步資訊"
@@ -4301,23 +4368,23 @@ msgstr "移動"
 msgid "Move All"
 msgstr "全移"
 
-#: html/Admin/Elements/PickCustomFields:83
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr "下移"
 
-#: html/Admin/Elements/PickCustomFields:75
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr "上移"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:48
+#: html/Admin/Elements/SelectSingleOrMultiple:26
 msgid "Multiple"
 msgstr "多�"
 
-#: lib/RT/User_Overlay.pm:227
+#: lib/RT/User_Overlay.pm:197
 msgid "Must specify 'Name' attribute"
 msgstr "必須指定 'Name' 的屬性"
 
-#: html/SelfService/Elements/MyRequests:70
+#: html/SelfService/Elements/MyRequests:48
 #. ($friendly_status)
 msgid "My %1 tickets"
 msgstr "我的 %1 申請單"
@@ -4334,23 +4401,27 @@ msgstr "表單申請追蹤"
 msgid "My Tickets"
 msgstr "表單處�"
 
-#: html/Approvals/index.html:46 html/Approvals/index.html:47
+#: html/Approvals/index.html:24 html/Approvals/index.html:25
 msgid "My approvals"
 msgstr "表單簽核"
 
-#: html/Search/Elements/SearchPrivacy:50 html/Search/Elements/SelectSearchObject:53 html/Search/Elements/SelectSearchesForObjects:53
+#: html/Search/Elements/SearchPrivacy:5 html/Search/Elements/SelectSearchObject:8 html/Search/Elements/SelectSearchesForObjects:8
 msgid "My saved searches"
 msgstr "我已儲存的查詢"
 
-#: html/Admin/CustomFields/Modify.html:58 html/Admin/Elements/AddCustomFieldValue:53 html/Admin/Elements/EditCustomField:55 html/Admin/Elements/EditCustomFieldValues:55 html/Admin/Elements/ModifyTemplate:49 html/Admin/Groups/Modify.html:65 html/User/Groups/Modify.html:65
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Groups/Modify.html:43 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43
 msgid "Name"
 msgstr "�稱"
 
-#: lib/RT/User_Overlay.pm:234
+#: lib/RT/User_Overlay.pm:204
 msgid "Name in use"
 msgstr "帳號已有人使用"
 
 #: NOT FOUND IN SOURCE
+msgid "Name matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Nationality"
 msgstr "國�"
 
@@ -4358,19 +4429,23 @@ msgstr "國�"
 msgid "Need approval from system administrator"
 msgstr "需先由系統管�員進行批准"
 
-#: html/Ticket/Elements/ShowDates:73
+#: html/Ticket/Elements/ShowDates:52
 msgid "Never"
 msgstr "從未更動"
 
-#: html/Elements/Quicksearch:51
+#: html/Elements/Quicksearch:29
 msgid "New"
 msgstr "新建立"
 
-#: html/Elements/EditLinks:115
+#: NOT FOUND IN SOURCE
+msgid "New Article"
+msgstr ""
+
+#: html/Elements/EditLinks:93
 msgid "New Links"
 msgstr "新增關係"
 
-#: html/Admin/Users/Modify.html:119 html/User/Prefs.html:109
+#: html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
 msgid "New Password"
 msgstr "新的密碼"
 
@@ -4378,11 +4453,15 @@ msgstr "新的密碼"
 msgid "New Pending Approval"
 msgstr "新的待簽核事項"
 
-#: html/Ticket/Elements/Tabs:193
+#: html/Ticket/Elements/Tabs:170
 msgid "New Query"
 msgstr "新增查詢"
 
 #: NOT FOUND IN SOURCE
+msgid "New Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "New Request"
 msgstr "表單申請"
 
@@ -4394,23 +4473,27 @@ msgstr "新增查詢"
 msgid "New Watchers"
 msgstr "新增視察員"
 
-#: html/Admin/Elements/CustomFieldTabs:93 html/Admin/Queues/CustomField.html:73
+#: NOT FOUND IN SOURCE
+msgid "New class"
+msgstr ""
+
+#: html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
 msgstr "新增自訂欄�"
 
-#: html/Admin/Elements/GroupTabs:77 html/User/Elements/GroupTabs:73
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "新增群組"
 
-#: html/SelfService/Prefs.html:53
+#: html/SelfService/Prefs.html:31
 msgid "New password"
 msgstr "新的密碼"
 
-#: lib/RT/User_Overlay.pm:817
+#: lib/RT/User_Overlay.pm:773
 msgid "New password notification sent"
 msgstr "�出新密碼通知"
 
-#: html/Admin/Elements/QueueTabs:95
+#: html/Admin/Elements/QueueTabs:69
 msgid "New queue"
 msgstr "新增表單"
 
@@ -4418,11 +4501,11 @@ msgstr "新增表單"
 msgid "New request"
 msgstr "�出申請單"
 
-#: html/Admin/Elements/SelectRights:65
+#: html/Admin/Elements/SelectRights:41
 msgid "New rights"
 msgstr "新增權�"
 
-#: html/Admin/Global/Scrip.html:61 html/Admin/Global/Scrips.html:60 html/Admin/Queues/Scrip.html:64 html/Admin/Queues/Scrips.html:76
+#: html/Admin/Global/Scrip.html:39 html/Admin/Global/Scrips.html:38 html/Admin/Queues/Scrip.html:42 html/Admin/Queues/Scrips.html:54
 msgid "New scrip"
 msgstr "新增手續"
 
@@ -4430,27 +4513,27 @@ msgstr "新增手續"
 msgid "New search"
 msgstr "�新查詢"
 
-#: html/Admin/Global/Template.html:81 html/Admin/Global/Templates.html:60 html/Admin/Queues/Template.html:79 html/Admin/Queues/Templates.html:71
+#: html/Admin/Global/Template.html:59 html/Admin/Global/Templates.html:38 html/Admin/Queues/Template.html:57 html/Admin/Queues/Templates.html:49
 msgid "New template"
 msgstr "新增範本"
 
-#: html/SelfService/Elements/Tabs:69
+#: html/SelfService/Elements/Tabs:47
 msgid "New ticket"
 msgstr "�出申請單"
 
-#: lib/RT/Ticket_Overlay.pm:2713
+#: lib/RT/Ticket_Overlay.pm:2700
 msgid "New ticket doesn't exist"
 msgstr "沒有新申請單"
 
-#: html/Admin/Elements/UserTabs:78
+#: html/Admin/Elements/UserTabs:50
 msgid "New user"
 msgstr "新增使用者"
 
-#: html/Admin/Elements/CreateUserCalled:47
+#: html/Admin/Elements/CreateUserCalled:25
 msgid "New user called"
 msgstr "新使用者�字"
 
-#: html/Admin/Queues/People.html:76 html/Ticket/Elements/EditPeople:50
+#: html/Admin/Queues/People.html:54 html/Ticket/Elements/EditPeople:28
 msgid "New watchers"
 msgstr "新視察員"
 
@@ -4462,11 +4545,11 @@ msgstr "更新視窗設定"
 msgid "New workflow"
 msgstr "新增�程"
 
-#: html/Ticket/Elements/Tabs:92
+#: html/Ticket/Elements/Tabs:70
 msgid "Next"
 msgstr "下一項"
 
-#: html/Elements/TicketList:104
+#: html/Elements/TicketList:67
 msgid "Next Page"
 msgstr "下一�"
 
@@ -4478,7 +4561,7 @@ msgstr "下一�"
 msgid "NickName"
 msgstr "暱稱"
 
-#: html/Admin/Users/Modify.html:84 html/User/Prefs.html:72
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -4490,35 +4573,35 @@ msgstr "�夜�"
 msgid "No"
 msgstr "�"
 
-#: html/Admin/CustomFields/UserRights.html:145
+#: NOT FOUND IN SOURCE
 msgid "No Class defined"
 msgstr "尚未定義類別"
 
-#: html/Admin/CustomFields/Modify.html:124 html/Admin/Elements/EditCustomField:119
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "無自訂欄�"
 
-#: html/Admin/CustomFields/GroupRights.html:103
+#: NOT FOUND IN SOURCE
 msgid "No CustomField defined"
 msgstr "尚未定義自訂欄�"
 
-#: html/Admin/Groups/GroupRights.html:105 html/Admin/Groups/UserRights.html:92
+#: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "尚未定義群組"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:477
+#: lib/RT/Tickets_Overlay_SQL.pm:452
 msgid "No Query"
 msgstr "沒有查詢"
 
-#: html/Admin/Queues/GroupRights.html:118 html/Admin/Queues/UserRights.html:89
+#: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "尚未定義表單"
 
-#: bin/rt-crontool:73
+#: bin/rt-crontool:52
 msgid "No RT user found. Please consult your RT administrator.\\n"
 msgstr "找�到 RT 使用者。請� RT 管�員查詢。\\n"
 
-#: html/Admin/Global/Template.html:100 html/Admin/Queues/Template.html:97
+#: html/Admin/Global/Template.html:78 html/Admin/Queues/Template.html:75
 msgid "No Template"
 msgstr "沒有範本"
 
@@ -4534,11 +4617,11 @@ msgstr "未指定申請單。退出申請單更改\\n\\n"
 msgid "No Workflow"
 msgstr "沒有�程"
 
-#: html/Approvals/Elements/Approve:67
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "暫�處�"
 
-#: lib/RT/Record.pm:935
+#: lib/RT/Record.pm:744
 msgid "No column specified"
 msgstr "未指定欄�"
 
@@ -4546,7 +4629,7 @@ msgstr "未指定欄�"
 msgid "No command found\\n"
 msgstr "找�到命令"
 
-#: html/Ticket/Elements/ShowRequestor:68
+#: html/Ticket/Elements/ShowRequestor:46
 msgid "No comment entered about this user"
 msgstr "沒有�這�使用者的評論"
 
@@ -4554,53 +4637,52 @@ msgstr "沒有�這�使用者的評論"
 msgid "No correspondence attached"
 msgstr "沒有附上申請單回覆"
 
-#: lib/RT/Action/Generic.pm:186 lib/RT/Condition/Generic.pm:198 lib/RT/Search/ActiveTicketsInQueue.pm:78 lib/RT/Search/Generic.pm:135
+#: lib/RT/Action/Generic.pm:159 lib/RT/Condition/Generic.pm:175 lib/RT/Search/ActiveTicketsInQueue.pm:55 lib/RT/Search/Generic.pm:112
 #. (ref $self)
 msgid "No description for %1"
 msgstr "沒有� %1 的�述"
 
-#: lib/RT/Users_Overlay.pm:185
+#: lib/RT/Users_Overlay.pm:159
 msgid "No group specified"
 msgstr "未指定群組"
 
-#: html/Admin/Groups/index.html:52
+#: NOT FOUND IN SOURCE
 msgid "No groups matching search criteria found."
 msgstr "找�到符�查詢�件的群組。"
 
-#: lib/RT/Ticket_Overlay.pm:2349
+#: lib/RT/Ticket_Overlay.pm:2475
 msgid "No message attached"
 msgstr "沒有附上訊�"
 
-#: lib/RT/User_Overlay.pm:1035
+#: lib/RT/User_Overlay.pm:991
 msgid "No password set"
 msgstr "沒有設定密碼"
 
-#: lib/RT/Queue_Overlay.pm:358
+#: lib/RT/Queue_Overlay.pm:296
 msgid "No permission to create queues"
 msgstr "沒有新增表單的權�"
 
-#: lib/RT/Ticket_Overlay.pm:409
-#. ($QueueObj->Name)
+#: NOT FOUND IN SOURCE
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "沒有在表單 '%1' 新增申請單的權�"
 
-#: lib/RT/User_Overlay.pm:187
+#: lib/RT/User_Overlay.pm:157
 msgid "No permission to create users"
 msgstr "沒有新增使用者的權�"
 
-#: html/SelfService/Display.html:165
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "沒有顯示該申請單的權�"
 
-#: html/SelfService/Update.html:117
+#: html/SelfService/Update.html:68
 msgid "No permission to view update ticket"
 msgstr "沒有檢視申請單更新的權�"
 
-#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
+#: lib/RT/Queue_Overlay.pm:716 lib/RT/Ticket_Overlay.pm:1581
 msgid "No principal specified"
 msgstr "未指定單�"
 
-#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
+#: html/Admin/Queues/People.html:153 html/Admin/Queues/People.html:163
 msgid "No principals selected."
 msgstr "未指定單�。"
 
@@ -4608,27 +4690,23 @@ msgstr "未指定單�。"
 msgid "No protocol specified in %1"
 msgstr "%1 內未指定�定"
 
-#: html/Admin/Queues/index.html:57
+#: html/Admin/Queues/index.html:34
 msgid "No queues matching search criteria found."
 msgstr "找�到符�查詢�件的表單。"
 
-#: html/Admin/Elements/SelectRights:106
+#: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
 msgstr "找�到權�"
 
-#: html/Admin/Elements/SelectRights:53
+#: html/Admin/Elements/SelectRights:32
 msgid "No rights granted."
 msgstr "沒有�定權�"
 
-#: lib/RT/SavedSearch.pm:187
-msgid "No search loaded"
-msgstr ""
-
-#: html/Search/Bulk.html:194
+#: html/Search/Bulk.html:162
 msgid "No search to operate on."
 msgstr "沒有�進行的查詢"
 
-#: html/Elements/RT__Ticket/ColumnMap:134
+#: html/Elements/TicketList:155
 msgid "No subject"
 msgstr "沒有標題"
 
@@ -4636,7 +4714,7 @@ msgstr "沒有標題"
 msgid "No ticket id specified"
 msgstr "未指定申請單編號"
 
-#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
+#: lib/RT/Transaction_Overlay.pm:455 lib/RT/Transaction_Overlay.pm:493
 msgid "No transaction type specified"
 msgstr "未指定更動報告類別"
 
@@ -4644,7 +4722,7 @@ msgstr "未指定更動報告類別"
 msgid "No user or email address specified"
 msgstr "未指定使用者或電�郵件地�"
 
-#: html/Admin/Users/index.html:55
+#: html/Admin/Users/index.html:35
 msgid "No users matching search criteria found."
 msgstr "找�到符�查詢�件的使用者。"
 
@@ -4652,15 +4730,15 @@ msgstr "找�到符�查詢�件的使用者。"
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "找�到�格的 RT 使用者。RT cvs 處�器已�用。請� RT 管�者詢�。\\n"
 
-#: lib/RT/Record.pm:932
+#: lib/RT/Record.pm:741
 msgid "No value sent to _Set!\\n"
 msgstr "_Set 沒有收到任何值!\\n"
 
-#: html/Elements/QuickCreate:61
+#: html/Elements/QuickCreate:16
 msgid "Nobody"
 msgstr "沒有人"
 
-#: lib/RT/Record.pm:937
+#: lib/RT/Record.pm:746
 msgid "Nonexistant field?"
 msgstr "欄��存在？"
 
@@ -4676,15 +4754,15 @@ msgstr "未設定�從 %2 內擷� %1"
 msgid "Not logged in"
 msgstr "尚未登入"
 
-#: html/Elements/Header:96
+#: html/Elements/Header:71
 msgid "Not logged in."
 msgstr "尚未登入"
 
-#: lib/RT/Date.pm:393
+#: lib/RT/Date.pm:369
 msgid "Not set"
 msgstr "尚未設定"
 
-#: html/NoAuth/Reminder.html:48
+#: html/NoAuth/Reminder.html:26
 msgid "Not yet implemented."
 msgstr "尚未完工。"
 
@@ -4692,7 +4770,7 @@ msgstr "尚未完工。"
 msgid "Not yet implemented...."
 msgstr "尚未完工..."
 
-#: html/Approvals/Elements/Approve:70
+#: html/Approvals/Elements/Approve:48
 msgid "Notes"
 msgstr "備註"
 
@@ -4700,7 +4778,7 @@ msgstr "備註"
 msgid "Notes:"
 msgstr "備註："
 
-#: lib/RT/User_Overlay.pm:820
+#: lib/RT/User_Overlay.pm:776
 msgid "Notification could not be sent"
 msgstr "無法�出通知"
 
@@ -4714,11 +4792,11 @@ msgstr "以評論方�通知管�員副本收件人"
 
 #: etc/initialdata:93 etc/upgrade/3.1.17/content:6
 msgid "Notify Ccs"
-msgstr "通知副本收件人"
+msgstr ""
 
 #: etc/initialdata:89 etc/upgrade/3.1.17/content:2
 msgid "Notify Ccs as Comment"
-msgstr "以評論方�通知副本收件人"
+msgstr ""
 
 #: etc/initialdata:128
 msgid "Notify Other Recipients"
@@ -4780,7 +4858,7 @@ msgstr "通知�象"
 msgid "Nov"
 msgstr "�一月"
 
-#: lib/RT/Date.pm:447
+#: lib/RT/Date.pm:421
 msgid "Nov."
 msgstr "11"
 
@@ -4796,33 +4874,19 @@ msgstr "104eHRMS 介�"
 msgid "OK"
 msgstr "確定"
 
-#: html/Search/Elements/SelectAndOr:47
-msgid "OR"
-msgstr ""
-
-#: lib/RT/Record.pm:319
+#: lib/RT/Record.pm:200
 msgid "Object could not be created"
 msgstr "無法新增物件"
 
-#: lib/RT/Record.pm:124
-msgid "Object could not be deleted"
-msgstr ""
-
-#: lib/RT/Record.pm:338
+#: lib/RT/Record.pm:219
 msgid "Object created"
 msgstr "物件新增完畢"
 
-#: lib/RT/Record.pm:121
-msgid "Object deleted"
-msgstr ""
-
-#: html/Admin/CustomFields/Objects.html:72 html/Admin/Elements/ObjectCustomFields:63
-#. ($ObjectType)
-#. ($LookupType)
+#: NOT FOUND IN SOURCE
 msgid "Object of type %1 cannot take custom fields"
 msgstr "自訂欄���用於類別為 %1 的物件"
 
-#: lib/RT/CustomField_Overlay.pm:901
+#: NOT FOUND IN SOURCE
 msgid "Object type mismatch"
 msgstr "物件類別�符"
 
@@ -4834,7 +4898,7 @@ msgstr "在�狀態"
 msgid "Oct"
 msgstr "�月"
 
-#: lib/RT/Date.pm:446
+#: lib/RT/Date.pm:420
 msgid "Oct."
 msgstr "10"
 
@@ -4846,19 +4910,19 @@ msgstr "�月"
 msgid "Office Phone"
 msgstr "辦公室電話"
 
-#: html/Tools/Elements/Tabs:53
+#: html/Tools/Elements/Tabs:31
 msgid "Offline"
 msgstr "離線"
 
-#: html/Tools/Offline.html:49
+#: html/Tools/Offline.html:27
 msgid "Offline edits"
 msgstr "離線編輯"
 
-#: html/Tools/Offline.html:46
+#: html/Tools/Offline.html:24
 msgid "Offline upload"
 msgstr "離線上載"
 
-#: html/Elements/SelectDateRelation:56
+#: html/Elements/SelectDateRelation:34
 msgid "On"
 msgstr "等於"
 
@@ -4884,7 +4948,7 @@ msgstr "承辦人改變時"
 
 #: etc/initialdata:177 etc/upgrade/3.1.17/content:15
 msgid "On Priority Change"
-msgstr "優先順�改變時"
+msgstr ""
 
 #: etc/initialdata:192
 msgid "On Queue Change"
@@ -4902,25 +4966,29 @@ msgstr "��改變時"
 msgid "On Transaction"
 msgstr "發生更動時"
 
-#: html/Approvals/Elements/PendingMyApproval:71
+#: html/Approvals/Elements/PendingMyApproval:49
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
 msgstr "僅顯示 %1 之後新增的申請單"
 
-#: html/Approvals/Elements/PendingMyApproval:69
+#: html/Approvals/Elements/PendingMyApproval:47
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
 msgstr "僅顯示 %1 之�新增的申請單"
 
-#: html/Elements/Quicksearch:52
+#: html/Elements/Quicksearch:30
 msgid "Open"
 msgstr "é–‹å•Ÿ"
 
-#: html/Ticket/Elements/Tabs:159
+#: html/Ticket/Elements/Tabs:137
 msgid "Open it"
 msgstr "é–‹å•Ÿ"
 
-#: html/SelfService/Elements/Tabs:63
+#: NOT FOUND IN SOURCE
+msgid "Open requests"
+msgstr ""
+
+#: html/SelfService/Elements/Tabs:41
 msgid "Open tickets"
 msgstr "開啟的申請單"
 
@@ -4952,7 +5020,7 @@ msgstr "�項�述"
 msgid "Option Name"
 msgstr "�項�稱"
 
-#: html/Search/Elements/DisplayOptions:56
+#: html/Search/Elements/DisplayOptions:35
 msgid "Order by"
 msgstr "排�方�"
 
@@ -4960,7 +5028,7 @@ msgstr "排�方�"
 msgid "Ordering and sorting"
 msgstr "順�與排�方�"
 
-#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:129
+#: html/Admin/Users/Modify.html:114 html/Elements/SelectUsers:28 html/User/Prefs.html:107
 msgid "Organization"
 msgstr "組織�稱"
 
@@ -4968,7 +5036,7 @@ msgstr "組織�稱"
 msgid "Organization:"
 msgstr "組織："
 
-#: html/Approvals/Elements/Approve:54
+#: html/Approvals/Elements/Approve:32
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
 msgstr "原申請單：#%1"
@@ -4981,15 +5049,15 @@ msgstr "其他e-mail帳號 (僅e-mail通知;多筆帳號請用逗號','�隔)"
 msgid "Out of range"
 msgstr "期�外"
 
-#: lib/RT/Transaction_Overlay.pm:611
+#: lib/RT/Transaction_Overlay.pm:525
 msgid "Outgoing email about a comment recorded"
 msgstr "已紀錄發�的評論郵件"
 
-#: lib/RT/Transaction_Overlay.pm:615
+#: lib/RT/Transaction_Overlay.pm:529
 msgid "Outgoing email recorded"
 msgstr "已紀錄發�的郵件"
 
-#: html/Admin/Queues/Modify.html:90
+#: html/Admin/Queues/Modify.html:68
 msgid "Over time, priority moves toward"
 msgstr "優先順�隨時間增加調整為"
 
@@ -5009,15 +5077,15 @@ msgstr "�代全域權� %1"
 msgid "Overview"
 msgstr "總覽"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "Own tickets"
 msgstr "承辦申請單"
 
-#: lib/RT/Queue_Overlay.pm:113
+#: lib/RT/Queue_Overlay.pm:89
 msgid "OwnTicket"
 msgstr "承辦申請單"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
+#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Search/Elements/PickBasics:114 html/SelfService/Elements/MyRequests:29 html/Ticket/Create.html:47 html/Ticket/Elements/EditPeople:42 html/Ticket/Elements/EditPeople:43 html/Ticket/Elements/ShowPeople:26 html/Ticket/Update.html:40 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1306
 msgid "Owner"
 msgstr "承辦人"
 
@@ -5025,11 +5093,11 @@ msgstr "承辦人"
 msgid "Owner changed from %1 to %2"
 msgstr "承辦人已從 %1 改為 %2"
 
-#: lib/RT/Ticket_Overlay.pm:495
+#: lib/RT/Ticket_Overlay.pm:467
 msgid "Owner could not be set."
 msgstr "無法設定承辦人。"
 
-#: lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:575
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "強制將承辦人從 %1 改為 %2"
@@ -5046,12 +5114,12 @@ msgstr "承辦人電話"
 msgid "Page #"
 msgstr " "
 
-#: html/Elements/TicketList:78
-#. ($Page, int($TotalFound/$Rows)+$oddRows)
+#: html/Elements/TicketList:45
+#. ($Page, int($TotalFound/$Rows)+1)
 msgid "Page %1 of %2"
 msgstr "第 %1/%2 �"
 
-#: html/Admin/Users/Modify.html:198 html/User/Prefs.html:97
+#: html/Admin/Users/Modify.html:171 html/User/Prefs.html:75
 msgid "Pager"
 msgstr "呼�器"
 
@@ -5067,7 +5135,7 @@ msgstr "呼��數"
 msgid "Parent"
 msgstr "上級"
 
-#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+#: html/Elements/EditLinks:117 html/Elements/EditLinks:54 html/Elements/ShowLinks:46 html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38
 msgid "Parents"
 msgstr "�申請單"
 
@@ -5075,45 +5143,28 @@ msgstr "�申請單"
 msgid "Park Space"
 msgstr "�車�申請"
 
-#: html/Elements/Login:74 html/User/Prefs.html:105
+#: html/Elements/Login:52 html/User/Prefs.html:83
 msgid "Password"
 msgstr "密碼"
 
-#: html/NoAuth/Reminder.html:46
+#: html/NoAuth/Reminder.html:24
 msgid "Password Reminder"
 msgstr "密碼�示"
 
-#: lib/RT/Transaction_Overlay.pm:770 lib/RT/User_Overlay.pm:1046
-msgid "Password changed"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1038 lib/RT/User_Overlay.pm:215
-#. ($RT::MinimumPasswordLength)
-msgid "Password needs to be at least %1 characters long"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:1045
-msgid "Password set"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/User_Overlay.pm:185 lib/RT/User_Overlay.pm:994
 msgid "Password too short"
 msgstr "密碼太短"
 
-#: html/User/Prefs.html:232
+#: html/Admin/Users/Modify.html:316 html/User/Prefs.html:209
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "密碼：%1"
 
-#: lib/RT/User_Overlay.pm:1031
-msgid "Password: Permission Denied"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:356
+#: html/Admin/Users/Modify.html:318
 msgid "Passwords do not match."
 msgstr "密碼確�失敗。"
 
-#: html/User/Prefs.html:234
+#: html/User/Prefs.html:211
 msgid "Passwords do not match. Your password has not been changed"
 msgstr "密碼確�失敗。您的密碼並未改變。"
 
@@ -5125,7 +5176,7 @@ msgstr "請�擇表單�稱"
 msgid "Pending Approval"
 msgstr "等待簽核"
 
-#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "人員"
 
@@ -5137,11 +5188,11 @@ msgstr "�有表單權�人員"
 msgid "Perform a user-defined action"
 msgstr "執行使用者自訂的動作"
 
-#: html/Admin/Tools/Configuration.html:94
+#: html/Admin/Tools/Configuration.html:49
 msgid "Perl configuration"
 msgstr "Perl 設定"
 
-#: lib/RT/ACE_Overlay.pm:252 lib/RT/ACE_Overlay.pm:258 lib/RT/ACE_Overlay.pm:581 lib/RT/ACE_Overlay.pm:591 lib/RT/ACE_Overlay.pm:601 lib/RT/ACE_Overlay.pm:666 lib/RT/Attribute_Overlay.pm:158 lib/RT/Attribute_Overlay.pm:164 lib/RT/Attribute_Overlay.pm:402 lib/RT/Attribute_Overlay.pm:411 lib/RT/Attribute_Overlay.pm:424 lib/RT/CurrentUser.pm:117 lib/RT/CurrentUser.pm:126 lib/RT/CustomField_Overlay.pm:1022 lib/RT/CustomField_Overlay.pm:167 lib/RT/CustomField_Overlay.pm:184 lib/RT/CustomField_Overlay.pm:195 lib/RT/CustomField_Overlay.pm:366 lib/RT/CustomField_Overlay.pm:398 lib/RT/CustomField_Overlay.pm:697 lib/RT/CustomField_Overlay.pm:870 lib/RT/CustomField_Overlay.pm:905 lib/RT/CustomField_Overlay.pm:950 lib/RT/Group_Overlay.pm:1125 lib/RT/Group_Overlay.pm:1129 lib/RT/Group_Overlay.pm:1138 lib/RT/Group_Overlay.pm:1248 lib/RT/Group_Overlay.pm:1252 lib/RT/Group_Overlay.pm:1258 lib/RT/Group_Overlay.pm:453 lib/RT/Group_Overlay.pm:550 lib/RT/Group_Overlay.pm:628 lib/RT/Group_Overlay.pm:636 lib/RT/Group_Overlay.pm:734 lib/RT/Group_Overlay.pm:738 lib/RT/Group_Overlay.pm:744 lib/RT/Group_Overlay.pm:930 lib/RT/Group_Overlay.pm:934 lib/RT/Group_Overlay.pm:947 lib/RT/Queue_Overlay.pm:1051 lib/RT/Queue_Overlay.pm:141 lib/RT/Queue_Overlay.pm:159 lib/RT/Queue_Overlay.pm:654 lib/RT/Queue_Overlay.pm:664 lib/RT/Queue_Overlay.pm:678 lib/RT/Queue_Overlay.pm:816 lib/RT/Queue_Overlay.pm:825 lib/RT/Queue_Overlay.pm:838 lib/RT/Scrip_Overlay.pm:150 lib/RT/Scrip_Overlay.pm:161 lib/RT/Scrip_Overlay.pm:226 lib/RT/Scrip_Overlay.pm:540 lib/RT/Template_Overlay.pm:112 lib/RT/Template_Overlay.pm:118 lib/RT/Template_Overlay.pm:309 lib/RT/Ticket_Overlay.pm:1318 lib/RT/Ticket_Overlay.pm:1328 lib/RT/Ticket_Overlay.pm:1342 lib/RT/Ticket_Overlay.pm:1483 lib/RT/Ticket_Overlay.pm:1493 lib/RT/Ticket_Overlay.pm:1507 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1944 lib/RT/Ticket_Overlay.pm:2082 lib/RT/Ticket_Overlay.pm:2252 lib/RT/Ticket_Overlay.pm:2302 lib/RT/Ticket_Overlay.pm:2474 lib/RT/Ticket_Overlay.pm:2577 lib/RT/Ticket_Overlay.pm:2625 lib/RT/Ticket_Overlay.pm:2704 lib/RT/Ticket_Overlay.pm:2718 lib/RT/Ticket_Overlay.pm:2942 lib/RT/Ticket_Overlay.pm:2952 lib/RT/Ticket_Overlay.pm:2957 lib/RT/Ticket_Overlay.pm:3180 lib/RT/Ticket_Overlay.pm:3184 lib/RT/Ticket_Overlay.pm:3327 lib/RT/Ticket_Overlay.pm:3448 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Overlay.pm:512 lib/RT/Transaction_Overlay.pm:540 lib/RT/Transaction_Overlay.pm:547 lib/RT/User_Overlay.pm:1184 lib/RT/User_Overlay.pm:1725 lib/RT/User_Overlay.pm:370 lib/RT/User_Overlay.pm:736 lib/RT/User_Overlay.pm:775
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:562 lib/RT/ACE_Overlay.pm:572 lib/RT/ACE_Overlay.pm:582 lib/RT/ACE_Overlay.pm:647 lib/RT/Attribute_Overlay.pm:135 lib/RT/Attribute_Overlay.pm:141 lib/RT/Attribute_Overlay.pm:379 lib/RT/Attribute_Overlay.pm:388 lib/RT/Attribute_Overlay.pm:401 lib/RT/CurrentUser.pm:103 lib/RT/CurrentUser.pm:94 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:239 lib/RT/CustomField_Overlay.pm:517 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1091 lib/RT/Group_Overlay.pm:1095 lib/RT/Group_Overlay.pm:1104 lib/RT/Group_Overlay.pm:1155 lib/RT/Group_Overlay.pm:1159 lib/RT/Group_Overlay.pm:1165 lib/RT/Group_Overlay.pm:426 lib/RT/Group_Overlay.pm:518 lib/RT/Group_Overlay.pm:596 lib/RT/Group_Overlay.pm:604 lib/RT/Group_Overlay.pm:701 lib/RT/Group_Overlay.pm:705 lib/RT/Group_Overlay.pm:711 lib/RT/Group_Overlay.pm:896 lib/RT/Group_Overlay.pm:900 lib/RT/Group_Overlay.pm:913 lib/RT/Queue_Overlay.pm:117 lib/RT/Queue_Overlay.pm:135 lib/RT/Queue_Overlay.pm:578 lib/RT/Queue_Overlay.pm:588 lib/RT/Queue_Overlay.pm:602 lib/RT/Queue_Overlay.pm:740 lib/RT/Queue_Overlay.pm:749 lib/RT/Queue_Overlay.pm:762 lib/RT/Queue_Overlay.pm:975 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:473 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1453 lib/RT/Ticket_Overlay.pm:1463 lib/RT/Ticket_Overlay.pm:1477 lib/RT/Ticket_Overlay.pm:1614 lib/RT/Ticket_Overlay.pm:1624 lib/RT/Ticket_Overlay.pm:1638 lib/RT/Ticket_Overlay.pm:1755 lib/RT/Ticket_Overlay.pm:2075 lib/RT/Ticket_Overlay.pm:2213 lib/RT/Ticket_Overlay.pm:2381 lib/RT/Ticket_Overlay.pm:2428 lib/RT/Ticket_Overlay.pm:2582 lib/RT/Ticket_Overlay.pm:2640 lib/RT/Ticket_Overlay.pm:2691 lib/RT/Ticket_Overlay.pm:2706 lib/RT/Ticket_Overlay.pm:2905 lib/RT/Ticket_Overlay.pm:2915 lib/RT/Ticket_Overlay.pm:2920 lib/RT/Ticket_Overlay.pm:3143 lib/RT/Ticket_Overlay.pm:3147 lib/RT/Ticket_Overlay.pm:3350 lib/RT/Ticket_Overlay.pm:3512 lib/RT/Ticket_Overlay.pm:3564 lib/RT/Ticket_Overlay.pm:3791 lib/RT/Transaction_Overlay.pm:443 lib/RT/Transaction_Overlay.pm:450 lib/RT/Transaction_Overlay.pm:479 lib/RT/Transaction_Overlay.pm:486 lib/RT/User_Overlay.pm:1088 lib/RT/User_Overlay.pm:1536 lib/RT/User_Overlay.pm:335 lib/RT/User_Overlay.pm:696 lib/RT/User_Overlay.pm:731 lib/RT/User_Overlay.pm:987
 msgid "Permission Denied"
 msgstr "權��足"
 
@@ -5157,7 +5208,7 @@ msgstr "�有權�表單列表："
 msgid "Personal"
 msgstr "代�人群組"
 
-#: html/User/Elements/Tabs:56
+#: html/User/Elements/Tabs:34
 msgid "Personal Groups"
 msgstr "代�人群組"
 
@@ -5169,11 +5220,11 @@ msgstr "個人首�"
 msgid "Personal Todo"
 msgstr "�人待辦事項"
 
-#: html/User/Groups/index.html:51 html/User/Groups/index.html:61
+#: html/User/Groups/index.html:29 html/User/Groups/index.html:39
 msgid "Personal groups"
 msgstr "代�人群組"
 
-#: html/User/Elements/DelegateRights:58
+#: html/User/Elements/DelegateRights:36
 msgid "Personal groups:"
 msgstr "代�人群組："
 
@@ -5205,7 +5256,7 @@ msgstr "電話"
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: html/Admin/Users/Modify.html:180 html/User/Prefs.html:82
+#: html/Admin/Users/Modify.html:153 html/User/Prefs.html:60
 msgid "Phone numbers"
 msgstr "電話號碼"
 
@@ -5273,7 +5324,7 @@ msgstr "�級"
 msgid "Pref"
 msgstr "�好"
 
-#: html/Elements/Header:87 html/Elements/Tabs:88 html/SelfService/Elements/Tabs:75 html/SelfService/Prefs.html:46 html/User/Prefs.html:46 html/User/Prefs.html:49
+#: html/Elements/Header:63 html/Elements/Tabs:55 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
 msgid "Preferences"
 msgstr "�好"
 
@@ -5281,15 +5332,15 @@ msgstr "�好"
 msgid "Prefs"
 msgstr "個人資訊"
 
-#: lib/RT/Action/Generic.pm:196
+#: lib/RT/Action/Generic.pm:169
 msgid "Prepare Stubbed"
 msgstr "�備動作完畢"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:62
 msgid "Prev"
 msgstr "上一項"
 
-#: html/Elements/TicketList:101
+#: html/Elements/TicketList:64
 msgid "Previous Page"
 msgstr "上一�"
 
@@ -5301,20 +5352,20 @@ msgstr "�一�"
 msgid "Pri"
 msgstr "優先順�"
 
-#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "找�到單� %1。"
 
-#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
+#: html/Search/Elements/PickBasics:58 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1104
 msgid "Priority"
 msgstr "優先順�"
 
-#: html/Admin/Queues/Modify.html:86
+#: html/Admin/Queues/Modify.html:64
 msgid "Priority starts at"
 msgstr "優先順�起始值"
 
-#: html/Search/Elements/EditSearches:50
+#: html/Search/Elements/EditSearches:2
 msgid "Privacy:"
 msgstr "隱�設定："
 
@@ -5322,12 +5373,12 @@ msgstr "隱�設定："
 msgid "Privileged"
 msgstr "內部�員"
 
-#: html/Admin/Users/Modify.html:334 html/User/Prefs.html:223
+#: html/Admin/Users/Modify.html:296 html/User/Prefs.html:200
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "內部�員狀態：%1"
 
-#: html/Admin/Users/index.html:102
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "內部�員"
 
@@ -5367,19 +5418,19 @@ msgstr "公共事務�"
 msgid "Purging stale data: %1"
 msgstr "移除�期資料: %1"
 
-#: html/Search/Elements/EditQuery:47
+#: html/Search/Build.html:47
 msgid "Query"
 msgstr "查詢"
 
-#: html/Search/Build.html:124 html/Ticket/Elements/Tabs:195
+#: html/Search/Build.html:84 html/Ticket/Elements/Tabs:172
 msgid "Query Builder"
 msgstr "建立查詢"
 
-#: html/Elements/QuickCreate:55 html/Elements/Quicksearch:50 html/Search/Elements/PickBasics:71 html/SelfService/Create.html:54 html/Ticket/Create.html:59 html/Ticket/Elements/EditBasics:57 html/Ticket/Elements/ShowBasics:76 html/User/Elements/DelegateRights:101 lib/RT/Tickets_Overlay.pm:1345
+#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:35 html/Ticket/Elements/ShowBasics:54 html/User/Elements/DelegateRights:79 lib/RT/Tickets_Overlay.pm:945
 msgid "Queue"
 msgstr "表單"
 
-#: html/Admin/Queues/CustomField.html:63 html/Admin/Queues/Scrip.html:71 html/Admin/Queues/Scrips.html:69 html/Admin/Queues/Templates.html:65
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
@@ -5393,7 +5444,7 @@ msgstr "找�到表單 '%1'\\n"
 msgid "Queue Keyword Selections"
 msgstr "表單關�字��"
 
-#: html/Admin/Queues/Modify.html:64
+#: html/Admin/Queues/Modify.html:42
 msgid "Queue Name"
 msgstr "表單�稱"
 
@@ -5417,19 +5468,19 @@ msgstr "表單手續"
 msgid "Queue Setup"
 msgstr "表單設定"
 
-#: lib/RT/Queue_Overlay.pm:362
+#: lib/RT/Queue_Overlay.pm:300
 msgid "Queue already exists"
 msgstr "表單已存在"
 
-#: lib/RT/Queue_Overlay.pm:371 lib/RT/Queue_Overlay.pm:377
+#: lib/RT/Queue_Overlay.pm:309 lib/RT/Queue_Overlay.pm:315
 msgid "Queue could not be created"
 msgstr "無法新增表單"
 
-#: html/Ticket/Create.html:239 lib/t/regression/01ticket_link_searching.t:17
+#: html/Ticket/Create.html:208
 msgid "Queue could not be loaded."
 msgstr "無法載入表單"
 
-#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:381 lib/RT/StyleGuide.pod:809
+#: docs/design_docs/string-extraction-guide.txt:83 lib/RT/Queue_Overlay.pm:319 lib/RT/StyleGuide.pod:789
 msgid "Queue created"
 msgstr "表單新增完畢"
 
@@ -5437,11 +5488,11 @@ msgstr "表單新增完畢"
 msgid "Queue is not specified."
 msgstr "未指定表單。"
 
-#: html/SelfService/Display.html:102 lib/RT/CustomField_Overlay.pm:192
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "找�到表單"
 
-#: html/Admin/Elements/Tabs:59 html/Admin/index.html:72
+#: html/Admin/Elements/Tabs:37 html/Admin/index.html:34
 msgid "Queues"
 msgstr "表單"
 
@@ -5449,24 +5500,24 @@ msgstr "表單"
 msgid "Quick Search"
 msgstr "表單��"
 
-#: html/Elements/Quicksearch:46
+#: html/Elements/Quicksearch:24
 msgid "Quick search"
 msgstr "表單一覽"
 
-#: html/Elements/QuickCreate:46
+#: html/Elements/QuickCreate:1
 msgid "Quick ticket creation"
 msgstr "快速建立申請單"
 
-#: html/Search/Results.html:83
+#: html/Search/Results.html:49
 msgid "RSS"
 msgstr "RSS"
 
-#: html/Elements/Login:66
+#: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
 msgstr "RT %1"
 
-#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:796
+#: docs/design_docs/string-extraction-guide.txt:70 lib/RT/StyleGuide.pod:776
 #. ($RT::VERSION, $RT::rtname)
 msgid "RT %1 for %2"
 msgstr "%2：RT %1 版"
@@ -5483,7 +5534,7 @@ msgstr "RT %1。版權所有 1996-%1 Jesse Vincent <jesse\\@bestpractical.com>\\
 msgid "RT %1. Copyright 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 msgstr "RT %1。版權所有 1996-2002 Jesse Vincent <jesse\\@bestpractical.com>\\n"
 
-#: html/Admin/index.html:46 html/Admin/index.html:47
+#: html/Admin/index.html:24 html/Admin/index.html:25
 msgid "RT Administration"
 msgstr "RT 管���"
 
@@ -5503,7 +5554,7 @@ msgstr "RT 設定錯誤"
 msgid "RT Critical error. Message not recorded!"
 msgstr "RT 致命錯誤。訊�未被紀錄。"
 
-#: html/Elements/Error:65 html/SelfService/Error.html:62
+#: html/Elements/Error:41 html/SelfService/Error.html:40
 msgid "RT Error"
 msgstr "RT 錯誤"
 
@@ -5516,14 +5567,18 @@ msgid "RT Recieved mail (%1) from itself."
 msgstr "RT 收到從自己寄出的郵件 (%1)。"
 
 #: NOT FOUND IN SOURCE
+msgid "RT Self Service"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT Self Service / Closed Tickets"
 msgstr "RT 自助�務/已解決的申請單"
 
-#: html/Admin/Tools/Configuration.html:73
+#: html/Admin/Tools/Configuration.html:28
 msgid "RT Variables"
 msgstr "RT 的變數"
 
-#: html/index.html:72 html/index.html:75
+#: html/index.html:50 html/index.html:53
 msgid "RT at a glance"
 msgstr "RT 一覽"
 
@@ -5539,15 +5594,11 @@ msgstr "RT 無法從外部資料庫查詢找到申請人資訊"
 msgid "RT couldn't find the queue: %1"
 msgstr "RT 找�到表單：%1"
 
-#: html/Elements/SetupSessionCookie:90
-msgid "RT couldn't store your session."
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "RT 無法確�這個 PGP 簽章。\\n"
 
-#: html/Elements/PageLayout:108
+#: html/Elements/PageLayout:85
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "%1 專用�程系統"
@@ -5565,6 +5616,14 @@ msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&
 msgstr "RT 版權所有 1996-%1 Jesse Vincent &lt;jesse@bestpractical.com&gt;。<br>本軟體� <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU 通用公共授權第二版</a> 散佈。"
 
 #: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent <jesse@bestpractical.com>.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "RT is &copy; Copyright 1996-2002 Jesse Vincent &lt;jesse@bestpractical.com&gt;.  It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT thinks this message may be a bounce"
 msgstr "RT �為這�能是退信"
 
@@ -5589,6 +5648,10 @@ msgid "RT::Ticket-Role"
 msgstr "申請單�行角色"
 
 #: NOT FOUND IN SOURCE
+msgid "RTFM Error"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "RT_System"
 msgstr "系統訊�"
 
@@ -5596,7 +5659,7 @@ msgstr "系統訊�"
 msgid "Read Only"
 msgstr "唯讀"
 
-#: html/Admin/Users/Modify.html:79 html/User/Prefs.html:69
+#: html/Admin/Users/Modify.html:57 html/User/Prefs.html:47
 msgid "Real Name"
 msgstr "真實姓�"
 
@@ -5608,31 +5671,31 @@ msgstr "真實姓�"
 msgid "Really reject this ticket?"
 msgstr "您確定��回這張申請單嗎？"
 
-#: lib/RT/Transaction_Overlay.pm:714
+#: lib/RT/Transaction_Overlay.pm:628
 #. ($value)
 msgid "Reference by %1 added"
 msgstr "已加入 %1 為�考本申請單"
 
-#: lib/RT/Transaction_Overlay.pm:754
+#: lib/RT/Transaction_Overlay.pm:668
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr "已移除 %1 為�考本申請單"
 
-#: lib/RT/Transaction_Overlay.pm:711
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Reference to %1 added"
 msgstr "已加入�考申請單 %1"
 
-#: lib/RT/Transaction_Overlay.pm:751
+#: lib/RT/Transaction_Overlay.pm:665
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr "已移除�考申請單 %1"
 
-#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
+#: html/Elements/EditLinks:129 html/Elements/EditLinks:81 html/Elements/ShowLinks:70 html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50
 msgid "Referred to by"
 msgstr "被�考"
 
-#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
+#: html/Elements/EditLinks:125 html/Elements/EditLinks:72 html/Elements/SelectLinkType:27 html/Elements/ShowLinks:60 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46
 msgid "Refers to"
 msgstr "�考"
 
@@ -5652,44 +5715,48 @@ msgstr "調整查詢�件"
 msgid "Refresh"
 msgstr "æ›´æ–°"
 
-#: html/Elements/Refresh:57
+#: html/Elements/Refresh:35
 #. ($value/60)
 msgid "Refresh this page every %1 minutes."
 msgstr "� %1 分�更新��"
 
 #: NOT FOUND IN SOURCE
+msgid "Relationships"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Remove"
 msgstr "移除"
 
-#: html/Search/Bulk.html:116
+#: html/Search/Bulk.html:95
 msgid "Remove AdminCc"
 msgstr "移除管�員副本"
 
-#: html/Search/Bulk.html:112
+#: html/Search/Bulk.html:91
 msgid "Remove Cc"
 msgstr "移除副本"
 
-#: html/Search/Bulk.html:108
+#: html/Search/Bulk.html:87
 msgid "Remove Requestor"
 msgstr "移除申請人"
 
-#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
+#: html/Ticket/Elements/ShowTransaction:142 html/Ticket/Elements/Tabs:123
 msgid "Reply"
 msgstr "回覆"
 
-#: html/Admin/Queues/Modify.html:72
+#: html/Admin/Queues/Modify.html:50
 msgid "Reply Address"
 msgstr "回覆地�"
 
-#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:54
 msgid "Reply to requestors"
 msgstr "回覆申請人"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "Reply to tickets"
 msgstr "�申請單進行回覆"
 
-#: lib/RT/Queue_Overlay.pm:111
+#: lib/RT/Queue_Overlay.pm:87
 msgid "ReplyToTicket"
 msgstr "回覆申請單"
 
@@ -5701,7 +5768,7 @@ msgstr "上下�刷�"
 msgid "Reported on"
 msgstr "到�日期"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
+#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "申請人"
 
@@ -5729,24 +5796,24 @@ msgstr "申請人"
 msgid "RequestorAddresses"
 msgstr "申請人地�"
 
-#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
 msgid "Requestors"
 msgstr "申請人"
 
-#: html/Admin/Queues/Modify.html:96
+#: html/Admin/Queues/Modify.html:74
 msgid "Requests should be due in"
 msgstr "申請單處�期�"
 
-#: lib/RT/Attribute_Overlay.pm:146
+#: lib/RT/Attribute_Overlay.pm:123
 #. ('Object')
 msgid "Required parameter '%1' not specified"
 msgstr "未指定必�的�數「%1�"
 
-#: html/Elements/Submit:104
+#: html/Elements/Submit:61
 msgid "Reset"
 msgstr "�設"
 
-#: html/Admin/Users/Modify.html:183 html/User/Prefs.html:85
+#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:63
 msgid "Residence"
 msgstr "�處"
 
@@ -5754,16 +5821,16 @@ msgstr "�處"
 msgid "Resolution"
 msgstr "解決狀態"
 
-#: html/Ticket/Elements/Tabs:155
+#: html/Ticket/Elements/Tabs:133
 msgid "Resolve"
 msgstr "解決"
 
-#: html/Ticket/Update.html:154
+#: html/Ticket/Update.html:119
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "解決申請單 #%1 (%2)"
 
-#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
+#: etc/initialdata:323 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1282
 msgid "Resolved"
 msgstr "已解決"
 
@@ -5775,7 +5842,7 @@ msgstr "回覆申請人"
 msgid "Responsibility Type"
 msgstr "責任�分"
 
-#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
+#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
 msgid "Results"
 msgstr "�果"
 
@@ -5783,11 +5850,11 @@ msgstr "�果"
 msgid "Results per page"
 msgstr "��列出幾筆�果"
 
-#: html/Admin/Users/Modify.html:126 html/User/Prefs.html:116
+#: html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
 msgid "Retype Password"
 msgstr "�次輸入密碼"
 
-#: html/Search/Elements/EditSearches:61
+#: html/Search/Elements/EditSearches:13
 msgid "Revert"
 msgstr "復原"
 
@@ -5795,44 +5862,44 @@ msgstr "復原"
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
 msgstr "在 %4 (%5) 的範�內找�到 %2 %3 的 %1 權�\\n"
 
-#: lib/RT/ACE_Overlay.pm:631
+#: lib/RT/ACE_Overlay.pm:612
 msgid "Right Delegated"
 msgstr "權�代�完畢"
 
-#: lib/RT/ACE_Overlay.pm:321
+#: lib/RT/ACE_Overlay.pm:302
 msgid "Right Granted"
 msgstr "權�設定完畢"
 
-#: lib/RT/ACE_Overlay.pm:179
+#: lib/RT/ACE_Overlay.pm:160
 msgid "Right Loaded"
 msgstr "權�載入完畢"
 
-#: lib/RT/ACE_Overlay.pm:696 lib/RT/ACE_Overlay.pm:717
+#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
 msgid "Right could not be revoked"
 msgstr "無法撤消權�"
 
-#: html/User/Delegation.html:85
+#: html/User/Delegation.html:63
 msgid "Right not found"
 msgstr "找�到權�"
 
-#: lib/RT/ACE_Overlay.pm:561 lib/RT/ACE_Overlay.pm:656
+#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
 msgid "Right not loaded."
 msgstr "權�並未載入。"
 
-#: lib/RT/ACE_Overlay.pm:713
+#: lib/RT/ACE_Overlay.pm:688
 msgid "Right revoked"
 msgstr "權�撤消完畢"
 
-#: html/Admin/Elements/UserTabs:67
+#: NOT FOUND IN SOURCE
 msgid "Rights"
 msgstr "權��代�人"
 
-#: html/Admin/CustomFields/GroupRights.html:129 lib/RT/Interface/Web.pm:901
+#: lib/RT/Interface/Web.pm:869
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "無法將權�賦予 %1"
 
-#: html/Admin/CustomFields/GroupRights.html:156 lib/RT/Interface/Web.pm:930
+#: lib/RT/Interface/Web.pm:899
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "無法撤消 %1 的權�"
@@ -5845,7 +5912,7 @@ msgstr "角色�員"
 msgid "Role Name"
 msgstr "角色�稱"
 
-#: html/Admin/Global/GroupRights.html:72 html/Admin/Queues/GroupRights.html:74
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
 msgstr "角色"
 
@@ -5853,7 +5920,7 @@ msgstr "角色"
 msgid "RootApproval"
 msgstr "交由系統管�員簽核"
 
-#: html/Search/Elements/DisplayOptions:83
+#: html/Search/Elements/DisplayOptions:62
 msgid "Rows per page"
 msgstr "��筆數"
 
@@ -5877,37 +5944,31 @@ msgstr "SMTP 伺�器"
 msgid "Sat"
 msgstr "星期六"
 
-#: lib/RT/Date.pm:418
+#: lib/RT/Date.pm:393
 msgid "Sat."
 msgstr "星期六"
 
-#: html/Search/Elements/EditSearches:70
+#: html/Search/Elements/EditSearches:21
 msgid "Save"
 msgstr "儲存"
 
-#: html/Admin/Global/Template.html:67 html/Admin/Groups/Modify.html:88 html/Admin/Queues/Modify.html:111 html/Admin/Queues/People.html:126 html/Admin/Users/Modify.html:238 html/SelfService/Prefs.html:58 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:127 html/Ticket/ModifyDates.html:60 html/Ticket/ModifyLinks.html:60 html/Ticket/ModifyPeople.html:59 html/User/Groups/Modify.html:77
+#: html/Admin/Global/Template.html:45 html/Admin/Queues/Modify.html:89 html/Admin/Queues/People.html:104 html/Admin/Users/Modify.html:198 html/SelfService/Prefs.html:36 html/Ticket/Modify.html:38 html/Ticket/ModifyAll.html:93 html/Ticket/ModifyDates.html:38 html/Ticket/ModifyLinks.html:38 html/Ticket/ModifyPeople.html:37
 msgid "Save Changes"
 msgstr "儲存更改"
 
-#: html/User/Prefs.html:179
+#: html/User/Prefs.html:157
 msgid "Save Preferences"
-msgstr "儲存�好"
+msgstr ""
 
-#: html/Ticket/Elements/PreviewScrips:124
+#: html/Ticket/Elements/PreviewScrips:79
 msgid "Save changes"
 msgstr "儲存更改"
 
-#: lib/RT/SavedSearch.pm:162
-#. ($name)
-msgid "Saved search %1"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:46
+#: html/Search/Elements/EditSearches:1
 msgid "Saved searches"
 msgstr "已儲存的查詢"
 
-#: html/Admin/Elements/ListGlobalScrips:61 html/Admin/Global/Scrip.html:70 html/Admin/Queues/Scrip.html:76
-#. ($scrip->Id)
+#: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
 #. ($id)
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
@@ -5921,23 +5982,23 @@ msgstr "訊�通知動作"
 msgid "Scrip Condition"
 msgstr "訊�通知�件"
 
-#: lib/RT/Scrip_Overlay.pm:205
+#: lib/RT/Scrip_Overlay.pm:180
 msgid "Scrip Created"
 msgstr "手續新增完畢"
 
-#: html/Admin/Elements/EditScrip:52
+#: html/Admin/Elements/EditScrip:30
 msgid "Scrip Fields"
-msgstr "手續欄�"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Scrip Name"
 msgstr "訊��稱"
 
-#: html/Admin/Elements/EditScrips:107
+#: html/Admin/Elements/EditScrips:85
 msgid "Scrip deleted"
 msgstr "手續刪除完畢"
 
-#: html/Admin/Elements/QueueTabs:67 html/Admin/Elements/SystemTabs:54 html/Admin/Global/index.html:62
+#: html/Admin/Elements/QueueTabs:45 html/Admin/Elements/SystemTabs:32 html/Admin/Global/index.html:40
 msgid "Scrips"
 msgstr "手續"
 
@@ -5949,11 +6010,11 @@ msgstr "訊�通知"
 msgid "Scrips for %1\\n"
 msgstr "%1 的手續\\n"
 
-#: html/Admin/Queues/Scrips.html:55
+#: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
 msgstr "�用於所有表單的手續"
 
-#: html/Elements/SimpleSearch:48 html/Search/Build.html:112
+#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:73
 msgid "Search"
 msgstr "查詢"
 
@@ -5961,17 +6022,12 @@ msgstr "查詢"
 msgid "Search Criteria"
 msgstr "查詢�件"
 
-#: lib/RT/SavedSearch.pm:116
-msgid "Search attribute load failure"
-msgstr ""
-
-#: html/Approvals/Elements/PendingMyApproval:60
+#: html/Approvals/Elements/PendingMyApproval:38
 msgid "Search for approvals"
 msgstr "簽核單查詢"
 
-#: lib/RT/SavedSearch.pm:194
-#. ($msg)
-msgid "Search update: %1"
+#: NOT FOUND IN SOURCE
+msgid "Search for articles"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -5986,35 +6042,31 @@ msgstr "二"
 msgid "Second-level Users"
 msgstr "二階主管員工"
 
-#: bin/rt-crontool:213
+#: bin/rt-crontool:184
 msgid "Security:"
 msgstr "安全性："
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "See custom fields"
 msgstr "查閱自訂欄�"
 
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "See exact outgoing email messages and their recipeients"
 msgstr "查閱�出的電�郵件�收件人"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "See ticket private commentary"
 msgstr "查閱申請單內的�人評論"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "See ticket summaries"
 msgstr "查閱申請單總覽"
 
-#: lib/RT/CustomField_Overlay.pm:100
+#: NOT FOUND IN SOURCE
 msgid "SeeCustomField"
 msgstr "查閱自訂欄�"
 
-#: lib/RT/Group_Overlay.pm:177
-msgid "SeeGroup"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:92
+#: lib/RT/Queue_Overlay.pm:68
 msgid "SeeQueue"
 msgstr "查閱表單"
 
@@ -6026,79 +6078,71 @@ msgstr "�擇"
 msgid "Select All"
 msgstr "全�"
 
-#: html/Admin/CustomFields/index.html:46 html/Admin/CustomFields/index.html:49
+#: NOT FOUND IN SOURCE
+msgid "Select a Class"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Select a Custom Field"
 msgstr "�擇自訂欄�"
 
-#: html/Admin/Groups/index.html:78
+#: NOT FOUND IN SOURCE
+msgid "Select a Custom Fields"
+msgstr ""
+
+#: html/Admin/Groups/index.html:50
 msgid "Select a group"
 msgstr "�擇群組"
 
-#: html/Admin/Queues/index.html:54
+#: NOT FOUND IN SOURCE
 msgid "Select a queue"
 msgstr "�擇表單"
 
-#: html/SelfService/CreateTicketInQueue.html:48
-msgid "Select a queue for your new ticket"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Select a queue to link to"
 msgstr "請�擇欲連�表單"
 
-#: html/Admin/Users/index.html:46 html/Admin/Users/index.html:49 html/Admin/Users/index.html:52
+#: html/Admin/Users/index.html:24 html/Admin/Users/index.html:27
 msgid "Select a user"
 msgstr "�擇使用者"
 
-#: html/Admin/Elements/CustomFieldTabs:90
-msgid "Select custom field"
-msgstr "�擇自訂欄�"
-
-#: html/Admin/Global/CustomFields/index.html:70
-msgid "Select custom fields for all user groups"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:65
-msgid "Select custom fields for all users"
-msgstr ""
-
-#: html/Admin/Global/CustomFields/index.html:76
-msgid "Select custom fields for tickets in all queues"
+#: NOT FOUND IN SOURCE
+msgid "Select class"
 msgstr ""
 
-#: html/Admin/Global/CustomFields/index.html:83
-msgid "Select custom fields for transactions on tickets in all queues"
-msgstr ""
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+msgid "Select custom field"
+msgstr "�擇自訂欄�"
 
-#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "�擇群組"
 
-#: lib/RT/CustomField_Overlay.pm:59
+#: lib/RT/CustomField_Overlay.pm:427
 msgid "Select multiple values"
 msgstr "�擇多�項目"
 
-#: lib/RT/CustomField_Overlay.pm:60
+#: lib/RT/CustomField_Overlay.pm:424
 msgid "Select one value"
 msgstr "�擇單一項目"
 
-#: html/Admin/Elements/QueueTabs:92
+#: html/Admin/Elements/QueueTabs:66
 msgid "Select queue"
 msgstr "�擇表單"
 
-#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
+#: html/Admin/Global/Scrip.html:36 html/Admin/Global/Scrips.html:35 html/Admin/Queues/Scrip.html:39 html/Admin/Queues/Scrips.html:51
 msgid "Select scrip"
 msgstr "�擇手續"
 
-#: html/Admin/Global/Template.html:78 html/Admin/Global/Templates.html:57 html/Admin/Queues/Template.html:76 html/Admin/Queues/Templates.html:68
+#: html/Admin/Global/Template.html:56 html/Admin/Global/Templates.html:35 html/Admin/Queues/Template.html:54 html/Admin/Queues/Templates.html:46
 msgid "Select template"
 msgstr "�擇範本"
 
-#: lib/RT/CustomField_Overlay.pm:61
+#: NOT FOUND IN SOURCE
 msgid "Select up to %1 values"
 msgstr "�擇最多 %1 個值"
 
-#: html/Admin/Elements/UserTabs:75
+#: html/Admin/Elements/UserTabs:46
 msgid "Select user"
 msgstr "�擇使用者"
 
@@ -6110,19 +6154,19 @@ msgstr "�擇�程"
 msgid "SelectExternal"
 msgstr "系統�項"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:35
 msgid "SelectMultiple"
 msgstr "多��項"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:34
 msgid "SelectSingle"
 msgstr "單一�項"
 
-#: html/Admin/Elements/EditCustomFields:58
+#: NOT FOUND IN SOURCE
 msgid "Selected Custom Fields"
 msgstr "已��的自訂欄�"
 
-#: html/Admin/CustomFields/Objects.html:59
+#: NOT FOUND IN SOURCE
 msgid "Selected objects"
 msgstr "已��的物件"
 
@@ -6160,11 +6204,11 @@ msgstr "寄信給特定的副本�密件副本收件人"
 
 #: etc/initialdata:94 etc/upgrade/3.1.17/content:7
 msgid "Sends mail to the Ccs"
-msgstr "寄信給副本收件人"
+msgstr ""
 
 #: etc/initialdata:90 etc/upgrade/3.1.17/content:3
 msgid "Sends mail to the Ccs as a comment"
-msgstr "以評論方�寄信給副本收件人"
+msgstr ""
 
 #: etc/initialdata:102
 msgid "Sends mail to the administrative Ccs"
@@ -6182,11 +6226,15 @@ msgstr "寄信給申請人"
 msgid "Sep"
 msgstr "�月"
 
-#: lib/RT/Date.pm:445
+#: lib/RT/Date.pm:419
 msgid "Sep."
 msgstr "09"
 
 #: NOT FOUND IN SOURCE
+msgid "Seperate multiple URLs with spaces"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "September"
 msgstr "�月"
 
@@ -6198,43 +6246,47 @@ msgstr "%1 的「�用�屬性已設為 %2"
 msgid "Shift Type"
 msgstr "�別屬性"
 
-#: html/Ticket/Elements/ShowTransaction:150
+#: html/Ticket/Elements/ShowTransaction:122
 msgid "Show"
 msgstr "顯示"
 
-#: html/Approvals/index.html:52
+#: html/Approvals/index.html:30
 msgid "Show Approvals"
-msgstr "顯示待簽核申請單"
+msgstr ""
 
-#: html/Search/Elements/EditFormat:56
+#: html/Search/Elements/EditFormat:11
 msgid "Show Columns"
 msgstr "顯示欄�"
 
-#: html/Ticket/Elements/Tabs:201
+#: html/Ticket/Elements/Tabs:178
 msgid "Show Results"
 msgstr "顯示�果"
 
-#: html/Approvals/Elements/PendingMyApproval:65
+#: NOT FOUND IN SOURCE
+msgid "Show advanced search options..."
+msgstr ""
+
+#: html/Approvals/Elements/PendingMyApproval:43
 msgid "Show approved requests"
 msgstr "顯示已批准的簽核單"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show basics"
 msgstr "顯示基本資訊"
 
-#: html/Approvals/Elements/PendingMyApproval:66
+#: html/Approvals/Elements/PendingMyApproval:44
 msgid "Show denied requests"
 msgstr "顯示已�回的簽核單"
 
-#: html/Ticket/Create.html:174 html/Ticket/Create.html:55
+#: html/Ticket/Create.html:143 html/Ticket/Create.html:33
 msgid "Show details"
 msgstr "顯示細節"
 
-#: html/Approvals/Elements/PendingMyApproval:64
+#: html/Approvals/Elements/PendingMyApproval:42
 msgid "Show pending requests"
 msgstr "顯示待處�的簽核單"
 
-#: html/Approvals/Elements/PendingMyApproval:67
+#: html/Approvals/Elements/PendingMyApproval:45
 msgid "Show requests awaiting other approvals"
 msgstr "顯示尚待他人批准的簽核單"
 
@@ -6246,47 +6298,43 @@ msgstr "顯示申請單內的�人評論"
 msgid "Show ticket summaries"
 msgstr "顯示申請單摘�"
 
-#: lib/RT/Queue_Overlay.pm:94
+#: lib/RT/Queue_Overlay.pm:70
 msgid "ShowACL"
 msgstr "顯示權�清單"
 
-#: lib/RT/System.pm:86
-msgid "ShowConfigTab"
-msgstr ""
-
-#: lib/RT/Queue_Overlay.pm:107
+#: lib/RT/Queue_Overlay.pm:83
 msgid "ShowOutgoingEmail"
 msgstr "顯示寄�郵件"
 
-#: lib/RT/Group_Overlay.pm:176
+#: lib/RT/Group_Overlay.pm:151
 msgid "ShowSavedSearches"
 msgstr "顯示已儲存的查詢"
 
-#: lib/RT/Queue_Overlay.pm:103
+#: lib/RT/Queue_Overlay.pm:79
 msgid "ShowScrips"
 msgstr "顯示手續"
 
-#: lib/RT/Queue_Overlay.pm:100
+#: lib/RT/Queue_Overlay.pm:76
 msgid "ShowTemplate"
 msgstr "顯示範本"
 
-#: lib/RT/Queue_Overlay.pm:104
+#: lib/RT/Queue_Overlay.pm:80
 msgid "ShowTicket"
 msgstr "顯示申請單"
 
-#: lib/RT/Queue_Overlay.pm:105
+#: lib/RT/Queue_Overlay.pm:81
 msgid "ShowTicketComments"
 msgstr "顯示申請單的評論"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Sign up as a ticket Requestor or ticket or queue Cc"
 msgstr "登記�為申請人或副本收件人"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "登記�為管�員副本收件人"
 
-#: html/Admin/Users/Modify.html:229 html/User/Prefs.html:167
+#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:145
 msgid "Signature"
 msgstr "簽�檔"
 
@@ -6294,27 +6342,23 @@ msgstr "簽�檔"
 msgid "Signed in as %1"
 msgstr "使用者：%1"
 
-#: html/Admin/Elements/SelectSingleOrMultiple:47
+#: html/Admin/Elements/SelectSingleOrMultiple:25
 msgid "Single"
 msgstr "單一"
 
-#: html/Search/Elements/EditFormat:75
-msgid "Size"
-msgstr ""
-
-#: html/Elements/Header:85
+#: html/Elements/Header:62
 msgid "Skip Menu"
 msgstr "略��單"
 
-#: html/Search/Elements/EditFormat:78
-msgid "Small"
-msgstr ""
-
-#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
 msgstr "順�"
 
 #: NOT FOUND IN SOURCE
+msgid "Sort Order"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Sort key"
 msgstr "排�方�"
 
@@ -6326,7 +6370,11 @@ msgstr "�果排�方�"
 msgid "SortOrder"
 msgstr "排�順�"
 
-#: html/Admin/Elements/EditScrip:87
+#: NOT FOUND IN SOURCE
+msgid "Squelched message recipients"
+msgstr ""
+
+#: html/Admin/Elements/EditScrip:65
 msgid "Stage"
 msgstr "關�"
 
@@ -6346,7 +6394,7 @@ msgstr "延宕"
 msgid "Start page"
 msgstr "首�"
 
-#: html/Elements/SelectDateType:48 html/Ticket/Elements/EditDates:53 html/Ticket/Elements/ShowDates:56
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
 msgid "Started"
 msgstr "實際起始日"
 
@@ -6354,7 +6402,7 @@ msgstr "實際起始日"
 msgid "Started date '%1' could not be parsed"
 msgstr "無法解讀起始日期 '%1"
 
-#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
 msgstr "應起始日"
 
@@ -6366,11 +6414,11 @@ msgstr "應起始日"
 msgid "Starts date '%1' could not be parsed"
 msgstr "無法解讀起始日期 '%1"
 
-#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
+#: html/Admin/Users/Modify.html:135 html/User/Prefs.html:123
 msgid "State"
 msgstr "å·ž"
 
-#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
+#: html/Search/Elements/PickBasics:77 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:31 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:37 lib/RT/Ticket_Overlay.pm:1276 lib/RT/Tickets_Overlay.pm:970
 msgid "Status"
 msgstr "��"
 
@@ -6378,7 +6426,8 @@ msgstr "��"
 msgid "Status Change"
 msgstr "��改變時"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:505
+#. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "��從 %1 改為 %2"
 
@@ -6386,65 +6435,69 @@ msgstr "��從 %1 改為 %2"
 msgid "StatusChange"
 msgstr "��改變時"
 
-#: html/Ticket/Elements/Tabs:170
+#: html/Ticket/Elements/Tabs:148
 msgid "Steal"
 msgstr "強制更�承辦人"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "Steal tickets"
 msgstr "強制承辦申請單"
 
-#: lib/RT/Queue_Overlay.pm:118
+#: lib/RT/Queue_Overlay.pm:94
 msgid "StealTicket"
 msgstr "強制承辦申請單"
 
-#: lib/RT/Transaction_Overlay.pm:667
+#: lib/RT/Transaction_Overlay.pm:581
 #. ($Old->Name)
-msgid "Stolen from %1"
-msgstr "承辦人從 %1 強制更�"
-
-#: NOT FOUND IN SOURCE
 msgid "Stolen from %1 "
-msgstr "承辦人從 %1 強制更� "
-
-#: html/Search/Elements/EditFormat:81
-msgid "Style"
-msgstr ""
+msgstr "承辦人從 %1 強制更�"
 
 #: NOT FOUND IN SOURCE
 msgid "Subgroup"
 msgstr "�群組"
 
-#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
+#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Search/Bulk.html:133 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:26 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:58 lib/RT/Ticket_Overlay.pm:1272 lib/RT/Tickets_Overlay.pm:1049
 msgid "Subject"
 msgstr "主題"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:603
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "標題已改為 %1"
 
-#: html/Elements/Submit:97
+#: html/Elements/Submit:58
 msgid "Submit"
 msgstr "�出"
 
 #: NOT FOUND IN SOURCE
+msgid "Submit Query"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Submit Workflow"
 msgstr "�出�程"
 
-#: lib/RT/Group_Overlay.pm:782
+#: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
 msgstr "設定�功"
 
 #: NOT FOUND IN SOURCE
+msgid "Summary"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Summary matches"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "Sun"
 msgstr "星期日"
 
-#: lib/RT/Date.pm:419
+#: lib/RT/Date.pm:394
 msgid "Sun."
 msgstr "星期日"
 
-#: lib/RT/System.pm:76
+#: lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "系統管�員"
 
@@ -6460,11 +6513,11 @@ msgstr "自動�步104HRMS"
 msgid "Synchronizing HRMS data.  This may take a while..."
 msgstr "正在�步化 HRMS 人事系統資料。請�待..."
 
-#: html/User/Elements/DelegateRights:98
+#: html/User/Elements/DelegateRights:76
 msgid "System"
 msgstr "系統"
 
-#: html/Admin/Elements/ToolTabs:54 html/Admin/Tools/Configuration.html:48
+#: html/Admin/Elements/ToolTabs:32 html/Admin/Tools/Configuration.html:3
 msgid "System Configuration"
 msgstr "系統設定"
 
@@ -6472,7 +6525,7 @@ msgstr "系統設定"
 msgid "System Defined"
 msgstr "系統定義"
 
-#: html/Admin/CustomFields/GroupRights.html:128 html/Admin/CustomFields/GroupRights.html:155 html/Admin/CustomFields/UserRights.html:128 html/Admin/CustomFields/UserRights.html:98 html/Admin/Elements/SelectRights:106 lib/RT/ACE_Overlay.pm:585 lib/RT/Interface/Web.pm:900 lib/RT/Interface/Web.pm:929
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:868 lib/RT/Interface/Web.pm:898
 msgid "System Error"
 msgstr "系統錯誤"
 
@@ -6484,24 +6537,19 @@ msgstr "系統錯誤。設定權�失敗。"
 msgid "System Error. right not granted"
 msgstr "系統錯誤。設定權�失敗。"
 
-#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
-#. ($msg)
-msgid "System Error: %1"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "System Rights"
 msgstr "系統權�"
 
-#: html/Admin/Tools/index.html:47
+#: html/Admin/Tools/index.html:2
 msgid "System Tools"
 msgstr "系統工具"
 
-#: lib/RT/ACE_Overlay.pm:634
+#: lib/RT/ACE_Overlay.pm:615
 msgid "System error. Right not delegated."
 msgstr "系統錯誤。權�代�失敗。"
 
-#: lib/RT/ACE_Overlay.pm:164 lib/RT/ACE_Overlay.pm:229 lib/RT/ACE_Overlay.pm:324 lib/RT/ACE_Overlay.pm:921
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
 msgid "System error. Right not granted."
 msgstr "系統錯誤。設定權�失敗。"
 
@@ -6509,7 +6557,7 @@ msgstr "系統錯誤。設定權�失敗。"
 msgid "System error. Unable to grant rights."
 msgstr "系統錯誤。無法設定權�。"
 
-#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "系統群組"
 
@@ -6521,7 +6569,7 @@ msgstr "系統內部用"
 msgid "SystemRolegroup for internal use"
 msgstr "內部使用的系統角色群組"
 
-#: lib/RT/CurrentUser.pm:358
+#: lib/RT/CurrentUser.pm:334
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
@@ -6529,19 +6577,19 @@ msgstr "TEST_STRING"
 msgid "TabbedUI"
 msgstr "�籤介�"
 
-#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
 msgid "Take"
 msgstr "��"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "Take tickets"
 msgstr "自行承辦申請單"
 
-#: lib/RT/Queue_Overlay.pm:116
+#: lib/RT/Queue_Overlay.pm:92
 msgid "TakeTicket"
 msgstr "自行承辦申請單"
 
-#: lib/RT/Transaction_Overlay.pm:652
+#: lib/RT/Transaction_Overlay.pm:566
 msgid "Taken"
 msgstr "已��"
 
@@ -6549,11 +6597,11 @@ msgstr "已��"
 msgid "Task"
 msgstr "工作事項"
 
-#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
+#: html/Admin/Elements/EditScrip:57 html/Tools/Offline.html:56
 msgid "Template"
 msgstr "範本"
 
-#: html/Admin/Global/Template.html:112 html/Admin/Queues/Template.html:113
+#: html/Admin/Global/Template.html:90 html/Admin/Queues/Template.html:89
 #. ($TemplateObj->Id())
 msgid "Template #%1"
 msgstr "範本 #%1"
@@ -6570,11 +6618,11 @@ msgstr "通知範本�述"
 msgid "Template Name"
 msgstr "通知範本�稱"
 
-#: html/Admin/Elements/EditTemplates:110
+#: html/Admin/Elements/EditTemplates:88
 msgid "Template deleted"
 msgstr "範本已刪除"
 
-#: lib/RT/Scrip_Overlay.pm:181
+#: lib/RT/Scrip_Overlay.pm:156
 msgid "Template not found"
 msgstr "找�到範本"
 
@@ -6582,11 +6630,11 @@ msgstr "找�到範本"
 msgid "Template not found\\n"
 msgstr "找�到範本\\n"
 
-#: lib/RT/Template_Overlay.pm:376
+#: lib/RT/Template_Overlay.pm:348
 msgid "Template parsed"
 msgstr "範本剖�完畢"
 
-#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
+#: html/Admin/Elements/QueueTabs:48 html/Admin/Elements/SystemTabs:35 html/Admin/Global/index.html:44
 msgid "Templates"
 msgstr "範本"
 
@@ -6602,33 +6650,33 @@ msgstr "找�到 %1 的範本\\n"
 msgid "Text"
 msgstr "文字"
 
-#: lib/RT/CustomField_Overlay.pm:877 lib/RT/Record.pm:931
+#: lib/RT/Record.pm:740
 msgid "That is already the current value"
 msgstr "已經是目�欄�的值"
 
-#: lib/RT/CustomField_Overlay.pm:407
+#: lib/RT/CustomField_Overlay.pm:248
 msgid "That is not a value for this custom field"
 msgstr "這�是該自訂欄�的值"
 
-#: lib/RT/Ticket_Overlay.pm:1955
+#: lib/RT/Ticket_Overlay.pm:2086
 msgid "That is the same value"
 msgstr "�樣的值"
 
-#: lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
 msgid "That principal already has that right"
 msgstr "這項單�已經�有該權�"
 
-#: lib/RT/Queue_Overlay.pm:750
+#: lib/RT/Queue_Overlay.pm:674
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "這項單�已經是這個表單的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1396
+#: lib/RT/Ticket_Overlay.pm:1527
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "這項單�已經是這份申請單的 %1"
 
-#: lib/RT/Queue_Overlay.pm:849
+#: lib/RT/Queue_Overlay.pm:773
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "這項單��是這個表單的 %1"
@@ -6637,11 +6685,11 @@ msgstr "這項單��是這個表單的 %1"
 msgid "That principal is not a %1 for this ticket"
 msgstr "這項單��是這份申請單的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1951
+#: lib/RT/Ticket_Overlay.pm:2082
 msgid "That queue does not exist"
 msgstr "此表單�存在"
 
-#: lib/RT/Ticket_Overlay.pm:3189
+#: lib/RT/Ticket_Overlay.pm:3152
 msgid "That ticket has unresolved dependencies"
 msgstr "這份申請單有尚未解決的附屬申請單"
 
@@ -6649,27 +6697,27 @@ msgstr "這份申請單有尚未解決的附屬申請單"
 msgid "That user already has that right"
 msgstr "使用者已具有該項權�"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2956
 msgid "That user already owns that ticket"
 msgstr "該使用者已經承辦這份申請單"
 
-#: lib/RT/Ticket_Overlay.pm:2965
+#: lib/RT/Ticket_Overlay.pm:2928
 msgid "That user does not exist"
 msgstr "使用者�存在"
 
-#: lib/RT/User_Overlay.pm:390
+#: lib/RT/User_Overlay.pm:355
 msgid "That user is already privileged"
 msgstr "這�使用者已經是內部�員"
 
-#: lib/RT/User_Overlay.pm:411
+#: lib/RT/User_Overlay.pm:376
 msgid "That user is already unprivileged"
 msgstr "這�使用者屬於�內部�員群組"
 
-#: lib/RT/User_Overlay.pm:403
+#: lib/RT/User_Overlay.pm:368
 msgid "That user is now privileged"
 msgstr "使用者加入內部�員群組完畢"
 
-#: lib/RT/User_Overlay.pm:424
+#: lib/RT/User_Overlay.pm:389
 msgid "That user is now unprivileged"
 msgstr "這�使用者已加入�內部�員群組"
 
@@ -6677,23 +6725,23 @@ msgstr "這�使用者已加入�內部�員群組"
 msgid "That user is now unprivilegedileged"
 msgstr "這�使用者已加入�內部�員群組"
 
-#: lib/RT/Ticket_Overlay.pm:2986
+#: lib/RT/Ticket_Overlay.pm:2949
 msgid "That user may not own tickets in that queue"
 msgstr "使用者�能沒有承辦表單裡的申請單"
 
-#: lib/RT/Link_Overlay.pm:234
+#: lib/RT/Link_Overlay.pm:200
 msgid "That's not a numerical id"
 msgstr "這�是一個數字編號"
 
-#: html/SelfService/Display.html:53 html/Ticket/Create.html:180 html/Ticket/Elements/ShowSummary:49
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "基本資訊"
 
-#: lib/RT/ACE_Overlay.pm:113
+#: lib/RT/ACE_Overlay.pm:87
 msgid "The CC of a ticket"
 msgstr "申請單的副本收件人"
 
-#: lib/RT/ACE_Overlay.pm:114
+#: lib/RT/ACE_Overlay.pm:88
 msgid "The administrative CC of a ticket"
 msgstr "申請單的管�員副本收件人"
 
@@ -6701,7 +6749,7 @@ msgstr "申請單的管�員副本收件人"
 msgid "The comment has been recorded"
 msgstr "評論已被紀錄"
 
-#: bin/rt-crontool:223
+#: bin/rt-crontool:194
 msgid "The following command will find all active tickets in the queue 'general' and set their priority to 99 if they haven't been touched in 4 hours:"
 msgstr "下列命令會找到 'general' 表單內所有�作中的申請單，並將其中 4 �時內未處�的申請單優先程度設為 99："
 
@@ -6709,19 +6757,19 @@ msgstr "下列命令會找到 'general' 表單內所有é�‹ä½œä¸­çš„申請單，ä
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "以下命令未被執行：\\n\\n"
 
-#: lib/RT/Record.pm:934
+#: lib/RT/Record.pm:743
 msgid "The new value has been set."
 msgstr "新的欄�值設定完�。"
 
-#: lib/RT/ACE_Overlay.pm:111
+#: lib/RT/ACE_Overlay.pm:85
 msgid "The owner of a ticket"
 msgstr "申請單的承辦人"
 
-#: lib/RT/ACE_Overlay.pm:112
+#: lib/RT/ACE_Overlay.pm:86
 msgid "The requestor of a ticket"
 msgstr "申請單的申請人"
 
-#: html/Admin/Elements/EditUserComments:47
+#: html/Admin/Elements/EditUserComments:25
 msgid "These comments aren't generally visible to the user"
 msgstr "該使用者�會看見這些評論"
 
@@ -6729,15 +6777,15 @@ msgstr "該使用者�會看見這些評論"
 msgid "Third-"
 msgstr "三"
 
-#: lib/RT/CustomField_Overlay.pm:912
+#: NOT FOUND IN SOURCE
 msgid "This custom field does not apply to that object"
 msgstr "此自訂欄���用於該物件"
 
-#: html/Admin/Tools/Configuration.html:50
+#: html/Admin/Tools/Configuration.html:5
 msgid "This feature is only available to system administrators"
 msgstr "此項功能僅�系統管�員使用"
 
-#: html/Ticket/Elements/PreviewScrips:93
+#: html/Ticket/Elements/PreviewScrips:48
 msgid "This message will be sent to..."
 msgstr "此訊�會寄給..."
 
@@ -6745,15 +6793,15 @@ msgstr "此訊�會寄給..."
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "申請單 %1 %2 (%3)\\n"
 
-#: bin/rt-crontool:214
+#: bin/rt-crontool:185
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "此工具程�會讓使用者經由 RT 執行任�命令。"
 
-#: lib/RT/Transaction_Overlay.pm:288
+#: lib/RT/Transaction_Overlay.pm:226
 msgid "This transaction appears to have no content"
 msgstr "此項更動報告沒有內容"
 
-#: html/Ticket/Elements/ShowRequestor:70
+#: html/Ticket/Elements/ShowRequestor:48
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
 msgstr "使用者�出的� %1 份優先處�申請單"
@@ -6766,7 +6814,7 @@ msgstr "使用者�出的� 25 份優先處�申請單"
 msgid "Thu"
 msgstr "星期四"
 
-#: lib/RT/Date.pm:416
+#: lib/RT/Date.pm:391
 msgid "Thu."
 msgstr "星期四"
 
@@ -6782,24 +6830,24 @@ msgstr "申請單 # %1 %2"
 msgid "Ticket # %1 Jumbo update: %2"
 msgstr "更新申請單 # %1 的全部資訊：%2"
 
-#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
+#: html/Ticket/ModifyAll.html:24 html/Ticket/ModifyAll.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
 msgstr "更新申請單 #%1 的全部資訊：%2"
 
-#: html/Approvals/Elements/ShowDependency:67
+#: html/Approvals/Elements/ShowDependency:45
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
 msgstr "申請單 #%1: %2"
 
-#: lib/RT/Action/CreateTickets.pm:1258 lib/RT/Action/CreateTickets.pm:1267 lib/RT/Action/CreateTickets.pm:595 lib/RT/Action/CreateTickets.pm:716 lib/RT/Action/CreateTickets.pm:729
+#: lib/RT/Action/CreateTickets.pm:1154 lib/RT/Action/CreateTickets.pm:1163 lib/RT/Action/CreateTickets.pm:516 lib/RT/Action/CreateTickets.pm:634 lib/RT/Action/CreateTickets.pm:647
 #. ($T::Tickets{$template_id}->Id)
 #. ($T::Tickets{$template_id}->id)
 #. ($ticket->Id)
 msgid "Ticket %1"
 msgstr "申請單 %1"
 
-#: lib/RT/Ticket_Overlay.pm:731 lib/RT/Ticket_Overlay.pm:751
+#: lib/RT/Ticket_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:720
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "申請單 #%1 �功新增於 '%2' 表單"
@@ -6808,12 +6856,12 @@ msgstr "申請單 #%1 �功新增於 '%2' 表單"
 msgid "Ticket %1 loaded\\n"
 msgstr "載入申請單 %1\\n"
 
-#: html/Search/Bulk.html:269
+#: html/Search/Bulk.html:216
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "申請單 %1：%2"
 
-#: html/Admin/Elements/QueueTabs:74
+#: NOT FOUND IN SOURCE
 msgid "Ticket Custom Fields"
 msgstr "申請單的自訂欄�"
 
@@ -6821,7 +6869,7 @@ msgstr "申請單的自訂欄�"
 msgid "Ticket Due"
 msgstr "表單處�期�"
 
-#: html/Ticket/History.html:46 html/Ticket/History.html:49
+#: html/Ticket/History.html:24 html/Ticket/History.html:27
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
 msgstr "申請單處�紀錄 # %1 %2"
@@ -6842,7 +6890,7 @@ msgstr "表單�行期�"
 msgid "Ticket Resolved"
 msgstr "申請單已解決"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1085
+#: NOT FOUND IN SOURCE
 msgid "Ticket Transactions"
 msgstr "申請單的更動"
 
@@ -6854,19 +6902,19 @@ msgstr "表單種類"
 msgid "Ticket attachment"
 msgstr "申請單附件"
 
-#: lib/RT/Tickets_Overlay.pm:1648
+#: lib/RT/Tickets_Overlay.pm:1228
 msgid "Ticket content"
 msgstr "申請單內容"
 
-#: lib/RT/Tickets_Overlay.pm:1697
+#: lib/RT/Tickets_Overlay.pm:1274
 msgid "Ticket content type"
 msgstr "申請單內容類別"
 
-#: lib/RT/Ticket_Overlay.pm:593 lib/RT/Ticket_Overlay.pm:607 lib/RT/Ticket_Overlay.pm:618 lib/RT/Ticket_Overlay.pm:739
+#: lib/RT/Ticket_Overlay.pm:565 lib/RT/Ticket_Overlay.pm:579 lib/RT/Ticket_Overlay.pm:590 lib/RT/Ticket_Overlay.pm:707
 msgid "Ticket could not be created due to an internal error"
 msgstr "內部錯誤，無法新增申請單"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Ticket created"
 msgstr "申請單新增完畢"
 
@@ -6874,7 +6922,7 @@ msgstr "申請單新增完畢"
 msgid "Ticket creation failed"
 msgstr "申請單新增失敗"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:502
 msgid "Ticket deleted"
 msgstr "申請單刪除完畢"
 
@@ -6886,7 +6934,7 @@ msgstr "找�到申請單編號"
 msgid "Ticket killed"
 msgstr "申請單刪除完畢"
 
-#: html/Ticket/Display.html:55
+#: html/Ticket/Display.html:33
 msgid "Ticket metadata"
 msgstr "申請單的�述資訊"
 
@@ -6902,20 +6950,17 @@ msgstr "申請單��已改變"
 msgid "Ticket watchers"
 msgstr "申請單視察員"
 
-#: lib/RT/Search/FromSQL.pm:83
-#. (ref $self)
-msgid "TicketSQL search module"
-msgstr ""
-
-#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:68 lib/RT/CustomField_Overlay.pm:1084
+#: html/Elements/Tabs:46
 msgid "Tickets"
 msgstr "申請單"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1452
+#. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "申請單 %1 %2"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Tickets_Overlay.pm:1410
+#. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "申請單 %1 (%2)"
 
@@ -6931,31 +6976,31 @@ msgstr "�出的申請單"
 msgid "Tickets from %1"
 msgstr "%1 的申請單"
 
-#: html/Approvals/Elements/ShowDependency:48
+#: html/Approvals/Elements/ShowDependency:26
 msgid "Tickets which depend on this approval:"
 msgstr "批准之後，�接續處�："
 
-#: html/Search/Elements/PickBasics:148 html/Ticket/Elements/EditBasics:61
+#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
 msgid "Time Estimated"
 msgstr "�計時間"
 
-#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
+#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
 msgid "Time Left"
 msgstr "剩餘時間"
 
-#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
+#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
 msgid "Time Worked"
 msgstr "處�時間"
 
-#: lib/RT/Tickets_Overlay.pm:1619
+#: lib/RT/Tickets_Overlay.pm:1201
 msgid "Time left"
 msgstr "剩餘時間"
 
-#: html/Elements/Footer:71
+#: html/Elements/Footer:44
 msgid "Time to display"
 msgstr "顯示時間"
 
-#: lib/RT/Tickets_Overlay.pm:1594
+#: lib/RT/Tickets_Overlay.pm:1177
 msgid "Time worked"
 msgstr "已處�時間"
 
@@ -6963,14 +7008,10 @@ msgstr "已處�時間"
 msgid "TimeLeft"
 msgstr "剩餘時間"
 
-#: lib/RT/Ticket_Overlay.pm:1143
+#: lib/RT/Ticket_Overlay.pm:1277
 msgid "TimeWorked"
 msgstr "已處�時間"
 
-#: html/Search/Elements/EditFormat:74
-msgid "Title"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "To generate a diff of this commit:"
 msgstr "產生這次更動的差異檔："
@@ -6979,7 +7020,7 @@ msgstr "產生這次更動的差異檔："
 msgid "To generate a diff of this commit:\\n"
 msgstr "產生這次更動的差異檔：\\n"
 
-#: html/Elements/Footer:61
+#: html/Elements/Footer:39
 #. ('<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>')
 msgid "To inquire about support, training, custom development or licensing, please contact %1."
 msgstr "如果有支��教育訓練�定製開發的需�，請連絡 %1。"
@@ -6988,11 +7029,11 @@ msgstr "如果有支��教育訓練�定製開發的需�，請連絡 %1。
 msgid "Todo"
 msgstr "待辦事項"
 
-#: lib/RT/Ticket_Overlay.pm:1146
+#: lib/RT/Ticket_Overlay.pm:1280
 msgid "Told"
 msgstr "告知日期"
 
-#: html/Admin/Elements/Tabs:68 html/Admin/index.html:88 html/Elements/Tabs:71
+#: html/Admin/Elements/Tabs:43 html/Elements/Tabs:49
 msgid "Tools"
 msgstr "工具"
 
@@ -7004,24 +7045,24 @@ msgstr "é �"
 msgid "Transaction"
 msgstr "æ›´å‹•"
 
-#: lib/RT/Transaction_Overlay.pm:794
+#: lib/RT/Transaction_Overlay.pm:705
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "清除更動報告 %1"
 
-#: lib/RT/Transaction_Overlay.pm:174
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Transaction Created"
 msgstr "更動報告已新增"
 
-#: html/Admin/Elements/QueueTabs:78
+#: NOT FOUND IN SOURCE
 msgid "Transaction Custom Fields"
 msgstr "更動的自訂欄�"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:92
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "未指定申請單編號，無法新增更動"
 
-#: lib/RT/Transaction_Overlay.pm:125
+#: NOT FOUND IN SOURCE
 msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
 msgstr "未指定物件類別�編號，無法新增更動"
 
@@ -7033,7 +7074,7 @@ msgstr "批次更動時"
 msgid "TransactionCreate"
 msgstr "新增更動時"
 
-#: lib/RT/Transaction_Overlay.pm:838
+#: lib/RT/Transaction_Overlay.pm:760
 msgid "Transactions are immutable"
 msgstr "��更改更動報告"
 
@@ -7049,19 +7090,23 @@ msgstr "試圖刪除�項權�：%1"
 msgid "Tue"
 msgstr "星期二"
 
-#: lib/RT/Date.pm:414
+#: lib/RT/Date.pm:389
 msgid "Tue."
 msgstr "星期二"
 
-#: html/Admin/CustomFields/Modify.html:66 html/Admin/Elements/EditCustomField:65 html/Ticket/Elements/AddWatchers:54 html/Ticket/Elements/AddWatchers:65 html/Ticket/Elements/AddWatchers:75 lib/RT/Ticket_Overlay.pm:1144 lib/RT/Tickets_Overlay.pm:1432
+#: html/Admin/Elements/EditCustomField:43 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1278 lib/RT/Tickets_Overlay.pm:1021
 msgid "Type"
 msgstr "類別"
 
-#: lib/RT/ScripCondition_Overlay.pm:129
+#: NOT FOUND IN SOURCE
+msgid "Unable to load article"
+msgstr ""
+
+#: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "尚無實作"
 
-#: html/Admin/Users/Modify.html:89
+#: html/Admin/Users/Modify.html:67
 msgid "Unix login"
 msgstr "外部系統登入帳號"
 
@@ -7069,21 +7114,16 @@ msgstr "外部系統登入帳號"
 msgid "UnixUsername"
 msgstr "外部系統登入帳號"
 
-#: lib/RT/Attachment_Overlay.pm:290 lib/RT/Record.pm:847
+#: lib/RT/Attachment_Overlay.pm:233 lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
-#. ($ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "��解的內容文字編碼方� %1"
 
-#: html/Search/Build.html:632
-msgid "Unknown field: $key"
-msgstr ""
-
-#: html/Elements/SelectResultsPerPage:58
+#: html/Elements/SelectResultsPerPage:36
 msgid "Unlimited"
 msgstr "全數顯示"
 
-#: html/Search/Elements/SelectSearchesForObjects:63
+#: html/Search/Elements/SelectSearchesForObjects:15
 msgid "Unnamed search"
 msgstr "未命�的查詢"
 
@@ -7091,15 +7131,15 @@ msgstr "未命�的查詢"
 msgid "Unprivileged"
 msgstr "�內部�員"
 
-#: html/Admin/Elements/EditCustomFields:60
+#: NOT FOUND IN SOURCE
 msgid "Unselected Custom Fields"
 msgstr "未��的自訂欄�"
 
-#: html/Admin/CustomFields/Objects.html:61
+#: NOT FOUND IN SOURCE
 msgid "Unselected objects"
 msgstr "未��的物件"
 
-#: lib/RT/Transaction_Overlay.pm:648
+#: lib/RT/Transaction_Overlay.pm:562
 msgid "Untaken"
 msgstr "未被��"
 
@@ -7111,23 +7151,23 @@ msgstr "未命�的查詢"
 msgid "Up"
 msgstr "上一�"
 
-#: html/Search/Bulk.html:54
+#: html/Search/Bulk.html:32
 msgid "Update"
 msgstr "處�"
 
-#: html/Search/Bulk.html:178
+#: html/Search/Bulk.html:146
 msgid "Update All"
-msgstr "全部更新"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "Update ID"
 msgstr "更新編號"
 
-#: html/Ticket/Update.html:133
+#: html/Ticket/Update.html:97
 msgid "Update Ticket"
-msgstr "更新申請單"
+msgstr ""
 
-#: html/Search/Bulk.html:148 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:70
+#: html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:48
 msgid "Update Type"
 msgstr "更新類別"
 
@@ -7139,7 +7179,7 @@ msgstr "整批更新申請單"
 msgid "Update email"
 msgstr "更新電�郵件信箱"
 
-#: html/Search/Results.html:80
+#: html/Search/Results.html:46
 msgid "Update multiple tickets"
 msgstr "批次更新申請單"
 
@@ -7147,11 +7187,11 @@ msgstr "批次更新申請單"
 msgid "Update name"
 msgstr "更新帳號"
 
-#: lib/RT/Action/CreateTickets.pm:737 lib/RT/Interface/Web.pm:524
+#: lib/RT/Action/CreateTickets.pm:655 lib/RT/Interface/Web.pm:479
 msgid "Update not recorded."
 msgstr "更新未被記錄"
 
-#: html/Search/Bulk.html:99
+#: html/Search/Bulk.html:78
 msgid "Update selected tickets"
 msgstr "更新�擇的申請單"
 
@@ -7159,7 +7199,7 @@ msgstr "更新�擇的申請單"
 msgid "Update signature"
 msgstr "更新簽章"
 
-#: html/Ticket/ModifyAll.html:84
+#: html/Ticket/ModifyAll.html:62
 msgid "Update ticket"
 msgstr "更新申請單"
 
@@ -7167,58 +7207,58 @@ msgstr "更新申請單"
 msgid "Update ticket # %1"
 msgstr "更新申請單 # %1"
 
-#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
+#: html/SelfService/Update.html:24 html/SelfService/Update.html:63
 #. ($Ticket->id)
 msgid "Update ticket #%1"
 msgstr "更新申請單 #%1"
 
-#: html/Ticket/Update.html:156
+#: html/Ticket/Update.html:121
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "更新申請單 #%1 (%2)"
 
-#: lib/RT/Action/CreateTickets.pm:735 lib/RT/Interface/Web.pm:523
+#: lib/RT/Action/CreateTickets.pm:653 lib/RT/Interface/Web.pm:477
 msgid "Update type was neither correspondence nor comment."
 msgstr "更新的內容並�申請單回覆也�是評論"
 
-#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1281
 msgid "Updated"
 msgstr "�次更新"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload"
 msgstr "上載"
 
-#: lib/RT/CustomField_Overlay.pm:84
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple files"
 msgstr "上載多個檔案"
 
-#: lib/RT/CustomField_Overlay.pm:79
+#: NOT FOUND IN SOURCE
 msgid "Upload multiple images"
 msgstr "上載多份圖片"
 
-#: lib/RT/CustomField_Overlay.pm:85
+#: NOT FOUND IN SOURCE
 msgid "Upload one file"
 msgstr "上載一個檔案"
 
-#: lib/RT/CustomField_Overlay.pm:80
+#: NOT FOUND IN SOURCE
 msgid "Upload one image"
 msgstr "上載一份圖片"
 
-#: lib/RT/CustomField_Overlay.pm:86
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 files"
 msgstr "上載最多 %1 個檔案"
 
-#: lib/RT/CustomField_Overlay.pm:81
+#: NOT FOUND IN SOURCE
 msgid "Upload up to %1 images"
 msgstr "上載最多 %1 份圖片"
 
-#: html/Tools/Offline.html:95
+#: html/Tools/Offline.html:73
 msgid "Upload your changes"
 msgstr "上載您的更動"
 
-#: html/Admin/index.html:90
-msgid "Use other RT administrative tools"
+#: NOT FOUND IN SOURCE
+msgid "Use the dropdown menus to select which transactions you want to extract into a new RTFM article"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
@@ -7233,7 +7273,7 @@ msgstr "使用者 %1 %2：%3\\n"
 msgid "User %1 Password: %2\\n"
 msgstr "使用者 %1 密碼：%2\\n"
 
-#: lib/RT/Ticket_Overlay.pm:496
+#: lib/RT/Ticket_Overlay.pm:468
 #. ($args{'Owner'})
 msgid "User '%1' could not be found."
 msgstr "找�到使用者 '%1'。"
@@ -7250,15 +7290,15 @@ msgstr "找�到使用者 '%1'\\n"
 msgid "User Defined"
 msgstr "使用者自訂"
 
-#: html/Admin/Elements/EditScrip:98
+#: html/Admin/Elements/EditScrip:76
 msgid "User Defined conditions and actions"
-msgstr "使用者自訂的�件�動作"
+msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "User ID"
 msgstr "使用者 ID"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "使用者 ID"
 
@@ -7266,7 +7306,7 @@ msgstr "使用者 ID"
 msgid "User Number"
 msgstr "員工編號"
 
-#: html/Admin/Elements/CustomFieldTabs:72 html/Admin/Elements/GroupTabs:68 html/Admin/Elements/QueueTabs:85 html/Admin/Elements/SystemTabs:68 html/Admin/Global/index.html:80
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
 msgid "User Rights"
 msgstr "使用者權�"
 
@@ -7278,17 +7318,16 @@ msgstr "使用者設定"
 msgid "User Shift"
 msgstr "員工�別"
 
-#: lib/RT/Interface/Web.pm:1283
-#. ($cf->Name, $class, $Object->id)
+#: NOT FOUND IN SOURCE
 msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
 msgstr "使用者試圖在 %2 物件 #%3 的自訂欄� %1 上執行未知的更新�作"
 
-#: html/Admin/Users/Modify.html:293
+#: html/Admin/Users/Modify.html:252
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "無法新增使用者：%1"
 
-#: lib/RT/User_Overlay.pm:331
+#: lib/RT/User_Overlay.pm:296
 msgid "User created"
 msgstr "使用者新增完畢"
 
@@ -7300,11 +7339,11 @@ msgstr "使用者 %1 新增完畢"
 msgid "User created: %1 (%2)"
 msgstr "使用者 %1 (%2) 新增完畢"
 
-#: html/Admin/CustomFields/GroupRights.html:74 html/Admin/Global/GroupRights.html:88 html/Admin/Groups/GroupRights.html:75 html/Admin/Queues/GroupRights.html:90
+#: html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
 msgid "User defined groups"
 msgstr "使用者定義的群組"
 
-#: lib/RT/User_Overlay.pm:593 lib/RT/User_Overlay.pm:613
+#: lib/RT/User_Overlay.pm:558 lib/RT/User_Overlay.pm:575
 msgid "User loaded"
 msgstr "已載入使用者"
 
@@ -7320,7 +7359,7 @@ msgstr "使用者 %1 已改�為 %2"
 msgid "User view"
 msgstr "使用者�人資料"
 
-#: html/Admin/Groups/index.html:99
+#: NOT FOUND IN SOURCE
 msgid "User-defined groups"
 msgstr "使用者自定群組"
 
@@ -7328,19 +7367,19 @@ msgstr "使用者自定群組"
 msgid "UserDefined"
 msgstr "使用者自定"
 
-#: html/Admin/Users/Modify.html:69 html/Elements/Login:73 html/Ticket/Elements/AddWatchers:56
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "帳號"
 
-#: html/Admin/Elements/GlobalCustomFieldTabs:55 html/Admin/Elements/SelectNewGroupMembers:47 html/Admin/Elements/Tabs:53 html/Admin/Global/CustomFields/index.html:64 html/Admin/Groups/Members.html:76 html/Admin/Queues/People.html:89 html/Admin/index.html:62 html/User/Groups/Members.html:79 lib/RT/CustomField_Overlay.pm:1086
+#: html/Admin/Elements/SelectNewGroupMembers:25 html/Admin/Elements/Tabs:31 html/Admin/Groups/Members.html:54 html/Admin/Queues/People.html:67 html/Admin/index.html:28 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "使用者"
 
-#: html/Admin/Users/index.html:85
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "符�查詢�件的使用者"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:523
+#: lib/RT/Tickets_Overlay_SQL.pm:494
 msgid "Valid Query"
 msgstr "��的查詢"
 
@@ -7348,7 +7387,7 @@ msgstr "��的查詢"
 msgid "ValueOfQueue"
 msgstr "�擇表單"
 
-#: html/Admin/CustomFields/Modify.html:89 html/Admin/Elements/EditCustomField:78
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "欄�值"
 
@@ -7356,11 +7395,15 @@ msgstr "欄�值"
 msgid "View log"
 msgstr "檢視紀錄檔"
 
-#: lib/RT/Queue_Overlay.pm:108
+#: NOT FOUND IN SOURCE
+msgid "VrijevormEnkele"
+msgstr ""
+
+#: lib/RT/Queue_Overlay.pm:84
 msgid "Watch"
 msgstr "視察"
 
-#: lib/RT/Queue_Overlay.pm:109
+#: lib/RT/Queue_Overlay.pm:85
 msgid "WatchAsAdminCc"
 msgstr "以管�員副本收件人身份視察"
 
@@ -7368,7 +7411,7 @@ msgstr "以管�員副本收件人身份視察"
 msgid "Watcher loaded"
 msgstr "�功載入視察員資訊"
 
-#: html/Admin/Elements/QueueTabs:63
+#: html/Admin/Elements/QueueTabs:41
 msgid "Watchers"
 msgstr "視察員"
 
@@ -7380,7 +7423,7 @@ msgstr "網�文字編碼方�"
 msgid "Wed"
 msgstr "星期三"
 
-#: lib/RT/Date.pm:415
+#: lib/RT/Date.pm:390
 msgid "Wed."
 msgstr "星期三"
 
@@ -7414,7 +7457,7 @@ msgstr "當申請單更�承辦人時"
 
 #: etc/initialdata:178 etc/upgrade/3.1.17/content:16
 msgid "Whenever a ticket's priority changes"
-msgstr "當申請單的優先順�改變時"
+msgstr ""
 
 #: etc/initialdata:193
 msgid "Whenever a ticket's queue changes"
@@ -7436,11 +7479,19 @@ msgstr "當評論��時"
 msgid "Whenever correspondence comes in"
 msgstr "當回覆��時"
 
-#: html/Admin/Users/Modify.html:188 html/User/Prefs.html:89
+#: NOT FOUND IN SOURCE
+msgid "Which are referred to by "
+msgstr ""
+
+#: NOT FOUND IN SOURCE
+msgid "Which refer to"
+msgstr ""
+
+#: html/Admin/Users/Modify.html:161 html/User/Prefs.html:67
 msgid "Work"
 msgstr "公�"
 
-#: html/Search/Results.html:84
+#: html/Search/Results.html:50
 msgid "Work offline"
 msgstr "離線工作"
 
@@ -7448,7 +7499,7 @@ msgstr "離線工作"
 msgid "WorkPhone"
 msgstr "公�電話"
 
-#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
+#: html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
 msgid "Worked"
 msgstr "處�時間"
 
@@ -7476,7 +7527,7 @@ msgstr "�程"
 msgid "Writable"
 msgstr "�讀寫"
 
-#: NOT FOUND IN SOURCE
+#: html/autohandler:150
 msgid "XXX CHANGEME You are not an authorized user"
 msgstr "XXX CHANGEME 您是未經授權的使用者"
 
@@ -7484,11 +7535,11 @@ msgstr "XXX CHANGEME 您是未經授權的使用者"
 msgid "Yes"
 msgstr "是"
 
-#: lib/RT/Ticket_Overlay.pm:3096
+#: lib/RT/Ticket_Overlay.pm:3059
 msgid "You already own this ticket"
 msgstr "您已是這份申請單的承辦人"
 
-#: html/autohandler:158 html/autohandler:166
+#: html/autohandler:142
 msgid "You are not an authorized user"
 msgstr "您�是被授權的使用者"
 
@@ -7496,7 +7547,7 @@ msgstr "您�是被授權的使用者"
 msgid "You can access it with the Download button on the right."
 msgstr "您�以按�方的「下載��來�得。"
 
-#: lib/RT/Ticket_Overlay.pm:2978
+#: lib/RT/Ticket_Overlay.pm:2941
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "祇能�新指派您所承辦或是沒有承辦人的申請單"
 
@@ -7504,20 +7555,20 @@ msgstr "祇能�新指派您所承辦或是沒有承辦人的申請單"
 msgid "You don't have permission to view that ticket.\\n"
 msgstr "您沒有看那份申請單的權�。\\n"
 
-#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
+#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:760
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
 msgstr "您會在表單 %2 找到 %1 的申請單"
 
-#: html/NoAuth/Logout.html:52
+#: html/NoAuth/Logout.html:30
 msgid "You have been logged out of RT."
 msgstr "您已登出 RT。"
 
-#: html/SelfService/Display.html:109
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "您沒有在該表單新增申請單的權�。"
 
-#: lib/RT/Ticket_Overlay.pm:1964
+#: lib/RT/Ticket_Overlay.pm:2095
 msgid "You may not create requests in that queue."
 msgstr "您�能在該表單中�出申請。"
 
@@ -7525,7 +7576,7 @@ msgstr "您�能在該表單中�出申請。"
 msgid "You need to restart the Request Tracker service for saved changes to take effect."
 msgstr "您必須�新啟動 Request Tracker �務，儲存的更動纔會生效。"
 
-#: html/NoAuth/Logout.html:56
+#: html/NoAuth/Logout.html:34
 msgid "You're welcome to login again"
 msgstr "歡迎下次�來"
 
@@ -7557,11 +7608,11 @@ msgstr "您的申請單已被 %1 �回。"
 msgid "Your request was rejected."
 msgstr "您的申請單已被�回。"
 
-#: html/autohandler:193
+#: html/autohandler:177
 msgid "Your username or password is incorrect"
 msgstr "您的帳號或密碼有誤"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:149
+#: html/Admin/Users/Modify.html:141 html/User/Prefs.html:127
 msgid "Zip"
 msgstr "郵��號"
 
@@ -7577,32 +7628,28 @@ msgstr "�期"
 msgid "alert"
 msgstr "急訊"
 
-#: lib/RT/System.pm:88
-msgid "allow creation of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and is not"
 msgstr ""
 
-#: lib/RT/System.pm:87
-msgid "allow loading of saved searches"
+#: NOT FOUND IN SOURCE
+msgid "and not"
 msgstr ""
 
 #: NOT FOUND IN SOURCE
 msgid "approving"
 msgstr "待簽核"
 
-#: html/User/Elements/DelegateRights:80
+#: html/User/Elements/DelegateRights:58
 #. ($right->PrincipalObj->Object->SelfDescription)
 msgid "as granted to %1"
 msgstr "權�� %1"
 
-#: html/Search/Elements/PickBasics:127
-msgid "belongs to"
-msgstr ""
-
-#: html/SelfService/Closed.html:49
+#: html/SelfService/Closed.html:27
 msgid "closed"
 msgstr "已解決"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:33
 msgid "contains"
 msgstr "包�"
 
@@ -7626,7 +7673,7 @@ msgstr "申請單回覆已�出"
 msgid "critical"
 msgstr "嚴�"
 
-#: html/Admin/Queues/Modify.html:98 lib/RT/Date.pm:342
+#: html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
 msgid "days"
 msgstr "天"
 
@@ -7642,19 +7689,15 @@ msgstr "�錯"
 msgid "delete"
 msgstr "刪除"
 
-#: lib/RT/Queue_Overlay.pm:88
+#: lib/RT/Queue_Overlay.pm:64
 msgid "deleted"
 msgstr "已刪除"
 
-#: html/Search/Elements/PickBasics:128
-msgid "does not belong to"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:61
+#: html/Search/Elements/PickBasics:33
 msgid "does not match"
 msgstr "�符�"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:34
 msgid "doesn't contain"
 msgstr "�包�"
 
@@ -7666,7 +7709,7 @@ msgstr "電�郵件信箱"
 msgid "emergency"
 msgstr "�難"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "equal to"
 msgstr "等於"
 
@@ -7674,30 +7717,6 @@ msgstr "等於"
 msgid "error"
 msgstr "錯誤"
 
-#: html/Search/Build.html:387
-msgid "error: can't move down"
-msgstr ""
-
-#: html/Search/Build.html:409
-msgid "error: can't move left"
-msgstr ""
-
-#: html/Search/Build.html:368
-msgid "error: can't move up"
-msgstr ""
-
-#: html/Search/Build.html:451
-msgid "error: nothing to delete"
-msgstr ""
-
-#: html/Search/Build.html:373 html/Search/Build.html:392 html/Search/Build.html:414 html/Search/Build.html:443
-msgid "error: nothing to move"
-msgstr ""
-
-#: html/Search/Build.html:469
-msgid "error: nothing to toggle"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "false"
 msgstr "�"
@@ -7706,36 +7725,40 @@ msgstr "�"
 msgid "filename"
 msgstr "檔�"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "greater than"
 msgstr "大於"
 
-#: lib/RT/Group_Overlay.pm:222
+#: lib/RT/Group_Overlay.pm:196
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "群組 '%1'"
 
-#: lib/RT/Date.pm:338
+#: lib/RT/Date.pm:315
 msgid "hours"
 msgstr "�時"
 
-#: html/Search/Elements/PickBasics:48
+#: NOT FOUND IN SOURCE
 msgid "id"
 msgstr "編號"
 
 #: NOT FOUND IN SOURCE
+msgid "in class %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "info"
 msgstr "資訊"
 
-#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickBasics:49 html/Search/Elements/PickBasics:80 html/Search/Elements/PickBasics:97 html/Search/Elements/PickCFs:37
 msgid "is"
 msgstr "是"
 
-#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickBasics:50 html/Search/Elements/PickBasics:81 html/Search/Elements/PickBasics:98 html/Search/Elements/PickCFs:38
 msgid "isn't"
 msgstr "�是"
 
-#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectEqualityOperator:37
 msgid "less than"
 msgstr "�於"
 
@@ -7743,15 +7766,15 @@ msgstr "�於"
 msgid "level Admin"
 msgstr "層主管"
 
-#: html/Search/Elements/PickBasics:60
+#: html/Search/Elements/PickBasics:32
 msgid "matches"
 msgstr "符�"
 
-#: lib/RT/Date.pm:334
+#: lib/RT/Date.pm:311
 msgid "min"
 msgstr "分"
 
-#: html/Ticket/Update.html:64
+#: html/Ticket/Update.html:42
 msgid "minutes"
 msgstr "分�"
 
@@ -7759,27 +7782,27 @@ msgstr "分�"
 msgid "modifications\\n\\n"
 msgstr "更改\\n\\n"
 
-#: lib/RT/Date.pm:350
+#: lib/RT/Date.pm:327
 msgid "months"
 msgstr "月"
 
-#: lib/RT/Queue_Overlay.pm:83
+#: lib/RT/Queue_Overlay.pm:59
 msgid "new"
 msgstr "新建立"
 
-#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr "沒有�稱"
 
-#: html/Admin/Elements/EditScrips:64
+#: html/Admin/Elements/EditScrips:42
 msgid "no value"
 msgstr "沒有值"
 
-#: html/Admin/Elements/EditQueueWatchers:48 html/Ticket/Elements/EditWatchers:49
+#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
 msgid "none"
 msgstr "ç„¡"
 
-#: html/Elements/SelectEqualityOperator:59
+#: html/Elements/SelectEqualityOperator:37
 msgid "not equal to"
 msgstr "�等於"
 
@@ -7795,7 +7818,7 @@ msgstr "�符�"
 msgid "number"
 msgstr "號"
 
-#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:60
 msgid "open"
 msgstr "é–‹å•Ÿ"
 
@@ -7803,21 +7826,21 @@ msgstr "é–‹å•Ÿ"
 msgid "opened"
 msgstr "已開啟"
 
-#: lib/RT/Group_Overlay.pm:227
+#: lib/RT/Group_Overlay.pm:201
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "使用者「%2�的「%1�代�人群組"
 
-#: lib/RT/Group_Overlay.pm:235
+#: lib/RT/Group_Overlay.pm:209
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "表單 %1 %2"
 
-#: lib/RT/Queue_Overlay.pm:87
+#: lib/RT/Queue_Overlay.pm:63
 msgid "rejected"
 msgstr "已�回"
 
-#: lib/RT/Queue_Overlay.pm:86
+#: lib/RT/Queue_Overlay.pm:62
 msgid "resolved"
 msgstr "已處�"
 
@@ -7825,33 +7848,29 @@ msgstr "已處�"
 msgid "rtname"
 msgstr "伺�器�稱"
 
-#: lib/RT/Date.pm:330
+#: lib/RT/Date.pm:307
 msgid "sec"
 msgstr "秒"
 
-#: lib/RT/System.pm:86
-msgid "show Configuration tab"
-msgstr ""
-
-#: html/Search/Results.html:82
+#: html/Search/Results.html:48
 msgid "spreadsheet"
 msgstr "試算表"
 
-#: lib/RT/Queue_Overlay.pm:85
+#: lib/RT/Queue_Overlay.pm:61
 msgid "stalled"
 msgstr "延宕"
 
-#: lib/RT/Group_Overlay.pm:230
+#: lib/RT/Group_Overlay.pm:204
 #. ($self->Type)
 msgid "system %1"
 msgstr "系統 %1"
 
-#: lib/RT/Group_Overlay.pm:241
+#: lib/RT/Group_Overlay.pm:215
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "系統群組 '%1'"
 
-#: html/Elements/Error:66 html/SelfService/Error.html:63
+#: html/Elements/Error:42 html/SelfService/Error.html:41
 msgid "the calling component did not specify why"
 msgstr "呼�元件未指明原因"
 
@@ -7859,7 +7878,7 @@ msgstr "呼�元件未指明原因"
 msgid "ticket #%1"
 msgstr "申請單 #%1"
 
-#: lib/RT/Group_Overlay.pm:238
+#: lib/RT/Group_Overlay.pm:212
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "申請單 #%1 %2"
@@ -7876,16 +7895,20 @@ msgstr "到"
 msgid "true"
 msgstr "真"
 
-#: lib/RT/Group_Overlay.pm:244
+#: lib/RT/Group_Overlay.pm:218
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "沒有�述的群組 %1"
 
 #: NOT FOUND IN SOURCE
+msgid "undescripbed group %1"
+msgstr ""
+
+#: NOT FOUND IN SOURCE
 msgid "unresolved"
 msgstr "未處�"
 
-#: lib/RT/Group_Overlay.pm:219
+#: lib/RT/Group_Overlay.pm:193
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "使用者 %1"
@@ -7894,7 +7917,7 @@ msgstr "使用者 %1"
 msgid "warning"
 msgstr "警告"
 
-#: lib/RT/Date.pm:346
+#: lib/RT/Date.pm:323
 msgid "weeks"
 msgstr "週"
 
@@ -7902,7 +7925,11 @@ msgstr "週"
 msgid "with template %1"
 msgstr "範本：%1"
 
-#: lib/RT/Date.pm:354
+#: lib/RT/Date.pm:331
 msgid "years"
 msgstr "å¹´"
 
+#: NOT FOUND IN SOURCE
+msgid "ニック�ーム"
+msgstr ""
+
diff --git a/rt/lib/RT/Interface/CLI.pm b/rt/lib/RT/Interface/CLI.pm
index 8c93295..4179994 100644
--- a/rt/lib/RT/Interface/CLI.pm
+++ b/rt/lib/RT/Interface/CLI.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 use strict;
 
 use RT;
@@ -55,7 +55,7 @@ BEGIN {
     use vars qw ($VERSION  @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
     
     # set the version for version checking
-    $VERSION = do { my @r = (q$Revision: 1.1.1.3 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+    $VERSION = do { my @r = (q$Revision: 1.1.1.2 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
     
     @ISA         = qw(Exporter);
     
diff --git a/rt/lib/RT/Interface/Email.pm b/rt/lib/RT/Interface/Email.pm
index 5db7c8a..04539a3 100755
--- a/rt/lib/RT/Interface/Email.pm
+++ b/rt/lib/RT/Interface/Email.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Interface::Email;
 
 use strict;
@@ -56,7 +56,7 @@ BEGIN {
     use vars qw ($VERSION  @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
     
     # set the version for version checking
-    $VERSION = do { my @r = (q$Revision: 1.1.1.5 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+    $VERSION = do { my @r = (q$Revision: 1.1.1.4 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
     
     @ISA         = qw(Exporter);
     
@@ -64,15 +64,15 @@ BEGIN {
     # as well as any optionally exported functions
     @EXPORT_OK   = qw(
               &CreateUser
-              &GetMessageContent
-              &CheckForLoops 
-              &CheckForSuspiciousSender
-              &CheckForAutoGenerated 
-              &MailError 
-              &ParseCcAddressesFromHead
-              &ParseSenderAddressFromHead 
-              &ParseErrorsToAddressFromHead
-              &ParseAddressFromHeader
+		      &GetMessageContent
+		      &CheckForLoops 
+		      &CheckForSuspiciousSender
+		      &CheckForAutoGenerated 
+		      &MailError 
+		      &ParseCcAddressesFromHead
+		      &ParseSenderAddressFromHead 
+		      &ParseErrorsToAddressFromHead
+                      &ParseAddressFromHeader
               &Gateway);
 
 }
@@ -139,8 +139,8 @@ sub CheckForSuspiciousSender {
 
     my ($From, $junk) = ParseSenderAddressFromHead($head);
     
-    if (($From =~ /^mailer-daemon\@/i) or
-	($From =~ /^postmaster\@/i)){
+    if (($From =~ /^mailer-daemon/i) or
+	($From =~ /^postmaster/i)){
 	return (1);
 	
     }
@@ -159,57 +159,13 @@ sub CheckForAutoGenerated {
     if ($Precedence =~ /^(bulk|junk)/i) {
 	return (1);
     }
-    
-    # First Class mailer uses this as a clue.
-    my $FCJunk = $head->get("X-FC-Machinegenerated") || "";
-    if ($FCJunk =~ /^true/i) {
-        return (1);
-    }
-
-    return (0);
-}
-
-# }}}
-
-# {{{ IsRTAddress
-
-=head2 IsRTAddress ADDRESS
-
-Takes a single parameter, an email address. 
-Returns true if that address matches the $RTAddressRegexp.  
-Returns false, otherwise.
-
-=cut
-
-sub IsRTAddress {
-    my $address = shift || '';
-
-    # Example: the following rule would tell RT not to Cc 
-    #   "tickets@noc.example.com"
-    if ( defined($RT::RTAddressRegexp) &&
-                       $address =~ /$RT::RTAddressRegexp/ ) {
-        return(1);
-    } else {
-        return (undef);
+    else {
+	return (0);
     }
 }
 
 # }}}
 
-# {{{ CullRTAddresses
-
-=head2 CullRTAddresses ARRAY
-
-Takes a single argument, an array of email addresses.
-Returns the same array with any IsRTAddress()es weeded out.
-
-=cut
-
-sub CullRTAddresses {
-    return (grep { IsRTAddress($_) } @_);
-}
-
-# }}}
 
 # {{{ sub MailError 
 sub MailError {
@@ -314,8 +270,7 @@ sub CreateUser {
 
     return $CurrentUser;
 }
-# }}}
-
+# }}}	    
 # {{{ ParseCcAddressesFromHead 
 
 =head2 ParseCcAddressesFromHead HASHREF
@@ -341,10 +296,10 @@ sub ParseCcAddressesFromHead {
     foreach my $AddrObj (@ToObjs, @CcObjs) {
 	my $Address = $AddrObj->address;
 	$Address = $args{'CurrentUser'}->UserObj->CanonicalizeEmailAddress($Address);
- 	next if ($args{'CurrentUser'}->EmailAddress =~ /^\Q$Address\E$/i);
-	next if ($args{'QueueObj'}->CorrespondAddress =~ /^\Q$Address\E$/i);
-	next if ($args{'QueueObj'}->CommentAddress =~ /^\Q$Address\E$/i);
-	next if (RT::EmailParser->IsRTAddress($Address));
+ 	next if ($args{'CurrentUser'}->EmailAddress =~ /^$Address$/i);
+	next if ($args{'QueueObj'}->CorrespondAddress =~ /^$Address$/i);
+	next if ($args{'QueueObj'}->CommentAddress =~ /^$Address$/i);
+	next if (RT::EmailParser::IsRTAddress(undef, $Address));
 	
 	push (@Addresses, $Address);
     }
@@ -410,8 +365,6 @@ Takes an address from $head->get('Line') and returns a tuple: user@host, friendl
 sub ParseAddressFromHeader{
     my $Addr = shift;
     
-    # Perl 5.8.0 breaks when doing regex matches on utf8
-    Encode::_utf8_off($Addr) if $] == 5.008;
     my @Addresses = Mail::Address->parse($Addr);
     
     my $AddrObj = $Addresses[0];
@@ -429,26 +382,6 @@ sub ParseAddressFromHeader{
 }
 # }}}
 
-# {{{ sub ParseTicketId 
-
-
-sub ParseTicketId {
-    my $Subject = shift;
-    my $id;
-
-    my $test_name = $RT::EmailSubjectTagRegex || qr/\Q$RT::rtname\E/;
-
-    if ( $Subject =~ s/\[$test_name\s+\#(\d+)\s*\]//i ) {
-        my $id = $1;
-        $RT::Logger->debug("Found a ticket ID. It's $id");
-        return ($id);
-    }
-    else {
-        return (undef);
-    }
-}
-
-# }}}
 
 
 =head2 Gateway ARGSREF
@@ -476,12 +409,11 @@ Returns:
 
     status code is a numeric value.
 
-      for temporary failures, the status code should be -75
+    for temporary failures, status code should be -75
 
-      for permanent failures which are handled by RT, the status code 
-      should be 0
+    for permanent failures which are handled by RT, status code should be 0
     
-      for succces, the status code should be 1
+    for succces, the status code should be 1
 
 
 
@@ -493,15 +425,14 @@ sub Gateway {
     my %args = %$argsref;
 
     # Set some reasonable defaults
-    $args{'action'} ||= 'correspond';
-    $args{'queue'}  ||= '1';
+    $args{'action'} = 'correspond' unless ( $args{'action'} );
+    $args{'queue'}  = '1'          unless ( $args{'queue'} );
 
     # Validate the action
-    my ($status, @actions) = IsCorrectAction( $args{'action'} );
-    unless ( $status ) {
+    unless ( $args{'action'} =~ /^(comment|correspond|action)$/ ) {
 
         # Can't safely loc this. What object do we loc around?
-        $RT::Logger->crit("Mail gateway called with an invalid action paramenter '".$actions[0]."' for queue '".$args{'queue'}."'");
+        $RT::Logger->crit("Mail gateway called with an invalid action paramenter '".$args{'action'}."' for queue '".$args{'queue'}."'");
 
         return ( -75, "Invalid 'action' parameter", undef );
     }
@@ -524,21 +455,21 @@ sub Gateway {
     my $Message = $parser->Entity();
     my $head    = $Message->head;
 
-    my ( $CurrentUser, $AuthStat, $error );
+    my ( $CurrentUser, $AuthStat, $status, $error );
 
     # Initalize AuthStat so comparisons work correctly
     $AuthStat = -9999999;
 
     my $ErrorsTo = ParseErrorsToAddressFromHead($head);
 
-    my $MessageId = $head->get('Message-ID')
+    my $MessageId = $head->get('Message-Id')
       || "<no-message-id-" . time . rand(2000) . "\@.$RT::Organization>";
 
     #Pull apart the subject line
     my $Subject = $head->get('Subject') || '';
     chomp $Subject;
 
-    $args{'ticket'} ||= ParseTicketId($Subject);
+    $args{'ticket'} ||= $parser->ParseTicketId($Subject);
 
     my $SystemTicket;
     my $Right = 'CreateTicket';
@@ -588,28 +519,22 @@ sub Gateway {
             }
         }
 
-	foreach my $action ( @actions ) {
-
-            ( $CurrentUser, $NewAuthStat ) = $Code->(
-                Message     => $Message,
-                RawMessageRef => \$args{'message'},
-                CurrentUser => $CurrentUser,
-                AuthLevel   => $AuthStat,
-                Action      => $action,
-                Ticket      => $SystemTicket,
-                Queue       => $SystemQueueObj
-            );
-
-
-            # If a module returns a "-1" then we discard the ticket, so.
-            $AuthStat = -1 if $NewAuthStat == -1;
+        ( $CurrentUser, $NewAuthStat ) = $Code->(
+            Message     => $Message,
+            RawMessageRef => \$args{'message'},
+            CurrentUser => $CurrentUser,
+            AuthLevel   => $AuthStat,
+            Action      => $args{'action'},
+            Ticket      => $SystemTicket,
+            Queue       => $SystemQueueObj
+        );
 
-            # You get the highest level of authentication you were assigned.
-            $AuthStat = $NewAuthStat if $NewAuthStat > $AuthStat;
 
-            last if $AuthStat == -1;
-	}
+        # If a module returns a "-1" then we discard the ticket, so.
+        $AuthStat = -1 if $NewAuthStat == -1;
 
+        # You get the highest level of authentication you were assigned.
+        $AuthStat = $NewAuthStat if $NewAuthStat > $AuthStat;
         last if $AuthStat == -1;
     }
 
@@ -716,15 +641,11 @@ EOT
     }
 
     if ($SquelchReplies) {
+        ## TODO: This is a hack.  It should be some other way to
+        ## indicate that the transaction should be "silent".
 
-        # Squelch replies to the sender, and also leave a clue to
-        # allow us to squelch ALL outbound messages. This way we
-        # can punt the logic of "what to do when we get a bounce"
-        # to the scrip. We might want to notify nobody. Or just
-        # the RT Owner. Or maybe all Privileged watchers.
         my ( $Sender, $junk ) = ParseSenderAddressFromHead($head);
         $head->add( 'RT-Squelch-Replies-To', $Sender );
-        $head->add( 'RT-DetectedAutoGenerated', 'true' );
     }
 
     # }}}
@@ -732,8 +653,7 @@ EOT
     my $Ticket = RT::Ticket->new($CurrentUser);
 
     # {{{ If we don't have a ticket Id, we're creating a new ticket
-    if ( (!$SystemTicket || !$SystemTicket->Id) && 
-           grep /^(comment|correspond)$/, @actions ) {
+    if ( !$args{'ticket'} ) {
 
         # {{{ Create a new ticket
 
@@ -765,113 +685,72 @@ EOT
             $RT::Logger->error("Create failed: $id / $Transaction / $ErrStr ");
             return ( 0, "Ticket creation failed", $Ticket );
         }
-	# strip comments&corresponds from the actions we don't need record twice
-	@actions = grep !/^(comment|correspond)$/, @actions;
-	$args{'ticket'} = $id;
 
         # }}}
     }
 
-    $Ticket->Load( $args{'ticket'} );
-    unless ( $Ticket->Id ) {
-        my $message = "Could not find a ticket with id " . $args{'ticket'};
-        MailError(
-            To          => $ErrorsTo,
-            Subject     => "Message not recorded",
-            Explanation => $message,
-            MIMEObj     => $Message
-        );
-    
-        return ( 0, $message );
-    }
-
     # }}}
-    foreach my $action( @actions ) {
-        #   If the action is comment, add a comment.
-        if ( $action =~ /^(comment|correspond)$/i ) {
-            my ( $status, $msg );
-            if ( $action =~ /^correspond$/i ) {
-                ( $status, $msg ) = $Ticket->Correspond( MIMEObj => $Message );
-            }
-            else {
-                ( $status, $msg ) = $Ticket->Comment( MIMEObj => $Message );
-            }
-            unless ($status) {
-    
-                #Warn the sender that we couldn't actually submit the comment.
-                MailError(
-                    To          => $ErrorsTo,
-                    Subject     => "Message not recorded",
-                    Explanation => $msg,
-                    MIMEObj     => $Message
-                );
-                return ( 0, "Message not recorded", $Ticket );
-            }
-        }
-        elsif ($RT::UnsafeEmailCommands && $action =~ /^take$/i ) {
-            my ( $status, $msg ) = $Ticket->SetOwner( $CurrentUser->id );
-            unless ($status) {
-    
-                #Warn the sender that we couldn't actually submit the comment.
-                MailError(
-                    To          => $ErrorsTo,
-                    Subject     => "Ticket not taken",
-                    Explanation => $msg,
-                    MIMEObj     => $Message
-                );
-                return ( 0, "Ticket not taken", $Ticket );
-            }
+
+    #   If the action is comment, add a comment.
+    elsif ( $args{'action'} =~ /^(comment|correspond)$/i ) {
+        $Ticket->Load( $args{'ticket'} );
+        unless ( $Ticket->Id ) {
+            my $message = "Could not find a ticket with id " . $args{'ticket'};
+            MailError(
+                To          => $ErrorsTo,
+                Subject     => "Message not recorded",
+                Explanation => $message,
+                MIMEObj     => $Message
+            );
+
+            return ( 0, $message );
         }
-        elsif ( $RT::UnsafeEmailCommands && $action =~ /^resolve$/i ) {
-            my ( $status, $msg ) = $Ticket->SetStatus( 'resolved' );
-            unless ($status) {
-                #Warn the sender that we couldn't actually submit the comment.
-                MailError(
-                    To          => $ErrorsTo,
-                    Subject     => "Ticket not resolved",
-                    Explanation => $msg,
-                    MIMEObj     => $Message
-                );
-                return ( 0, "Ticket not resolved", $Ticket );
-            }
+
+        my ( $status, $msg );
+        if ( $args{'action'} =~ /^correspond$/ ) {
+            ( $status, $msg ) = $Ticket->Correspond( MIMEObj => $Message );
         }
-    
         else {
-    
-            #Return mail to the sender with an error
+            ( $status, $msg ) = $Ticket->Comment( MIMEObj => $Message );
+        }
+        unless ($status) {
+
+            #Warn the sender that we couldn't actually submit the comment.
             MailError(
                 To          => $ErrorsTo,
-                Subject     => "RT Configuration error",
-                Explanation => "'"
-                  . $args{'action'}
-                  . "' not a recognized action."
-                  . " Your RT administrator has misconfigured "
-                  . "the mail aliases which invoke RT",
-                MIMEObj => $Message
-            );
-            $RT::Logger->crit( $args{'action'} . " type unknown for $MessageId" );
-            return (
-                -75,
-                "Configuration error: "
-                  . $args{'action'}
-                  . " not a recognized action",
-                $Ticket
+                Subject     => "Message not recorded",
+                Explanation => $msg,
+                MIMEObj     => $Message
             );
-    
+            return ( 0, "Message not recorded", $Ticket );
         }
     }
 
-    return ( 1, "Success", $Ticket );
-}
+    else {
 
-sub IsCorrectAction
-{
-	my $action = shift;
-	my @actions = split /-/, $action;
-	foreach ( @actions ) {
-		return (0, $_) unless /^(?:comment|correspond|take|resolve)$/;
-	}
-	return (1, @actions);
+        #Return mail to the sender with an error
+        MailError(
+            To          => $ErrorsTo,
+            Subject     => "RT Configuration error",
+            Explanation => "'"
+              . $args{'action'}
+              . "' not a recognized action."
+              . " Your RT administrator has misconfigured "
+              . "the mail aliases which invoke RT",
+            MIMEObj => $Message
+        );
+        $RT::Logger->crit( $args{'action'} . " type unknown for $MessageId" );
+        return (
+            -75,
+            "Configuration error: "
+              . $args{'action'}
+              . " not a recognized action",
+            $Ticket
+        );
+
+    }
+
+    return ( 1, "Success", $Ticket );
 }
 
 
diff --git a/rt/lib/RT/Interface/Email/Auth/GnuPG.pm b/rt/lib/RT/Interface/Email/Auth/GnuPG.pm
index 2dfada7..724b1b3 100755
--- a/rt/lib/RT/Interface/Email/Auth/GnuPG.pm
+++ b/rt/lib/RT/Interface/Email/Auth/GnuPG.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 #
 package RT::Interface::Email::Auth::GnuPG;
 use Mail::GnuPG;
diff --git a/rt/lib/RT/Interface/Email/Auth/MailFrom.pm b/rt/lib/RT/Interface/Email/Auth/MailFrom.pm
index ef315dd..0efadb1 100644
--- a/rt/lib/RT/Interface/Email/Auth/MailFrom.pm
+++ b/rt/lib/RT/Interface/Email/Auth/MailFrom.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Interface::Email::Auth::MailFrom;
 use RT::Interface::Email qw(ParseSenderAddressFromHead CreateUser);
 
@@ -122,36 +122,6 @@ sub GetCurrentUser {
             }
 
         }
-        elsif ( $args{'Action'} =~ /^take$/i ) {
-
-            # check to see whether "Everybody" or "Unprivileged users" can correspond on tickets
-            unless ( $everyone->PrincipalObj->HasRight(Object => $args{'Queue'},
-                                                       Right  => 'OwnTicket'
-                     )
-                     || $unpriv->PrincipalObj->HasRight(
-                                                       Object => $args{'Queue'},
-                                                       Right  => 'OwnTicket'
-                     )
-              ) {
-                return ( $args{'CurrentUser'}, 0 );
-            }
-
-        }
-        elsif ( $args{'Action'} =~ /^resolve$/i ) {
-
-            # check to see whether "Everybody" or "Unprivileged users" can correspond on tickets
-            unless ( $everyone->PrincipalObj->HasRight(Object => $args{'Queue'},
-                                                       Right  => 'ModifyTicket'
-                     )
-                     || $unpriv->PrincipalObj->HasRight(
-                                                       Object => $args{'Queue'},
-                                                       Right  => 'ModifyTicket'
-                     )
-              ) {
-                return ( $args{'CurrentUser'}, 0 );
-            }
-
-        }
         else {
             return ( $args{'CurrentUser'}, 0 );
         }
diff --git a/rt/lib/RT/Interface/Email/Filter/SpamAssassin.pm b/rt/lib/RT/Interface/Email/Filter/SpamAssassin.pm
index c552d76..8c9eae8 100644
--- a/rt/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+++ b/rt/lib/RT/Interface/Email/Filter/SpamAssassin.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,31 +42,22 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::Interface::Email::Filter::SpamAssassin;
 
 use Mail::SpamAssassin;
 my $spamtest = Mail::SpamAssassin->new();
 
 sub GetCurrentUser {
-    my %args = (
-        Message     => undef,
-        CurrentUser => undef,
-        AuthLevel   => undef,
-        @_
-    );
-    my $status = $spamtest->check( $args{'Message'} );
-    return ( $args{'CurrentUser'}, $args{'AuthLevel'} )
-      unless $status->is_spam();
-
+    my $item = shift;
+    my $status = $spamtest->check ($item);
+    return (undef, 0) unless $status->is_spam();
     eval { $status->rewrite_mail() };
-    if ( $status->get_hits > $status->get_required_hits() * 1.5 ) {
-
+    if ($status->get_hits > $status->get_required_hits()*1.5) { 
         # Spammy indeed
-        return ( $args{'CurrentUser'}, -1 );
+        return (undef, -1);
     }
-    return ( $args{'CurrentUser'}, $args{'AuthLevel'} );
-
+    return (undef, 0);
 }
 
 =head1 NAME
diff --git a/rt/lib/RT/Interface/REST.pm b/rt/lib/RT/Interface/REST.pm
index 279ddf4..8c8baa1 100644
--- a/rt/lib/RT/Interface/REST.pm
+++ b/rt/lib/RT/Interface/REST.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # lib/RT/Interface/REST.pm
 #
 
@@ -54,7 +54,7 @@ BEGIN {
     use Exporter ();
     use vars qw($VERSION @ISA @EXPORT);
 
-    $VERSION = do { my @r = (q$Revision: 1.1.1.3 $ =~ /\d+/g); sprintf "%d."."%02d"x$#r, @r };
+    $VERSION = do { my @r = (q$Revision: 1.1.1.2 $ =~ /\d+/g); sprintf "%d."."%02d"x$#r, @r };
 
     @ISA = qw(Exporter);
     @EXPORT = qw(expand_list form_parse form_compose vpush vsplit);
diff --git a/rt/lib/RT/Interface/Web.pm b/rt/lib/RT/Interface/Web.pm
index 724d7e5..0151cc1 100644
--- a/rt/lib/RT/Interface/Web.pm
+++ b/rt/lib/RT/Interface/Web.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 ## Portions Copyright 2000 Tobias Brox <tobix@fsck.com>
 
 ## This is a library of static subs to be used by the Mason web
@@ -77,7 +77,6 @@ does a css-busting but minimalist escaping of whatever html you're passing in.
 
 sub EscapeUTF8  {
         my  $ref = shift;
-        return unless defined $$ref;
         my $val = $$ref;
         use bytes;
         $val =~ s/&/&#38;/g;
@@ -95,24 +94,6 @@ sub EscapeUTF8  {
 
 # }}}
 
-# {{{ EscapeURI
-
-=head2 EscapeURI SCALARREF
-
-Escapes URI component according to RFC2396
-
-=cut
-
-use Encode qw();
-sub EscapeURI {
-    my $ref = shift;
-    $$ref = Encode::encode_utf8( $$ref );
-    $$ref =~ s/([^a-zA-Z0-9_.!~*'()-])/uc sprintf("%%%02X", ord($1))/eg;
-    Encode::_utf8_on( $$ref );
-}
-
-# }}}
-
 # {{{ WebCanonicalizeInfo
 
 =head2 WebCanonicalizeInfo();
@@ -311,42 +292,17 @@ sub CreateTicket {
         Starts          => $starts->ISO,
         MIMEObj         => $MIMEObj
     );
-    foreach my $arg (keys %ARGS) {
-            my $cfid = $1;
-
+    foreach my $arg (%ARGS) {
+        if ($arg =~ /^CustomField-(\d+)(.*?)$/) {
             next if ($arg =~ /-Magic$/);
-       #Object-RT::Ticket--CustomField-3-Values
-        if ($arg =~ /^Object-RT::Transaction--CustomField-/) {
-            $create_args{$arg} = $ARGS{$arg};
-        }
-        elsif ($arg =~ /^Object-RT::Ticket--CustomField-(\d+)(.*?)$/) {
-            my $cfid = $1;
-            my $cf = RT::CustomField->new( $session{'CurrentUser'});
-            $cf->Load($cfid);
-
-            if ( $cf->Type eq 'Freeform' && ! $cf->SingleValue) {
-                $ARGS{$arg} =~ s/\r\n/\n/g;
-                $ARGS{$arg} = [split('\n', $ARGS{$arg})];
-            }
-
-            if ( $cf->Type =~ /text/i) { # Catch both Text and Wikitext
-                $ARGS{$arg} =~ s/\r//g;
-            }
-
-            if ( $arg =~ /-Upload$/ ) {
-                $create_args{"CustomField-".$cfid} = _UploadedFile($arg);
-            }
-            else {
-                $create_args{"CustomField-".$cfid} = $ARGS{"$arg"};
-            }
+            $create_args{"CustomField-".$1} = $ARGS{"$arg"};
         }
     }
 
-
-    # XXX TODO This code should be about six lines. and badly needs refactoring.
- 
-    # {{{ turn new link lists into arrays, and pass in the proper arguments
-    my (@dependson, @dependedonby, @parents, @children, @refersto, @referredtoby);
+    # turn new link lists into arrays, and pass in the proper arguments
+    my (@dependson, @dependedonby, 
+	@parents, @children, 
+	@refersto, @referredtoby);
 
     foreach my $luri ( split ( / /, $ARGS{"new-DependsOn"} ) ) {
 	$luri =~ s/\s*$//;    # Strip trailing whitespace
@@ -380,9 +336,7 @@ sub CreateTicket {
 	push @referredtoby, $luri;
     }
     $create_args{'ReferredToBy'} = \@referredtoby;
-    # }}}
-  
- 
+
     my ( $id, $Trans, $ErrMsg ) = $Ticket->Create(%create_args);
     unless ( $id && $Trans ) {
         Abort($ErrMsg);
@@ -444,10 +398,9 @@ sub ProcessUpdateMessage {
     );
 
     #Make the update content have no 'weird' newlines in it
-    if (   $args{ARGSRef}->{'UpdateTimeWorked'}
-        || $args{ARGSRef}->{'UpdateContent'}
-        || $args{ARGSRef}->{'UpdateAttachments'} )
-    {
+    if ( $args{ARGSRef}->{'UpdateTimeWorked'} ||
+	 $args{ARGSRef}->{'UpdateContent'} ||
+	 $args{ARGSRef}->{'UpdateAttachments'}) {
 
         if (
             $args{ARGSRef}->{'UpdateSubject'} eq $args{'TicketObj'}->Subject() )
@@ -456,76 +409,43 @@ sub ProcessUpdateMessage {
         }
 
         my $Message = MakeMIMEEntity(
-            Subject => $args{ARGSRef}->{'UpdateSubject'},
-            Body    => $args{ARGSRef}->{'UpdateContent'},
+            Subject             => $args{ARGSRef}->{'UpdateSubject'},
+            Body                => $args{ARGSRef}->{'UpdateContent'},
         );
 
-        $Message->head->add( 'Message-ID' => 
-              "<rt-"
-              . $RT::VERSION . "-"
-              . $$ . "-"
-              . CORE::time() . "-"
-              . int(rand(2000)) . "."
-              . $args{'TicketObj'}->id . "-"
-              . "0" . "-"  # Scrip
-              . "0" . "@"  # Email sent
-              . $RT::Organization
-              . ">" );
-        my $old_txn = RT::Transaction->new( $session{'CurrentUser'} );
-        if ( $args{ARGSRef}->{'QuoteTransaction'} ) {
-            $old_txn->Load( $args{ARGSRef}->{'QuoteTransaction'} );
-        }
-        else {
-            $old_txn = $args{TicketObj}->Transactions->First();
+        if ($args{ARGSRef}->{'UpdateAttachments'}) {
+            $Message->make_multipart;
+            $Message->add_part($_) foreach values %{$args{ARGSRef}->{'UpdateAttachments'}};
         }
 
-        if ( $old_txn->Message && $old_txn->Message->First ) {
-            my @in_reply_to = split(/\s+/m, $old_txn->Message->First->GetHeader('In-Reply-To') || '');  
-            my @references = split(/\s+/m, $old_txn->Message->First->GetHeader('References') || '' );  
-            my @msgid = split(/\s+/m,$old_txn->Message->First->GetHeader('Message-ID') || ''); 
-            my @rtmsgid = split(/\s+/m,$old_txn->Message->First->GetHeader('RT-Message-ID') || ''); 
-
-            $Message->head->replace( 'In-Reply-To', join (' ', @rtmsgid ? @rtmsgid : @msgid));
-            $Message->head->replace( 'References', join(' ', @references, @msgid, @rtmsgid));
+        ## TODO: Implement public comments
+        if ( $args{ARGSRef}->{'UpdateType'} =~ /^(private|public)$/ ) {
+            my ( $Transaction, $Description, $Object ) = $args{TicketObj}->Comment(
+                CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
+                BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
+                MIMEObj      => $Message,
+                TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
+            );
+            push ( @{ $args{Actions} }, $Description );
+        }
+        elsif ( $args{ARGSRef}->{'UpdateType'} eq 'response' ) {
+            my ( $Transaction, $Description, $Object ) = $args{TicketObj}->Correspond(
+                CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
+                BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
+                MIMEObj      => $Message,
+                TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
+            );
+            push ( @{ $args{Actions} }, $Description );
+        }
+        else {
+            push ( @{ $args{'Actions'} },
+                loc("Update type was neither correspondence nor comment.").
+                " ".
+                loc("Update not recorded.")
+            );
         }
-
-    if ( $args{ARGSRef}->{'UpdateAttachments'} ) {
-        $Message->make_multipart;
-        $Message->add_part($_)
-          foreach values %{ $args{ARGSRef}->{'UpdateAttachments'} };
-    }
-
-    ## TODO: Implement public comments
-    if ( $args{ARGSRef}->{'UpdateType'} =~ /^(private|public)$/ ) {
-        my ( $Transaction, $Description, $Object ) = $args{TicketObj}->Comment(
-            CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
-            BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
-            MIMEObj      => $Message,
-            TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
-        );
-        push( @{ $args{Actions} }, $Description );
-        $Object->UpdateCustomFields( ARGSRef => $args{ARGSRef} ) if $Object;
-    }
-    elsif ( $args{ARGSRef}->{'UpdateType'} eq 'response' ) {
-        my ( $Transaction, $Description, $Object ) =
-          $args{TicketObj}->Correspond(
-            CcMessageTo  => $args{ARGSRef}->{'UpdateCc'},
-            BccMessageTo => $args{ARGSRef}->{'UpdateBcc'},
-            MIMEObj      => $Message,
-            TimeTaken    => $args{ARGSRef}->{'UpdateTimeWorked'}
-          );
-        push( @{ $args{Actions} }, $Description );
-        $Object->UpdateCustomFields( ARGSRef => $args{ARGSRef} ) if $Object;
-    }
-    else {
-        push(
-            @{ $args{'Actions'} },
-            loc("Update type was neither correspondence nor comment.") . " "
-              . loc("Update not recorded.")
-        );
     }
 }
-}
 
 # }}}
 
@@ -869,6 +789,19 @@ sub ParseDateToISO {
 
 # }}}
 
+# {{{ sub Config 
+# TODO: This might eventually read the cookies, user configuration
+# information from the DB, queue configuration information from the
+# DB, etc.
+
+sub Config {
+    my $args = shift;
+    my $key  = shift;
+    return $args->{$key} || $RT::WebOptions{$key};
+}
+
+# }}}
+
 # {{{ sub ProcessACLChanges
 
 sub ProcessACLChanges {
@@ -926,6 +859,7 @@ sub ProcessACLChanges {
                 $obj = $object_type->new($session{'CurrentUser'});
                 $obj->Load($object_id);      
             } else {
+		die;
                 push (@results, loc("System Error"). ': '.
                                 loc("Rights could not be revoked for [_1]", $object_type));
                 next;
@@ -1072,10 +1006,7 @@ sub ProcessTicketBasics {
         }
     }
 
-
-   # Status isn't a field that can be set to a null value.
-   # RT core complains if you try
-    delete $ARGSRef->{'Status'} unless ($ARGSRef->{'Status'});
+    $ARGSRef->{'Status'} ||= $TicketObj->Status;
     
     my @results = UpdateRecordObject(
         AttributesRef => \@attribs,
@@ -1105,158 +1036,117 @@ sub ProcessTicketBasics {
 
 # }}}
 
-sub ProcessTicketCustomFieldUpdates {
-    my %args = @_;
-    $args{'Object'} = delete $args{'TicketObj'};
-    my $ARGSRef = { %{ $args{'ARGSRef'} } };
+# {{{ Sub ProcessTicketCustomFieldUpdates
 
-    # Build up a list of objects that we want to work with
-    my %custom_fields_to_mod;
-    foreach my $arg ( keys %$ARGSRef ) {
-        if ( $arg =~ /^Ticket-(\d+-.*)/) {
-	    $ARGSRef->{"Object-RT::Ticket-$1"} = delete $ARGSRef->{$arg};
-	}
-        elsif ( $arg =~ /^CustomField-(\d+-.*)/) {
-	    $ARGSRef->{"Object-RT::Ticket--$1"} = delete $ARGSRef->{$arg};
-	}
-    }
+sub ProcessTicketCustomFieldUpdates {
+    my %args = (
+        ARGSRef => undef,
+        @_
+    );
 
-    return ProcessObjectCustomFieldUpdates(%args, ARGSRef => $ARGSRef);
-}
+    my @results;
 
-sub ProcessObjectCustomFieldUpdates {
-    my %args = @_;
     my $ARGSRef = $args{'ARGSRef'};
-    my @results;
 
-    # Build up a list of objects that we want to work with
+    # Build up a list of tickets that we want to work with
+    my %tickets_to_mod;
     my %custom_fields_to_mod;
-    foreach my $arg ( keys %$ARGSRef ) {
-        if ( $arg =~ /^Object-([\w:]+)-(\d*)-CustomField-(\d+)-/ ) {
-            # For each of those objects, find out what custom fields we want to work with.
-            $custom_fields_to_mod{$1}{$2 || $args{'Object'}->Id}{$3} = 1;
+    foreach my $arg ( keys %{$ARGSRef} ) {
+        if ( $arg =~ /^Ticket-(\d+)-CustomField-(\d+)-/ ) {
+
+            # For each of those tickets, find out what custom fields we want to work with.
+            $custom_fields_to_mod{$1}{$2} = 1;
         }
     }
 
-    # For each of those objects
-    foreach my $class ( keys %custom_fields_to_mod ) {
-	foreach my $id ( keys %{$custom_fields_to_mod{$class}} ) {
-	    my $Object = $args{'Object'};
-	    if (!$Object or ref($Object) ne $class or $Object->id != $id) {
-		$Object = $class->new( $session{'CurrentUser'} );
-		$Object->Load($id);
+    # For each of those tickets
+    foreach my $tick ( keys %custom_fields_to_mod ) {
+        my $Ticket = $args{'TicketObj'};
+	if (!$Ticket or $Ticket->id != $tick) {
+	    $Ticket = RT::Ticket->new( $session{'CurrentUser'} );
+	    $Ticket->Load($tick);
 	}
 
-	    # For each custom field  
-	    foreach my $cf ( keys %{ $custom_fields_to_mod{$class}{$id} } ) {
+        # For each custom field  
+        foreach my $cf ( keys %{ $custom_fields_to_mod{$tick} } ) {
+
 	    my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
 	    $CustomFieldObj->LoadById($cf);
 
-		foreach my $arg ( keys %{$ARGSRef} ) {
-		    # Only interested in args for the current CF:
-		    next unless ( $arg =~ /^Object-$class-(?:$id)?-CustomField-$cf-/ );
-
-		    # since http won't pass in a form element with a null value, we need
-		    # to fake it
-		    if ($arg =~ /^(.*?)-Values-Magic$/ ) {
-			# We don't care about the magic, if there's really a values element;
-			next if ($ARGSRef->{$1.'-Value'} || $ARGSRef->{$1.'-Values'}) ;
-
-                        # "Empty" values does not mean anything for Image and Binary fields
-                        next if $CustomFieldObj->Type =~ /^(?:Image|Binary)$/;
-
-			$arg = $1."-Values";
-			$ARGSRef->{$1."-Values"} = undef;
-		    
-		    }
-		    my @values = ();
-		    if (ref( $ARGSRef->{$arg} ) eq 'ARRAY' ) {
-			@values = @{ $ARGSRef->{$arg} };
-		    } elsif ($CustomFieldObj->Type =~ /text/i) { # Both Text and Wikitext
-			@values = ($ARGSRef->{$arg});
-		    } else {
-			@values = split /\n/, $ARGSRef->{$arg};
-		    }
-		    
-		    if ( ($CustomFieldObj->Type eq 'Freeform' 
-			  && ! $CustomFieldObj->SingleValue) ||
-			  $CustomFieldObj->Type =~ /text/i) {
-			foreach my $val (@values) {
-			    $val =~ s/\r//g;
-			}
-		    }
-
-		    if ( ( $arg =~ /-AddValue$/ ) || ( $arg =~ /-Value$/ ) ) {
-			foreach my $value (@values) {
-			    next unless length($value);
-			    my ( $val, $msg ) = $Object->AddCustomFieldValue(
-				Field => $cf,
-				Value => $value
-			    );
-			    push ( @results, $msg );
-			}
-		    }
-		    elsif ( $arg =~ /-Upload$/ ) {
-                        my $value_hash = _UploadedFile($arg) or next;
-
-			my ( $val, $msg ) = $Object->AddCustomFieldValue(
-                            %$value_hash,
+            foreach my $arg ( keys %{$ARGSRef} ) {
+                # since http won't pass in a form element with a null value, we need
+                # to fake it
+                if ($arg =~ /^(.*?)-Values-Magic$/ ) {
+                    # We don't care about the magic, if there's really a values element;
+                    next if (exists $ARGSRef->{$1.'-Values'}) ;
+
+                    $arg = $1."-Values";
+                    $ARGSRef->{$1."-Values"} = undef;
+                
+                }
+                next unless ( $arg =~ /^Ticket-$tick-CustomField-$cf-/ );
+                my @values =
+                  ( ref( $ARGSRef->{$arg} ) eq 'ARRAY' ) 
+                  ? @{ $ARGSRef->{$arg} }
+                  : split /\n/, $ARGSRef->{$arg} ;
+
+		#for poor windows boxen that pass in "\r\n"
+		local $/ = "\r";
+		chomp @values;
+
+                if ( ( $arg =~ /-AddValue$/ ) || ( $arg =~ /-Value$/ ) ) {
+                    foreach my $value (@values) {
+                        next unless length($value);
+                        my ( $val, $msg ) = $Ticket->AddCustomFieldValue(
                             Field => $cf,
-			);
-			push ( @results, $msg );
-		    }
-		    elsif ( $arg =~ /-DeleteValues$/ ) {
-			foreach my $value (@values) {
-			    next unless length($value);
-			    my ( $val, $msg ) = $Object->DeleteCustomFieldValue(
-				Field => $cf,
-				Value => $value
-			    );
-			    push ( @results, $msg );
-			}
-		    }
-		    elsif ( $arg =~ /-DeleteValueIds$/ ) {
-			foreach my $value (@values) {
-			    next unless length($value);
-			    my ( $val, $msg ) = $Object->DeleteCustomFieldValue(
-				Field => $cf,
-				ValueId => $value,
-			    );
-			    push ( @results, $msg );
-			}
-		    }
-		    elsif ( $arg =~ /-Values$/ and !$CustomFieldObj->Repeated) {
-			my $cf_values = $Object->CustomFieldValues($cf);
-
-			my %values_hash;
-			foreach my $value (@values) {
-			    next unless length($value);
-
-			    # build up a hash of values that the new set has
-			    $values_hash{$value} = 1;
-
-			    unless ( $cf_values->HasEntry($value) ) {
-				my ( $val, $msg ) = $Object->AddCustomFieldValue(
-				    Field => $cf,
-				    Value => $value
-				);
-				push ( @results, $msg );
-			    }
-
-			}
-			while ( my $cf_value = $cf_values->Next ) {
-			    unless ( $values_hash{ $cf_value->Content } == 1 ) {
-				my ( $val, $msg ) = $Object->DeleteCustomFieldValue(
-				    Field => $cf,
-				    Value => $cf_value->Content
-				);
-				push ( @results, $msg);
-
-			    }
-			}
-		    }
-		    elsif ( $arg =~ /-Values$/ ) {
-			my $cf_values = $Object->CustomFieldValues($cf);
+                            Value => $value
+                        );
+                        push ( @results, $msg );
+                    }
+                }
+                elsif ( $arg =~ /-DeleteValues$/ ) {
+                    foreach my $value (@values) {
+                        next unless length($value);
+                        my ( $val, $msg ) = $Ticket->DeleteCustomFieldValue(
+                            Field => $cf,
+                            Value => $value
+                        );
+                        push ( @results, $msg );
+                    }
+                }
+                elsif ( $arg =~ /-Values$/ and $CustomFieldObj->Type !~ /Entry/) {
+                    my $cf_values = $Ticket->CustomFieldValues($cf);
+
+                    my %values_hash;
+                    foreach my $value (@values) {
+                        next unless length($value);
+
+                        # build up a hash of values that the new set has
+                        $values_hash{$value} = 1;
+
+                        unless ( $cf_values->HasEntry($value) ) {
+                            my ( $val, $msg ) = $Ticket->AddCustomFieldValue(
+                                Field => $cf,
+                                Value => $value
+                            );
+                            push ( @results, $msg );
+                        }
+
+                    }
+                    while ( my $cf_value = $cf_values->Next ) {
+                        unless ( $values_hash{ $cf_value->Content } == 1 ) {
+                            my ( $val, $msg ) = $Ticket->DeleteCustomFieldValue(
+                                Field => $cf,
+                                Value => $cf_value->Content
+                            );
+                            push ( @results, $msg);
+
+                        }
+
+                    }
+                }
+                elsif ( $arg =~ /-Values$/ ) {
+                    my $cf_values = $Ticket->CustomFieldValues($cf);
 
 		    # keep everything up to the point of difference, delete the rest
 		    my $delete_flag;
@@ -1272,23 +1162,24 @@ sub ProcessObjectCustomFieldUpdates {
 
 		    # now add/replace extra things, if any
 		    foreach my $value (@values) {
-			    my ( $val, $msg ) = $Object->AddCustomFieldValue(
+			my ( $val, $msg ) = $Ticket->AddCustomFieldValue(
 			    Field => $cf,
 			    Value => $value
 			);
 			push ( @results, $msg );
 		    }
 		}
-		    else {
-			push ( @results, loc("User asked for an unknown update type for custom field [_1] for [_2] object #[_3]", $cf->Name, $class, $Object->id ) );
-		    }
-		}
-	    }
-	    return (@results);
-	}
+                else {
+                    push ( @results, "User asked for an unknown update type for custom field " . $cf->Name . " for ticket " . $Ticket->id );
+                }
+            }
+        }
+        return (@results);
     }
 }
 
+# }}}
+
 # {{{ sub ProcessTicketWatchers
 
 =head2 ProcessTicketWatchers ( TicketObj => $Ticket, ARGSRef => \%ARGS );
@@ -1442,7 +1333,6 @@ sub ProcessTicketLinks {
     my $Ticket  = $args{'TicketObj'};
     my $ARGSRef = $args{'ARGSRef'};
 
-
     my (@results) = ProcessRecordLinks(RecordObj => $Ticket,
 				       ARGSRef => $ARGSRef);
 
@@ -1512,34 +1402,6 @@ sub ProcessRecordLinks {
     return (@results);
 }
 
-
-=head2 _UploadedFile ( $arg );
-
-Takes a CGI parameter name; if a file is uploaded under that name,
-return a hash reference suitable for AddCustomFieldValue's use:
-C<( Value => $filename, LargeContent => $content, ContentType => $type )>.
-
-Returns C<undef> if no files were uploaded in the C<$arg> field.
-
-=cut
-
-sub _UploadedFile {
-    my $arg = shift;
-    my $cgi_object = $m->cgi_object;
-    my $fh = $cgi_object->upload($arg) or return undef;
-    my $upload_info = $cgi_object->uploadInfo($fh);
-
-    my $filename = "$fh";
-    $filename =~ s#^.*[\\/]##;
-    binmode($fh);
-
-    return {
-        Value => $filename,
-        LargeContent => do { local $/; scalar <$fh> },
-        ContentType => $upload_info->{'Content-Type'},
-    };
-}
-
 eval "require RT::Interface::Web_Vendor";
 die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Web_Vendor.pm});
 eval "require RT::Interface::Web_Local";
diff --git a/rt/lib/RT/Interface/Web/Handler.pm b/rt/lib/RT/Interface/Web/Handler.pm
index ce92225..7ee654e 100644
--- a/rt/lib/RT/Interface/Web/Handler.pm
+++ b/rt/lib/RT/Interface/Web/Handler.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,24 +42,9 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 package RT::Interface::Web::Handler;
 
-use CGI qw/-private_tempfiles/;
-use MIME::Entity;
-use Text::Wrapper;
-use CGI::Cookie;
-use Time::ParseDate;
-use Time::HiRes;
-use HTML::Entities;
-use HTML::Scrubber;
-use Text::Quoted;
-use RT::Interface::Web::Handler;
-use File::Path qw( rmtree );
-use File::Glob qw( bsd_glob );
-use File::Spec::Unix;
-
 sub DefaultHandlerArgs  { (
     comp_root => [
         [ local    => $RT::MasonLocalComponentRoot ],
@@ -68,10 +53,7 @@ sub DefaultHandlerArgs  { (
     default_escape_flags => 'h',
     data_dir             => "$RT::MasonDataDir",
     allow_globals        => [qw(%session)],
-    # Turn off static source if we're in developer mode.
-    static_source        => ($RT::DevelMode ? '0' : '1'), 
-    use_object_files     => ($RT::DevelMode ? '0' : '1'), 
-    autoflush            => 0
+    autoflush            => 1
 ) };
 
 # {{{ sub new 
@@ -87,17 +69,19 @@ sub new {
     my $class = shift;
     $class->InitSessionDir;
 
-    if ( $mod_perl::VERSION && $mod_perl::VERSION >= 1.9908 ) {
-#        require Apache::RequestUtil;
-#        no warnings 'redefine';
-#        my $sub = *Apache::request{CODE};
-#        *Apache::request = sub {
-#            my $r;
-#            eval { $r = $sub->('Apache'); };
-#
-#            # warn $@ if $@;
-#            return $r;
-#        };
+    if ($MasonX::Apache2Handler::VERSION) {
+        goto &NewApache2Handler;
+    }
+    elsif ($mod_perl::VERSION and $mod_perl::VERSION >= 1.9908) {
+	require Apache::RequestUtil;
+	no warnings 'redefine';
+	my $sub = *Apache::request{CODE};
+	*Apache::request = sub {
+	    my $r;
+	    eval { $r = $sub->('Apache'); };
+	    # warn $@ if $@;
+	    return $r;
+	};
         goto &NewApacheHandler;
     }
     elsif ($CGI::MOD_PERL) {
@@ -112,14 +96,14 @@ sub InitSessionDir {
     # Activate the following if running httpd as root (the normal case).
     # Resets ownership of all files created by Mason at startup.
     # Note that mysql uses DB for sessions, so there's no need to do this.
-    unless ( $RT::DatabaseType =~ /(?:mysql|Pg)/ ) {
+    unless ( $RT::DatabaseType =~ /(mysql|Pg)/ ) {
 
         # Clean up our umask to protect session files
         umask(0077);
 
         if ($CGI::MOD_PERL) {
             chown( Apache->server->uid, Apache->server->gid,
-                $RT::MasonSessionDir )
+                [$RT::MasonSessionDir] )
             if Apache->server->can('uid');
         }
 
@@ -186,36 +170,9 @@ sub NewHandler {
     );
   
     $handler->interp->set_escape( h => \&RT::Interface::Web::EscapeUTF8 );
-    $handler->interp->set_escape( u => \&RT::Interface::Web::EscapeURI  );
     return($handler);
 }
 
-=head2 CleanupRequest
-
-Rollback any uncommitted transaction.
-Flush the ACL cache
-Flush the searchbuilder query cache
-
-=cut
-
-sub CleanupRequest {
-
-    if ( $RT::Handle->TransactionDepth ) {
-        $RT::Handle->ForceRollback;
-        $RT::Logger->crit(
-            "Transaction not committed. Usually indicates a software fault."
-            . "Data loss may have occurred" );
-    }
-
-    # Clean out the ACL cache. the performance impact should be marginal.
-    # Consistency is imprived, too.
-    RT::Principal->InvalidateACLCache();
-    DBIx::SearchBuilder::Record::Cachable->FlushCache
-      if ( $RT::WebFlushDbCacheEveryRequest
-        and UNIVERSAL::can(
-            'DBIx::SearchBuilder::Record::Cachable' => 'FlushCache' ) );
-
-}
 # }}}
 
 1;
diff --git a/rt/lib/RT/Interface/Web/QueryBuilder/Tree.pm b/rt/lib/RT/Interface/Web/QueryBuilder/Tree.pm
deleted file mode 100755
index 67b7283..0000000
--- a/rt/lib/RT/Interface/Web/QueryBuilder/Tree.pm
+++ /dev/null
@@ -1,245 +0,0 @@
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-package RT::Interface::Web::QueryBuilder::Tree;
-
-use strict;
-use warnings;
-
-use base qw/Tree::Simple/;
-
-=head1 NAME
-
-  RT::Interface::Web::QueryBuilder::Tree - subclass of Tree::Simple used in Query Builder
-
-=head1 DESCRIPTION
-
-This class provides support functionality for the Query Builder (Search/Build.html).
-It is a subclass of L<Tree::Simple>.
-
-=head1 METHODS
-
-=head2 TraversePrePost PREFUNC POSTFUNC
-
-Traverses the tree depth-first.  Before processing the node's children,
-calls PREFUNC with the node as its argument; after processing all of the
-children, calls POSTFUNC with the node as its argument.
-
-(Note that unlike Tree::Simple's C<traverse>, it actually calls its functions
-on the root node passed to it.)
-
-=cut
-
-sub TraversePrePost {
-   my ($self, $prefunc, $postfunc) = @_;
-
-   $prefunc->($self);
-   
-   foreach my $child ($self->getAllChildren()) { 
-           $child->TraversePrePost($prefunc, $postfunc);
-   }
-   
-   $postfunc->($self);
-}
-
-=head2 GetReferencedQueues
-
-Returns a hash reference with keys each queue name referenced in a clause in
-the key (even if it's "Queue != 'Foo'"), and values all 1.
-
-=cut
-
-sub GetReferencedQueues {
-    my $self = shift;
-
-    my $queues = {};
-
-    $self->traverse(
-        sub {
-            my $node = shift;
-
-            return if $node->isRoot;
-
-            my $clause = $node->getNodeValue();
-         
-            if ( ref($clause) and $clause->{Key} eq 'Queue' ) {
-                $queues->{ $clause->{Value} } = 1;
-            };
-        }
-    );
-
-    return $queues;
-}
-
-=head2 GetQueryAndOptionList SELECTED_NODES
-
-Given an array reference of tree nodes that have been selected by the user,
-traverses the tree and returns the equivalent SQL query and a list of hashes
-representing the "clauses" select option list.  Each has contains the keys
-TEXT, INDEX, SELECTED, and DEPTH.  TEXT is the displayed text of the option
-(including parentheses, not including indentation); INDEX is the 0-based
-index of the option in the list (also used as its CGI parameter); SELECTED
-is either 'SELECTED' or '', depending on whether the node corresponding
-to the select option was in the SELECTED_NODES list; and DEPTH is the
-level of indentation for the option.
-
-=cut 
-
-sub GetQueryAndOptionList {
-    my $self           = shift;
-    my $selected_nodes = shift;
-
-    my $optionlist = [];
-
-    my $i = 0;
-
-    $self->TraversePrePost(
-        sub { # This is called before recursing to the node's children.
-            my $node = shift;
-
-            return if $node->isRoot or $node->getParent->isRoot;
-
-            my $clause = $node->getNodeValue();
-            my $str = ' ';
-            my $aggregator_context = $node->getParent()->getNodeValue();
-            $str = $aggregator_context . " " if $node->getIndex() > 0;
-
-            if ( ref($clause) ) { # ie, it's a leaf              
-                $str .=
-                  $clause->{Key} . " " . $clause->{Op} . " " . $clause->{Value};
-            }
-
-            unless ($node->getParent->getParent->isRoot) {
-        #        used to check !ref( $parent->getNodeValue() ) )
-                if ( $node->getIndex() == 0 ) {
-                    $str = '( ' . $str;
-                }
-            }
-
-            push @$optionlist, {
-                TEXT     => $str,
-                INDEX    => $i,
-                SELECTED => (grep { $_ == $node } @$selected_nodes) ? 'SELECTED' : '',
-                DEPTH    => $node->getDepth() - 1,
-            };
-
-            $i++;
-        }, sub {
-            # This is called after recursing to the node's children.
-            my $node = shift;
-
-            return if $node->isRoot or $node->getParent->isRoot or $node->getParent->getParent->isRoot;
-
-            # Only do this for the rightmost child.
-            return unless $node->getIndex == $node->getParent->getChildCount - 1;
-
-            $optionlist->[-1]{TEXT} .= ' )';
-        }
-    );
-
-    return (join ' ', map { $_->{TEXT} } @$optionlist), $optionlist;
-}
-
-=head2 PruneChildLessAggregators
-
-If tree manipulation has left it in a state where there are ANDs, ORs,
-or parenthesizations with no children, get rid of them.
-
-=cut
-
-sub PruneChildlessAggregators {
-    my $self = shift;
-
-    $self->TraversePrePost(
-        sub {
-        },
-        sub {
-            my $node = shift;
-
-            return if $node->isRoot or $node->getParent->isRoot;
-            
-            # We're only looking for aggregators (AND/OR)
-            return if ref $node->getNodeValue;
-            
-            return if $node->getChildCount != 0;
-            
-            # OK, this is a childless aggregator.  Remove self.
-            
-            $node->getParent->removeChild($node);
-            
-            # Deal with circular refs
-            $node->DESTROY;
-        }
-    );
-}
-
-=head2 GetDisplayedNodes
-
-This function returns a list of the nodes of the tree in depth-first
-order which correspond to options in the "clauses" multi-select box.
-In fact, it's all of them but the root and its child.
-
-=cut
-
-sub GetDisplayedNodes {
-    my $self = shift;
-    my @lines;
-
-    $self->traverse(sub {
-        my $node = shift;
-
-        push @lines, $node unless $node->isRoot or $node->getParent->isRoot;
-    });
-
-    return @lines;
-}
-
-
-eval "require RT::Interface::Web::QueryBuilder::Tree_Vendor";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Web/QueryBuilder/Tree_Vendor.pm});
-eval "require RT::Interface::Web::QueryBuilder::Tree_Local";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Web/QueryBuilder/Tree_Local.pm});
-
-1;
diff --git a/rt/lib/RT/Interface/Web/Standalone.pm b/rt/lib/RT/Interface/Web/Standalone.pm
deleted file mode 100755
index bc2423e..0000000
--- a/rt/lib/RT/Interface/Web/Standalone.pm
+++ /dev/null
@@ -1,37 +0,0 @@
-package RT::Interface::Web::Standalone;
-
-use strict;
-use base 'HTTP::Server::Simple::Mason';
-use RT::Interface::Web::Handler;
-use RT::Interface::Web;
-
-sub handler_class { "RT::Interface::Web::Handler" }
-
-sub setup_escapes {
-    my $self = shift;
-    my $handler = shift;
-
-    # Override HTTP::Server::Simple::Mason's version of this method to do
-    # nothing.  (RT::Interface::Web::Handler does this already for us in
-    # NewHandler.)
-} 
-
-sub default_mason_config {
-    return @RT::MasonParameters;
-} 
-
-sub handle_request {
-
-    my $self = shift;
-    my $cgi = shift;
-
-    Module::Refresh->refresh if $RT::DevelMode;
-
-    $self->SUPER::handle_request($cgi);
-    $RT::Logger->crit($@) if ($@);
-
-    RT::Interface::Web::Handler->CleanupRequest();
-
-}
-
-1;
diff --git a/rt/lib/RT/Link.pm b/rt/lib/RT/Link.pm
index cc68aa6..d9595fb 100644
--- a/rt/lib/RT/Link.pm
+++ b/rt/lib/RT/Link.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -260,25 +260,25 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         Base => 
-		{read => 1, write => 1, sql_type => 12, length => 240,  is_blob => 0,  is_numeric => 0,  type => 'varchar(240)', default => ''},
+		{read => 1, write => 1, type => 'varchar(240)', default => ''},
         Target => 
-		{read => 1, write => 1, sql_type => 12, length => 240,  is_blob => 0,  is_numeric => 0,  type => 'varchar(240)', default => ''},
+		{read => 1, write => 1, type => 'varchar(240)', default => ''},
         Type => 
-		{read => 1, write => 1, sql_type => 12, length => 20,  is_blob => 0,  is_numeric => 0,  type => 'varchar(20)', default => ''},
+		{read => 1, write => 1, type => 'varchar(20)', default => ''},
         LocalTarget => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         LocalBase => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
@@ -310,7 +310,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Link_Overlay.pm b/rt/lib/RT/Link_Overlay.pm
index 28143cf..ef0347a 100644
--- a/rt/lib/RT/Link_Overlay.pm
+++ b/rt/lib/RT/Link_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Link - an RT Link object
@@ -77,9 +76,6 @@ ok (UNIVERSAL::isa($link, 'DBIx::SearchBuilder::Record'));
 
 =cut
 
-
-package RT::Link;
-
 use strict;
 no warnings qw(redefine);
 
@@ -107,31 +103,23 @@ sub Create {
     my $base = RT::URI->new( $self->CurrentUser );
     $base->FromURI( $args{'Base'} );
 
-    unless ( $base->Resolver && $base->Scheme ) {
-	my $msg = $self->loc("Couldn't resolve base '[_1]' into a URI.", 
-			     $args{'Base'});
-        $RT::Logger->warning( "$self $msg\n" );
+    unless ( $base->Resolver and $base->Scheme ) {
+        $RT::Logger->warning( "$self couldn't resolve base:'"
+                              . $args{'Base'} . " - "
+                              . "' into a URI\n" );
 
-	if (wantarray) {
-	    return(undef, $msg);
-	} else {
-	    return (undef);
-	}
+        return (undef);
     }
 
     my $target = RT::URI->new( $self->CurrentUser );
     $target->FromURI( $args{'Target'} );
 
     unless ( $target->Resolver ) {
-	my $msg = $self->loc("Couldn't resolve target '[_1]' into a URI.", 
-			     $args{'Target'});
-        $RT::Logger->warning( "$self $msg\n" );
-
-	if (wantarray) {
-	    return(undef, $msg);
-	} else {
-	    return (undef);
-	}
+        $RT::Logger->warning( "$self couldn't resolve target:'"
+                              . $args{'Target'} . " - "
+                              . "' into a URI\n" );
+
+        return (undef);
     }
 
     my $base_id   = 0;
diff --git a/rt/lib/RT/Links.pm b/rt/lib/RT/Links.pm
index 3626e22..07dcae7 100644
--- a/rt/lib/RT/Links.pm
+++ b/rt/lib/RT/Links.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Links_Overlay.pm b/rt/lib/RT/Links_Overlay.pm
index 203b60a..156193f 100644
--- a/rt/lib/RT/Links_Overlay.pm
+++ b/rt/lib/RT/Links_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Links - A collection of Link objects
@@ -67,9 +66,6 @@ ok (require RT::Links);
 
 =cut
 
-
-package RT::Links;
-
 use strict;
 no warnings qw(redefine);
 use RT::URI;
diff --git a/rt/lib/RT/ObjectCustomFieldValue.pm b/rt/lib/RT/ObjectCustomFieldValue.pm
deleted file mode 100644
index 5b80906..0000000
--- a/rt/lib/RT/ObjectCustomFieldValue.pm
+++ /dev/null
@@ -1,431 +0,0 @@
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
-# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
-# 
-# !! DO NOT EDIT THIS FILE !!
-#
-
-use strict;
-
-
-=head1 NAME
-
-RT::ObjectCustomFieldValue
-
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-=head1 METHODS
-
-=cut
-
-package RT::ObjectCustomFieldValue;
-use RT::Record; 
-use RT::CustomField;
-
-
-use vars qw( @ISA );
-@ISA= qw( RT::Record );
-
-sub _Init {
-  my $self = shift; 
-
-  $self->Table('ObjectCustomFieldValues');
-  $self->SUPER::_Init(@_);
-}
-
-
-
-
-
-=head2 Create PARAMHASH
-
-Create takes a hash of values and creates a row in the database:
-
-  int(11) 'CustomField'.
-  varchar(255) 'ObjectType'.
-  int(11) 'ObjectId'.
-  int(11) 'SortOrder'.
-  varchar(255) 'Content'.
-  longtext 'LargeContent'.
-  varchar(80) 'ContentType'.
-  varchar(80) 'ContentEncoding'.
-  smallint(6) 'Disabled'.
-
-=cut
-
-
-
-
-sub Create {
-    my $self = shift;
-    my %args = ( 
-                CustomField => '0',
-                ObjectType => '',
-                ObjectId => '0',
-                SortOrder => '0',
-                Content => '',
-                LargeContent => '',
-                ContentType => '',
-                ContentEncoding => '',
-                Disabled => '0',
-
-		  @_);
-    $self->SUPER::Create(
-                         CustomField => $args{'CustomField'},
-                         ObjectType => $args{'ObjectType'},
-                         ObjectId => $args{'ObjectId'},
-                         SortOrder => $args{'SortOrder'},
-                         Content => $args{'Content'},
-                         LargeContent => $args{'LargeContent'},
-                         ContentType => $args{'ContentType'},
-                         ContentEncoding => $args{'ContentEncoding'},
-                         Disabled => $args{'Disabled'},
-);
-
-}
-
-
-
-=head2 id
-
-Returns the current value of id. 
-(In the database, id is stored as int(11).)
-
-
-=cut
-
-
-=head2 CustomField
-
-Returns the current value of CustomField. 
-(In the database, CustomField is stored as int(11).)
-
-
-
-=head2 SetCustomField VALUE
-
-
-Set CustomField to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, CustomField will be stored as a int(11).)
-
-
-=cut
-
-
-=head2 CustomFieldObj
-
-Returns the CustomField Object which has the id returned by CustomField
-
-
-=cut
-
-sub CustomFieldObj {
-	my $self = shift;
-	my $CustomField =  RT::CustomField->new($self->CurrentUser);
-	$CustomField->Load($self->__Value('CustomField'));
-	return($CustomField);
-}
-
-=head2 ObjectType
-
-Returns the current value of ObjectType. 
-(In the database, ObjectType is stored as varchar(255).)
-
-
-
-=head2 SetObjectType VALUE
-
-
-Set ObjectType to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, ObjectType will be stored as a varchar(255).)
-
-
-=cut
-
-
-=head2 ObjectId
-
-Returns the current value of ObjectId. 
-(In the database, ObjectId is stored as int(11).)
-
-
-
-=head2 SetObjectId VALUE
-
-
-Set ObjectId to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, ObjectId will be stored as a int(11).)
-
-
-=cut
-
-
-=head2 SortOrder
-
-Returns the current value of SortOrder. 
-(In the database, SortOrder is stored as int(11).)
-
-
-
-=head2 SetSortOrder VALUE
-
-
-Set SortOrder to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, SortOrder will be stored as a int(11).)
-
-
-=cut
-
-
-=head2 Content
-
-Returns the current value of Content. 
-(In the database, Content is stored as varchar(255).)
-
-
-
-=head2 SetContent VALUE
-
-
-Set Content to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, Content will be stored as a varchar(255).)
-
-
-=cut
-
-
-=head2 LargeContent
-
-Returns the current value of LargeContent. 
-(In the database, LargeContent is stored as longtext.)
-
-
-
-=head2 SetLargeContent VALUE
-
-
-Set LargeContent to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, LargeContent will be stored as a longtext.)
-
-
-=cut
-
-
-=head2 ContentType
-
-Returns the current value of ContentType. 
-(In the database, ContentType is stored as varchar(80).)
-
-
-
-=head2 SetContentType VALUE
-
-
-Set ContentType to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, ContentType will be stored as a varchar(80).)
-
-
-=cut
-
-
-=head2 ContentEncoding
-
-Returns the current value of ContentEncoding. 
-(In the database, ContentEncoding is stored as varchar(80).)
-
-
-
-=head2 SetContentEncoding VALUE
-
-
-Set ContentEncoding to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, ContentEncoding will be stored as a varchar(80).)
-
-
-=cut
-
-
-=head2 Creator
-
-Returns the current value of Creator. 
-(In the database, Creator is stored as int(11).)
-
-
-=cut
-
-
-=head2 Created
-
-Returns the current value of Created. 
-(In the database, Created is stored as datetime.)
-
-
-=cut
-
-
-=head2 LastUpdatedBy
-
-Returns the current value of LastUpdatedBy. 
-(In the database, LastUpdatedBy is stored as int(11).)
-
-
-=cut
-
-
-=head2 LastUpdated
-
-Returns the current value of LastUpdated. 
-(In the database, LastUpdated is stored as datetime.)
-
-
-=cut
-
-
-=head2 Disabled
-
-Returns the current value of Disabled. 
-(In the database, Disabled is stored as smallint(6).)
-
-
-
-=head2 SetDisabled VALUE
-
-
-Set Disabled to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, Disabled will be stored as a smallint(6).)
-
-
-=cut
-
-
-
-sub _CoreAccessible {
-    {
-     
-        id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
-        CustomField => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
-        ObjectType => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
-        ObjectId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
-        SortOrder => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
-        Content => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
-        LargeContent => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'longtext', default => ''},
-        ContentType => 
-		{read => 1, write => 1, sql_type => 12, length => 80,  is_blob => 0,  is_numeric => 0,  type => 'varchar(80)', default => ''},
-        ContentEncoding => 
-		{read => 1, write => 1, sql_type => 12, length => 80,  is_blob => 0,  is_numeric => 0,  type => 'varchar(80)', default => ''},
-        Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
-        Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
-        LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
-        LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
-        Disabled => 
-		{read => 1, write => 1, sql_type => 5, length => 6,  is_blob => 0,  is_numeric => 1,  type => 'smallint(6)', default => '0'},
-
- }
-};
-
-
-        eval "require RT::ObjectCustomFieldValue_Overlay";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomFieldValue_Overlay.pm}) {
-            die $@;
-        };
-
-        eval "require RT::ObjectCustomFieldValue_Vendor";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomFieldValue_Vendor.pm}) {
-            die $@;
-        };
-
-        eval "require RT::ObjectCustomFieldValue_Local";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomFieldValue_Local.pm}) {
-            die $@;
-        };
-
-
-
-
-=head1 SEE ALSO
-
-This class allows "overlay" methods to be placed
-into the following files _Overlay is for a System overlay by the original author,
-_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
-
-These overlay files can contain new subs or subs to replace existing subs in this module.
-
-Each of these files should begin with the line 
-
-   no warnings qw(redefine);
-
-so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
-
-RT::ObjectCustomFieldValue_Overlay, RT::ObjectCustomFieldValue_Vendor, RT::ObjectCustomFieldValue_Local
-
-=cut
-
-
-1;
diff --git a/rt/lib/RT/ObjectCustomFieldValue_Overlay.pm b/rt/lib/RT/ObjectCustomFieldValue_Overlay.pm
deleted file mode 100644
index 9b753e8..0000000
--- a/rt/lib/RT/ObjectCustomFieldValue_Overlay.pm
+++ /dev/null
@@ -1,174 +0,0 @@
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-package RT::ObjectCustomFieldValue;
-
-use strict;
-no warnings qw(redefine);
-
-
-sub Create {
-    my $self = shift;
-    my %args = (
-                CustomField => '0',
-                ObjectType => '',
-                ObjectId => '0',
-                Disabled => '0',
-                Content => '',
-                LargeContent => '',
-                ContentType => '',
-                ContentEncoding => '',
-
-          @_);
-
-   
-    if( $args{'Content'} && length($args{'Content'}) > 255 && !$args{'LargeContent'} ) {
-
-        $args{'LargeContent'} = $args{'Content'};
-        $args{'Content'} = '';
-        $args{'ContentType'} = 'text/plain';
-    }
-
-    ( $args{'ContentEncoding'}, $args{'LargeContent'} ) =
-      $self->_EncodeLOB( $args{'LargeContent'}, $args{'ContentType'} )
-      if ( $args{'LargeContent'} );
-
-    $self->SUPER::Create(
-                         CustomField => $args{'CustomField'},
-                         ObjectType => $args{'ObjectType'},
-                         ObjectId => $args{'ObjectId'},
-                         Disabled => $args{'Disabled'},
-                         Content => $args{'Content'},
-                         LargeContent => $args{'LargeContent'},
-                         ContentType => $args{'ContentType'},
-                         ContentEncoding => $args{'ContentEncoding'},
-);
-
-
-
-}
-
-
-sub LargeContent {
-    my $self = shift;
-    $self->_DecodeLOB( $self->ContentType, $self->ContentEncoding,
-        $self->_Value( 'LargeContent', decode_utf8 => 0 ) );
-
-}
-
-
-
-
-=head2 LoadByTicketContentAndCustomField { Ticket => TICKET, CustomField => CUSTOMFIELD, Content => CONTENT }
-
-Loads a custom field value by Ticket, Content and which CustomField it's tied to
-
-=cut
-
-
-sub LoadByTicketContentAndCustomField {
-    my $self = shift;
-    my %args = ( Ticket => undef,
-                CustomField => undef,
-                Content => undef,
-                @_
-                );
-
-
-    $self->LoadByCols( Content => $args{'Content'},
-                         CustomField => $args{'CustomField'},
-                         ObjectType => 'RT::Ticket',
-                         ObjectId => $args{'Ticket'},
-			 Disabled => 0
-			 );
-
-    
-}
-
-sub LoadByObjectContentAndCustomField {
-    my $self = shift;
-    my %args = ( Object => undef,
-                CustomField => undef,
-                Content => undef,
-                @_
-                );
-
-    my $obj = $args{'Object'} or return;
-
-    $self->LoadByCols( Content => $args{'Content'},
-                         CustomField => $args{'CustomField'},
-                         ObjectType => ref($obj),
-                         ObjectId => $obj->Id,
-			 Disabled => 0
-			 );
-
-}
-
-
-=head2 Content
-
-Return this custom field's content. If there's no "regular"
-content, try "LargeContent"
-
-=cut
-
-
-sub Content {
-    my $self = shift;
-    my $content = $self->SUPER::Content;
-    if (!$content && $self->ContentType eq 'text/plain') {
-       return $self->LargeContent(); 
-    } else {
-        return $content;
-    }
-}
-
-
-sub Delete {
-    my $self = shift;
-    $self->SetDisabled(1);
-}
-
-1;
diff --git a/rt/lib/RT/ObjectCustomFieldValues.pm b/rt/lib/RT/ObjectCustomFieldValues.pm
deleted file mode 100644
index 296a925..0000000
--- a/rt/lib/RT/ObjectCustomFieldValues.pm
+++ /dev/null
@@ -1,148 +0,0 @@
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-# Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
-# WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
-# 
-# !! DO NOT EDIT THIS FILE !!
-#
-
-use strict;
-
-
-=head1 NAME
-
-  RT::ObjectCustomFieldValues -- Class Description
- 
-=head1 SYNOPSIS
-
-  use RT::ObjectCustomFieldValues
-
-=head1 DESCRIPTION
-
-
-=head1 METHODS
-
-=cut
-
-package RT::ObjectCustomFieldValues;
-
-use RT::SearchBuilder;
-use RT::ObjectCustomFieldValue;
-
-use vars qw( @ISA );
-@ISA= qw(RT::SearchBuilder);
-
-
-sub _Init {
-    my $self = shift;
-    $self->{'table'} = 'ObjectCustomFieldValues';
-    $self->{'primary_key'} = 'id';
-
-
-
-  # By default, order by SortOrder
-  $self->OrderByCols(
-	 { ALIAS => 'main',
-	   FIELD => 'SortOrder',
-	   ORDER => 'ASC' },
-	 { ALIAS => 'main',
-	   FIELD => 'id',
-	   ORDER => 'ASC' },
-     );
-
-    return ( $self->SUPER::_Init(@_) );
-}
-
-
-=head2 NewItem
-
-Returns an empty new RT::ObjectCustomFieldValue item
-
-=cut
-
-sub NewItem {
-    my $self = shift;
-    return(RT::ObjectCustomFieldValue->new($self->CurrentUser));
-}
-
-        eval "require RT::ObjectCustomFieldValues_Overlay";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomFieldValues_Overlay.pm}) {
-            die $@;
-        };
-
-        eval "require RT::ObjectCustomFieldValues_Vendor";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomFieldValues_Vendor.pm}) {
-            die $@;
-        };
-
-        eval "require RT::ObjectCustomFieldValues_Local";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomFieldValues_Local.pm}) {
-            die $@;
-        };
-
-
-
-
-=head1 SEE ALSO
-
-This class allows "overlay" methods to be placed
-into the following files _Overlay is for a System overlay by the original author,
-_Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customizations.  
-
-These overlay files can contain new subs or subs to replace existing subs in this module.
-
-Each of these files should begin with the line 
-
-   no warnings qw(redefine);
-
-so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
-
-RT::ObjectCustomFieldValues_Overlay, RT::ObjectCustomFieldValues_Vendor, RT::ObjectCustomFieldValues_Local
-
-=cut
-
-
-1;
diff --git a/rt/lib/RT/ObjectCustomField_Overlay.pm b/rt/lib/RT/ObjectCustomField_Overlay.pm
deleted file mode 100644
index e1dc7e2..0000000
--- a/rt/lib/RT/ObjectCustomField_Overlay.pm
+++ /dev/null
@@ -1,101 +0,0 @@
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-package RT::ObjectCustomField;
-
-use strict;
-no warnings qw(redefine);
-
-sub Create {
-    my $self = shift;
-    my %args = ( 
-                CustomField => '0',
-                ObjectId => '0',
-		SortOrder => undef,
-		  @_);
-
-    if (!defined $args{SortOrder}) {
-	my $CF = $self->CustomFieldObj($args{'CustomField'});
-	my $ObjectCFs = RT::ObjectCustomFields->new($self->CurrentUser);
-	$ObjectCFs->LimitToObjectId($args{'ObjectId'});
-	$ObjectCFs->LimitToLookupType($CF->LookupType);
-
-	$args{SortOrder} = $ObjectCFs->Count + 1;
-    }
-
-    $self->SUPER::Create(
-                         CustomField => $args{'CustomField'},
-                         ObjectId => $args{'ObjectId'},
-                         SortOrder => $args{'SortOrder'},
-		     );
-}
-
-sub Delete {
-    my $self = shift;
-
-    my $ObjectCFs = RT::ObjectCustomFields->new($self->CurrentUser);
-    $ObjectCFs->LimitToObjectId($self->ObjectId);
-    $ObjectCFs->LimitToLookupType($self->CustomFieldObj->LookupType);
-
-    # Move everything below us up
-    my $sort_order = $self->SortOrder;
-    while (my $OCF = $ObjectCFs->Next) {
-	my $this_order = $OCF->SortOrder;
-	next if $this_order <= $sort_order; 
-	$OCF->SetSortOrder($this_order - 1);
-    }
-
-    $self->SUPER::Delete;
-}
-
-sub CustomFieldObj {
-    my $self = shift;
-    my $id = shift || $self->CustomField;
-    my $CF = RT::CustomField->new($self->CurrentUser);
-    $CF->Load($id) or die "Cannot load CustomField $id";
-    return $CF;
-}
-
-1;
diff --git a/rt/lib/RT/ObjectCustomFields_Overlay.pm b/rt/lib/RT/ObjectCustomFields_Overlay.pm
deleted file mode 100644
index a496c4b..0000000
--- a/rt/lib/RT/ObjectCustomFields_Overlay.pm
+++ /dev/null
@@ -1,113 +0,0 @@
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-package RT::ObjectCustomFields;
-
-use strict;
-no warnings qw(redefine);
-
-sub LimitToCustomField {
-    my $self = shift;
-    my $id = shift;
-    $self->Limit( FIELD => 'CustomField', VALUE => $id );
-}
-
-sub LimitToObjectId {
-    my $self = shift;
-    my $id = shift || 0;
-    $self->Limit( FIELD => 'ObjectId', VALUE => $id );
-}
-
-sub LimitToLookupType {
-    my $self = shift;
-    my $lookup = shift;
-    unless ($self->{'_cfs_alias'}) {
-        $self->{'_cfs_alias'}  = $self->NewAlias('CustomFields');
-    }
-    $self->Join( ALIAS1 => 'main',
-                FIELD1 => 'CustomField',
-                ALIAS2 => $self->{'_cfs_alias'},
-                FIELD2 => 'id' );
-    $self->Limit( ALIAS           => $self->{'_cfs_alias'},
-                 FIELD           => 'LookupType',
-                 OPERATOR        => '=',
-                 VALUE           => $lookup );
-}
-
-sub HasEntryForCustomField {
-    my $self = shift;
-    my $id = shift;
-
-    my @items = grep {$_->CustomField == $id } @{$self->ItemsArrayRef};
-
-    if ($#items > 1) {
-	die "$self HasEntry had a list with more than one of $id in it. this can never happen";
-    }
-    if ($#items == -1 ) {
-	return undef;
-    }
-    else {
-	return ($items[0]);
-    }  
-}
-
-sub CustomFields {
-    my $self = shift;
-    my %seen;
-    map { $_->CustomFieldObj } @{$self->ItemsArrayRef};
-}
-
-sub _DoSearch {
-    my $self = shift;
-    if ($self->{'_cfs_alias'}) {
-    $self->Limit( ALIAS           => $self->{'_cfs_alias'},
-                 FIELD           => 'Disabled',
-                 OPERATOR        => '!=',
-                 VALUE           =>  1);
-    }
-    $self->SUPER::_DoSearch()
-}
-
-1;
diff --git a/rt/lib/RT/Principal.pm b/rt/lib/RT/Principal.pm
index da0c669..3d8bf2b 100644
--- a/rt/lib/RT/Principal.pm
+++ b/rt/lib/RT/Principal.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -182,13 +182,13 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         PrincipalType => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         ObjectId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, write => 1, type => 'int(11)', default => ''},
         Disabled => 
-		{read => 1, write => 1, sql_type => 5, length => 6,  is_blob => 0,  is_numeric => 1,  type => 'smallint(6)', default => '0'},
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
 
  }
 };
@@ -220,7 +220,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Principal_Overlay.pm b/rt/lib/RT/Principal_Overlay.pm
index 4783c5c..3e2edaa 100644
--- a/rt/lib/RT/Principal_Overlay.pm
+++ b/rt/lib/RT/Principal_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,27 +42,15 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-#
-
-package RT::Principal;
-
+# }}} END BPS TAGGED BLOCK
 use strict;
-use warnings;
 
 no warnings qw(redefine);
-
-use Cache::Simple::TimedExpiry;
-
-
+use vars qw(%_ACL_KEY_CACHE);
 
 use RT::Group;
 use RT::User;
 
-# Set up the ACL cache on startup
-our $_ACL_CACHE;
-InvalidateACLCache();
-
 # {{{ IsGroup
 
 =head2 IsGroup
@@ -143,11 +131,6 @@ sub Object {
 
 A helper function which calls RT::ACE->Create
 
-
-
-   Returns a tuple of (STATUS, MESSAGE);  If the call succeeded, STATUS is true. Otherwise it's 
-   false.
-
 =cut
 
 sub GrantRight {
@@ -157,6 +140,11 @@ sub GrantRight {
                 @_);
 
 
+    #if we haven't specified any sort of right, we're talking about a global right
+    if (!defined $args{'Object'} && !defined $args{'ObjectId'} && !defined $args{'ObjectType'}) {
+        $args{'Object'} = $RT::System;
+    }
+
     unless ($args{'Right'}) {
         return(0, $self->loc("Invalid Right"));
     }
@@ -184,11 +172,6 @@ sub GrantRight {
 
 Delete a right that a user has 
 
-
-   Returns a tuple of (STATUS, MESSAGE);  If the call succeeded, STATUS is true. Otherwise it's 
-      false.
-
-
 =cut
 
 sub RevokeRight {
@@ -223,40 +206,7 @@ sub RevokeRight {
 
 # }}}
 
-# {{{ sub _CleanupInvalidDelegations
-
-=head2 sub _CleanupInvalidDelegations { InsideTransaction => undef }
-
-Revokes all ACE entries delegated by this principal which are
-inconsistent with this principal's current delegation rights.  Does
-not perform permission checks, but takes no action and returns success
-if this principal still retains DelegateRights.  Should only ever be
-called from inside the RT library.
-
-If this principal is a group, recursively calls this method on each
-cached user member of itself.
-
-If called from inside a transaction, specify a true value for the
-InsideTransaction parameter.
 
-Returns a true value if the deletion succeeded; returns a false value
-and logs an internal error if the deletion fails (should not happen).
-
-=cut
-
-# This is currently just a stub for the methods of the same name in
-# RT::User and RT::Group.
-
-sub _CleanupInvalidDelegations {
-    my $self = shift;
-    unless ( $self->Id ) {
-	$RT::Logger->warning("Principal not loaded.");
-	return (undef);
-    }
-    return ($self->Object->_CleanupInvalidDelegations(@_));
-}
-
-# }}}
 
 # {{{ sub HasRight
 
@@ -291,31 +241,28 @@ Returns undef if no ACE was found.
 sub HasRight {
 
     my $self = shift;
-    my %args = (
-        Right        => undef,
-        Object       => undef,
-        EquivObjects => undef,
-        @_
-    );
+    my %args = ( Right      => undef,
+                 Object     => undef,
+                 EquivObjects    => undef,
+                 @_ );
 
     if ( $self->Disabled ) {
-        $RT::Logger->err( "Disabled User:  "
-              . $self->id
-              . " failed access check for "
-              . $args{'Right'} );
+        $RT::Logger->err( "Disabled User:  " . $self->id . " failed access check for " . $args{'Right'} );
         return (undef);
     }
 
     if ( !defined $args{'Right'} ) {
-        $RT::Logger->crit("HasRight called without a right");
+        require Carp;
+        $RT::Logger->debug( Carp::cluck("HasRight called without a right") );
         return (undef);
     }
 
-    if (   defined( $args{'Object'} )
-        && UNIVERSAL::can( $args{'Object'}, 'id' )
-        && $args{'Object'}->id )
-    {
-        push( @{ $args{'EquivObjects'} }, $args{Object} );
+    if ( defined( $args{'Object'} )) {
+        return (undef) unless (UNIVERSAL::can( $args{'Object'}, 'id' ) );
+        push(@{$args{'EquivObjects'}}, $args{Object});
+    }
+    elsif ( $args{'ObjectId'} && $args{'ObjectType'} ) {
+        $RT::Logger->crit(Carp::cluck("API not supprted"));
     }
     else {
         $RT::Logger->crit("$self HasRight called with no valid object");
@@ -323,50 +270,88 @@ sub HasRight {
     }
 
     # If this object is a ticket, we care about ticket roles and queue roles
-    if ( ( ref( $args{'Object'} ) eq 'RT::Ticket' ) && $args{'Object'}->Id ) {
-
-# this is a little bit hacky, but basically, now that we've done the ticket roles magic, we load the queue object
-# and ask all the rest of our questions about the queue.
-        push( @{ $args{'EquivObjects'} }, $args{'Object'}->QueueObj );
+    if ( (ref($args{'Object'}) eq 'RT::Ticket') && $args{'Object'}->Id) {
+        # this is a little bit hacky, but basically, now that we've done the ticket roles magic, we load the queue object
+        # and ask all the rest of our questions about the queue.
+        push (@{$args{'EquivObjects'}}, $args{'Object'}->QueueObj);
 
     }
 
+
     # {{{ If we've cached a win or loss for this lookup say so
 
     # {{{ Construct a hashkey to cache decisions in
     my $hashkey = do {
-        no warnings 'uninitialized';
-
-        # We don't worry about the hash ordering, as this is only
-        # temporarily used; also if the key changes it would be
-        # invalidated anyway.
-        join(
-            ";:;",
-            $self->Id,
-            map {
-                $_,    # the key of each arguments
-                  ( $_ eq 'EquivObjects' )    # for object arrayref...
-                  ? map( _ReferenceId($_), @{ $args{$_} } )    # calculate each
-                  : _ReferenceId( $args{$_} )    # otherwise just the value
-              } keys %args
+	no warnings 'uninitialized';
+        
+	# We don't worry about the hash ordering, as this is only
+	# temporarily used; also if the key changes it would be
+	# invalidated anyway.
+        join (
+            ";:;", $self->Id, map {
+                $_,                              # the key of each arguments
+                ($_ eq 'EquivObjects')           # for object arrayref...
+		    ? map(_ReferenceId($_), @{$args{$_}}) # calculate each
+                    : _ReferenceId( $args{$_} ) # otherwise just the value
+            } keys %args
         );
     };
-
     # }}}
 
+    #Anything older than 60 seconds needs to be rechecked
+    my $cache_timeout = ( time - 60 );
+
     # {{{ if we've cached a positive result for this query, return 1
+    if (    ( defined $self->_ACLCache->{"$hashkey"} )
+         && ( $self->_ACLCache->{"$hashkey"}{'val'} == 1 )
+         && ( defined $self->_ACLCache->{"$hashkey"}{'set'} )
+         && ( $self->_ACLCache->{"$hashkey"}{'set'} > $cache_timeout ) ) {
 
-    my $cached_answer = $_ACL_CACHE->fetch($hashkey);
+        #$RT::Logger->debug("Cached ACL win for ".  $args{'Right'}.$args{'Scope'}.  $args{'AppliesTo'}."\n");	    
+        return ( 1);
+    }
+    # }}}
 
-    # Returns undef on cache miss
-    if ( defined $cached_answer ) {
-        if ( $cached_answer == 1 ) {
-            return (1);
-        }
-        elsif ( $cached_answer == -1 ) {
-            return (0);
-        }
+    #  {{{ if we've cached a negative result for this query return undef
+    elsif (    ( defined $self->_ACLCache->{"$hashkey"} )
+            && ( $self->_ACLCache->{"$hashkey"}{'val'} == -1 )
+            && ( defined $self->_ACLCache->{"$hashkey"}{'set'} )
+            && ( $self->_ACLCache->{"$hashkey"}{'set'} > $cache_timeout ) ) {
+
+        #$RT::Logger->debug("Cached ACL loss decision for ".  $args{'Right'}.$args{'Scope'}.  $args{'AppliesTo'}."\n");	    
+
+        return (undef);
     }
+    # }}}
+
+    # }}}
+
+
+
+    #  {{{ Out of date docs
+    
+    #   We want to grant the right if:
+
+
+    #    # The user has the right as a member of a system-internal or 
+    #    # user-defined group
+    #
+    #    Find all records from the ACL where they're granted to a group 
+    #    of type "UserDefined" or "System"
+    #    for the object "System or the object "Queue N" and the group we're looking
+    #    at has the recursive member $self->Id
+    #
+    #    # The user has the right based on a role
+    #
+    #    Find all the records from ACL where they're granted to the role "foo"
+    #    for the object "System" or the object "Queue N" and the group we're looking
+    #   at is of domain  ("RT::Queue-Role" and applies to the right queue)
+    #                             or ("RT::Ticket-Role" and applies to the right ticket)
+    #    and the type is the same as the type of the ACL and the group has
+    #    the recursive member $self->Id
+    #
+
+    # }}}
 
     my ( $or_look_at_object_rights, $or_check_roles );
     my $right = $args{'Right'};
@@ -374,108 +359,119 @@ sub HasRight {
     # {{{ Construct Right Match
 
     # If an object is defined, we want to look at rights for that object
-
+   
     my @look_at_objects;
-    push( @look_at_objects, "ACL.ObjectType = 'RT::System'" )
-      unless $self->can('_IsOverrideGlobalACL')
-      and $self->_IsOverrideGlobalACL( $args{Object} );
-
-    foreach my $obj ( @{ $args{'EquivObjects'} } ) {
-        next unless ( UNIVERSAL::can( $obj, 'id' ) );
-        my $type = ref($obj);
-        my $id   = $obj->id;
-
-        unless ($id) {
-            use Carp;
-            Carp::cluck(
-                "Trying to check $type rights for an unspecified $type");
-            $RT::Logger->crit(
-                "Trying to check $type rights for an unspecified $type");
-        }
-        push @look_at_objects,
-          "(ACL.ObjectType = '$type' AND ACL.ObjectId = '$id')";
-    }
+    push (@look_at_objects, "ACL.ObjectType = 'RT::System'")
+        unless $self->can('_IsOverrideGlobalACL') and $self->_IsOverrideGlobalACL($args{Object});
+
+
 
+    foreach my $obj (@{$args{'EquivObjects'}}) {
+            next unless (UNIVERSAL::can($obj, 'id'));
+            my $type = ref($obj);
+            my $id = $obj->id;
+
+            unless ($id) {
+                use Carp;
+		Carp::cluck("Trying to check $type rights for an unspecified $type");
+                $RT::Logger->crit("Trying to check $type rights for an unspecified $type");
+            }
+            push @look_at_objects, "(ACL.ObjectType = '$type' AND ACL.ObjectId = '$id')"; 
+            }
+
+     
     # }}}
 
     # {{{ Build that honkin-big SQL query
 
-    my $query_base =
-      "SELECT ACL.id from ACL, Groups, Principals, CachedGroupMembers WHERE  " .
+    
 
-      # Only find superuser or rights with the name $right
-      "(ACL.RightName = 'SuperUser' OR  ACL.RightName = '$right') " .
+    my $query_base = "SELECT ACL.id from ACL, Groups, Principals, CachedGroupMembers WHERE  ".
+    # Only find superuser or rights with the name $right
+   "(ACL.RightName = 'SuperUser' OR  ACL.RightName = '$right') ".
+   # Never find disabled groups.
+   "AND Principals.Disabled = 0 " .
+   "AND CachedGroupMembers.Disabled = 0  ".
+    "AND Principals.id = Groups.id " .  # We always grant rights to Groups
 
-      # Never find disabled groups.
-      "AND Principals.Disabled = 0 "
-      . "AND CachedGroupMembers.Disabled = 0  "
-      . "AND Principals.id = Groups.id "
-      .    # We always grant rights to Groups
+    # See if the principal is a member of the group recursively or _is the rightholder_
+    # never find recursively disabled group members
+    # also, check to see if the right is being granted _directly_ to this principal,
+    #  as is the case when we want to look up group rights
+    "AND  Principals.id = CachedGroupMembers.GroupId AND CachedGroupMembers.MemberId = '" . $self->Id . "' ".
 
-# See if the principal is a member of the group recursively or _is the rightholder_
-# never find recursively disabled group members
-# also, check to see if the right is being granted _directly_ to this principal,
-#  as is the case when we want to look up group rights
-"AND  Principals.id = CachedGroupMembers.GroupId AND CachedGroupMembers.MemberId = '"
-      . $self->Id . "' "
-      .
+    # Make sure the rights apply to the entire system or to the object in question
+    "AND ( ".join(' OR ', @look_at_objects).") ";
 
-  # Make sure the rights apply to the entire system or to the object in question
-      "AND ( " . join( ' OR ', @look_at_objects ) . ") ";
 
-# The groups query does the query based on group membership and individual user rights
 
-    my $groups_query = $query_base .
+    # The groups query does the query based on group membership and individual user rights
 
-# limit the result set to groups of types ACLEquivalence (user)  UserDefined, SystemInternal and Personal
-"AND ( (  ACL.PrincipalId = Principals.id AND ACL.PrincipalType = 'Group' AND "
-      . "(Groups.Domain = 'SystemInternal' OR Groups.Domain = 'UserDefined' OR Groups.Domain = 'ACLEquivalence' OR Groups.Domain = 'Personal'))"
-      .
+	my $groups_query = $query_base . 
 
-      " ) ";
-    $self->_Handle->ApplyLimits( \$groups_query, 1 );    #only return one result
+    # limit the result set to groups of types ACLEquivalence (user)  UserDefined, SystemInternal and Personal
+    "AND ( (  ACL.PrincipalId = Principals.id AND ACL.PrincipalType = 'Group' AND ".
+        "(Groups.Domain = 'SystemInternal' OR Groups.Domain = 'UserDefined' OR Groups.Domain = 'ACLEquivalence' OR Groups.Domain = 'Personal'))".
 
+        " ) ";
+        $self->_Handle->ApplyLimits(\$groups_query, 1); #only return one result
+        
     my @roles;
-    foreach my $object ( @{ $args{'EquivObjects'} } ) {
-        push( @roles, $self->_RolesForObject( ref($object), $object->id ) );
+    foreach my $object (@{$args{'EquivObjects'}}) { 
+          push (@roles, $self->_RolesForObject(ref($object), $object->id));
     }
 
     # The roles query does the query based on roles
     my $roles_query;
     if (@roles) {
-        $roles_query =
-            $query_base . "AND " . " ( ("
-          . join( ' OR ', @roles ) . " ) "
-          . " AND Groups.Type = ACL.PrincipalType AND Groups.Id = Principals.id AND Principals.PrincipalType = 'Group') ";
-        $self->_Handle->ApplyLimits( \$roles_query, 1 ); #only return one result
+	 $roles_query = $query_base . "AND ".
+            " ( (".join (' OR ', @roles)." ) ".  
+        " AND Groups.Type = ACL.PrincipalType AND Groups.Id = Principals.id AND Principals.PrincipalType = 'Group') "; 
+        $self->_Handle->ApplyLimits(\$roles_query, 1); #only return one result
+
+   }
+
 
-    }
 
     # }}}
 
     # {{{ Actually check the ACL by performing an SQL query
-    #   $RT::Logger->debug("Now Trying $groups_query");
+    #   $RT::Logger->debug("Now Trying $groups_query");	
     my $hitcount = $self->_Handle->FetchResult($groups_query);
 
     # }}}
-
-    # {{{ if there's a match, the right is granted
+    
+    # {{{ if there's a match, the right is granted 
     if ($hitcount) {
-        $_ACL_CACHE->set( $hashkey => 1 );
+
+        # Cache a positive hit.
+        $self->_ACLCache->{"$hashkey"}{'set'} = time;
+        $self->_ACLCache->{"$hashkey"}{'val'} = 1;
         return (1);
     }
+    # }}}
+    # {{{ If there's no match on groups, try it on roles
+    else {   
 
-    # Now check the roles query
-    $hitcount = $self->_Handle->FetchResult($roles_query);
+    	$hitcount = $self->_Handle->FetchResult($roles_query);
 
-    if ($hitcount) {
-        $_ACL_CACHE->set( $hashkey => 1 );
-        return (1);
-    }
+        if ($hitcount) {
+
+            # Cache a positive hit.
+            $self->_ACLCache->{"$hashkey"}{'set'} = time;
+            $self->_ACLCache->{"$hashkey"}{'val'} = 1;
+            return (1);
+	    }
 
-    # We failed to find an acl hit
-    $_ACL_CACHE->set( $hashkey => -1 );
-    return (undef);
+        else {
+            # cache a negative hit
+            $self->_ACLCache->{"$hashkey"}{'set'} = time;
+            $self->_ACLCache->{"$hashkey"}{'val'} = -1;
+
+            return (undef);
+	    }
+    }
+    # }}}
 }
 
 # }}}
@@ -517,19 +513,34 @@ sub _RolesForObject {
 
 # {{{ ACL caching
 
+# {{{ _ACLCache
 
-# {{{ InvalidateACLCache
-
-=head2 InvalidateACLCache
+=head2 _ACLCache
 
-Cleans out and reinitializes the user rights cache
+# Function: _ACLCache
+# Type    : private instance
+# Args    : none
+# Lvalue  : hash: ACLCache
+# Desc    : Returns a reference to the Key cache hash
 
 =cut
 
-sub InvalidateACLCache {
-    $_ACL_CACHE = Cache::Simple::TimedExpiry->new();
-    $_ACL_CACHE->expire_after($RT::ACLCacheLifetime||60);
+sub _ACLCache {
+    return(\%_ACL_KEY_CACHE);
+}
+
+# }}}
+
+# {{{ _InvalidateACLCache
+
+=head2 _InvalidateACLCache
+
+Cleans out and reinitializes the user rights key cache
+
+=cut
 
+sub _InvalidateACLCache {
+    %_ACL_KEY_CACHE = ();
 }
 
 # }}}
diff --git a/rt/lib/RT/Principals.pm b/rt/lib/RT/Principals.pm
index a61cfb9..17b588f 100644
--- a/rt/lib/RT/Principals.pm
+++ b/rt/lib/RT/Principals.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Principals_Overlay.pm b/rt/lib/RT/Principals_Overlay.pm
index c06b9c6..c4f89ef 100644
--- a/rt/lib/RT/Principals_Overlay.pm
+++ b/rt/lib/RT/Principals_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Principals - a collection of RT::Principal objects
@@ -66,9 +65,6 @@ ok (require RT::Principals);
 
 =cut
 
-
-package RT::Principals;
-
 use strict;
 no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Queue.pm b/rt/lib/RT/Queue.pm
index 23839d4..03bb2de 100755
--- a/rt/lib/RT/Queue.pm
+++ b/rt/lib/RT/Queue.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -323,31 +323,31 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         Name => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         Description => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         CorrespondAddress => 
-		{read => 1, write => 1, sql_type => 12, length => 120,  is_blob => 0,  is_numeric => 0,  type => 'varchar(120)', default => ''},
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
         CommentAddress => 
-		{read => 1, write => 1, sql_type => 12, length => 120,  is_blob => 0,  is_numeric => 0,  type => 'varchar(120)', default => ''},
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
         InitialPriority => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         FinalPriority => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         DefaultDueIn => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         Disabled => 
-		{read => 1, write => 1, sql_type => 5, length => 6,  is_blob => 0,  is_numeric => 1,  type => 'smallint(6)', default => '0'},
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
 
  }
 };
@@ -379,7 +379,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Queue_Overlay.pm b/rt/lib/RT/Queue_Overlay.pm
index 2f180fc..0d50a74 100644
--- a/rt/lib/RT/Queue_Overlay.pm
+++ b/rt/lib/RT/Queue_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Queue - an RT Queue object
@@ -65,20 +64,18 @@ use RT::Queue;
 
 =cut
 
-
-package RT::Queue;
-
 use strict;
 no warnings qw(redefine);
 
-use vars qw(@DEFAULT_ACTIVE_STATUS @DEFAULT_INACTIVE_STATUS $RIGHTS);
-
+use vars qw(@STATUS @ACTIVE_STATUS @INACTIVE_STATUS $RIGHTS);
 use RT::Groups;
 use RT::ACL;
-use RT::Interface::Email;
+use RT::EmailParser;
+
 
-@DEFAULT_ACTIVE_STATUS = qw(new open stalled);
-@DEFAULT_INACTIVE_STATUS = qw(resolved rejected deleted);  
+@ACTIVE_STATUS = qw(new open stalled);
+@INACTIVE_STATUS = qw(resolved rejected deleted);
+@STATUS = (@ACTIVE_STATUS, @INACTIVE_STATUS);
 
 # $self->loc('new'); # For the string extractor to get a string to localize
 # $self->loc('open'); # For the string extractor to get a string to localize
@@ -94,7 +91,7 @@ $RIGHTS = {
     ShowACL             => 'Display Access Control List',             # loc_pair
     ModifyACL           => 'Modify Access Control List',              # loc_pair
     ModifyQueueWatchers => 'Modify the queue watchers',               # loc_pair
-    AssignCustomFields  => 'Assign and remove custom fields',         # loc_pair
+    AdminCustomFields   => 'Create, delete and modify custom fields', # loc_pair
     ModifyTemplate      => 'Modify Scrip templates for this queue',   # loc_pair
     ShowTemplate        => 'Display Scrip templates for this queue',  # loc_pair
 
@@ -183,12 +180,7 @@ Returns an array of all ActiveStatuses for this queue
 
 sub ActiveStatusArray {
     my $self = shift;
-    if (@RT::ActiveStatus) {
-    	return (@RT::ActiveStatus)
-    } else {
-        $RT::Logger->warning("RT::ActiveStatus undefined, falling back to deprecated defaults");
-        return (@DEFAULT_ACTIVE_STATUS);
-    }
+    return (@ACTIVE_STATUS);
 }
 
 # }}}
@@ -203,12 +195,7 @@ Returns an array of all InactiveStatuses for this queue
 
 sub InactiveStatusArray {
     my $self = shift;
-    if (@RT::InactiveStatus) {
-    	return (@RT::InactiveStatus)
-    } else {
-        $RT::Logger->warning("RT::InactiveStatus undefined, falling back to deprecated defaults");
-        return (@DEFAULT_INACTIVE_STATUS);
-    }
+    return (@INACTIVE_STATUS);
 }
 
 # }}}
@@ -223,7 +210,7 @@ Returns an array of all statuses for this queue
 
 sub StatusArray {
     my $self = shift;
-    return ($self->ActiveStatusArray(), $self->InactiveStatusArray());
+    return (@STATUS);
 }
 
 # }}}
@@ -232,23 +219,20 @@ sub StatusArray {
 
 =head2 IsValidStatus VALUE
 
-Returns true if VALUE is a valid status.  Otherwise, returns 0.
-
-=begin testing
+Returns true if VALUE is a valid status.  Otherwise, returns 0
 
+=for testing
 my $q = RT::Queue->new($RT::SystemUser);
 ok($q->IsValidStatus('new')== 1, 'New is a valid status');
 ok($q->IsValidStatus('f00')== 0, 'f00 is not a valid status');
 
-=end testing
-
 =cut
 
 sub IsValidStatus {
     my $self  = shift;
     my $value = shift;
 
-    my $retval = grep ( $_ eq $value, $self->StatusArray );
+    my $retval = grep ( /^$value$/, $self->StatusArray );
     return ($retval);
 
 }
@@ -261,22 +245,19 @@ sub IsValidStatus {
 
 Returns true if VALUE is a Active status.  Otherwise, returns 0
 
-=begin testing
-
+=for testing
 my $q = RT::Queue->new($RT::SystemUser);
 ok($q->IsActiveStatus('new')== 1, 'New is a Active status');
 ok($q->IsActiveStatus('rejected')== 0, 'Rejected is an inactive status');
 ok($q->IsActiveStatus('f00')== 0, 'f00 is not a Active status');
 
-=end testing
-
 =cut
 
 sub IsActiveStatus {
     my $self  = shift;
     my $value = shift;
 
-    my $retval = grep ( $_ eq $value, $self->ActiveStatusArray );
+    my $retval = grep ( /^$value$/, $self->ActiveStatusArray );
     return ($retval);
 
 }
@@ -289,22 +270,19 @@ sub IsActiveStatus {
 
 Returns true if VALUE is a Inactive status.  Otherwise, returns 0
 
-=begin testing
-
+=for testing
 my $q = RT::Queue->new($RT::SystemUser);
 ok($q->IsInactiveStatus('new')== 0, 'New is a Active status');
 ok($q->IsInactiveStatus('rejected')== 1, 'rejeected is an Inactive status');
 ok($q->IsInactiveStatus('f00')== 0, 'f00 is not a Active status');
 
-=end testing
-
 =cut
 
 sub IsInactiveStatus {
     my $self  = shift;
     my $value = shift;
 
-    my $retval = grep ( $_ eq $value, $self->InactiveStatusArray );
+    my $retval = grep ( /^$value$/, $self->InactiveStatusArray );
     return ($retval);
 
 }
@@ -314,34 +292,11 @@ sub IsInactiveStatus {
 
 # {{{ sub Create
 
+=head2 Create
 
-
-
-=head2 Create(ARGS)
-
-Arguments: ARGS is a hash of named parameters.  Valid parameters are:
-
-  Name (required)
-  Description
-  CorrespondAddress
-  CommentAddress
-  InitialPriority
-  FinalPriority
-  DefaultDueIn
- 
+Create takes the name of the new queue 
 If you pass the ACL check, it creates the queue and returns its queue id.
 
-=begin testing
-
-my $queue = RT::Queue->new($RT::SystemUser);
-my ($id, $val) = $queue->Create( Name => 'Test1');
-ok($id, $val);
-
-($id, $val) = $queue->Create( Name => '66');
-ok(!$id, $val);
-
-=end testing
-
 =cut
 
 sub Create {
@@ -402,8 +357,8 @@ sub Delete {
 =head2 SetDisabled
 
 Takes a boolean.
-1 will cause this queue to no longer be available for tickets.
-0 will re-enable this queue.
+1 will cause this queue to no longer be avaialble for tickets.
+0 will re-enable this queue
 
 =cut
 
@@ -454,14 +409,20 @@ sub ValidateName {
     my $tempqueue = new RT::Queue($RT::SystemUser);
     $tempqueue->Load($name);
 
+    #If we couldn't load it :)
+    unless ( $tempqueue->id() ) {
+        return (1);
+    }
+
     #If this queue exists, return undef
-    if ( $tempqueue->Name() && $tempqueue->id != $self->id)  {
+    #Avoid the ACL check.
+    if ( $tempqueue->Name() ) {
         return (undef);
     }
 
     #If the queue doesn't exist, return 1
     else {
-        return ($self->SUPER::ValidateName($name));
+        return (1);
     }
 
 }
@@ -494,7 +455,7 @@ sub Templates {
 
 # {{{  CustomField
 
-=head2 CustomField NAME
+=item CustomField NAME
 
 Load the queue-specific custom field named NAME
 
@@ -511,38 +472,18 @@ sub CustomField {
 
 # {{{ CustomFields
 
-=head2 CustomFields
+=item CustomFields
 
 Returns an RT::CustomFields object containing all global custom fields, as well as those tied to this queue
 
 =cut
 
-# XXX TODO - this should become TicketCustomFields
-
 sub CustomFields {
     my $self = shift;
-    warn "Queue->CustomFields is deprecated, use Queue->TicketCustomFields instead";
-    return $self->TicketCustomFields(@_);
-}
-
-sub TicketCustomFields {
-    my $self = shift;
-
-    my $cfs = RT::CustomFields->new( $self->CurrentUser );
-    if ( $self->CurrentUserHasRight('SeeQueue') ) {
-	$cfs->LimitToGlobalOrObjectId( $self->Id );
-	$cfs->LimitToLookupType( 'RT::Queue-RT::Ticket' );
-    }
-    return ($cfs);
-}
-
-sub TicketTransactionCustomFields {
-    my $self = shift;
 
     my $cfs = RT::CustomFields->new( $self->CurrentUser );
     if ( $self->CurrentUserHasRight('SeeQueue') ) {
-	$cfs->LimitToGlobalOrObjectId( $self->Id );
-	$cfs->LimitToLookupType( 'RT::Queue-RT::Ticket-RT::Transaction' );
+        $cfs->LimitToGlobalOrQueue( $self->Id );
     }
     return ($cfs);
 }
@@ -669,7 +610,7 @@ sub AddWatcher {
             }
         }
      else {
-            $RT::Logger->warning( "$self -> AddWatcher got passed a bogus type");
+            $RT::Logger->warn( "$self -> AddWatcher got passed a bogus type");
             return ( 0, $self->loc('Error in parameters to Queue->AddWatcher') );
         }
     }
@@ -721,7 +662,7 @@ sub _AddWatcher {
              my $new_user = RT::User->new($RT::SystemUser);
 
             my ( $Address, $Name ) =  
-               RT::Interface::Email::ParseAddressFromHeader($args{'Email'});
+               RT::EmailParser::ParseAddressFromHeader('', $args{'Email'});
 
             my ( $Val, $Message ) = $new_user->Create(
                 Name => $Address,
@@ -830,7 +771,7 @@ sub DeleteWatcher {
             }
         }
         else {
-            $RT::Logger->warning( "$self -> DeleteWatcher got passed a bogus type");
+            $RT::Logger->warn( "$self -> DeleteWatcher got passed a bogus type");
             return ( 0, $self->loc('Error in parameters to Queue->DeleteWatcher') );
         }
     }
@@ -1001,8 +942,8 @@ sub IsWatcher {
 
 =head2 IsCc PRINCIPAL_ID
 
-Takes an RT::Principal id.
-Returns true if the principal is a requestor of the current queue.
+  Takes an RT::Principal id.
+  Returns true if the principal is a requestor of the current queue.
 
 
 =cut
@@ -1021,8 +962,8 @@ sub IsCc {
 
 =head2 IsAdminCc PRINCIPAL_ID
 
-Takes an RT::Principal id.
-Returns true if the principal is a requestor of the current queue.
+  Takes an RT::Principal id.
+  Returns true if the principal is a requestor of the current queue.
 
 =cut
 
@@ -1123,7 +1064,7 @@ sub HasRight {
     }
     return (
         $args{'Principal'}->HasRight(
-            Object => $self->Id ? $self : $RT::System,
+            Object => $self,
             Right    => $args{'Right'}
           )
     );
diff --git a/rt/lib/RT/Queues.pm b/rt/lib/RT/Queues.pm
index a702081..e1be353 100755
--- a/rt/lib/RT/Queues.pm
+++ b/rt/lib/RT/Queues.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Queues_Overlay.pm b/rt/lib/RT/Queues_Overlay.pm
index 06e3e12..a3bbb78 100644
--- a/rt/lib/RT/Queues_Overlay.pm
+++ b/rt/lib/RT/Queues_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Queues - a collection of RT::Queue objects
@@ -66,9 +65,6 @@ ok (require RT::Queues);
 
 =cut
 
-
-package RT::Queues;
-
 use strict;
 no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Record.pm b/rt/lib/RT/Record.pm
index d3a8268..57a5ea7 100755
--- a/rt/lib/RT/Record.pm
+++ b/rt/lib/RT/Record.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Record - Base class for RT record objects
@@ -108,48 +107,6 @@ sub _PrimaryKeys {
 
 # }}}
 
-=head2 Delete
-
-Delete this record object from the database.
-
-=cut
-
-sub Delete {
-    my $self = shift;
-    my ($rv) = $self->SUPER::Delete;
-    if ($rv) {
-        return ($rv, $self->loc("Object deleted"));
-    } else {
-
-        return(0, $self->loc("Object could not be deleted"))
-    } 
-}
-
-=head2 ObjectTypeStr
-
-Returns a string which is this object's type.  The type is the class,
-without the "RT::" prefix.
-
-=begin testing
-
-my $ticket = RT::Ticket->new($RT::SystemUser);
-my $group = RT::Group->new($RT::SystemUser);
-is($ticket->ObjectTypeStr, 'Ticket', "Ticket returns correct typestring");
-is($group->ObjectTypeStr, 'Group', "Group returns correct typestring");
-
-=end testing
-
-=cut
-
-sub ObjectTypeStr {
-    my $self = shift;
-    if (ref($self) =~ /^.*::(\w+)$/) {
-	return $self->loc($1);
-    } else {
-	return $self->loc(ref($self));
-    }
-}
-
 =head2 Attributes
 
 Return this object's attributes as an RT::Attributes object
@@ -188,9 +145,7 @@ sub AddAttribute {
                                       Description => $args{'Description'},
                                       Content     => $args{'Content'} );
 
-                                     
-    # XXX TODO: Why won't RedoSearch work here?                                     
-    $self->Attributes->_DoSearch;
+    $self->Attributes->RedoSearch;
     
     return ($id, $msg);
 }
@@ -258,7 +213,7 @@ sub _Handle {
 
 # {{{ sub Create 
 
-=head2  Create PARAMHASH
+=item  Create PARAMHASH
 
 Takes a PARAMHASH of Column -> Value pairs.
 If any Column has a Validate$PARAMNAME subroutine defined and the 
@@ -377,11 +332,10 @@ sub LoadByCols {
                 $newhash{$key} = $hash{$key};
             }
             else {
-                my ($op, $val, $func);
-                ($key, $op, $val, $func) = $self->_Handle->_MakeClauseCaseInsensitive($key, '=', $hash{$key});
+                my ($op, $val);
+                ($key, $op, $val) = $self->_Handle->_MakeClauseCaseInsensitive($key, '=', $hash{$key});
                 $newhash{$key}->{operator} = $op;
                 $newhash{$key}->{value} = $val;
-                $newhash{$key}->{function} = $func;
             }
         }
 
@@ -483,7 +437,6 @@ sub LongSinceUpdateAsString {
 # }}} Datehandling
 
 # {{{ sub _Set 
-#
 sub _Set {
     my $self = shift;
 
@@ -501,33 +454,12 @@ sub _Set {
         $args{'Value'} = 0;
     }
 
-    my $old_val = $self->__Value($args{'Field'});
-     $self->_SetLastUpdated();
-    my $ret = $self->SUPER::_Set(
+    $self->_SetLastUpdated();
+    my ( $val, $msg ) = $self->SUPER::_Set(
         Field => $args{'Field'},
         Value => $args{'Value'},
         IsSQL => $args{'IsSQL'}
     );
-        my ($status, $msg) =  $ret->as_array();
-
-        # @values has two values, a status code and a message.
-
-    # $ret is a Class::ReturnValue object. as such, in a boolean context, it's a bool
-    # we want to change the standard "success" message
-    if ($status) {
-        $msg =
-          $self->loc(
-            "[_1] changed from [_2] to [_3]",
-            $args{'Field'},
-            ( $old_val ? "'$old_val'" : $self->loc("(no value)") ),
-            '"' . $self->__Value( $args{'Field'}) . '"' 
-          );
-      } else {
-
-          $msg = $self->CurrentUser->loc_fuzzy($msg);
-    }
-    return wantarray ? ($status, $msg) : $ret;     
-
 }
 
 # }}}
@@ -617,22 +549,8 @@ sub URI {
 }
 
 # }}}
+ 
 
-=head2 ValidateName NAME
-
-Validate the name of the record we're creating. Mostly, just make sure it's not a numeric ID, which is invalid for Name
-
-=cut
-
-sub ValidateName {
-    my $self = shift;
-    my $value = shift;
-    if ($value && $value=~ /^\d+$/) {
-        return(0);
-    } else  {
-         return (1);
-    }
-}
 
 
 
@@ -832,26 +750,6 @@ sub _EncodeLOB {
 
 }
 
-sub _DecodeLOB {
-    my $self            = shift;
-    my $ContentType     = shift;
-    my $ContentEncoding = shift;
-    my $Content         = shift;
-
-    if ( $ContentEncoding eq 'base64' ) {
-        $Content = MIME::Base64::decode_base64($Content);
-    }
-    elsif ( $ContentEncoding eq 'quoted-printable' ) {
-        $Content = MIME::QuotedPrint::decode($Content);
-    }
-    elsif ( $ContentEncoding && $ContentEncoding ne 'none' ) {
-        return ( $self->loc( "Unknown ContentEncoding [_1]", $ContentEncoding ) );
-    }
-    if ( $ContentType eq 'text/plain' ) {
-       $Content = Encode::decode_utf8($Content) unless Encode::is_utf8($Content);
-    }
-        return ($Content);
-}
 
 # {{{ LINKDIRMAP
 # A helper table for links mapping to make it easier
@@ -895,7 +793,8 @@ sub Update {
             && defined(
                 $ARGSRef->{ $args{'AttributePrefix'} . "-" . $attribute }
             )
-          ) {
+          )
+        {
             $value = $ARGSRef->{ $args{'AttributePrefix'} . "-" . $attribute };
 
         }
@@ -919,15 +818,14 @@ sub Update {
         next if ( $value eq $self->$attribute() );
         my $method = "Set$attribute";
         my ( $code, $msg ) = $self->$method($value);
-        my ($prefix) = ref($self) =~ /RT::(\w+)/;
 
-        # Default to $id, but use name if we can get it.
-        my $label = $self->id;
-        $label = $self->Name if (UNIVERSAL::can($self,'Name'));
-        push @results, $self->loc( "$prefix [_1]", $label ) . ': '. $msg;
+        my ($prefix) = ref($self) =~ /RT::(\w+)/;
+        push @results,
+          $self->loc( "$prefix [_1]", $self->id ) . ': '
+          . $self->loc($attribute) . ': '
+          . $self->CurrentUser->loc_fuzzy($msg);
 
 =for loc
-
                                    "[_1] could not be set to [_2].",       # loc
                                    "That is already the current value",    # loc
                                    "No value sent to _Set!\n",             # loc
@@ -940,7 +838,6 @@ sub Update {
                                    "Couldn't find row",                    # loc
                                    "Missing a primary key?: [_1]",         # loc
                                    "Found Object",                         # loc
-
 =cut
 
     }
@@ -948,7 +845,7 @@ sub Update {
     return @results;
 }
 
-# {{{ Routines dealing with Links
+# {{{ Routines dealing with Links between tickets
 
 # {{{ Link Collections
 
@@ -1056,12 +953,6 @@ ok ($addid, $addmsg);
 ok (($addid, $addmsg) =$t1->AddLink( Type => 'DependsOn', Target => $t3->id));
 
 ok ($addid, $addmsg);
-my $link = RT::Link->new($RT::SystemUser);
-my ($rv, $msg) = $link->Load($addid);
-ok ($rv, $msg);
-ok ($link->LocalTarget == $t3->id, "Link LocalTarget is correct");
-ok ($link->LocalBase   == $t1->id, "Link LocalBase   is correct");
-
 ok ($t1->HasUnresolvedDependencies, "Ticket ".$t1->Id." has unresolved deps");
 ok (!$t1->HasUnresolvedDependencies( Type => 'blah' ), "Ticket ".$t1->Id." has no unresolved blahs");
 ok ($t1->HasUnresolvedDependencies( Type => 'approval' ), "Ticket ".$t1->Id." has unresolved approvals");
@@ -1070,12 +961,10 @@ ok (!$t2->HasUnresolvedDependencies, "Ticket ".$t2->Id." has no unresolved deps"
 
 my ($rid, $rmsg)= $t1->Resolve();
 ok(!$rid, $rmsg);
-my ($rid2, $rmsg2) = $t2->Resolve();
-ok ($rid2, $rmsg2);
+ok($t2->Resolve);
 ($rid, $rmsg)= $t1->Resolve();
 ok(!$rid, $rmsg);
-my ($rid3,$rmsg3) = $t3->Resolve;
-ok ($rid3,$rmsg3);
+ok($t3->Resolve);
 ($rid, $rmsg)= $t1->Resolve();
 ok($rid, $rmsg);
 
@@ -1206,14 +1095,6 @@ sub DependsOn {
 
 # {{{ sub _Links 
 
-=head2 Links DIRECTION TYPE 
-
-return links to/from this object. 
-
-=cut
-
-*Links = \&_Links;
-
 sub _Links {
     my $self = shift;
 
@@ -1263,7 +1144,8 @@ sub _AddLink {
     my $direction;
 
     if ( $args{'Base'} and $args{'Target'} ) {
-        $RT::Logger->debug( "$self tried to create a link. both base and target were specified\n" );
+        $RT::Logger->debug(
+"$self tried to delete a link. both base and target were specified\n" );
         return ( 0, $self->loc("Can't specifiy both base and target") );
     }
     elsif ( $args{'Base'} ) {
@@ -1310,7 +1192,7 @@ sub _AddLink {
     my $TransString =
       "Record $args{'Base'} $args{Type} record $args{'Target'}.";
 
-    return ( $linkid, $self->loc( "Link created ([_1])", $TransString ) );
+    return ( 1, $self->loc( "Link created ([_1])", $TransString ) );
 }
 
 # }}}
@@ -1383,486 +1265,6 @@ sub _DeleteLink {
 
 # }}}
 
-# }}}
-
-# {{{ Routines dealing with transactions
-
-# {{{ sub _NewTransaction
-
-=head2 _NewTransaction  PARAMHASH
-
-Private function to create a new RT::Transaction object for this ticket update
-
-=cut
-
-sub _NewTransaction {
-    my $self = shift;
-    my %args = (
-        TimeTaken => undef,
-        Type      => undef,
-        OldValue  => undef,
-        NewValue  => undef,
-        OldReference  => undef,
-        NewReference  => undef,
-        ReferenceType => undef,
-        Data      => undef,
-        Field     => undef,
-        MIMEObj   => undef,
-        ActivateScrips => 1,
-        CommitScrips => 1,
-        @_
-    );
-
-    my $old_ref = $args{'OldReference'};
-    my $new_ref = $args{'NewReference'};
-    my $ref_type = $args{'ReferenceType'};
-    if ($old_ref or $new_ref) {
-	$ref_type ||= ref($old_ref) || ref($new_ref);
-	if (!$ref_type) {
-	    $RT::Logger->error("Reference type not specified for transaction");
-	    return;
-	}
-	$old_ref = $old_ref->Id if ref($old_ref);
-	$new_ref = $new_ref->Id if ref($new_ref);
-    }
-
-    require RT::Transaction;
-    my $trans = new RT::Transaction( $self->CurrentUser );
-    my ( $transaction, $msg ) = $trans->Create(
-	ObjectId  => $self->Id,
-	ObjectType => ref($self),
-        TimeTaken => $args{'TimeTaken'},
-        Type      => $args{'Type'},
-        Data      => $args{'Data'},
-        Field     => $args{'Field'},
-        NewValue  => $args{'NewValue'},
-        OldValue  => $args{'OldValue'},
-        NewReference  => $new_ref,
-        OldReference  => $old_ref,
-        ReferenceType => $ref_type,
-        MIMEObj   => $args{'MIMEObj'},
-        ActivateScrips => $args{'ActivateScrips'},
-        CommitScrips => $args{'CommitScrips'},
-    );
-
-    # Rationalize the object since we may have done things to it during the caching.
-    $self->Load($self->Id);
-
-    $RT::Logger->warning($msg) unless $transaction;
-
-    $self->_SetLastUpdated;
-
-    if ( defined $args{'TimeTaken'} ) {
-        $self->_UpdateTimeTaken( $args{'TimeTaken'} );
-    }
-    if ( $RT::UseTransactionBatch and $transaction ) {
-	    push @{$self->{_TransactionBatch}}, $trans;
-    }
-    return ( $transaction, $msg, $trans );
-}
-
-# }}}
-
-# {{{ sub Transactions 
-
-=head2 Transactions
-
-  Returns an RT::Transactions object of all transactions on this record object
-
-=cut
-
-sub Transactions {
-    my $self = shift;
-
-    use RT::Transactions;
-    my $transactions = RT::Transactions->new( $self->CurrentUser );
-
-    #If the user has no rights, return an empty object
-    $transactions->Limit(
-        FIELD => 'ObjectId',
-        VALUE => $self->id,
-    );
-    $transactions->Limit(
-        FIELD => 'ObjectType',
-        VALUE => ref($self),
-    );
-
-    return ($transactions);
-}
-
-# }}}
-# }}}
-#
-# {{{ Routines dealing with custom fields
-
-sub CustomFields {
-    my $self = shift;
-    my $cfs  = RT::CustomFields->new( $self->CurrentUser );
-
-    # XXX handle multiple types properly
-    $cfs->LimitToLookupType( $self->CustomFieldLookupType );
-    $cfs->LimitToGlobalOrObjectId(
-        $self->_LookupId( $self->CustomFieldLookupType ) );
-
-    return $cfs;
-}
-
-# TODO: This _only_ works for RT::Class classes. it doesn't work, for example, for RT::FM classes.
-
-sub _LookupId {
-    my $self = shift;
-    my $lookup = shift;
-    my @classes = ($lookup =~ /RT::(\w+)-/g);
-
-    my $object = $self;
-    foreach my $class (reverse @classes) {
-	my $method = "${class}Obj";
-	$object = $object->$method;
-    }
-
-    return $object->Id;
-}
-
-
-=head2 CustomFieldLookupType 
-
-Returns the path RT uses to figure out which custom fields apply to this object.
-
-=cut
-
-sub CustomFieldLookupType {
-    my $self = shift;
-    return ref($self);
-}
-
-#TODO Deprecated API. Destroy in 3.6
-sub _LookupTypes { 
-    my  $self = shift;
-    $RT::Logger->warning("_LookupTypes call is deprecated. Replace with CustomFieldLookupType");
-    $RT::Logger->warning("Besides, it was a private API. Were you doing using it?");
-
-    return($self->CustomFieldLookupType);
-
-}
-
-# {{{ AddCustomFieldValue
-
-=head2 AddCustomFieldValue { Field => FIELD, Value => VALUE }
-
-VALUE should be a string.
-FIELD can be a CustomField object OR a CustomField ID.
-
-
-Adds VALUE as a value of CustomField FIELD.  If this is a single-value custom field,
-deletes the old value. 
-If VALUE is not a valid value for the custom field, returns 
-(0, 'Error message' ) otherwise, returns (1, 'Success Message')
-
-=cut
-
-sub AddCustomFieldValue {
-    my $self = shift;
-    $self->_AddCustomFieldValue(@_);
-}
-
-sub _AddCustomFieldValue {
-    my $self = shift;
-    my %args = (
-        Field             => undef,
-        Value             => undef,
-        RecordTransaction => 1,
-        @_
-    );
-
-    my $cf = $self->LoadCustomFieldByIdentifier($args{'Field'});
-
-    unless ( $cf->Id ) {
-        return ( 0, $self->loc( "Custom field [_1] not found", $args{'Field'} ) );
-    }
-
-    my $OCFs = $self->CustomFields;
-    $OCFs->Limit( FIELD => 'id', VALUE => $cf->Id );
-    unless ( $OCFs->Count ) {
-        return (
-            0,
-            $self->loc(
-                "Custom field [_1] does not apply to this object",
-                $args{'Field'}
-            )
-        );
-    }
-    # Load up a ObjectCustomFieldValues object for this custom field and this ticket
-    my $values = $cf->ValuesForObject($self);
-
-    unless ( $cf->ValidateValue( $args{'Value'} ) ) {
-        return ( 0, $self->loc("Invalid value for custom field") );
-    }
-
-    # If the custom field only accepts a certain # of values, delete the existing
-    # value and record a "changed from foo to bar" transaction
-    unless ( $cf->UnlimitedValues) {
-
- # We need to whack any old values here.  In most cases, the custom field should
- # only have one value to delete.  In the pathalogical case, this custom field
- # used to be a multiple and we have many values to whack....
-        my $cf_values = $values->Count;
-
-        if ( $cf_values > $cf->MaxValues ) {
-            my $i = 0;   #We want to delete all but the max we can currently have , so we can then
-                 # execute the same code to "change" the value from old to new
-            while ( my $value = $values->Next ) {
-                $i++;
-                if ( $i < $cf_values ) {
-                    my ( $val, $msg ) = $cf->DeleteValueForObject(
-                        Object  => $self,
-                        Content => $value->Content
-                    );
-                    unless ($val) {
-                        return ( 0, $msg );
-                    }
-                    my ( $TransactionId, $Msg, $TransactionObj ) =
-                      $self->_NewTransaction(
-                        Type         => 'CustomField',
-                        Field        => $cf->Id,
-                        OldReference => $value,
-                      );
-                }
-            }
-        }
-
-        my ( $old_value, $old_content );
-        if ( $old_value = $cf->ValuesForObject($self)->First ) {
-            $old_content = $old_value->Content();
-            return (1) if( $old_content eq $args{'Value'} && $old_value->LargeContent eq $args{'LargeContent'});;
-        }
-
-        my ( $new_value_id, $value_msg ) = $cf->AddValueForObject(
-            Object       => $self,
-            Content      => $args{'Value'},
-            LargeContent => $args{'LargeContent'},
-            ContentType  => $args{'ContentType'},
-        );
-
-        unless ($new_value_id) {
-            return ( 0, $self->loc( "Could not add new custom field value. [_1] ",, $value_msg));
-        }
-
-        my $new_value = RT::ObjectCustomFieldValue->new( $self->CurrentUser );
-        $new_value->Load($new_value_id);
-
-        # now that adding the new value was successful, delete the old one
-        if ($old_value) {
-            my ( $val, $msg ) = $old_value->Delete();
-            unless ($val) {
-                return ( 0, $msg );
-            }
-        }
-
-        if ( $args{'RecordTransaction'} ) {
-            my ( $TransactionId, $Msg, $TransactionObj ) =
-              $self->_NewTransaction(
-                Type         => 'CustomField',
-                Field        => $cf->Id,
-                OldReference => $old_value,
-                NewReference => $new_value,
-              );
-        }
-
-        if ( $old_value eq '' ) {
-            return ( 1, $self->loc( "[_1] [_2] added", $cf->Name, $new_value->Content ));
-        }
-        elsif ( $new_value->Content eq '' ) {
-            return ( 1,
-                $self->loc( "[_1] [_2] deleted", $cf->Name, $old_value->Content ) );
-        }
-        else {
-            return ( 1, $self->loc( "[_1] [_2] changed to [_3]", $cf->Name, $old_content,                $new_value->Content));
-        }
-
-    }
-
-    # otherwise, just add a new value and record "new value added"
-    else {
-        my ($new_value_id) = $cf->AddValueForObject(
-            Object       => $self,
-            Content      => $args{'Value'},
-            LargeContent => $args{'LargeContent'},
-            ContentType  => $args{'ContentType'},
-        );
-
-        unless ($new_value_id) {
-            return ( 0, $self->loc("Could not add new custom field value. ") );
-        }
-        if ( $args{'RecordTransaction'} ) {
-            my ( $TransactionId, $Msg, $TransactionObj ) =
-              $self->_NewTransaction(
-                Type          => 'CustomField',
-                Field         => $cf->Id,
-                NewReference  => $new_value_id,
-                ReferenceType => 'RT::ObjectCustomFieldValue',
-              );
-            unless ($TransactionId) {
-                return ( 0,
-                    $self->loc( "Couldn't create a transaction: [_1]", $Msg ) );
-            }
-        }
-        return ( 1, $self->loc( "[_1] added as a value for [_2]", $args{'Value'}, $cf->Name));
-    }
-
-}
-
-# }}}
-
-# {{{ DeleteCustomFieldValue
-
-=head2 DeleteCustomFieldValue { Field => FIELD, Value => VALUE }
-
-Deletes VALUE as a value of CustomField FIELD. 
-
-VALUE can be a string, a CustomFieldValue or a ObjectCustomFieldValue.
-
-If VALUE is not a valid value for the custom field, returns 
-(0, 'Error message' ) otherwise, returns (1, 'Success Message')
-
-=cut
-
-sub DeleteCustomFieldValue {
-    my $self = shift;
-    my %args = (
-        Field   => undef,
-        Value   => undef,
-        ValueId => undef,
-        @_
-    );
-
-    my $cf = $self->LoadCustomFieldByIdentifier($args{'Field'});
-
-    unless ( $cf->Id ) {
-        return ( 0, $self->loc( "Custom field [_1] not found", $args{'Field'} ) );
-    }
-    my ( $val, $msg ) = $cf->DeleteValueForObject(
-        Object  => $self,
-        Id      => $args{'ValueId'},
-        Content => $args{'Value'},
-    );
-    unless ($val) {
-        return ( 0, $msg );
-    }
-    my ( $TransactionId, $Msg, $TransactionObj ) = $self->_NewTransaction(
-        Type          => 'CustomField',
-        Field         => $cf->Id,
-        OldReference  => $val,
-        ReferenceType => 'RT::ObjectCustomFieldValue',
-    );
-    unless ($TransactionId) {
-        return ( 0, $self->loc( "Couldn't create a transaction: [_1]", $Msg ) );
-    }
-
-    return (
-        $TransactionId,
-        $self->loc(
-            "[_1] is no longer a value for custom field [_2]",
-            $TransactionObj->OldValue, $cf->Name
-        )
-    );
-}
-
-# }}}
-
-# {{{ FirstCustomFieldValue
-
-=head2 FirstCustomFieldValue FIELD
-
-Return the content of the first value of CustomField FIELD for this ticket
-Takes a field id or name
-
-=cut
-
-sub FirstCustomFieldValue {
-    my $self = shift;
-    my $field = shift;
-    my $values = $self->CustomFieldValues($field);
-    if ($values->First) {
-        return $values->First->Content;
-    } else {
-        return undef;
-    }
-
-}
-
-
-
-# {{{ CustomFieldValues
-
-=head2 CustomFieldValues FIELD
-
-Return a ObjectCustomFieldValues object of all values of the CustomField whose 
-id or Name is FIELD for this record.
-
-Returns an RT::ObjectCustomFieldValues object
-
-=cut
-
-sub CustomFieldValues {
-    my $self  = shift;
-    my $field = shift;
-
-    if ($field) {
-        my $cf = $self->LoadCustomFieldByIdentifier($field);
-
-        # we were asked to search on a custom field we couldn't fine
-        unless ( $cf->id ) {
-            return RT::ObjectCustomFieldValues->new( $self->CurrentUser );
-        }
-        return ( $cf->ValuesForObject($self) );
-    }
-
-    # we're not limiting to a specific custom field;
-    my $ocfs = RT::ObjectCustomFieldValues->new( $self->CurrentUser );
-    $ocfs->LimitToObject($self);
-    return $ocfs;
-
-}
-
-=head2 CustomField IDENTIFER
-
-Find the custom field has id or name IDENTIFIER for this object.
-
-If no valid field is found, returns an empty RT::CustomField object.
-
-=cut
-
-sub LoadCustomFieldByIdentifier {
-    my $self = shift;
-    my $field = shift;
-    
-    my $cf = RT::CustomField->new($self->CurrentUser);
-
-    if ( UNIVERSAL::isa( $field, "RT::CustomField" ) ) {
-        $cf->LoadById( $field->id );
-    }
-    elsif ($field =~ /^\d+$/) {
-        $cf = RT::CustomField->new($self->CurrentUser);
-        $cf->Load($field); 
-    } else {
-
-        my $cfs = $self->CustomFields($self->CurrentUser);
-        $cfs->Limit(FIELD => 'Name', VALUE => $field);
-        $cf = $cfs->First || RT::CustomField->new($self->CurrentUser);
-    }
-    return $cf;
-}
-
-
-# }}}
-
-# }}}
-
-# }}}
-
-sub BasicColumns {
-}
-
 eval "require RT::Record_Vendor";
 die $@ if ($@ && $@ !~ qr{^Can't locate RT/Record_Vendor.pm});
 eval "require RT::Record_Local";
diff --git a/rt/lib/RT/SavedSearch.pm b/rt/lib/RT/SavedSearch.pm
deleted file mode 100644
index 65411a7..0000000
--- a/rt/lib/RT/SavedSearch.pm
+++ /dev/null
@@ -1,327 +0,0 @@
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-
-=head1 NAME
-
-  RT::SavedSearch - an API for saving and retrieving search form values.
-
-=head1 SYNOPSIS
-
-  use RT::SavedSearch
-
-=head1 DESCRIPTION
-
-  SavedSearch is an object that can belong to either an RT::User or an
-  RT::Group.  It consists of an ID, a description, and a number of
-  search parameters.
-
-=head1 METHODS
-
-=begin testing
-
-use_ok(RT::SavedSearch);
-
-# Real tests are in lib/t/20savedsearch.t
-
-=end testing
-
-=cut
-
-package RT::SavedSearch;
-
-use RT::Base;
-use RT::Attribute;
-
-use strict;
-use vars qw/@ISA/;
-@ISA = qw/RT::Base/;
-
-sub new  {
-    my $proto = shift;
-    my $class = ref($proto) || $proto;
-    my $self  = {};
-    $self->{'Id'} = 0;
-    bless ($self, $class);
-    $self->CurrentUser(@_);
-    return $self;
-}
-
-=head2 Load
-
-Takes a privacy specification, an object ID, and a search ID.  Loads
-the given search ID if it belongs to the stated user or group.
-Returns a tuple of status and message, where status is true on
-success.
-
-=cut
-
-sub Load {
-    my $self = shift;
-    my ($privacy, $id) = @_;
-    my $object = $self->_GetObject($privacy);
-
-    if ($object) {
-	$self->{'Attribute'} = $object->Attributes->WithId($id);
-	if ($self->{'Attribute'}->Id) {
-	    $self->{'Id'} = $self->{'Attribute'}->Id;
-	    $self->{'Privacy'} = $privacy;
-	    $self->{'Type'} = $self->{'Attribute'}->SubValue('SearchType');
-	    return (1, $self->loc("Loaded search [_1]", $self->Name));
-	} else {
-	    $RT::Logger->error("Could not load attribute " . $id
-			       . " for object " . $privacy);
-	    return (0, $self->loc("Search attribute load failure"));
-	}
-    } else {
-	$RT::Logger->error("Could not load object $privacy when loading search");
-	return (0, $self->loc("Could not load object for [_1]", $privacy));
-    }
-
-}
-
-=head2 Save
-
-Takes a privacy, an optional type, a name, and a hashref containing the
-search parameters.  Saves the given parameters to the appropriate user/
-group object, and loads the resulting search.  Returns a tuple of status
-and message, where status is true on success.  Defaults are:
-  Privacy:      undef
-  Type:         Ticket
-  Name:         "new search"
-  SearchParams: (empty hash)
-
-=cut
-
-sub Save {
-    my $self = shift;
-    my %args = ('Privacy' => 'RT::User-' . $self->CurrentUser->Id,
-		'Type' => 'Ticket',
-		'Name' => 'new search',
-		'SearchParams' => {},
-		@_);
-    my $privacy = $args{'Privacy'};
-    my $type = $args{'Type'};
-    my $name = $args{'Name'};
-    my %params = %{$args{'SearchParams'}};
-
-    $params{'SearchType'} = $type;
-    my $object = $self->_GetObject($privacy);
-    if ($object) {
-	my ($att_id, $att_msg) = $object->AddAttribute(
-						       'Name' => 'SavedSearch',
-						       'Description' => $name,
-						       'Content' => \%params);
-	if ($att_id) {
-	    $self->{'Attribute'} = $object->Attributes->WithId($att_id);
-	    $self->{'Id'} = $att_id;
-	    $self->{'Privacy'} = $privacy;
-	    $self->{'Type'} = $type;
-	    return (1, $self->loc("Saved search [_1]", $name));
-	} else {
-	    $RT::Logger->error("SavedSearch save failure: $att_msg");
-	    return (0, $self->loc("Failed to create search attribute"));
-	}
-    } else {
-	return (0, $self->loc("Failed to load object for [_1]", $privacy));
-    }
-}
-
-=head2 Update
-
-Updates the parameters of an existing search.  Takes the arguments
-"Name" and "SearchParams"; SearchParams should be a hashref containing
-the new parameters of the search.  If Name is not specified, the name
-will not be changed.
-
-=cut
-
-sub Update {
-    my $self = shift;
-    my %args = ('Name' => '',
-		'SearchParams' => {},
-		@_);
-    
-    return(0, $self->loc("No search loaded")) unless $self->Id;
-    return(0, $self->loc("Could not load search attribute"))
-	unless $self->{'Attribute'}->Id;
-    my ($status, $msg) = $self->{'Attribute'}->SetSubValues(%{$args{'SearchParams'}});
-    if ($status && $args{'Name'}) {
-	($status, $msg) = $self->{'Attribute'}->SetDescription($args{'Name'});
-    }
-    return ($status, $self->loc("Search update: [_1]", $msg));
-}
-
-=head2 Delete
-    
-Deletes the existing search.  Returns a tuple of status and message,
-where status is true upon success.
-
-=cut
-
-sub Delete {
-    my $self = shift;
-
-    my ($status, $msg) = $self->{'Attribute'}->Delete;
-    if ($status) {
-	return (1, $self->loc("Deleted search"));
-    } else {
-	return (0, $self->loc("Delete failed: [_1]", $msg));
-    }
-}
-	
-
-### Accessor methods
-
-=head2 Name
-
-Returns the name of the search.
-
-=cut
-
-sub Name {
-    my $self = shift;
-    return unless ref($self->{'Attribute'}) eq 'RT::Attribute';
-    return $self->{'Attribute'}->Description();
-}
-
-=head2 GetParameter
-
-Returns the given named parameter of the search, e.g. 'Query', 'Format'.
-
-=cut
-
-sub GetParameter {
-    my $self = shift;
-    my $param = shift;
-    return unless ref($self->{'Attribute'}) eq 'RT::Attribute';
-    return $self->{'Attribute'}->SubValue($param);
-}
-
-=head2 Id
-
-Returns the numerical id of this search.
-
-=cut
-
-sub Id {
-     my $self = shift;
-     return $self->{'Id'};
-}
-
-=head2 Privacy
-
-Returns the principal object to whom this search belongs, in a string
-"<class>-<id>", e.g. "RT::Group-16".
-
-=cut
-
-sub Privacy {
-    my $self = shift;
-    return $self->{'Privacy'};
-}
-
-=head2 Type
-
-Returns the type of this search, e.g. 'Ticket'.  Useful for denoting the
-saved searches that are relevant to a particular search page.
-
-=cut
-
-sub Type {
-    my $self = shift;
-    return $self->{'Type'};
-}
-
-### Internal methods
-
-# _GetObject: helper routine to load the correct object whose parameters
-#  have been passed.
-
-sub _GetObject {
-    my $self = shift;
-    my $privacy = shift;
-
-    my ($obj_type, $obj_id) = split(/\-/, $privacy);
-    unless ($obj_type eq 'RT::User' || $obj_type eq 'RT::Group') {
-	$RT::Logger->error("Tried to load a search belonging to an $obj_type, which is neither a user nor a group");
-	return undef;
-    }
-
-    my $object;
-    eval "
-         require $obj_type;
-         \$object = $obj_type->new(\$self->CurrentUser);
-         \$object->Load(\$obj_id);
-    ";
-    unless (ref($object) eq $obj_type) {
-	$RT::Logger->error("Could not load object of type $obj_type with ID $obj_id");
-	return undef;
-    }
-    
-    # Do not allow the loading of a user object other than the current
-    # user, or of a group object of which the current user is not a member.
-
-    if ($obj_type eq 'RT::User' 
-	&& $object->Id != $self->CurrentUser->UserObj->Id()) {
-	$RT::Logger->debug("Permission denied for user other than self");
-	return undef;
-    }
-    if ($obj_type eq 'RT::Group' &&
-	!$object->HasMemberRecursively($self->CurrentUser->PrincipalObj)) {
-	$RT::Logger->debug("Permission denied, ".$self->CurrentUser->Name.
-			   " is not a member of group");
-	return undef;
-    }
-
-    return $object;
-}
-
-eval "require RT::SavedSearch_Vendor";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/SavedSearch_Vendor.pm});
-eval "require RT::SavedSearch_Local";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/SavedSearch_Local.pm});
-
-1;
diff --git a/rt/lib/RT/SavedSearches.pm b/rt/lib/RT/SavedSearches.pm
deleted file mode 100644
index 262bfa8..0000000
--- a/rt/lib/RT/SavedSearches.pm
+++ /dev/null
@@ -1,206 +0,0 @@
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-
-=head1 NAME
-
-  RT::SavedSearches - a pseudo-collection for SavedSearch objects.
-
-=head1 SYNOPSIS
-
-  use RT::SavedSearch
-
-=head1 DESCRIPTION
-
-  SavedSearches is an object consisting of a number of SavedSearch objects.
-  It works more or less like a DBIx::SearchBuilder collection, although it
-  is not.
-
-=head1 METHODS
-
-=begin testing
-
-use_ok(RT::SavedSearches);
-
-# The real tests are in lib/t/20savedsearch.t
-
-=end testing
-
-=cut
-
-package RT::SavedSearches;
-
-use RT::Base;
-use RT::SavedSearch;
-
-use strict;
-use vars qw/@ISA/;
-@ISA = qw/RT::Base/;
-
-sub new  {
-    my $proto = shift;
-    my $class = ref($proto) || $proto;
-    my $self  = {};
-    bless ($self, $class);
-    $self->CurrentUser(@_);
-    $self->{'idx'} = 0;
-    $self->{'objects'} = [];
-    return $self;
-}
-
-=head2 LimitToPrivacy
-
-Takes two argumets: a privacy string, of the format "<class>-<id>", as
-produced by RT::SavedSearch::Privacy(); and a type string, as produced
-by RT::SavedSearch::Type().  The SavedSearches object will load the
-searches belonging to that user or group that are of the type
-specified.  If no type is specified, all the searches belonging to the
-user/group will be loaded.  Repeated calls to the same object should DTRT.
-
-=cut
-
-sub LimitToPrivacy {
-    my $self = shift;
-    my $privacy = shift;
-    my $type = shift;
-
-    my $object = $self->_GetObject($privacy);
-
-    if ($object) {
-	$self->{'objects'} = [];
-	my @search_atts = $object->Attributes->Named('SavedSearch');
-	foreach my $att (@search_atts) {
-	    my $search = RT::SavedSearch->new($self->CurrentUser);
-	    $search->Load($privacy, $att->Id);
-	    next if $type && $search->Type ne $type;
-	    push(@{$self->{'objects'}}, $search);
-	}
-    } else {
-	$RT::Logger->error("Could not load object $privacy");
-    }
-}
-
-### Accessor methods
-
-=head2 Next
-
-Returns the next object in the collection.
-
-=cut
-
-sub Next {
-    my $self = shift;
-    my $search = $self->{'objects'}->[$self->{'idx'}];
-    if ($search) {
-	$self->{'idx'}++;
-    } else {
-	# We have run out of objects; reset the counter.
-	$self->{'idx'} = 0;
-    }
-    return $search;
-}
-
-=head2 Count
-
-Returns the number of search objects found.
-
-=cut
-
-sub Count {
-    my $self = shift;
-    return scalar @{$self->{'objects'}};
-}
-
-### Internal methods
-
-# _GetObject: helper routine to load the correct object whose parameters
-#  have been passed.
-
-sub _GetObject {
-    my $self = shift;
-    my $privacy = shift;
-
-    my ($obj_type, $obj_id) = split(/\-/, $privacy);
-    unless ($obj_type eq 'RT::User' || $obj_type eq 'RT::Group') {
-	$RT::Logger->error("Tried to load a search belonging to an $obj_type, which is neither a user nor a group");
-	return undef;
-    }
-
-    my $object;
-    eval "
-         require $obj_type;
-         \$object = $obj_type->new(\$self->CurrentUser);
-         \$object->Load($obj_id);
-    ";
-    unless (ref($object) eq $obj_type) {
-	$RT::Logger->error("Could not load object of type $obj_type with ID $obj_id");
-	return undef;
-    }
-    
-    # Do not allow the loading of a user object other than the current
-    # user, or of a group object of which the current user is not a member.
-
-    if ($obj_type eq 'RT::User'
-	&& $object->Id != $self->CurrentUser->UserObj->Id()) {
-	$RT::Logger->error('Requested user ' . $object->Id 
-			   . 'is not current user');
-	return undef;
-    }
-    if ($obj_type eq 'RT::Group'
-	&& !$object->HasMemberRecursively($self->CurrentUser->PrincipalObj)) {
-	$RT::Logger->error('Current user does not belong to requested group ' 
-			   . $object->Id);
-	return undef;
-    }
-
-    return $object;
-}
-
-eval "require RT::SavedSearches_Vendor";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/SavedSearches_Vendor.pm});
-eval "require RT::SavedSearches_Local";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/SavedSearches_Local.pm});
-
-1;
diff --git a/rt/lib/RT/Scrip.pm b/rt/lib/RT/Scrip.pm
index 85fe6a8..1c414d8 100755
--- a/rt/lib/RT/Scrip.pm
+++ b/rt/lib/RT/Scrip.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -446,37 +446,37 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         Description => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         ScripCondition => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         ScripAction => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         ConditionRules => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'text', default => ''},
+		{read => 1, write => 1, type => 'text', default => ''},
         ActionRules => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'text', default => ''},
+		{read => 1, write => 1, type => 'text', default => ''},
         CustomIsApplicableCode => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'text', default => ''},
+		{read => 1, write => 1, type => 'text', default => ''},
         CustomPrepareCode => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'text', default => ''},
+		{read => 1, write => 1, type => 'text', default => ''},
         CustomCommitCode => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'text', default => ''},
+		{read => 1, write => 1, type => 'text', default => ''},
         Stage => 
-		{read => 1, write => 1, sql_type => 12, length => 32,  is_blob => 0,  is_numeric => 0,  type => 'varchar(32)', default => ''},
+		{read => 1, write => 1, type => 'varchar(32)', default => ''},
         Queue => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Template => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
@@ -508,7 +508,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/ScripAction.pm b/rt/lib/RT/ScripAction.pm
index 075162f..e3d2a90 100755
--- a/rt/lib/RT/ScripAction.pm
+++ b/rt/lib/RT/ScripAction.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -239,23 +239,23 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         Name => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         Description => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         ExecModule => 
-		{read => 1, write => 1, sql_type => 12, length => 60,  is_blob => 0,  is_numeric => 0,  type => 'varchar(60)', default => ''},
+		{read => 1, write => 1, type => 'varchar(60)', default => ''},
         Argument => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
@@ -287,7 +287,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/ScripAction_Overlay.pm b/rt/lib/RT/ScripAction_Overlay.pm
index 76e047f..c0a10ca 100644
--- a/rt/lib/RT/ScripAction_Overlay.pm
+++ b/rt/lib/RT/ScripAction_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::ScripAction - RT Action object
@@ -69,9 +68,6 @@ ok (require RT::ScripAction);
 
 =cut
 
-
-package RT::ScripAction;
-
 use strict;
 no warnings qw(redefine);
 use RT::Template;
@@ -93,12 +89,10 @@ sub _Accessible  {
 # }}}
 
 # {{{ sub Create 
-
 =head2 Create
-
-Takes a hash. Creates a new Action entry.  should be better
-documented.
-
+  
+ Takes a hash. Creates a new Action entry.
+ should be better documented.
 =cut
 
 sub Create  {
@@ -117,15 +111,6 @@ sub Delete  {
 # }}}
 
 # {{{ sub Load 
-
-=head2 Load IDENTIFIER
-
-Loads an action by its Name.
-
-Returns: Id, Error Message
-
-=cut
-
 sub Load  {
     my $self = shift;
     my $identifier = shift;
@@ -148,7 +133,7 @@ sub Load  {
 	
 	$self->{'Template'} = $template;
     }
-    return ($self->Id, ($self->loc('[_1] ScripAction loaded', $self->Id)));
+    return ($self->loc('[_1] ScripAction loaded', $self->Id));
 }
 # }}}
 
@@ -175,13 +160,13 @@ sub LoadAction  {
  
     eval "require $type" || die "Require of $type failed.\n$@\n";
     
-    $self->{'Action'}  = $type->new ( Argument => $self->Argument,
-                                      CurrentUser => $self->CurrentUser,
-                                      ScripActionObj => $self, 
-                                      ScripObj => $args{'ScripObj'},
-                                      TemplateObj => $self->TemplateObj,
-                                      TicketObj => $args{'TicketObj'},
-                                      TransactionObj => $args{'TransactionObj'},
+    $self->{'Action'}  = $type->new ( ScripActionObj => $self, 
+				      TicketObj => $args{'TicketObj'},
+				      ScripObj => $args{'ScripObj'},
+				      TransactionObj => $args{'TransactionObj'},
+				      TemplateObj => $self->TemplateObj,
+				      Argument => $self->Argument,
+                      CurrentUser => $self->CurrentUser
 				    );
 }
 # }}}
@@ -229,7 +214,6 @@ sub TemplateObj {
 
 sub Prepare  {
     my $self = shift;
-    $self->{_Message_ID} = 0;
     return ($self->Action->Prepare());
   
 }
diff --git a/rt/lib/RT/ScripActions.pm b/rt/lib/RT/ScripActions.pm
index c34e52f..677fd85 100755
--- a/rt/lib/RT/ScripActions.pm
+++ b/rt/lib/RT/ScripActions.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/ScripActions_Overlay.pm b/rt/lib/RT/ScripActions_Overlay.pm
index 9c29d4c..c7cb3eb 100644
--- a/rt/lib/RT/ScripActions_Overlay.pm
+++ b/rt/lib/RT/ScripActions_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::ScripActions - Collection of Action objects
@@ -66,9 +65,6 @@ ok (require RT::ScripActions);
 
 =cut
 
-
-package RT::ScripActions;
-
 use strict;
 no warnings qw(redefine);
 
diff --git a/rt/lib/RT/ScripCondition.pm b/rt/lib/RT/ScripCondition.pm
index bf2c560..4e0398c 100755
--- a/rt/lib/RT/ScripCondition.pm
+++ b/rt/lib/RT/ScripCondition.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -260,25 +260,25 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         Name => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         Description => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         ExecModule => 
-		{read => 1, write => 1, sql_type => 12, length => 60,  is_blob => 0,  is_numeric => 0,  type => 'varchar(60)', default => ''},
+		{read => 1, write => 1, type => 'varchar(60)', default => ''},
         Argument => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         ApplicableTransTypes => 
-		{read => 1, write => 1, sql_type => 12, length => 60,  is_blob => 0,  is_numeric => 0,  type => 'varchar(60)', default => ''},
+		{read => 1, write => 1, type => 'varchar(60)', default => ''},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
@@ -310,7 +310,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/ScripCondition_Overlay.pm b/rt/lib/RT/ScripCondition_Overlay.pm
index 4424657..158a2c9 100644
--- a/rt/lib/RT/ScripCondition_Overlay.pm
+++ b/rt/lib/RT/ScripCondition_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::ScripCondition - RT scrip conditional
@@ -69,9 +68,6 @@ ok (require RT::ScripCondition);
 
 =cut
 
-
-package RT::ScripCondition;
-
 use strict;
 no warnings qw(redefine);
 
diff --git a/rt/lib/RT/ScripConditions.pm b/rt/lib/RT/ScripConditions.pm
index 99bde7d..8daaea9 100755
--- a/rt/lib/RT/ScripConditions.pm
+++ b/rt/lib/RT/ScripConditions.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/ScripConditions_Overlay.pm b/rt/lib/RT/ScripConditions_Overlay.pm
index 7670d58..1b23e2d 100644
--- a/rt/lib/RT/ScripConditions_Overlay.pm
+++ b/rt/lib/RT/ScripConditions_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::ScripConditions - Collection of Action objects
@@ -67,9 +66,6 @@ ok (require RT::ScripConditions);
 
 =cut
 
-
-package RT::ScripConditions;
-
 use strict;
 no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Scrip_Overlay.pm b/rt/lib/RT/Scrip_Overlay.pm
index ae2782a..1e1854a 100644
--- a/rt/lib/RT/Scrip_Overlay.pm
+++ b/rt/lib/RT/Scrip_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Scrip - an RT Scrip object
@@ -99,9 +98,6 @@ ok ($ticket2->Priority != '87', "Ticket priority is set right");
 
 =cut
 
-
-package RT::Scrip;
-
 use strict;
 no warnings qw(redefine);
 
@@ -269,7 +265,7 @@ sub ActionObj {
         $self->{'ScripActionObj'} = RT::ScripAction->new( $self->CurrentUser );
 
         #TODO: why are we loading Actions with templates like this.
-        # two separate methods might make more sense
+        # two seperate methods might make more sense
         $self->{'ScripActionObj'}->Load( $self->ScripAction, $self->Template );
     }
     return ( $self->{'ScripActionObj'} );
@@ -340,9 +336,6 @@ should be loaded by the SuperUser role
 =cut
 
 
-# XXX TODO : This code appears to be obsoleted in favor of similar code in Scrips->Apply.
-# Why is this here? Is it still called?
-
 sub Apply {
     my $self = shift;
     my %args = ( TicketObj      => undef,
@@ -424,19 +417,16 @@ sub IsApplicable {
 	    $RT::Logger->error( "Unknown Scrip stage:" . $self->Stage );
 	    return (undef);
 	}
-	my $ConditionObj = $self->ConditionObj;
+
 	foreach my $TransactionObj ( @Transactions ) {
-	    # in TxnBatch stage we can select scrips that are not applicable to all txns
-	    my $txn_type = $TransactionObj->Type;
-	    next unless( $ConditionObj->ApplicableTransTypes =~ /(?:^|,)(?:Any|\Q$txn_type\E)(?:,|$)/i );
 	    # Load the scrip's Condition object
-	    $ConditionObj->LoadCondition(
+	    $self->ConditionObj->LoadCondition(
 		ScripObj       => $self,
 		TicketObj      => $args{'TicketObj'},
 		TransactionObj => $TransactionObj,
 	    );
 
-            if ( $ConditionObj->IsApplicable() ) {
+            if ( $self->ConditionObj->IsApplicable() ) {
 	        # We found an application Transaction -- return it
                 $return = $TransactionObj;
                 last;
@@ -512,7 +502,7 @@ sub Commit {
     $args{'TicketObj'}->Load( $args{'TicketObj'}->Id );
 
     if ($@) {
-        $RT::Logger->error( "Scrip Commit " . $self->Id . " died. - " . $@ );
+        $RT::Logger->error( "Scrip IsApplicable " . $self->Id . " died. - " . $@ );
         return (undef);
     }
 
diff --git a/rt/lib/RT/Scrips.pm b/rt/lib/RT/Scrips.pm
index 9605a64..0ec2ad7 100755
--- a/rt/lib/RT/Scrips.pm
+++ b/rt/lib/RT/Scrips.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Scrips_Overlay.pm b/rt/lib/RT/Scrips_Overlay.pm
index 0f606c8..2f395ff 100644
--- a/rt/lib/RT/Scrips_Overlay.pm
+++ b/rt/lib/RT/Scrips_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Scrips - a collection of RT Scrip objects
@@ -66,9 +65,6 @@ ok (require RT::Scrips);
 
 =cut
 
-
-package RT::Scrips;
-
 use strict;
 no warnings qw(redefine);
 
@@ -258,7 +254,6 @@ sub Prepared {
 
 
 # {{{ sup _SetupSourceObjects
-
 =head2  _SetupSourceObjects { TicketObj , Ticket, Transaction, TransactionObj }
 
 Setup a ticket and transaction for this Scrip collection to work with as it runs through the 
@@ -318,8 +313,8 @@ sub _FindScrips {
 
     $self->LimitToQueue( $self->{'TicketObj'}->QueueObj->Id )
       ;    #Limit it to  $Ticket->QueueObj->Id
-    $self->LimitToGlobal();
-      # or to "global"
+    $self->LimitToGlobal()
+      unless $self->{'TicketObj'}->QueueObj->Disabled;    # or to "global"
 
     $self->Limit( FIELD => "Stage", VALUE => $args{'Stage'} );
 
@@ -333,16 +328,14 @@ sub _FindScrips {
     );
 
     #We only want things where the scrip applies to this sort of transaction
-    # TransactionBatch stage can define list of transaction
-    foreach( split /\s*,\s*/, ($args{'Type'} || '') ) {
-	$self->Limit(
-	    ALIAS           => $ConditionsAlias,
-	    FIELD           => 'ApplicableTransTypes',
-	    OPERATOR        => 'LIKE',
-	    VALUE           => $_,
-	    ENTRYAGGREGATOR => 'OR',
-	)
-    }
+    $self->Limit(
+        ALIAS           => $ConditionsAlias,
+        FIELD           => 'ApplicableTransTypes',
+        OPERATOR        => 'LIKE',
+        VALUE           => $args{'Type'},
+        ENTRYAGGREGATOR => 'OR',
+      )
+      if $args{'Type'};
 
     # Or where the scrip applies to any transaction
     $self->Limit(
diff --git a/rt/lib/RT/Search/ActiveTicketsInQueue.pm b/rt/lib/RT/Search/ActiveTicketsInQueue.pm
index 9f9dac7..d34b72a 100644
--- a/rt/lib/RT/Search/ActiveTicketsInQueue.pm
+++ b/rt/lib/RT/Search/ActiveTicketsInQueue.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Search::ActiveTicketsInQueue
diff --git a/rt/lib/RT/Search/FromSQL.pm b/rt/lib/RT/Search/FromSQL.pm
index 3842bb6..5d9d670 100644
--- a/rt/lib/RT/Search/FromSQL.pm
+++ b/rt/lib/RT/Search/FromSQL.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,30 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (Except where explictly superceded by other copyright notices)
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
+# 
+# 
+# END LICENSE BLOCK
 =head1 NAME
 
   RT::Search::FromSQL
diff --git a/rt/lib/RT/Search/Generic.pm b/rt/lib/RT/Search/Generic.pm
index 3f3aa83..d95c94b 100644
--- a/rt/lib/RT/Search/Generic.pm
+++ b/rt/lib/RT/Search/Generic.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Search::Generic - ;
diff --git a/rt/lib/RT/SearchBuilder.pm b/rt/lib/RT/SearchBuilder.pm
index 3de9fc2..615f197 100644
--- a/rt/lib/RT/SearchBuilder.pm
+++ b/rt/lib/RT/SearchBuilder.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::SearchBuilder - a baseclass for RT collection objects
@@ -132,42 +131,14 @@ sub LimitToDeleted {
 Takes NAME, OPERATOR and VALUE to find records that has the
 matching Attribute.
 
-If EMPTY is set, also select rows with an empty string as
-Attribute's Content.
-
-If NULL is set, also select rows without the named Attribute.
-
 =cut
 
-my %Negate = qw(
-    =		!=
-    !=		=
-    >		<=
-    <		>=
-    >=		<
-    <=		>
-    LIKE	NOT LIKE
-    NOT LIKE	LIKE
-    IS		IS NOT
-    IS NOT	IS
-);
-
 sub LimitAttribute {
     my ($self, %args) = @_;
-    my $clause = 'ALIAS';
-    my $operator = ($args{OPERATOR} || '=');
-    
-    if ($args{NULL} and exists $args{VALUE}) {
-	$clause = 'LEFTJOIN';
-	$operator = $Negate{$operator};
-    }
-    elsif ($args{NEGATE}) {
-	$operator = $Negate{$operator};
-    }
     
     my $alias = $self->Join(
 	TYPE   => 'left',
-	ALIAS1 => $args{ALIAS} || 'main',
+	ALIAS1 => 'main',
 	FIELD1 => 'id',
 	TABLE2 => 'Attributes',
 	FIELD2 => 'ObjectId'
@@ -177,13 +148,13 @@ sub LimitAttribute {
     $type =~ s/(?:s|Collection)$//; # XXX - Hack!
 
     $self->Limit(
-	$clause	   => $alias,
+	ALIAS	   => $alias,
 	FIELD      => 'ObjectType',
 	OPERATOR   => '=',
 	VALUE      => $type,
     );
     $self->Limit(
-	$clause	   => $alias,
+	ALIAS	   => $alias,
 	FIELD      => 'Name',
 	OPERATOR   => '=',
 	VALUE      => $args{NAME},
@@ -192,90 +163,27 @@ sub LimitAttribute {
     return unless exists $args{VALUE};
 
     $self->Limit(
-	$clause	   => $alias,
+	ALIAS	   => $alias,
 	FIELD      => 'Content',
-	OPERATOR   => $operator,
+	OPERATOR   => ($args{OPERATOR} || '='),
 	VALUE      => $args{VALUE},
+	ENTRYAGGREGATOR => 'OR',
     );
 
-    # Capture rows with the attribute defined as an empty string.
-    $self->Limit(
-	$clause    => $alias,
-	FIELD      => 'Content',
-	OPERATOR   => '=',
-	VALUE      => '',
-	ENTRYAGGREGATOR => $args{NULL} ? 'AND' : 'OR',
-    ) if $args{EMPTY};
-
-    # Capture rows without the attribute defined
-    $self->Limit(
-	%args,
-	ALIAS      => $alias,
-	FIELD	   => 'id',
-	OPERATOR   => ($args{NEGATE} ? 'IS NOT' : 'IS'),
-	VALUE      => 'NULL',
-    ) if $args{NULL};
+    if ($args{EMPTY}) {
+	# Capture rows without the attribute defined by testing IS NULL.
+	$self->Limit(
+	    ALIAS      => $alias,
+	    FIELD      => $_,
+	    OPERATOR   => 'IS',
+	    VALUE      => 'NULL',
+	    ENTRYAGGREGATOR => 'OR',
+	) for qw( ObjectType Name Content );
+    }
 }
 # }}}
 
-# {{{ sub LimitCustomField
-
-=head2 LimitCustomField
-
-Takes a paramhash of key/value pairs with the following keys:
-
-=over 4
-
-=item CUSTOMFIELD - CustomField id. Optional
-
-=item OPERATOR - The usual Limit operators
-
-=item VALUE - The value to compare against
-
-=back
-
-=cut
-
-sub _SingularClass {
-    my $self = shift;
-    my $class = ref($self);
-    $class =~ s/s$// or die "Cannot deduce SingularClass for $class";
-    return $class;
-}
-
-sub LimitCustomField {
-    my $self = shift;
-    my %args = ( VALUE        => undef,
-                 CUSTOMFIELD  => undef,
-                 OPERATOR     => '=',
-                 @_ );
-
-    my $alias = $self->Join(
-	TYPE       => 'left',
-	ALIAS1     => 'main',
-	FIELD1     => 'id',
-	TABLE2     => 'ObjectCustomFieldValues',
-	FIELD2     => 'ObjectId'
-    );
-    $self->Limit(
-	ALIAS      => $alias,
-	FIELD      => 'CustomField',
-	OPERATOR   => '=',
-	VALUE      => $args{'CUSTOMFIELD'},
-    ) if ($args{'CUSTOMFIELD'});
-    $self->Limit(
-	ALIAS      => $alias,
-	FIELD      => 'ObjectType',
-	OPERATOR   => '=',
-	VALUE      => $self->_SingularClass,
-    );
-    $self->Limit(
-	ALIAS      => $alias,
-	FIELD      => 'Content',
-	OPERATOR   => $args{'OPERATOR'},
-	VALUE      => $args{'VALUE'},
-    );
-}
+1;
 
 # {{{ sub FindAllRows
 
@@ -311,7 +219,7 @@ sub Limit {
 
 # {{{ sub ItemsOrderBy
 
-=head2 ItemsOrderBy
+=item ItemsOrderBy
 
 If it has a SortOrder attribute, sort the array by SortOrder.
 Otherwise, if it has a "Name" attribute, sort alphabetically by Name
@@ -338,7 +246,7 @@ sub ItemsOrderBy {
 
 # {{{ sub ItemsArrayRef
 
-=head2 ItemsArrayRef
+=item ItemsArrayRef
 
 Return this object's ItemsArray, in the order that ItemsOrderBy sorts
 it.
diff --git a/rt/lib/RT/StyleGuide.pod b/rt/lib/RT/StyleGuide.pod
index f0d1d15..4a45e82 100644
--- a/rt/lib/RT/StyleGuide.pod
+++ b/rt/lib/RT/StyleGuide.pod
@@ -239,27 +239,7 @@ leads to cleaner code.
         my $var1 = shift;                       # right
         my $var2 = shift;                       
 
-=head2 Method parameters
 
-If a method takes exactly one mandatory argument, the argument should be
-passed in a straightforward manner:
-
-        my $self = shift;
-        my $id = shift;
-
-In all other cases, the method needs to take named parameters, usually
-using a C<%args> hash to store them:
-
-        my $self = shift;
-        my %args = ( Name => undef,
-                     Description => undef,
-                     @_ );
-
-You may specify defaults to those named parameters instead of using
-C<undef> above, as long as it is documented as such.
-
-It is worth noting that the existing RT codebase had not followed this
-style perfectly; we are trying to fix it without breaking exsiting APIs.
 
 =head2 Tests
 
@@ -877,28 +857,7 @@ is a good chance it will not be dealt with.
 Send patches to rt-<major-version>-bugs@fsck.com, too.  Use C<diff
 -u> for patches.
 
-=head1 SCHEMA DESIGN
-
-RT uses a convention to denote the foreign key status in its tables.
-The rule of thumb is:
-
-=over 4
-
-=item When it references to another table, always use the table name
-
-For example, the C<Template> field in the C<Scrips> table refers to
-the C<Id> of the same-named C<Template> table.
-
-=item Otherwise, always use the C<Id> suffix
-
-For example, the C<ObjectId> field in the C<ACL> table can refer
-to any object, so it has the C<Id> suffix.
-
-=back
 
-There are some legacy fields that did not follow this rule, namely
-C<ACL.PrincipalId>, C<GroupMembers.GroupId> and C<Attachments.TransactionId>,
-but new tables are expected to be consistent.
 
 =head1 TO DO
 
diff --git a/rt/lib/RT/System.pm b/rt/lib/RT/System.pm
index 515e3a4..b544531 100644
--- a/rt/lib/RT/System.pm
+++ b/rt/lib/RT/System.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME 
 
 RT::System
@@ -82,10 +81,7 @@ $RIGHTS = {
     AdminUsers     => 'Create, delete and modify users',              # loc_pair
     ModifySelf     => "Modify one's own RT account",                  # loc_pair
     DelegateRights =>
-      "Delegate specific rights which have been granted to you.",     # loc_pair
-    ShowConfigTab => "show Configuration tab",     # loc_pair
-    LoadSavedSearch => "allow loading of saved searches",     # loc_pair
-    CreateSavedSearch => "allow creation of saved searches",      # loc_pair
+      "Delegate specific rights which have been granted to you."      # loc_pair
 };
 
 # Tell RT::ACE that this sort of object can get acls granted
@@ -122,14 +118,12 @@ sub AvailableRights {
 
     my $queue = RT::Queue->new($RT::SystemUser);
     my $group = RT::Group->new($RT::SystemUser);
-    my $cf    = RT::CustomField->new($RT::SystemUser);
 
     my $qr =$queue->AvailableRights();
     my $gr = $group->AvailableRights();
-    my $cr = $cf->AvailableRights();
 
     # Build a merged list of all system wide rights, queue rights and group rights.
-    my %rights = (%{$RIGHTS}, %{$gr}, %{$qr}, %{$cr});
+    my %rights = (%{$RIGHTS}, %{$gr}, %{$qr});
     return(\%rights);
 }
 
diff --git a/rt/lib/RT/Template.pm b/rt/lib/RT/Template.pm
index 4f7aacb..c18a750 100755
--- a/rt/lib/RT/Template.pm
+++ b/rt/lib/RT/Template.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -317,29 +317,29 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         Queue => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Name => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         Description => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         Type => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         Language => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         TranslationOf => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Content => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'blob', default => ''},
+		{read => 1, write => 1, type => 'blob', default => ''},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
@@ -371,7 +371,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Template_Overlay.pm b/rt/lib/RT/Template_Overlay.pm
index bfff0f0..877b5c4 100644
--- a/rt/lib/RT/Template_Overlay.pm
+++ b/rt/lib/RT/Template_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Portions Copyright 2000 Tobias Brox <tobix@cpan.org> 
 
 =head1 NAME
@@ -66,9 +66,6 @@ ok(require RT::Template);
 
 =cut
 
-
-package RT::Template;
-
 use strict;
 no warnings qw(redefine);
 
@@ -324,13 +321,10 @@ sub MIMEObj {
 
 # {{{ sub Parse 
 
-=head2 Parse
+=item Parse
 
  This routine performs Text::Template parsing on the template and then
  imports the results into a MIME::Entity so we can really use it
-
- Takes a hash containing Argument, TicketObj, and TransactionObj.
-
  It returns a tuple of (val, message)
  If val is 0, the message contains an error message
 
@@ -409,15 +403,7 @@ sub _ParseContent {
         SOURCE => $content
     );
 
-    my $is_broken = 0;
-    my $retval = $template->fill_in( PACKAGE => 'T', BROKEN => sub {
-        my (%args) = @_;
-        $RT::Logger->error("Template parsing error: $args{error}")
-	    unless $args{error} =~ /^Died at /; # ignore intentional die()
-        $is_broken++;
-	return undef;
-    } );
-    return undef if $is_broken;
+    my $retval = $template->fill_in( PACKAGE => 'T' );
 
     # MIME::Parser has problems dealing with high-bit utf8 data.
     Encode::_utf8_off($retval);
diff --git a/rt/lib/RT/Templates.pm b/rt/lib/RT/Templates.pm
index 6271b97..925107e 100755
--- a/rt/lib/RT/Templates.pm
+++ b/rt/lib/RT/Templates.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Templates_Overlay.pm b/rt/lib/RT/Templates_Overlay.pm
index f5e8ce5..fb9b4a0 100644
--- a/rt/lib/RT/Templates_Overlay.pm
+++ b/rt/lib/RT/Templates_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Templates - a collection of RT Template objects
@@ -65,9 +64,6 @@ ok (require RT::Templates);
 
 =cut
 
-
-package RT::Templates;
-
 use strict;
 no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Ticket.pm b/rt/lib/RT/Ticket.pm
index 905ae8f..0d3c787 100755
--- a/rt/lib/RT/Ticket.pm
+++ b/rt/lib/RT/Ticket.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -590,55 +590,55 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         EffectiveId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Queue => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Type => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         IssueStatement => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Resolution => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Owner => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Subject => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => '[no subject]'},
+		{read => 1, write => 1, type => 'varchar(200)', default => '[no subject]'},
         InitialPriority => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         FinalPriority => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Priority => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         TimeEstimated => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         TimeWorked => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Status => 
-		{read => 1, write => 1, sql_type => 12, length => 10,  is_blob => 0,  is_numeric => 0,  type => 'varchar(10)', default => ''},
+		{read => 1, write => 1, type => 'varchar(10)', default => ''},
         TimeLeft => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Told => 
-		{read => 1, write => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, write => 1, type => 'datetime', default => ''},
         Starts => 
-		{read => 1, write => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, write => 1, type => 'datetime', default => ''},
         Started => 
-		{read => 1, write => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, write => 1, type => 'datetime', default => ''},
         Due => 
-		{read => 1, write => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, write => 1, type => 'datetime', default => ''},
         Resolved => 
-		{read => 1, write => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, write => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         Disabled => 
-		{read => 1, write => 1, sql_type => 5, length => 6,  is_blob => 0,  is_numeric => 1,  type => 'smallint(6)', default => '0'},
+		{read => 1, write => 1, type => 'smallint(6)', default => '0'},
 
  }
 };
@@ -670,7 +670,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/ObjectCustomField.pm b/rt/lib/RT/TicketCustomFieldValue.pm
index 89c59c6..7176472 100644
--- a/rt/lib/RT/ObjectCustomField.pm
+++ b/rt/lib/RT/TicketCustomFieldValue.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -54,7 +54,7 @@ use strict;
 
 =head1 NAME
 
-RT::ObjectCustomField
+RT::TicketCustomFieldValue
 
 
 =head1 SYNOPSIS
@@ -65,9 +65,10 @@ RT::ObjectCustomField
 
 =cut
 
-package RT::ObjectCustomField;
+package RT::TicketCustomFieldValue;
 use RT::Record; 
 use RT::CustomField;
+use RT::Ticket;
 
 
 use vars qw( @ISA );
@@ -76,7 +77,7 @@ use vars qw( @ISA );
 sub _Init {
   my $self = shift; 
 
-  $self->Table('ObjectCustomFields');
+  $self->Table('TicketCustomFieldValues');
   $self->SUPER::_Init(@_);
 }
 
@@ -88,9 +89,9 @@ sub _Init {
 
 Create takes a hash of values and creates a row in the database:
 
+  int(11) 'Ticket'.
   int(11) 'CustomField'.
-  int(11) 'ObjectId'.
-  int(11) 'SortOrder'.
+  varchar(255) 'Content'.
 
 =cut
 
@@ -100,15 +101,15 @@ Create takes a hash of values and creates a row in the database:
 sub Create {
     my $self = shift;
     my %args = ( 
+                Ticket => '0',
                 CustomField => '0',
-                ObjectId => '0',
-                SortOrder => '0',
+                Content => '',
 
 		  @_);
     $self->SUPER::Create(
+                         Ticket => $args{'Ticket'},
                          CustomField => $args{'CustomField'},
-                         ObjectId => $args{'ObjectId'},
-                         SortOrder => $args{'SortOrder'},
+                         Content => $args{'Content'},
 );
 
 }
@@ -124,69 +125,83 @@ Returns the current value of id.
 =cut
 
 
-=head2 CustomField
+=head2 Ticket
 
-Returns the current value of CustomField. 
-(In the database, CustomField is stored as int(11).)
+Returns the current value of Ticket. 
+(In the database, Ticket is stored as int(11).)
 
 
 
-=head2 SetCustomField VALUE
+=head2 SetTicket VALUE
 
 
-Set CustomField to VALUE. 
+Set Ticket to VALUE. 
 Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, CustomField will be stored as a int(11).)
+(In the database, Ticket will be stored as a int(11).)
 
 
 =cut
 
 
-=head2 CustomFieldObj
+=head2 TicketObj
 
-Returns the CustomField Object which has the id returned by CustomField
+Returns the Ticket Object which has the id returned by Ticket
 
 
 =cut
 
-sub CustomFieldObj {
+sub TicketObj {
 	my $self = shift;
-	my $CustomField =  RT::CustomField->new($self->CurrentUser);
-	$CustomField->Load($self->__Value('CustomField'));
-	return($CustomField);
+	my $Ticket =  RT::Ticket->new($self->CurrentUser);
+	$Ticket->Load($self->__Value('Ticket'));
+	return($Ticket);
 }
 
-=head2 ObjectId
+=head2 CustomField
 
-Returns the current value of ObjectId. 
-(In the database, ObjectId is stored as int(11).)
+Returns the current value of CustomField. 
+(In the database, CustomField is stored as int(11).)
 
 
 
-=head2 SetObjectId VALUE
+=head2 SetCustomField VALUE
 
 
-Set ObjectId to VALUE. 
+Set CustomField to VALUE. 
 Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, ObjectId will be stored as a int(11).)
+(In the database, CustomField will be stored as a int(11).)
+
+
+=cut
+
+
+=head2 CustomFieldObj
+
+Returns the CustomField Object which has the id returned by CustomField
 
 
 =cut
 
+sub CustomFieldObj {
+	my $self = shift;
+	my $CustomField =  RT::CustomField->new($self->CurrentUser);
+	$CustomField->Load($self->__Value('CustomField'));
+	return($CustomField);
+}
 
-=head2 SortOrder
+=head2 Content
 
-Returns the current value of SortOrder. 
-(In the database, SortOrder is stored as int(11).)
+Returns the current value of Content. 
+(In the database, Content is stored as varchar(255).)
 
 
 
-=head2 SetSortOrder VALUE
+=head2 SetContent VALUE
 
 
-Set SortOrder to VALUE. 
+Set Content to VALUE. 
 Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, SortOrder will be stored as a int(11).)
+(In the database, Content will be stored as a varchar(255).)
 
 
 =cut
@@ -233,38 +248,38 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
+        Ticket => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         CustomField => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
-        ObjectId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
-        SortOrder => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Content => 
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
 
 
-        eval "require RT::ObjectCustomField_Overlay";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomField_Overlay.pm}) {
+        eval "require RT::TicketCustomFieldValue_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValue_Overlay.pm}) {
             die $@;
         };
 
-        eval "require RT::ObjectCustomField_Vendor";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomField_Vendor.pm}) {
+        eval "require RT::TicketCustomFieldValue_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValue_Vendor.pm}) {
             die $@;
         };
 
-        eval "require RT::ObjectCustomField_Local";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomField_Local.pm}) {
+        eval "require RT::TicketCustomFieldValue_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValue_Local.pm}) {
             die $@;
         };
 
@@ -279,13 +294,13 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
 so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-RT::ObjectCustomField_Overlay, RT::ObjectCustomField_Vendor, RT::ObjectCustomField_Local
+RT::TicketCustomFieldValue_Overlay, RT::TicketCustomFieldValue_Vendor, RT::TicketCustomFieldValue_Local
 
 =cut
 
diff --git a/rt/lib/RT/Interface/Web/QueryBuilder.pm b/rt/lib/RT/TicketCustomFieldValue_Overlay.pm
index b7526b3..270c593 100755..100644
--- a/rt/lib/RT/Interface/Web/QueryBuilder.pm
+++ b/rt/lib/RT/TicketCustomFieldValue_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,15 +42,33 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-package RT::Interface::Web::QueryBuilder;
-
+# }}} END BPS TAGGED BLOCK
 use strict;
-use warnings;
+no warnings qw(redefine);
+
+
+
+=head2 LoadByTicketContentAndCustomField { Ticket => TICKET, CustomField => CUSTOMFIELD, Content => CONTENT }
+
+Loads a custom field value by Ticket, Content and which CustomField it's tied to
+
+=cut
+
+
+sub LoadByTicketContentAndCustomField {
+    my $self = shift;
+    my %args = ( Ticket => undef,
+                CustomField => undef,
+                Content => undef,
+                @_
+                );
+
+
+    $self->LoadByCols( Content => $args{'Content'},
+                         CustomField => $args{'CustomField'},
+                         Ticket => $args{'Ticket'});
 
-eval "require RT::Interface::Web::QueryBuilder_Vendor";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Web/QueryBuilder_Vendor.pm});
-eval "require RT::Interface::Web::QueryBuilder_Local";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Web/QueryBuilder_Local.pm});
+    
+}
 
 1;
diff --git a/rt/lib/RT/ObjectCustomFields.pm b/rt/lib/RT/TicketCustomFieldValues.pm
index fcbf332..2174afe 100644
--- a/rt/lib/RT/ObjectCustomFields.pm
+++ b/rt/lib/RT/TicketCustomFieldValues.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -54,11 +54,11 @@ use strict;
 
 =head1 NAME
 
-  RT::ObjectCustomFields -- Class Description
+  RT::TicketCustomFieldValues -- Class Description
  
 =head1 SYNOPSIS
 
-  use RT::ObjectCustomFields
+  use RT::TicketCustomFieldValues
 
 =head1 DESCRIPTION
 
@@ -67,10 +67,10 @@ use strict;
 
 =cut
 
-package RT::ObjectCustomFields;
+package RT::TicketCustomFieldValues;
 
 use RT::SearchBuilder;
-use RT::ObjectCustomField;
+use RT::TicketCustomFieldValue;
 
 use vars qw( @ISA );
 @ISA= qw(RT::SearchBuilder);
@@ -78,48 +78,37 @@ use vars qw( @ISA );
 
 sub _Init {
     my $self = shift;
-    $self->{'table'} = 'ObjectCustomFields';
+    $self->{'table'} = 'TicketCustomFieldValues';
     $self->{'primary_key'} = 'id';
 
 
-
-  # By default, order by SortOrder
-  $self->OrderByCols(
-	 { ALIAS => 'main',
-	   FIELD => 'SortOrder',
-	   ORDER => 'ASC' },
-	 { ALIAS => 'main',
-	   FIELD => 'id',
-	   ORDER => 'ASC' },
-     );
-
     return ( $self->SUPER::_Init(@_) );
 }
 
 
 =head2 NewItem
 
-Returns an empty new RT::ObjectCustomField item
+Returns an empty new RT::TicketCustomFieldValue item
 
 =cut
 
 sub NewItem {
     my $self = shift;
-    return(RT::ObjectCustomField->new($self->CurrentUser));
+    return(RT::TicketCustomFieldValue->new($self->CurrentUser));
 }
 
-        eval "require RT::ObjectCustomFields_Overlay";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomFields_Overlay.pm}) {
+        eval "require RT::TicketCustomFieldValues_Overlay";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValues_Overlay.pm}) {
             die $@;
         };
 
-        eval "require RT::ObjectCustomFields_Vendor";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomFields_Vendor.pm}) {
+        eval "require RT::TicketCustomFieldValues_Vendor";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValues_Vendor.pm}) {
             die $@;
         };
 
-        eval "require RT::ObjectCustomFields_Local";
-        if ($@ && $@ !~ qr{^Can't locate RT/ObjectCustomFields_Local.pm}) {
+        eval "require RT::TicketCustomFieldValues_Local";
+        if ($@ && $@ !~ qr{^Can't locate RT/TicketCustomFieldValues_Local.pm}) {
             die $@;
         };
 
@@ -134,13 +123,13 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
 so that perl does not kick and scream when you redefine a subroutine or variable in your overlay.
 
-RT::ObjectCustomFields_Overlay, RT::ObjectCustomFields_Vendor, RT::ObjectCustomFields_Local
+RT::TicketCustomFieldValues_Overlay, RT::TicketCustomFieldValues_Vendor, RT::TicketCustomFieldValues_Local
 
 =cut
 
diff --git a/rt/lib/RT/ObjectCustomFieldValues_Overlay.pm b/rt/lib/RT/TicketCustomFieldValues_Overlay.pm
index 315c16f..8cbaca5 100644
--- a/rt/lib/RT/ObjectCustomFieldValues_Overlay.pm
+++ b/rt/lib/RT/TicketCustomFieldValues_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,9 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-package RT::ObjectCustomFieldValues;
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 no warnings qw(redefine);
 
@@ -78,14 +76,7 @@ Limits the returned set to values for the ticket with Id TICKETID
 sub LimitToTicket {
     my $self = shift;
     my $ticket = shift;
-
-
-    $RT::Logger->warning(ref($self) . " -> LimitToTicket deprecated in favor of LimitToObject");
-
-    $self->Limit( FIELD => 'ObjectType',
-		  VALUE => 'RT::Ticket',
-		  OPERATOR => '=');
-    return ($self->Limit( FIELD => 'ObjectId',
+    return ($self->Limit( FIELD => 'Ticket',
 			  VALUE => $ticket,
 			  OPERATOR => '='));
 
@@ -94,18 +85,6 @@ sub LimitToTicket {
 # }}}
 
 
-sub LimitToObject {
-    my $self = shift;
-    my $object = shift;
-    $self->Limit( FIELD => 'ObjectType',
-		  VALUE => ref($object),
-		  OPERATOR => '=');
-    return ($self->Limit( FIELD => 'ObjectId',
-			  VALUE => $object->Id,
-			  OPERATOR => '='));
-
-}
-
 =sub HasEntry VALUE
 
 Returns true if this CustomFieldValues collection has an entry with content that eq VALUE
@@ -125,29 +104,5 @@ sub HasEntry {
 
 }
 
-sub _DoSearch {
-    my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_expired_rows'}) {
-        $self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoSearch(@_));
-    
-}
-
-sub _DoCount {
-    my $self = shift;
-    
-    #unless we really want to find disabled rows, make sure we\'re only finding enabled ones.
-    unless($self->{'find_expired_rows'}) {
-        $self->LimitToEnabled();
-    }
-    
-    return($self->SUPER::_DoCount(@_));
-    
-}
-
 1;
 
diff --git a/rt/lib/RT/Ticket_Overlay.pm b/rt/lib/RT/Ticket_Overlay.pm
index d04ecec..a5d6860 100644
--- a/rt/lib/RT/Ticket_Overlay.pm
+++ b/rt/lib/RT/Ticket_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # {{{ Front Material 
 
 =head1 SYNOPSIS
@@ -66,16 +66,12 @@ ok($testqueue->Create( Name => 'ticket tests'));
 ok($testqueue->Id != 0);
 use_ok(RT::CustomField);
 ok(my $testcf = RT::CustomField->new($RT::SystemUser));
-my ($ret, $cmsg) = $testcf->Create( Name => 'selectmulti',
+ok($testcf->Create( Name => 'selectmulti',
                     Queue => $testqueue->id,
-                               Type => 'SelectMultiple');
-ok($ret,"Created the custom field - ".$cmsg);
-($ret,$cmsg) = $testcf->AddValue ( Name => 'Value1',
+                               Type => 'SelectMultiple'));
+ok($testcf->AddValue ( Name => 'Value1',
                         SortOrder => '1',
-                        Description => 'A testing value');
-
-ok($ret, "Added a value - ".$cmsg);
-
+                        Description => 'A testing value'));
 ok($testcf->AddValue ( Name => 'Value2',
                         SortOrder => '2',
                         Description => 'Another testing value'));
@@ -111,8 +107,8 @@ ok($t->CustomFieldValues($testcf->Id)->Count == 0);
 
 ok(my $t2 = RT::Ticket->new($RT::SystemUser));
 ok($t2->Load($id));
-is($t2->Subject, 'Testing');
-is($t2->QueueObj->Id, $testqueue->id);
+ok($t2->Subject eq 'Testing');
+ok($t2->QueueObj->Id eq $testqueue->id);
 ok($t2->OwnerObj->Id == $u->Id);
 
 my $t3 = RT::Ticket->new($RT::SystemUser);
@@ -137,9 +133,6 @@ ok($t3->CustomFieldValues($testcf->Id)->Count == 1,
 
 =cut
 
-
-package RT::Ticket;
-
 use strict;
 no warnings qw(redefine);
 
@@ -149,8 +142,8 @@ use RT::Record;
 use RT::Links;
 use RT::Date;
 use RT::CustomFields;
+use RT::TicketCustomFieldValues;
 use RT::Tickets;
-use RT::Transactions;
 use RT::URI::fsck_com_rt;
 use RT::URI;
 use MIME::Entity;
@@ -238,7 +231,6 @@ sub Load {
     #TODO modify this routine to look at EffectiveId and do the recursive load
     # thing. be careful to cache all the interim tickets we try so we don't loop forever.
 
-
     #If it's a local URI, turn it into a ticket id
     if ( $id =~ /^$RT::TicketBaseURI(\d+)$/ ) {
         $id = $1;
@@ -251,7 +243,7 @@ sub Load {
 
     #If we have an integer URI, load the ticket
     if ( $id =~ /^\d+$/ ) {
-        my ($ticketid,$msg) = $self->LoadById($id);
+        my $ticketid = $self->LoadById($id);
 
         unless ($self->Id) {
             $RT::Logger->crit("$self tried to load a bogus ticket: $id\n");
@@ -261,13 +253,11 @@ sub Load {
 
     #It's not a URI. It's not a numerical ticket ID. Punt!
     else {
-        $RT::Logger->warning("Tried to load a bogus ticket id: '$id'");
         return (undef);
     }
 
     #If we're merged, resolve the merge.
     if ( ( $self->EffectiveId ) and ( $self->EffectiveId != $self->Id ) ) {
-        $RT::Logger->debug ("We found a merged ticket.". $self->id ."/".$self->EffectiveId);
         return ( $self->Load( $self->EffectiveId ) );
     }
 
@@ -387,7 +377,8 @@ sub Create {
         $QueueObj->Load( $args{'Queue'}->Id );
     }
     else {
-        $RT::Logger->debug( $args{'Queue'} . " not a recognised queue object." );
+        $RT::Logger->debug(
+            $args{'Queue'} . " not a recognised queue object." );
     }
 
     #Can't create a ticket without a queue.
@@ -406,7 +397,11 @@ sub Create {
     {
         return (
             0, 0,
-            $self->loc( "No permission to create tickets in the queue '[_1]'", $QueueObj->Name));
+            $self->loc(
+                "No permission to create tickets in the queue '[_1]'",
+                $QueueObj->Name
+            )
+        );
     }
 
     unless ( $QueueObj->IsValidStatus( $args{'Status'} ) ) {
@@ -678,7 +673,7 @@ sub Create {
         foreach my $link (
             ref( $args{$type} ) ? @{ $args{$type} } : ( $args{$type} ) )
         {
-            my ( $wval, $wmsg ) = $self->_AddLink(
+            my ( $wval, $wmsg ) = $self->AddLink(
                 Type                          => $LINKTYPEMAP{$type}->{'Type'},
                 $LINKTYPEMAP{$type}->{'Mode'} => $link,
                 Silent                        => 1
@@ -696,18 +691,13 @@ sub Create {
         next unless ( $arg =~ /^CustomField-(\d+)$/i );
         my $cfid = $1;
         foreach
-          my $value ( UNIVERSAL::isa( $args{$arg} => 'ARRAY' ) ? @{ $args{$arg} } : ( $args{$arg} ) )
+          my $value ( ref( $args{$arg} ) ? @{ $args{$arg} } : ( $args{$arg} ) )
         {
             next unless ( length($value) );
-
-            # Allow passing in uploaded LargeContent etc by hash reference
             $self->_AddCustomFieldValue(
-                (UNIVERSAL::isa( $value => 'HASH' )
-                    ? %$value
-                    : (Value => $value)
-                ),
                 Field             => $cfid,
-                RecordTransaction => 0,
+                Value             => $value,
+                RecordTransaction => 0
             );
         }
     }
@@ -725,8 +715,6 @@ sub Create {
 
         if ( $self->Id && $Trans ) {
 
-            $TransObj->UpdateCustomFields(ARGSRef => \%args);
-
             $RT::Logger->info( "Ticket " . $self->Id . " created in queue '" . $QueueObj->Name . "' by " . $self->CurrentUser->Name );
             $ErrStr = $self->loc( "Ticket [_1] created in queue '[_2]'", $self->Id, $QueueObj->Name );
             $ErrStr = join( "\n", $ErrStr, @non_fatal_errors );
@@ -736,7 +724,11 @@ sub Create {
 
             $ErrStr = join( "\n", $ErrStr, @non_fatal_errors );
             $RT::Logger->error("Ticket couldn't be created: $ErrStr");
-            return ( 0, 0, $self->loc( "Ticket could not be created due to an internal error"));
+            return (
+                0, 0,
+                $self->loc(
+                    "Ticket could not be created due to an internal error")
+            );
         }
 
         $RT::Handle->Commit();
@@ -758,6 +750,170 @@ sub Create {
 
 # }}}
 
+# {{{ sub CreateFromEmailMessage
+
+
+=head2 CreateFromEmailMessage { Message, Queue, ExtractActorFromHeaders } 
+
+This code replaces what was once a large part of the email gateway.
+It takes an email message as a parameter, parses out the sender, subject
+and a MIME object. It then creates a ticket based on those attributes
+
+=cut
+
+sub CreateFromEmailMessage {
+    my $self = shift;
+    my %args = ( Message => undef,
+                 Queue => undef,
+                 ExtractActorFromSender => undef,
+                 @_ );
+
+    
+    # Pull out requestor
+
+    # Pull out Cc?
+
+    # 
+
+
+}
+
+# }}}
+
+
+# {{{ CreateFrom822
+
+=head2 FORMAT
+
+CreateTickets uses the template as a template for an ordered set of tickets 
+to create. The basic format is as follows:
+
+
+ ===Create-Ticket: identifier
+ Param: Value
+ Param2: Value
+ Param3: Value
+ Content: Blah
+ blah
+ blah
+ ENDOFCONTENT
+=head2 Acceptable fields
+
+A complete list of acceptable fields for this beastie:
+
+
+    *  Queue           => Name or id# of a queue
+       Subject         => A text string
+       Status          => A valid status. defaults to 'new'
+
+       Due             => Dates can be specified in seconds since the epoch
+                          to be handled literally or in a semi-free textual
+                          format which RT will attempt to parse.
+       Starts          => 
+       Started         => 
+       Resolved        => 
+       Owner           => Username or id of an RT user who can and should own 
+                          this ticket
+   +   Requestor       => Email address
+   +   Cc              => Email address 
+   +   AdminCc         => Email address 
+       TimeWorked      => 
+       TimeEstimated   => 
+       TimeLeft        => 
+       InitialPriority => 
+       FinalPriority   => 
+       Type            => 
+    +  DependsOn       => 
+    +  DependedOnBy    =>
+    +  RefersTo        =>
+    +  ReferredToBy    => 
+    +  Members         =>
+    +  MemberOf        => 
+       Content         => content. Can extend to multiple lines. Everything
+                          within a template after a Content: header is treated
+                          as content until we hit a line containing only 
+                          ENDOFCONTENT
+       ContentType     => the content-type of the Content field
+       CustomField-<id#> => custom field value
+
+Fields marked with an * are required.
+
+Fields marked with a + man have multiple values, simply
+by repeating the fieldname on a new line with an additional value.
+
+
+When parsed, field names are converted to lowercase and have -s stripped.
+Refers-To, RefersTo, refersto, refers-to and r-e-f-er-s-tO will all 
+be treated as the same thing.
+
+
+=begin testing
+
+use_ok(RT::Ticket);
+
+=end testing
+
+
+=cut
+
+sub CreateFrom822 {
+    my $self    = shift;
+    my $content = shift;
+
+
+
+    my %args = $self->_Parse822HeadersForAttributes($content);
+
+    # Now we have a %args to work with.
+    # Make sure we have at least the minimum set of
+    # reasonable data and do our thang
+    my $ticket = RT::Ticket->new($RT::SystemUser);
+
+    my %ticketargs = (
+        Queue           => $args{'queue'},
+        Subject         => $args{'subject'},
+        Status          => $args{'status'},
+        Due             => $args{'due'},
+        Starts          => $args{'starts'},
+        Started         => $args{'started'},
+        Resolved        => $args{'resolved'},
+        Owner           => $args{'owner'},
+        Requestor       => $args{'requestor'},
+        Cc              => $args{'cc'},
+        AdminCc         => $args{'admincc'},
+        TimeWorked      => $args{'timeworked'},
+        TimeEstimated   => $args{'timeestimated'},
+        TimeLeft        => $args{'timeleft'},
+        InitialPriority => $args{'initialpriority'},
+        FinalPriority   => $args{'finalpriority'},
+        Type            => $args{'type'},
+        DependsOn       => $args{'dependson'},
+        DependedOnBy    => $args{'dependedonby'},
+        RefersTo        => $args{'refersto'},
+        ReferredToBy    => $args{'referredtoby'},
+        Members         => $args{'members'},
+        MemberOf        => $args{'memberof'},
+        MIMEObj         => $args{'mimeobj'}
+    );
+
+    # Add custom field entries to %ticketargs.
+    # TODO: allow named custom fields
+    map {
+        /^customfield-(\d+)$/
+          && ( $ticketargs{ "CustomField-" . $1 } = $args{$_} );
+    } keys(%args);
+
+    my ( $id, $transid, $msg ) = $ticket->Create(%ticketargs);
+    unless ($id) {
+        $RT::Logger->error( "Couldn't create a related ticket for "
+              . $self->TicketObj->Id . " "
+              . $msg );
+    }
+
+    return (1);
+}
+
+# }}}
 
 # {{{ UpdateFrom822 
 
@@ -873,6 +1029,7 @@ sub UpdateFrom822 {
         $ticketargs{'Queue'} = $tempqueue->Id() if ( $tempqueue->id );
     }
 
+    # die "updaterecordobject is a webui thingy";
     my @results;
 
     foreach my $attribute (@attribs) {
@@ -1164,24 +1321,16 @@ sub Import {
         }
     }
 
-    my $create_groups_ret = $self->_CreateTicketGroups();
-    unless ($create_groups_ret) {
-        $RT::Logger->crit(
-            "Couldn't create ticket groups for ticket " . $self->Id );
-    }
-
-    $self->OwnerGroup->_AddMember( PrincipalId => $Owner->PrincipalId );
-
     my $watcher;
     foreach $watcher ( @{ $args{'Cc'} } ) {
-        $self->_AddWatcher( Type => 'Cc', Email => $watcher, Silent => 1 );
+        $self->_AddWatcher( Type => 'Cc', Person => $watcher, Silent => 1 );
     }
     foreach $watcher ( @{ $args{'AdminCc'} } ) {
-        $self->_AddWatcher( Type => 'AdminCc', Email => $watcher,
+        $self->_AddWatcher( Type => 'AdminCc', Person => $watcher,
             Silent => 1 );
     }
     foreach $watcher ( @{ $args{'Requestor'} } ) {
-        $self->_AddWatcher( Type => 'Requestor', Email => $watcher,
+        $self->_AddWatcher( Type => 'Requestor', Person => $watcher,
             Silent => 1 );
     }
 
@@ -1190,6 +1339,7 @@ sub Import {
 
 # }}}
 
+
 # {{{ Routines dealing with watchers.
 
 # {{{ _CreateTicketGroups 
@@ -1337,7 +1487,7 @@ sub AddWatcher {
             }
         }
         else {
-            $RT::Logger->warning( "$self -> AddWatcher got passed a bogus type");
+            $RT::Logger->warn( "$self -> AddWatcher got passed a bogus type");
             return ( 0, $self->loc('Error in parameters to Ticket->AddWatcher') );
         }
     }
@@ -1373,10 +1523,6 @@ sub _AddWatcher {
     if ($args{'Email'}) {
         my $user = RT::User->new($RT::SystemUser);
         my ($pid, $msg) = $user->LoadOrCreateByEmail($args{'Email'});
-	# If we can't load the user by email address, let's try to load by username	
-	unless ($pid) { 
-		($pid,$msg) = $user->Load($args{'Email'})
-	}
         if ($pid) {
             $args{'PrincipalId'} = $pid; 
         }
@@ -2239,8 +2385,6 @@ MIMEObj, TimeTaken, CcMessageTo, BccMessageTo, Content, DryRun
 If DryRun is defined, this update WILL NOT BE RECORDED. Scrips will not be committed.
 They will, however, be prepared and you'll be able to access them through the TransactionObj
 
-Returns: Transaction id, Error Message, Transaction Object
-(note the different order from Create()!)
 
 =cut
 
@@ -2290,9 +2434,6 @@ if there's no MIMEObj, Content is used to build a MIME::Entity object
 If DryRun is defined, this update WILL NOT BE RECORDED. Scrips will not be committed.
 They will, however, be prepared and you'll be able to access them through the TransactionObj
 
-Returns: Transaction id, Error Message, Transaction Object
-(note the different order from Create()!)
-
 
 =cut
 
@@ -2382,24 +2523,6 @@ sub _RecordNote {
                                  ) )
       if defined $args{'BccMessageTo'};
 
-    # If this is from an external source, we need to come up with its
-    # internal Message-ID now, so all emails sent because of this
-    # message have a common Message-ID
-    unless ($args{'MIMEObj'}->head->get('Message-ID')
-            =~ /<(rt-.*?-\d+-\d+)\.(\d+-0-0)\@$RT::Organization>/) {
-        $args{'MIMEObj'}->head->set( 'RT-Message-ID',
-            "<rt-"
-            . $RT::VERSION . "-"
-            . $$ . "-"
-            . CORE::time() . "-"
-            . int(rand(2000)) . '.'
-            . $self->id . "-"
-            . "0" . "-"  # Scrip
-            . "0" . "@"  # Email sent
-            . $RT::Organization
-            . ">" );
-    }
-
     #Record the correspondence (write the transaction)
     my ( $Trans, $msg, $TransObj ) = $self->_NewTransaction(
              Type => $args{'NoteType'},
@@ -2524,51 +2647,6 @@ sub DeleteLink {
 
 Takes a paramhash of Type and one of Base or Target. Adds that link to this ticket.
 
-=begin testing 
-
-my $q1 = RT::Queue->new($RT::SystemUser);
-my ($id,$msg) = $q1->Create(Name => 'LinkTest1');
-ok ($id,$msg);
-my $q2 = RT::Queue->new($RT::SystemUser);
-($id,$msg) = $q2->Create(Name => 'LinkTest2');
-ok ($id,$msg);
-
-my $u1 = RT::User->new($RT::SystemUser);
-($id,$msg) =$u1->Create(Name => 'LinkTestUser');
-
-ok ($id,$msg);
-
-($id,$msg) = $u1->PrincipalObj->GrantRight ( Object => $q1, Right => 'CreateTicket');
-ok ($id,$msg);
-($id,$msg) = $u1->PrincipalObj->GrantRight ( Object => $q1, Right => 'ModifyTicket');
-ok ($id,$msg);
-
-my $tid;
-
-my $creator = RT::CurrentUser->new($u1->id);
-
-my $ticket = RT::Ticket->new( $creator);
-ok($ticket->isa('RT::Ticket'));
-($id,$tid, $msg) = $ticket->Create(Subject => 'Link test 1', Queue => $q1->id);
-ok ($id,$msg);
-
-
-my $ticket2 = RT::Ticket->new($RT::SystemUser);
-($id, $tid, $msg) = $ticket2->Create(Subject => 'Link test 2', Queue => $q2->id);
-ok ($id, $msg);
-
-($id,$msg) =$ticket->AddLink(Type => 'RefersTo', Target => $ticket2->id);
-ok(!$id,$msg);
-($id,$msg) = $u1->PrincipalObj->GrantRight ( Object => $q2, Right => 'CreateTicket');
-ok ($id,$msg);
-($id,$msg) = $u1->PrincipalObj->GrantRight ( Object => $q2, Right => 'ModifyTicket');
-ok ($id,$msg);
-($id,$msg) =$ticket->AddLink(Type => 'RefersTo', Target => $ticket2->id);
-ok($id,$msg);
-($id,$msg) =$ticket->AddLink(Type => 'RefersTo', Target => -1);
-ok(!$id,$msg);
-
-=end testing 
 
 =cut
 
@@ -2585,58 +2663,6 @@ sub AddLink {
         return ( 0, $self->loc("Permission Denied") );
     }
 
-
-    $self->_AddLink(%args);
-}
-
-=head2 _AddLink  
-
-Private non-acled variant of AddLink so that links can be added during create.
-
-=cut
-
-sub _AddLink {
-    my $self = shift;
-    my %args = ( Target => '',
-                 Base   => '',
-                 Type   => '',
-                 Silent => undef,
-                 @_ );
-
-    # {{{ If the other URI is an RT::Ticket, we want to make sure the user
-    # can modify it too...
-    my $other_ticket_uri = RT::URI->new($self->CurrentUser);
-
-    if ( $args{'Target'} ) {
-        $other_ticket_uri->FromURI( $args{'Target'} );
-
-    }
-    elsif ( $args{'Base'} ) {
-        $other_ticket_uri->FromURI( $args{'Base'} );
-    }
-
-    unless ( $other_ticket_uri->Resolver && $other_ticket_uri->Scheme ) {
-	my $msg = $args{'Target'} ? $self->loc("Couldn't resolve target '[_1]' into a URI.", $args{'Target'})
-          : $self->loc("Couldn't resolve base '[_1]' into a URI.", $args{'Base'});
-        $RT::Logger->warning( "$self $msg\n" );
-
-        return( 0, $msg );
-    }
-
-    if ( $other_ticket_uri->Resolver->Scheme eq 'fsck.com-rt') {
-        my $object = $other_ticket_uri->Resolver->Object;
-
-        if (   UNIVERSAL::isa( $object, 'RT::Ticket' )
-            && $object->id
-            && !$object->CurrentUserHasRight('ModifyTicket') )
-        {
-            return ( 0, $self->loc("Permission Denied") );
-        }
-
-    }
-
-    # }}}
-
     my ($val, $Msg) = $self->SUPER::_AddLink(%args);
 
     if (!$val) {
@@ -2654,7 +2680,7 @@ sub _AddLink {
 
     # Don't write the transaction if we're doing this on create
     if ( $args{'Silent'} ) {
-        return ( $val, $Msg );
+        return ( 1, $Msg );
     }
     else {
 	my $remote_uri = RT::URI->new( $RT::SystemUser );
@@ -2666,67 +2692,52 @@ sub _AddLink {
 				   Field => $LINKDIRMAP{$args{'Type'}}->{$direction},
 				   NewValue =>  $remote_uri->URI || $remote_link,
 				   TimeTaken => 0 );
-        return ( $val, $Msg );
+        return ( $Trans, $Msg );
     }
 
 }
 
 # }}}
 
-
 # {{{ sub MergeInto
 
 =head2 MergeInto
-
 MergeInto take the id of the ticket to merge this ticket into.
 
-
-=begin testing
-
-my $t1 = RT::Ticket->new($RT::SystemUser);
-$t1->Create ( Subject => 'Merge test 1', Queue => 'general', Requestor => 'merge1@example.com');
-my $t1id = $t1->id;
-my $t2 = RT::Ticket->new($RT::SystemUser);
-$t2->Create ( Subject => 'Merge test 2', Queue => 'general', Requestor => 'merge2@example.com');
-my $t2id = $t2->id;
-my ($msg, $val) = $t1->MergeInto($t2->id);
-ok ($msg,$val);
-$t1 = RT::Ticket->new($RT::SystemUser);
-is ($t1->id, undef, "ok. we've got a blank ticket1");
-$t1->Load($t1id);
-
-is ($t1->id, $t2->id);
-
-is ($t1->Requestors->MembersObj->Count, 2);
-
-
-=end testing
-
 =cut
 
 sub MergeInto {
     my $self      = shift;
-    my $ticket_id = shift;
+    my $MergeInto = shift;
 
     unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
         return ( 0, $self->loc("Permission Denied") );
     }
 
     # Load up the new ticket.
-    my $MergeInto = RT::Ticket->new($RT::SystemUser);
-    $MergeInto->Load($ticket_id);
+    my $NewTicket = RT::Ticket->new($RT::SystemUser);
+    $NewTicket->Load($MergeInto);
 
     # make sure it exists.
-    unless ( $MergeInto->Id ) {
+    unless ( defined $NewTicket->Id ) {
         return ( 0, $self->loc("New ticket doesn't exist") );
     }
 
     # Make sure the current user can modify the new ticket.
-    unless ( $MergeInto->CurrentUserHasRight('ModifyTicket') ) {
+    unless ( $NewTicket->CurrentUserHasRight('ModifyTicket') ) {
+        $RT::Logger->debug("failed...");
         return ( 0, $self->loc("Permission Denied") );
     }
 
-    $RT::Handle->BeginTransaction();
+    $RT::Logger->debug(
+        "checking if the new ticket has the same id and effective id...");
+    unless ( $NewTicket->id == $NewTicket->EffectiveId ) {
+        $RT::Logger->err( "$self trying to merge into "
+              . $NewTicket->Id
+              . " which is itself merged.\n" );
+        return ( 0,
+            $self->loc("Can't merge into a merged ticket. You should never get this error") );
+    }
 
     # We use EffectiveId here even though it duplicates information from
     # the links table becasue of the massive performance hit we'd take
@@ -2736,20 +2747,19 @@ sub MergeInto {
     #update this ticket's effective id to the new ticket's id.
     my ( $id_val, $id_msg ) = $self->__Set(
         Field => 'EffectiveId',
-        Value => $MergeInto->Id()
+        Value => $NewTicket->Id()
     );
 
     unless ($id_val) {
-        $RT::Handle->Rollback();
+        $RT::Logger->error(
+            "Couldn't set effective ID for " . $self->Id . ": $id_msg" );
         return ( 0, $self->loc("Merge failed. Couldn't set EffectiveId") );
     }
 
     my ( $status_val, $status_msg ) = $self->__Set( Field => 'Status', Value => 'resolved');
 
     unless ($status_val) {
-        $RT::Handle->Rollback();
         $RT::Logger->error( $self->loc("[_1] couldn't set status to resolved. RT's Database may be inconsistent.", $self) );
-        return ( 0, $self->loc("Merge failed. Couldn't set Status") );
     }
 
 
@@ -2757,24 +2767,11 @@ sub MergeInto {
     my $old_links_to = RT::Links->new($self->CurrentUser);
     $old_links_to->Limit(FIELD => 'Target', VALUE => $self->URI);
 
-    my %old_seen;
     while (my $link = $old_links_to->Next) {
-        if (exists $old_seen{$link->Base."-".$link->Type}) {
-            $link->Delete;
-        }   
-        elsif ($link->Base eq $MergeInto->URI) {
+        if ($link->Base eq $NewTicket->URI) {
             $link->Delete;
         } else {
-            # First, make sure the link doesn't already exist. then move it over.
-            my $tmp = RT::Link->new($RT::SystemUser);
-            $tmp->LoadByCols(Base => $link->Base, Type => $link->Type, LocalTarget => $MergeInto->id);
-            if ($tmp->id)   {
-                    $link->Delete;
-            } else { 
-                $link->SetTarget($MergeInto->URI);
-                $link->SetLocalTarget($MergeInto->id);
-            }
-            $old_seen{$link->Base."-".$link->Type} =1;
+            $link->SetTarget($NewTicket->URI);
         }
 
     }
@@ -2783,55 +2780,42 @@ sub MergeInto {
     $old_links_from->Limit(FIELD => 'Base', VALUE => $self->URI);
 
     while (my $link = $old_links_from->Next) {
-        if (exists $old_seen{$link->Type."-".$link->Target}) {
-            $link->Delete;
-        }   
-        if ($link->Target eq $MergeInto->URI) {
+        if ($link->Target eq $NewTicket->URI) {
             $link->Delete;
         } else {
-            # First, make sure the link doesn't already exist. then move it over.
-            my $tmp = RT::Link->new($RT::SystemUser);
-            $tmp->LoadByCols(Target => $link->Target, Type => $link->Type, LocalBase => $MergeInto->id);
-            if ($tmp->id)   {
-                    $link->Delete;
-            } else { 
-                $link->SetBase($MergeInto->URI);
-                $link->SetLocalBase($MergeInto->id);
-                $old_seen{$link->Type."-".$link->Target} =1;
-            }
+            $link->SetBase($NewTicket->URI);
         }
 
     }
 
     # Update time fields
-    foreach my $type qw(TimeEstimated TimeWorked TimeLeft) {
-
-        my $mutator = "Set$type";
-        $MergeInto->$mutator(
-            ( $MergeInto->$type() || 0 ) + ( $self->$type() || 0 ) );
+    $NewTicket->SetTimeEstimated(($NewTicket->TimeEstimated || 0) + ($self->TimeEstimated || 0));
+    $NewTicket->SetTimeWorked(   ($NewTicket->TimeWorked || 0)    + ($self->TimeWorked || 0));
+    $NewTicket->SetTimeLeft(     ($NewTicket->TimeLeft || 0)      + ($self->TimeLeft || 0));   
 
+    #add all of this ticket's watchers to that ticket.
+    my $requestors = $self->Requestors->MembersObj;
+    while (my $watcher = $requestors->Next) { 
+        $NewTicket->_AddWatcher( Type => 'Requestor',
+                                  Silent => 1,
+                                  PrincipalId => $watcher->MemberId);
     }
-#add all of this ticket's watchers to that ticket.
-    foreach my $watcher_type qw(Requestors Cc AdminCc) {
-
-        my $people = $self->$watcher_type->MembersObj;
-        my $addwatcher_type =  $watcher_type;
-        $addwatcher_type  =~ s/s$//;
 
-        while ( my $watcher = $people->Next ) {
-            
-           my ($val, $msg) =  $MergeInto->_AddWatcher(
-                Type        => $addwatcher_type,
-                Silent => 1,
-                PrincipalId => $watcher->MemberId
-            );
-            unless ($val) {
-                $RT::Logger->warning($msg);
-            }
+    my $Ccs = $self->Cc->MembersObj;
+    while (my $watcher = $Ccs->Next) { 
+        $NewTicket->_AddWatcher( Type => 'Cc',
+                                  Silent => 1,
+                                  PrincipalId => $watcher->MemberId);
     }
 
+    my $AdminCcs = $self->AdminCc->MembersObj;
+    while (my $watcher = $AdminCcs->Next) { 
+        $NewTicket->_AddWatcher( Type => 'AdminCc',
+                                  Silent => 1,
+                                  PrincipalId => $watcher->MemberId);
     }
 
+
     #find all of the tickets that were merged into this ticket. 
     my $old_mergees = new RT::Tickets( $self->CurrentUser );
     $old_mergees->Limit(
@@ -2844,16 +2828,15 @@ sub MergeInto {
     while ( my $ticket = $old_mergees->Next() ) {
         my ( $val, $msg ) = $ticket->__Set(
             Field => 'EffectiveId',
-            Value => $MergeInto->Id()
+            Value => $NewTicket->Id()
         );
     }
 
     #make a new link: this ticket is merged into that other ticket.
-    $self->AddLink( Type   => 'MergedInto', Target => $MergeInto->Id());
+    $self->AddLink( Type   => 'MergedInto', Target => $NewTicket->Id());
 
-    $MergeInto->_SetLastUpdated;    
+    $NewTicket->_SetLastUpdated;
 
-    $RT::Handle->Commit();
     return ( 1, $self->loc("Merge Successful") );
 }
 
@@ -2921,13 +2904,12 @@ ok ($root->Id, "Loaded the root user");
 my $t = RT::Ticket->new($RT::SystemUser);
 $t->Load(1);
 $t->SetOwner('root');
-is ($t->OwnerObj->Name, 'root' , "Root owns the ticket");
+ok ($t->OwnerObj->Name eq 'root' , "Root owns the ticket");
 $t->Steal();
-is ($t->OwnerObj->id, $RT::SystemUser->id , "SystemUser owns the ticket");
+ok ($t->OwnerObj->id eq $RT::SystemUser->id , "SystemUser owns the ticket");
 my $txns = RT::Transactions->new($RT::SystemUser);
 $txns->OrderBy(FIELD => 'id', ORDER => 'DESC');
-$txns->Limit(FIELD => 'ObjectId', VALUE => '1');
-$txns->Limit(FIELD => 'ObjectType', VALUE => 'RT::Ticket');
+$txns->Limit(FIELD => 'Ticket', VALUE => '1');
 my $steal  = $txns->First;
 ok($steal->OldValue == $root->Id , "Stolen from root");
 ok($steal->NewValue == $RT::SystemUser->Id , "Stolen by the systemuser");
@@ -3154,14 +3136,14 @@ my $tt = RT::Ticket->new($RT::SystemUser);
 my ($id, $tid, $msg)= $tt->Create(Queue => 'general',
             Subject => 'test');
 ok($id, $msg);
-is($tt->Status, 'new', "New ticket is created as new");
+ok($tt->Status eq 'new', "New ticket is created as new");
 
 ($id, $msg) = $tt->SetStatus('open');
 ok($id, $msg);
-like($msg, qr/open/i, "Status message is correct");
+ok ($msg =~ /open/i, "Status message is correct");
 ($id, $msg) = $tt->SetStatus('resolved');
 ok($id, $msg);
-like($msg, qr/resolved/i, "Status message is correct");
+ok ($msg =~ /resolved/i, "Status message is correct");
 ($id, $msg) = $tt->SetStatus('resolved');
 ok(!$id,$msg);
 
@@ -3209,9 +3191,9 @@ sub SetStatus {
                      RecordTransaction => 0 );
     }
 
-    #When we close a ticket, set the 'Resolved' attribute to now.
-    # It's misnamed, but that's just historical.
-    if ( $self->QueueObj->IsInactiveStatus($args{Status}) ) {
+    if ( $args{Status} =~ /^(resolved|rejected|dead)$/ ) {
+
+        #When we resolve a ticket, set the 'Resolved' attribute to now.
         $self->_Set( Field             => 'Resolved',
                      Value             => $now->ISO,
                      RecordTransaction => 0 );
@@ -3221,7 +3203,6 @@ sub SetStatus {
    my ($val, $msg)= $self->_Set( Field           => 'Status',
                           Value           => $args{Status},
                           TimeTaken       => 0,
-                          CheckACL      => 0,
                           TransactionType => 'Status'  );
 
     return($val,$msg);
@@ -3314,7 +3295,285 @@ sub Resolve {
 
 # }}}
 
-	
+# {{{ Routines dealing with custom fields
+
+
+# {{{ FirstCustomFieldValue
+
+=item FirstCustomFieldValue FIELD
+
+Return the content of the first value of CustomField FIELD for this ticket
+Takes a field id or name
+
+=cut
+
+sub FirstCustomFieldValue {
+    my $self = shift;
+    my $field = shift;
+    my $values = $self->CustomFieldValues($field);
+    if ($values->First) {
+        return $values->First->Content;
+    } else {
+        return undef;
+    }
+
+}
+
+
+
+# {{{ CustomFieldValues
+
+=item CustomFieldValues FIELD
+
+Return a TicketCustomFieldValues object of all values of CustomField FIELD for this ticket.  
+Takes a field id or name.
+
+
+=cut
+
+sub CustomFieldValues {
+    my $self  = shift;
+    my $field = shift;
+
+    my $cf = RT::CustomField->new($self->CurrentUser);
+
+    if ($field =~ /^\d+$/) {
+        $cf->LoadById($field);
+    } elsif ($field) {
+        $cf->LoadByNameAndQueue(Name => $field, Queue => $self->QueueObj->Id);
+        unless( $cf->id ) {
+            $cf->LoadByNameAndQueue(Name => $field, Queue => '0');
+        }
+    }
+    my $cf_values = RT::TicketCustomFieldValues->new( $self->CurrentUser );
+    $cf_values->LimitToCustomField($cf->id) if $cf->id;
+    $cf_values->LimitToTicket($self->Id());
+    $cf_values->OrderBy( FIELD => 'id' );
+
+    # @values is a CustomFieldValues object;
+    return ($cf_values);
+}
+
+# }}}
+
+# {{{ AddCustomFieldValue
+
+=item AddCustomFieldValue { Field => FIELD, Value => VALUE }
+
+VALUE should be a string.
+FIELD can be a CustomField object, a CustomField ID, or a CustomField Name.
+
+
+Adds VALUE as a value of CustomField FIELD.  If this is a single-value custom field,
+deletes the old value. 
+If VALUE isn't a valid value for the custom field, returns 
+(0, 'Error message' ) otherwise, returns (1, 'Success Message')
+
+=cut
+
+sub AddCustomFieldValue {
+    my $self = shift;
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+    $self->_AddCustomFieldValue(@_);
+}
+
+sub _AddCustomFieldValue {
+    my $self = shift;
+    my %args = (
+        Field => undef,
+        Value => undef,
+	RecordTransaction => 1,
+        @_
+    );
+
+    my $cf = RT::CustomField->new( $self->CurrentUser );
+    if ( UNIVERSAL::isa( $args{'Field'}, "RT::CustomField" ) ) {
+        $cf->Load( $args{'Field'}->id );
+    }
+    elsif ($args{'Field'} =~ /\D/) {
+        $cf->LoadByNameAndQueue( Name => $args{'Field'}, Queue => $self->QueueObj->Id );
+    }
+    else {
+        $cf->Load( $args{'Field'} );
+    }
+
+    unless ( $cf->Id ) {
+        return ( 0, $self->loc("Custom field [_1] not found", $args{'Field'}) );
+    }
+
+    # Load up a TicketCustomFieldValues object for this custom field and this ticket
+    my $values = $cf->ValuesForTicket( $self->id );
+
+    unless ( $cf->ValidateValue( $args{'Value'} ) ) {
+        return ( 0, $self->loc("Invalid value for custom field") );
+    }
+
+    # If the custom field only accepts a single value, delete the existing
+    # value and record a "changed from foo to bar" transaction
+    if ( $cf->SingleValue ) {
+
+        # We need to whack any old values here.  In most cases, the custom field should
+        # only have one value to delete.  In the pathalogical case, this custom field
+        # used to be a multiple and we have many values to whack....
+        my $cf_values = $values->Count;
+
+        if ( $cf_values > 1 ) {
+            my $i = 0;   #We want to delete all but the last one, so we can then
+                 # execute the same code to "change" the value from old to new
+            while ( my $value = $values->Next ) {
+                $i++;
+                if ( $i < $cf_values ) {
+                    my $old_value = $value->Content;
+                    my ($val, $msg) = $cf->DeleteValueForTicket(Ticket => $self->Id, Content => $value->Content);
+                    unless ($val) {
+                        return (0,$msg);
+                    }
+                    my ( $TransactionId, $Msg, $TransactionObj ) =
+                      $self->_NewTransaction(
+                        Type     => 'CustomField',
+                        Field    => $cf->Id,
+                        OldValue => $old_value
+                      );
+                }
+            }
+        }
+
+        my $old_value;
+        if (my $value = $cf->ValuesForTicket( $self->Id )->First) {
+	    $old_value = $value->Content();
+	    return (1) if $old_value eq $args{'Value'};
+	}
+
+        my ( $new_value_id, $value_msg ) = $cf->AddValueForTicket(
+            Ticket  => $self->Id,
+            Content => $args{'Value'}
+        );
+
+        unless ($new_value_id) {
+            return ( 0,
+                $self->loc("Could not add new custom field value for ticket. [_1] ",
+                  ,$value_msg) );
+        }
+
+        my $new_value = RT::TicketCustomFieldValue->new( $self->CurrentUser );
+        $new_value->Load($new_value_id);
+
+        # now that adding the new value was successful, delete the old one
+	if (defined $old_value) {
+	    my ($val, $msg) = $cf->DeleteValueForTicket(Ticket => $self->Id, Content => $old_value);
+	    unless ($val) { 
+	    		return (0,$msg);
+	    }
+	}
+
+	if ($args{'RecordTransaction'}) {
+        my ( $TransactionId, $Msg, $TransactionObj ) = $self->_NewTransaction(
+            Type     => 'CustomField',
+            Field    => $cf->Id,
+            OldValue => $old_value,
+            NewValue => $new_value->Content
+        );
+	}
+
+        if ( $old_value eq '' ) {
+            return ( 1, $self->loc("[_1] [_2] added", $cf->Name, $new_value->Content) );
+        }
+        elsif ( $new_value->Content eq '' ) {
+            return ( 1, $self->loc("[_1] [_2] deleted", $cf->Name, $old_value) );
+        }
+        else {
+            return ( 1, $self->loc("[_1] [_2] changed to [_3]", $cf->Name, $old_value, $new_value->Content ) );
+        }
+
+    }
+
+    # otherwise, just add a new value and record "new value added"
+    else {
+        my ( $new_value_id ) = $cf->AddValueForTicket(
+            Ticket  => $self->Id,
+            Content => $args{'Value'}
+        );
+
+        unless ($new_value_id) {
+            return ( 0,
+                $self->loc("Could not add new custom field value for ticket. "));
+        }
+    if ( $args{'RecordTransaction'} ) {
+        my ( $TransactionId, $Msg, $TransactionObj ) = $self->_NewTransaction(
+            Type     => 'CustomField',
+            Field    => $cf->Id,
+            NewValue => $args{'Value'}
+        );
+        unless ($TransactionId) {
+            return ( 0,
+                $self->loc( "Couldn't create a transaction: [_1]", $Msg ) );
+        }
+    }
+        return ( 1, $self->loc("[_1] added as a value for [_2]",$args{'Value'}, $cf->Name));
+    }
+
+}
+
+# }}}
+
+# {{{ DeleteCustomFieldValue
+
+=item DeleteCustomFieldValue { Field => FIELD, Value => VALUE }
+
+Deletes VALUE as a value of CustomField FIELD. 
+
+VALUE can be a string, a CustomFieldValue or a TicketCustomFieldValue.
+
+If VALUE isn't a valid value for the custom field, returns 
+(0, 'Error message' ) otherwise, returns (1, 'Success Message')
+
+=cut
+
+sub DeleteCustomFieldValue {
+    my $self = shift;
+    my %args = (
+        Field => undef,
+        Value => undef,
+        @_);
+
+    unless ( $self->CurrentUserHasRight('ModifyTicket') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+    my $cf = RT::CustomField->new( $self->CurrentUser );
+    if ( UNIVERSAL::isa( $args{'Field'}, "RT::CustomField" ) ) {
+        $cf->LoadById( $args{'Field'}->id );
+    }
+    else {
+        $cf->LoadById( $args{'Field'} );
+    }
+
+    unless ( $cf->Id ) {
+        return ( 0, $self->loc("Custom field not found") );
+    }
+
+
+     my ($val, $msg) = $cf->DeleteValueForTicket(Ticket => $self->Id, Content => $args{'Value'});
+     unless ($val) { 
+            return (0,$msg);
+     }
+        my ( $TransactionId, $Msg, $TransactionObj ) = $self->_NewTransaction(
+            Type     => 'CustomField',
+            Field    => $cf->Id,
+            OldValue => $args{'Value'}
+        );
+        unless($TransactionId) {
+            return(0, $self->loc("Couldn't create a transaction: [_1]", $Msg));
+        } 
+
+        return($TransactionId, $self->loc("[_1] is no longer a value for custom field [_2]", $args{'Value'}, $cf->Name));
+}
+
+# }}}
+
+# }}}
+
 # {{{ Actions + Routines dealing with transactions
 
 # {{{ sub SetTold and _SetTold
@@ -3369,6 +3628,113 @@ sub _SetTold {
 
 # }}}
 
+# {{{ sub Transactions 
+
+=head2 Transactions
+
+  Returns an RT::Transactions object of all transactions on this ticket
+
+=cut
+
+sub Transactions {
+    my $self = shift;
+
+    use RT::Transactions;
+    my $transactions = RT::Transactions->new( $self->CurrentUser );
+
+    #If the user has no rights, return an empty object
+    if ( $self->CurrentUserHasRight('ShowTicket') ) {
+        my $tickets = $transactions->NewAlias('Tickets');
+        $transactions->Join(
+            ALIAS1 => 'main',
+            FIELD1 => 'Ticket',
+            ALIAS2 => $tickets,
+            FIELD2 => 'id'
+        );
+        $transactions->Limit(
+            ALIAS => $tickets,
+            FIELD => 'EffectiveId',
+            VALUE => $self->id()
+        );
+
+        # if the user may not see comments do not return them
+        unless ( $self->CurrentUserHasRight('ShowTicketComments') ) {
+            $transactions->Limit(
+                FIELD    => 'Type',
+                OPERATOR => '!=',
+                VALUE    => "Comment",
+                ENTRYAGGREGATOR => 'AND'
+            );
+            $transactions->Limit(
+                FIELD    => 'Type',
+                OPERATOR => '!=',
+                VALUE    => "CommentEmailRecord",
+                ENTRYAGGREGATOR => 'AND'
+            );
+        }
+    }
+
+    return ($transactions);
+}
+
+# }}}
+
+# {{{ sub _NewTransaction
+
+=head2 _NewTransaction  PARAMHASH
+
+Private function to create a new RT::Transaction object for this ticket update
+
+=cut
+
+sub _NewTransaction {
+    my $self = shift;
+    my %args = (
+        TimeTaken => 0,
+        Type      => undef,
+        OldValue  => undef,
+        NewValue  => undef,
+        Data      => undef,
+        Field     => undef,
+        MIMEObj   => undef,
+        ActivateScrips => 1,
+        CommitScrips => 1,
+        @_
+    );
+
+    require RT::Transaction;
+    my $trans = new RT::Transaction( $self->CurrentUser );
+    my ( $transaction, $msg ) = $trans->Create(
+        Ticket    => $self->Id,
+        TimeTaken => $args{'TimeTaken'},
+        Type      => $args{'Type'},
+        Data      => $args{'Data'},
+        Field     => $args{'Field'},
+        NewValue  => $args{'NewValue'},
+        OldValue  => $args{'OldValue'},
+        MIMEObj   => $args{'MIMEObj'},
+        ActivateScrips => $args{'ActivateScrips'},
+        CommitScrips => $args{'CommitScrips'},
+    );
+
+    # Rationalize the object since we may have done things to it during the caching.
+    $self->Load($self->Id);
+
+    $RT::Logger->warning($msg) unless $transaction;
+
+    $self->_SetLastUpdated;
+
+    if ( defined $args{'TimeTaken'} ) {
+        $self->_UpdateTimeTaken( $args{'TimeTaken'} );
+    }
+    if ( $RT::UseTransactionBatch and $transaction ) {
+	    push @{$self->{_TransactionBatch}}, $trans;
+    }
+    return ( $transaction, $msg, $trans );
+}
+
+# }}}
+
 =head2 TransactionBatch
 
   Returns an array reference of all transactions created on this ticket during
@@ -3386,11 +3752,6 @@ sub TransactionBatch {
 sub DESTROY {
     my $self = shift;
 
-    # DESTROY methods need to localize $@, or it may unset it.  This
-    # causes $m->abort to not bubble all of the way up.  See perlbug
-    # http://rt.perl.org/rt3/Ticket/Display.html?id=17650
-    local $@;
-
     # The following line eliminates reentrancy.
     # It protects against the fact that perl doesn't deal gracefully
     # when an object's refcount is changed in its destructor.
@@ -3402,7 +3763,6 @@ sub DESTROY {
 	Stage		=> 'TransactionBatch',
 	TicketObj	=> $self,
 	TransactionObj	=> $batch->[0],
-	Type		=> join(',', (map { $_->Type } @{$batch}) )
     );
 }
 
@@ -3410,9 +3770,9 @@ sub DESTROY {
 
 # {{{ PRIVATE UTILITY METHODS. Mostly needed so Ticket can be a DBIx::Record
 
-# {{{ sub _OverlayAccessible
+# {{{ sub _ClassAccessible
 
-sub _OverlayAccessible {
+sub _ClassAccessible {
     {
         EffectiveId       => { 'read' => 1,  'write' => 1,  'public' => 1 },
           Queue           => { 'read' => 1,  'write' => 1 },
@@ -3494,7 +3854,7 @@ sub _Set {
                                                OldValue  => $Old,
                                                TimeTaken => $args{'TimeTaken'},
         );
-        return ( $Trans, scalar $TransObj->BriefDescription );
+        return ( $Trans, scalar $TransObj->Description );
     }
     else {
         return ( $ret, $msg );
@@ -3612,9 +3972,7 @@ sub HasRight {
 
     unless ( ( defined $args{'Principal'} ) and ( ref( $args{'Principal'} ) ) )
     {
-        Carp::cluck;
-        $RT::Logger->crit("Principal attrib undefined for Ticket::HasRight");
-        return(undef);
+        $RT::Logger->warning("Principal attrib undefined for Ticket::HasRight");
     }
 
     return (
@@ -3629,103 +3987,6 @@ sub HasRight {
 
 # }}}
 
-# {{{ sub Transactions 
-
-=head2 Transactions
-
-  Returns an RT::Transactions object of all transactions on this ticket
-
-=cut
-
-sub Transactions {
-    my $self = shift;
-
-    my $transactions = RT::Transactions->new( $self->CurrentUser );
-
-    #If the user has no rights, return an empty object
-    if ( $self->CurrentUserHasRight('ShowTicket') ) {
-        $transactions->LimitToTicket($self->id);
-
-        # if the user may not see comments do not return them
-        unless ( $self->CurrentUserHasRight('ShowTicketComments') ) {
-            $transactions->Limit(
-                FIELD    => 'Type',
-                OPERATOR => '!=',
-                VALUE    => "Comment"
-            );
-            $transactions->Limit(
-                FIELD    => 'Type',
-                OPERATOR => '!=',
-                VALUE    => "CommentEmailRecord",
-                ENTRYAGGREGATOR => 'AND'
-            );
-
-        }
-    }
-
-    return ($transactions);
-}
-
-# }}}
-
-
-# {{{ TransactionCustomFields
-
-=head2 TransactionCustomFields
-
-    Returns the custom fields that transactions on tickets will ahve.
-
-=cut
-
-sub TransactionCustomFields {
-    my $self = shift;
-    return $self->QueueObj->TicketTransactionCustomFields;
-}
-
-# }}}
-
-# {{{ sub CustomFieldValues
-
-=head2 CustomFieldValues
-
-# Do name => id mapping (if needed) before falling back to
-# RT::Record's CustomFieldValues
-
-See L<RT::Record>
-
-=cut
-
-sub CustomFieldValues {
-    my $self  = shift;
-    my $field = shift;
-    unless ( $field =~ /^\d+$/ ) {
-        my $cf = RT::CustomField->new( $self->CurrentUser );
-        $cf->LoadByNameAndQueue( Name => $field, Queue => $self->QueueObj->Id );
-        unless ( $cf->id ) {
-            $cf->LoadByNameAndQueue( Name => $field, Queue => '0' );
-        }
-        $field = $cf->id;
-    }
-    return $self->SUPER::CustomFieldValues($field);
-}
-
-# }}}
-
-# {{{ sub CustomFieldLookupType
-
-=head2 CustomFieldLookupType
-
-Returns the RT::Ticket lookup type, which can be passed to 
-RT::CustomField->Create() via the 'LookupType' hash key.
-
-=cut
-
-# }}}
-
-sub CustomFieldLookupType {
-    "RT::Queue-RT::Ticket";
-}
-
 1;
 
 =head1 AUTHOR
diff --git a/rt/lib/RT/Tickets.pm b/rt/lib/RT/Tickets.pm
index 0f880e1..7bf452d 100755
--- a/rt/lib/RT/Tickets.pm
+++ b/rt/lib/RT/Tickets.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Tickets_Overlay.pm b/rt/lib/RT/Tickets_Overlay.pm
index 0e6585c..582e786 100644
--- a/rt/lib/RT/Tickets_Overlay.pm
+++ b/rt/lib/RT/Tickets_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Major Changes:
 
 # - Decimated ProcessRestrictions and broke it into multiple
@@ -73,51 +73,44 @@
 =begin testing
 
 ok (require RT::Tickets);
-ok( my $testtickets = RT::Tickets->new( $RT::SystemUser ) );
-ok( $testtickets->LimitStatus( VALUE => 'deleted' ) );
-# Should be zero until 'allow_deleted_search'
-ok( $testtickets->Count == 0 );
 
 =end testing
 
 =cut
-
-package RT::Tickets;
-
 use strict;
-
-package RT::Tickets;
-
 no warnings qw(redefine);
 use vars qw(@SORTFIELDS);
 use RT::CustomFields;
 
+
 # Configuration Tables:
 
 # FIELDS is a mapping of searchable Field name, to Type, and other
 # metadata.
 
-my %FIELDS = (
-    Status          => ['ENUM'],
-    Queue           => [ 'ENUM' => 'Queue', ],
-    Type            => [ 'ENUM', ],
-    Creator         => [ 'ENUM' => 'User', ],
-    LastUpdatedBy   => [ 'ENUM' => 'User', ],
-    Owner           => [ 'ENUM' => 'User', ],
-    EffectiveId     => [ 'INT', ],
-    id              => [ 'INT', ],
-    InitialPriority => [ 'INT', ],
-    FinalPriority   => [ 'INT', ],
-    Priority        => [ 'INT', ],
-    TimeLeft        => [ 'INT', ],
-    TimeWorked      => [ 'INT', ],
-    MemberOf        => [ 'LINK' => To => 'MemberOf', ],
-    DependsOn       => [ 'LINK' => To => 'DependsOn', ],
-    RefersTo        => [ 'LINK' => To => 'RefersTo', ],
-    HasMember       => [ 'LINK' => From => 'MemberOf', ],
-    DependentOn     => [ 'LINK' => From => 'DependsOn', ],
-    DependedOnBy    => [ 'LINK' => From => 'DependsOn', ],
-    ReferredToBy    => [ 'LINK' => From => 'RefersTo', ],
+my %FIELDS =
+  ( Status	    => ['ENUM'],
+    Queue	    => ['ENUM' => 'Queue',],
+    Type	    => ['ENUM',],
+    Creator	    => ['ENUM' => 'User',],
+    LastUpdatedBy   => ['ENUM' => 'User',],
+    Owner	    => ['ENUM' => 'User',],
+    EffectiveId	    => ['INT',],
+    id		    => ['INT',],
+    InitialPriority => ['INT',],
+    FinalPriority   => ['INT',],
+    Priority	    => ['INT',],
+    TimeLeft	    => ['INT',],
+    TimeWorked	    => ['INT',],
+    MemberOf	    => ['LINK' => To => 'MemberOf', ],
+    DependsOn	    => ['LINK' => To => 'DependsOn',],
+    RefersTo        => ['LINK' => To => 'RefersTo',],
+    HasMember	    => ['LINK' => From => 'MemberOf',],
+    DependentOn     => ['LINK' => From => 'DependsOn',],
+    DependedOnBy     => ['LINK' => From => 'DependsOn',],
+    ReferredToBy    => ['LINK' => From => 'RefersTo',],
+#   HasDepender	    => ['LINK',],
+#   RelatedTo	    => ['LINK',],
     Told	    => ['DATE' => 'Told',],
     Starts	    => ['DATE' => 'Starts',],
     Started	    => ['DATE' => 'Started',],
@@ -133,75 +126,68 @@ my %FIELDS = (
     Requestor       => ['WATCHERFIELD' => 'Requestor',],
     Requestors       => ['WATCHERFIELD' => 'Requestor',],
     Cc              => ['WATCHERFIELD' => 'Cc',],
-    AdminCc         => ['WATCHERFIELD' => 'AdminCc',],
+    AdminCc         => ['WATCHERFIELD' => 'AdminCC',],
     Watcher	    => ['WATCHERFIELD'],
     LinkedTo	    => ['LINKFIELD',],
     CustomFieldValue =>['CUSTOMFIELD',],
     CF              => ['CUSTOMFIELD',],
-    Updated          => [ 'TRANSDATE', ],
-    RequestorGroup   => [ 'MEMBERSHIPFIELD' => 'Requestor', ],
-    CCGroup          => [ 'MEMBERSHIPFIELD' => 'Cc', ],
-    AdminCCGroup     => [ 'MEMBERSHIPFIELD' => 'AdminCc', ],
-    WatcherGroup     => [ 'MEMBERSHIPFIELD', ],
-);
+  );
 
 # Mapping of Field Type to Function
-my %dispatch = (
-    ENUM            => \&_EnumLimit,
-    INT             => \&_IntLimit,
-    LINK            => \&_LinkLimit,
-    DATE            => \&_DateLimit,
-    STRING          => \&_StringLimit,
-    TRANSFIELD      => \&_TransLimit,
-    TRANSDATE       => \&_TransDateLimit,
+my %dispatch =
+  ( ENUM	    => \&_EnumLimit,
+    INT		    => \&_IntLimit,
+    LINK	    => \&_LinkLimit,
+    DATE	    => \&_DateLimit,
+    STRING	    => \&_StringLimit,
+    TRANSFIELD	    => \&_TransLimit,
+    TRANSDATE	    => \&_TransDateLimit,
     WATCHERFIELD    => \&_WatcherLimit,
-    MEMBERSHIPFIELD => \&_WatcherMembershipLimit,
-    LINKFIELD       => \&_LinkFieldLimit,
-    CUSTOMFIELD     => \&_CustomFieldLimit,
-);
-my %can_bundle = ( WATCHERFIELD => "yeps", );
+    LINKFIELD	    => \&_LinkFieldLimit,
+    CUSTOMFIELD    => \&_CustomFieldLimit,
+  );
+my %can_bundle =
+  ( WATCHERFIELD => "yeps",
+  );
 
 # Default EntryAggregator per type
 # if you specify OP, you must specify all valid OPs
 my %DefaultEA = (
-    INT  => 'AND',
-    ENUM => {
-        '='  => 'OR',
-        '!=' => 'AND'
-    },
-    DATE => {
-        '='  => 'OR',
-        '>=' => 'AND',
-        '<=' => 'AND',
-        '>'  => 'AND',
-        '<'  => 'AND'
-    },
-    STRING => {
-        '='        => 'OR',
-        '!='       => 'AND',
-        'LIKE'     => 'AND',
-        'NOT LIKE' => 'AND'
-    },
-    TRANSFIELD   => 'AND',
-    TRANSDATE    => 'AND',
-    LINK         => 'OR',
-    LINKFIELD    => 'AND',
-    TARGET       => 'AND',
-    BASE         => 'AND',
-    WATCHERFIELD => {
-        '='        => 'OR',
-        '!='       => 'AND',
-        'LIKE'     => 'OR',
-        'NOT LIKE' => 'AND'
-    },
-
-    CUSTOMFIELD => 'OR',
-);
+                 INT		=> 'AND',
+                 ENUM		=> { '=' => 'OR',
+				     '!='=> 'AND'
+				   },
+                 DATE		=> { '=' => 'OR',
+				     '>='=> 'AND',
+				     '<='=> 'AND',
+				     '>' => 'AND',
+				     '<' => 'AND'
+				   },
+                 STRING		=> { '=' => 'OR',
+				     '!='=> 'AND',
+				     'LIKE'=> 'AND',
+				     'NOT LIKE'	=> 'AND'
+				   },
+                 TRANSFIELD	=> 'AND',
+                 TRANSDATE	=> 'AND',
+                 LINK           => 'OR',
+                 LINKFIELD	=> 'AND',
+                 TARGET		=> 'AND',
+                 BASE		=> 'AND',
+                 WATCHERFIELD	=> { '=' => 'OR',
+				     '!='=> 'AND',
+				     'LIKE'=> 'OR',
+				     'NOT LIKE'	=> 'AND'
+				   },
+
+                 CUSTOMFIELD	=> 'OR',
+                );
+
 
 # Helper functions for passing the above lexically scoped tables above
 # into Tickets_Overlay_SQL.
-sub FIELDS     { return \%FIELDS }
-sub dispatch   { return \%dispatch }
+sub FIELDS   { return \%FIELDS   }
+sub dispatch { return \%dispatch }
 sub can_bundle { return \%can_bundle }
 
 # Bring in the clowns.
@@ -210,10 +196,10 @@ require RT::Tickets_Overlay_SQL;
 # {{{ sub SortFields
 
 @SORTFIELDS = qw(id Status
-  Queue Subject
-  Owner Created Due Starts Started
-  Told
-  Resolved LastUpdated Priority TimeWorked TimeLeft);
+		 Queue Subject
+         Owner Created Due Starts Started
+         Told
+		 Resolved LastUpdated Priority TimeWorked TimeLeft);
 
 =head2 SortFields
 
@@ -222,12 +208,14 @@ Returns the list of fields that lists of tickets can easily be sorted by
 =cut
 
 sub SortFields {
-    my $self = shift;
-    return (@SORTFIELDS);
+	my $self = shift;
+	return(@SORTFIELDS);
 }
 
+
 # }}}
 
+
 # BEGIN SQL STUFF *********************************
 
 =head1 Limit Helper Routines
@@ -262,27 +250,26 @@ Meta Data:
 =cut
 
 sub _EnumLimit {
-    my ( $sb, $field, $op, $value, @rest ) = @_;
+  my ($sb,$field,$op,$value,@rest) = @_;
 
-    # SQL::Statement changes != to <>.  (Can we remove this now?)
-    $op = "!=" if $op eq "<>";
+  # SQL::Statement changes != to <>.  (Can we remove this now?)
+  $op = "!=" if $op eq "<>";
 
-    die "Invalid Operation: $op for $field"
-      unless $op eq "=" or $op eq "!=";
+  die "Invalid Operation: $op for $field"
+    unless $op eq "=" or $op eq "!=";
 
-    my $meta = $FIELDS{$field};
-    if ( defined $meta->[1] ) {
-        my $class = "RT::" . $meta->[1];
-        my $o     = $class->new( $sb->CurrentUser );
-        $o->Load($value);
-        $value = $o->Id;
-    }
-    $sb->_SQLLimit(
-        FIELD    => $field,
-        VALUE    => $value,
-        OPERATOR => $op,
-        @rest,
-    );
+  my $meta = $FIELDS{$field};
+  if (defined $meta->[1]) {
+    my $class = "RT::" . $meta->[1];
+    my $o = $class->new($sb->CurrentUser);
+    $o->Load( $value );
+    $value = $o->Id;
+  }
+  $sb->_SQLLimit( FIELD => $field,,
+	      VALUE => $value,
+	      OPERATOR => $op,
+	      @rest,
+	    );
 }
 
 =head2 _IntLimit
@@ -296,19 +283,20 @@ Meta Data:
 =cut
 
 sub _IntLimit {
-    my ( $sb, $field, $op, $value, @rest ) = @_;
+  my ($sb,$field,$op,$value,@rest) = @_;
 
-    die "Invalid Operator $op for $field"
-      unless $op =~ /^(=|!=|>|<|>=|<=)$/;
+  die "Invalid Operator $op for $field"
+    unless $op =~ /^(=|!=|>|<|>=|<=)$/;
 
-    $sb->_SQLLimit(
-        FIELD    => $field,
-        VALUE    => $value,
-        OPERATOR => $op,
-        @rest,
-    );
+  $sb->_SQLLimit(
+	     FIELD => $field,
+	     VALUE => $value,
+	     OPERATOR => $op,
+	     @rest,
+	    );
 }
 
+
 =head2 _LinkLimit
 
 Handle fields which deal with links between tickets.  (MemberOf, DependsOn)
@@ -320,114 +308,64 @@ Meta Data:
 =cut
 
 sub _LinkLimit {
-    my ( $sb, $field, $op, $value, @rest ) = @_;
+  my ($sb,$field,$op,$value,@rest) = @_;
 
-    my $meta = $FIELDS{$field};
-    die "Invalid Operator $op for $field" unless $op =~ /^(=|!=|IS)/io;
+  die "Op must be ="
+    unless $op eq "=";
 
-    die "Incorrect Metadata for $field"
-      unless ( defined $meta->[1] and defined $meta->[2] );
+  my $meta = $FIELDS{$field};
+  die "Incorrect Meta Data for $field"
+    unless (defined $meta->[1] and defined $meta->[2]);
 
-    my $direction = $meta->[1];
+  $sb->{_sql_linkalias} = $sb->NewAlias ('Links')
+    unless defined $sb->{_sql_linkalias};
 
-    my $matchfield;
-    my $linkfield;
-    my $is_local = 1;
-    my $is_null  = 0;
-    if ( $direction eq 'To' ) {
-        $matchfield = "Target";
-        $linkfield  = "Base";
+  $sb->_OpenParen();
 
-    }
-    elsif ( $direction eq 'From' ) {
-        $linkfield  = "Target";
-        $matchfield = "Base";
+  $sb->_SQLLimit(
+	     ALIAS => $sb->{_sql_linkalias},
+	     FIELD =>   'Type',
+	     OPERATOR => '=',
+	     VALUE => $meta->[2],
+	     @rest,
+	    );
 
-    }
-    else {
-        die "Invalid link direction '$meta->[1]' for $field\n";
-    }
+  if ($meta->[1] eq "To") {
+    my $matchfield = ( $value  =~ /^(\d+)$/ ? "LocalTarget" : "Target" );
 
-    if ( $op eq '=' || $op =~ /^is/oi ) {
-        if ( $value eq '' || $value =~ /^null$/io ) {
-            $is_null = 1;
-        }
-        elsif ( $value =~ /\D/o ) {
-            $is_local = 0;
-        }
-        else {
-            $is_local = 1;
-        }
-    }
-
-#For doing a left join to find "unlinked tickets" we want to generate a query that looks like this
-#    SELECT main.* FROM Tickets main
-#        LEFT JOIN Links Links_1 ON (     (Links_1.Type = 'MemberOf')
-#                                      AND(main.id = Links_1.LocalTarget))
-#        WHERE   ((main.EffectiveId = main.id))
-#            AND ((main.Status != 'deleted'))
-#            AND (Links_1.LocalBase IS NULL);
-
-    if ($is_null) {
-        my $linkalias = $sb->Join(
-            TYPE   => 'left',
-            ALIAS1 => 'main',
-            FIELD1 => 'id',
-            TABLE2 => 'Links',
-            FIELD2 => 'Local' . $linkfield
-        );
-
-        $sb->SUPER::Limit(
-            LEFTJOIN => $linkalias,
-            FIELD    => 'Type',
-            OPERATOR => '=',
-            VALUE    => $meta->[2],
-            @rest,
-        );
-
-        $sb->_SQLLimit(
-            ALIAS           => $linkalias,
-            ENTRYAGGREGATOR => 'AND',
-            FIELD           => ( $is_local ? "Local$matchfield" : $matchfield ),
-            OPERATOR        => 'IS',
-            VALUE           => 'NULL',
-            QUOTEVALUE      => '0',
-        );
+    $sb->_SQLLimit(
+	       ALIAS => $sb->{_sql_linkalias},
+	       ENTRYAGGREGATOR => 'AND',
+	       FIELD =>   $matchfield,
+	       OPERATOR => '=',
+	       VALUE => $value ,
+	      );
 
-    }
-    else {
+    #If we're searching on target, join the base to ticket.id
+    $sb->_SQLJoin( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'},
+	       ALIAS2 => $sb->{_sql_linkalias},	 FIELD2 => 'LocalBase');
 
-        $sb->{_sql_linkalias} = $sb->NewAlias('Links')
-          unless defined $sb->{_sql_linkalias};
+  } elsif ( $meta->[1] eq "From" ) {
+    my $matchfield = ( $value  =~ /^(\d+)$/ ? "LocalBase" : "Base" );
 
-        $sb->_OpenParen();
+    $sb->_SQLLimit(
+	       ALIAS => $sb->{_sql_linkalias},
+	       ENTRYAGGREGATOR => 'AND',
+	       FIELD =>   $matchfield,
+	       OPERATOR => '=',
+	       VALUE => $value ,
+	      );
 
-        $sb->_SQLLimit(
-            ALIAS    => $sb->{_sql_linkalias},
-            FIELD    => 'Type',
-            OPERATOR => '=',
-            VALUE    => $meta->[2],
-            @rest,
-        );
+    #If we're searching on base, join the target to ticket.id
+    $sb->_SQLJoin( ALIAS1 => 'main',     FIELD1 => $sb->{'primary_key'},
+	       ALIAS2 => $sb->{_sql_linkalias}, FIELD2 => 'LocalTarget');
 
-        $sb->_SQLLimit(
-            ALIAS           => $sb->{_sql_linkalias},
-            ENTRYAGGREGATOR => 'AND',
-            FIELD           => ( $is_local ? "Local$matchfield" : $matchfield ),
-            OPERATOR        => '=',
-            VALUE           => $value,
-        );
+  } else {
+    die "Invalid link direction '$meta->[1]' for $field\n";
+  }
 
-        #If we're searching on target, join the base to ticket.id
-        $sb->_SQLJoin(
-            ALIAS1 => 'main',
-            FIELD1 => $sb->{'primary_key'},
-            ALIAS2 => $sb->{_sql_linkalias},
-            FIELD2 => 'Local' . $linkfield
-        );
+  $sb->_CloseParen();
 
-        $sb->_CloseParen();
-    }
 }
 
 =head2 _DateLimit
@@ -440,61 +378,64 @@ Meta Data:
 =cut
 
 sub _DateLimit {
-    my ( $sb, $field, $op, $value, @rest ) = @_;
+  my ($sb,$field,$op,$value,@rest) = @_;
 
-    die "Invalid Date Op: $op"
-      unless $op =~ /^(=|>|<|>=|<=)$/;
+  die "Invalid Date Op: $op"
+     unless $op =~ /^(=|>|<|>=|<=)$/;
 
-    my $meta = $FIELDS{$field};
-    die "Incorrect Meta Data for $field"
-      unless ( defined $meta->[1] );
+  my $meta = $FIELDS{$field};
+  die "Incorrect Meta Data for $field"
+    unless (defined $meta->[1]);
 
-    use POSIX 'strftime';
-    
-    my $date = RT::Date->new($sb->CurrentUser);
-    $date->Set(Format => 'unknown', Value => $value); 
-    my $time = $date->Unix;
+  require Time::ParseDate;
+  use POSIX 'strftime';
 
-    if ( $op eq "=" ) {
+  # FIXME: Replace me with RT::Date( Type => 'unknown' ...)
+  my $time = Time::ParseDate::parsedate( $value,
+			UK => $RT::DateDayBeforeMonth,
+			PREFER_PAST => $RT::AmbiguousDayInPast,
+			PREFER_FUTURE => !($RT::AmbiguousDayInPast),
+                        FUZZY => 1
+				       );
 
-        # if we're specifying =, that means we want everything on a
-        # particular single day.  in the database, we need to check for >
-        # and < the edges of that day.
+  if ($op eq "=") {
+    # if we're specifying =, that means we want everything on a
+    # particular single day.  in the database, we need to check for >
+    # and < the edges of that day.
 
-        my $daystart =
-          strftime( "%Y-%m-%d %H:%M", gmtime( $time - ( $time % 86400 ) ) );
-        my $dayend = strftime( "%Y-%m-%d %H:%M",
-            gmtime( $time + ( 86399 - $time % 86400 ) ) );
+    my $daystart = strftime("%Y-%m-%d %H:%M",
+			    gmtime($time - ( $time % 86400 )));
+    my $dayend   = strftime("%Y-%m-%d %H:%M",
+			    gmtime($time + ( 86399 - $time % 86400 )));
 
-        $sb->_OpenParen;
+    $sb-> _OpenParen;
 
-        $sb->_SQLLimit(
-            FIELD    => $meta->[1],
-            OPERATOR => ">=",
-            VALUE    => $daystart,
-            @rest,
-        );
+    $sb->_SQLLimit(
+		   FIELD => $meta->[1],
+		   OPERATOR => ">=",
+		   VALUE => $daystart,
+		   @rest,
+		  );
 
-        $sb->_SQLLimit(
-            FIELD    => $meta->[1],
-            OPERATOR => "<=",
-            VALUE    => $dayend,
-            @rest,
-            ENTRYAGGREGATOR => 'AND',
-        );
+    $sb->_SQLLimit(
+		   FIELD => $meta->[1],
+		   OPERATOR => "<=",
+		   VALUE => $dayend,
+		   @rest,
+		   ENTRYAGGREGATOR => 'AND',
+		  );
 
-        $sb->_CloseParen;
+    $sb-> _CloseParen;
 
-    }
-    else {
-        $value = strftime( "%Y-%m-%d %H:%M", gmtime($time) );
-        $sb->_SQLLimit(
-            FIELD    => $meta->[1],
-            OPERATOR => $op,
-            VALUE    => $value,
-            @rest,
-        );
-    }
+  } else {
+    $value = strftime("%Y-%m-%d %H:%M", gmtime($time));
+    $sb->_SQLLimit(
+		   FIELD => $meta->[1],
+		   OPERATOR => $op,
+		   VALUE => $value,
+		   @rest,
+		  );
+  }
 }
 
 =head2 _StringLimit
@@ -507,19 +448,19 @@ Meta Data:
 =cut
 
 sub _StringLimit {
-    my ( $sb, $field, $op, $value, @rest ) = @_;
+  my ($sb,$field,$op,$value,@rest) = @_;
 
-    # FIXME:
-    # Valid Operators:
-    #  =, !=, LIKE, NOT LIKE
+  # FIXME:
+  # Valid Operators:
+  #  =, !=, LIKE, NOT LIKE
 
-    $sb->_SQLLimit(
-        FIELD         => $field,
-        OPERATOR      => $op,
-        VALUE         => $value,
-        CASESENSITIVE => 0,
-        @rest,
-    );
+  $sb->_SQLLimit(
+	     FIELD => $field,
+	     OPERATOR => $op,
+	     VALUE => $value,
+	     CASESENSITIVE => 0,
+	     @rest,
+	    );
 }
 
 =head2 _TransDateLimit
@@ -533,91 +474,40 @@ Meta Data:
 
 =cut
 
-# This routine should really be factored into translimit.
 sub _TransDateLimit {
-    my ( $sb, $field, $op, $value, @rest ) = @_;
-
-    # See the comments for TransLimit, they apply here too
-
-    $sb->{_sql_transalias} = $sb->NewAlias('Transactions')
-        unless defined $sb->{_sql_transalias};
-    $sb->{_sql_trattachalias} = $sb->NewAlias('Attachments')
-        unless defined $sb->{_sql_trattachalias};
-
-    my $date = RT::Date->new( $sb->CurrentUser );
-    $date->Set( Format => 'unknown', Value => $value );
-    my $time = $date->Unix;
-
-    $sb->_OpenParen;
-    if ( $op eq "=" ) {
-
-        # if we're specifying =, that means we want everything on a
-        # particular single day.  in the database, we need to check for >
-        # and < the edges of that day.
-
-        my $daystart = strftime( "%Y-%m-%d %H:%M",
-            gmtime( $time - ( $time % 86400 ) ) );
-        my $dayend = strftime( "%Y-%m-%d %H:%M",
-            gmtime( $time + ( 86399 - $time % 86400 ) ) );
-
-        $sb->_SQLLimit(
-            ALIAS         => $sb->{_sql_transalias},
-            FIELD         => 'Created',
-            OPERATOR      => ">=",
-            VALUE         => $daystart,
-            CASESENSITIVE => 0,
-            @rest
-        );
-        $sb->_SQLLimit(
-            ALIAS           => $sb->{_sql_transalias},
-            FIELD           => 'Created',
-            OPERATOR        => "<=",
-            VALUE           => $dayend,
-            CASESENSITIVE   => 0,
-            @rest,
-            ENTRYAGGREGATOR => 'AND',
-        );
+  my ($sb,$field,$op,$value,@rest) = @_;
 
-    }
+  # See the comments for TransLimit, they apply here too
 
-    # not searching for a single day
-    else {
+  $sb->{_sql_transalias} = $sb->NewAlias ('Transactions')
+    unless defined $sb->{_sql_transalias};
+  $sb->{_sql_trattachalias} = $sb->NewAlias ('Attachments')
+    unless defined $sb->{_sql_trattachalias};
 
-        #Search for the right field
-        $sb->_SQLLimit(
-            ALIAS         => $sb->{_sql_transalias},
-            FIELD         => 'Created',
-            OPERATOR      => $op,
-            VALUE         => $value,
-            CASESENSITIVE => 0,
-            @rest
-        );
-    }
+  $sb->_OpenParen;
 
-    # Join Transactions To Attachments
+  # Join Transactions To Attachments
+  $sb->_SQLJoin( ALIAS1 => $sb->{_sql_trattachalias}, FIELD1 => 'TransactionId',
+	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'id');
 
-    $sb->_SQLJoin(
-        ALIAS1 => $sb->{_sql_trattachalias},
-        FIELD1 => 'TransactionId',
-        ALIAS2 => $sb->{_sql_transalias},
-        FIELD2 => 'id',
-    );
+  # Join Transactions to Tickets
+  $sb->_SQLJoin( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'}, # UGH!
+	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'Ticket');
 
-    # Join Transactions to Tickets
-    $sb->_SQLJoin(
-        ALIAS1 => 'main',
-        FIELD1 => $sb->{'primary_key'},     # UGH!
-        ALIAS2 => $sb->{_sql_transalias},
-        FIELD2 => 'ObjectId'
-    );
+  my $d = new RT::Date( $sb->CurrentUser );
+  $d->Set( Format => 'ISO', Value => $value);
+   $value = $d->ISO;
 
-    $sb->SUPER::Limit(
-        ALIAS => $sb->{_sql_transalias},
-        FIELD => 'ObjectType',
-        VALUE => 'RT::Ticket'
-    );
+  #Search for the right field
+  $sb->_SQLLimit(ALIAS => $sb->{_sql_trattachalias},
+		 FIELD =>    'Created',
+		 OPERATOR => $op,
+		 VALUE =>    $value,
+		 CASESENSITIVE => 0,
+		 @rest
+		);
 
-    $sb->_CloseParen;
+  $sb->_CloseParen;
 }
 
 =head2 _TransLimit
@@ -630,81 +520,65 @@ Meta Data:
 =cut
 
 sub _TransLimit {
+  # Content, ContentType, Filename
 
-    # Content, ContentType, Filename
-
-    # If only this was this simple.  We've got to do something
-    # complicated here:
+  # If only this was this simple.  We've got to do something
+  # complicated here:
 
-    #Basically, we want to make sure that the limits apply to
-    #the same attachment, rather than just another attachment
-    #for the same ticket, no matter how many clauses we lump
-    #on. We put them in TicketAliases so that they get nuked
-    #when we redo the join.
+            #Basically, we want to make sure that the limits apply to
+            #the same attachment, rather than just another attachment
+            #for the same ticket, no matter how many clauses we lump
+            #on. We put them in TicketAliases so that they get nuked
+            #when we redo the join.
 
-    # In the SQL, we might have
-    #       (( Content = foo ) or ( Content = bar AND Content = baz ))
-    # The AND group should share the same Alias.
+  # In the SQL, we might have
+  #       (( Content = foo ) or ( Content = bar AND Content = baz ))
+  # The AND group should share the same Alias.
 
-    # Actually, maybe it doesn't matter.  We use the same alias and it
-    # works itself out? (er.. different.)
+  # Actually, maybe it doesn't matter.  We use the same alias and it
+  # works itself out? (er.. different.)
 
-    # Steal more from _ProcessRestrictions
+  # Steal more from _ProcessRestrictions
 
-    # FIXME: Maybe look at the previous FooLimit call, and if it was a
-    # TransLimit and EntryAggregator == AND, reuse the Aliases?
+  # FIXME: Maybe look at the previous FooLimit call, and if it was a
+  # TransLimit and EntryAggregator == AND, reuse the Aliases?
 
-    # Or better - store the aliases on a per subclause basis - since
-    # those are going to be the things we want to relate to each other,
-    # anyway.
+  # Or better - store the aliases on a per subclause basis - since
+  # those are going to be the things we want to relate to each other,
+  # anyway.
 
-    # maybe we should not allow certain kinds of aggregation of these
-    # clauses and do a psuedo regex instead? - the problem is getting
-    # them all into the same subclause when you have (A op B op C) - the
-    # way they get parsed in the tree they're in different subclauses.
+  # maybe we should not allow certain kinds of aggregation of these
+  # clauses and do a psuedo regex instead? - the problem is getting
+  # them all into the same subclause when you have (A op B op C) - the
+  # way they get parsed in the tree they're in different subclauses.
 
-    my ( $self, $field, $op, $value, @rest ) = @_;
+  my ($sb,$field,$op,$value,@rest) = @_;
 
-    $self->{_sql_transalias} = $self->NewAlias('Transactions')
-      unless defined $self->{_sql_transalias};
-    $self->{_sql_trattachalias} = $self->NewAlias('Attachments')
-      unless defined $self->{_sql_trattachalias};
+  $sb->{_sql_transalias} = $sb->NewAlias ('Transactions')
+    unless defined $sb->{_sql_transalias};
+  $sb->{_sql_trattachalias} = $sb->NewAlias ('Attachments')
+    unless defined $sb->{_sql_trattachalias};
 
-    $self->_OpenParen;
-
-    #Search for the right field
-    $self->_SQLLimit(
-        ALIAS         => $self->{_sql_trattachalias},
-        FIELD         => $field,
-        OPERATOR      => $op,
-        VALUE         => $value,
-        CASESENSITIVE => 0,
-        @rest
-    );
+  $sb->_OpenParen;
 
-    $self->_SQLJoin(
-        ALIAS1 => $self->{_sql_trattachalias},
-        FIELD1 => 'TransactionId',
-        ALIAS2 => $self->{_sql_transalias},
-        FIELD2 => 'id'
-    );
+  #Search for the right field
+  $sb->_SQLLimit(ALIAS => $sb->{_sql_trattachalias},
+		 FIELD =>    $field,
+		 OPERATOR => $op,
+		 VALUE =>    $value,
+		 CASESENSITIVE => 0,
+		 @rest
+		);
 
-    # Join Transactions to Tickets
-    $self->_SQLJoin(
-        ALIAS1 => 'main',
-        FIELD1 => $self->{'primary_key'},     # Why not use "id" here?
-        ALIAS2 => $self->{_sql_transalias},
-        FIELD2 => 'ObjectId'
-    );
+  # Join Transactions To Attachments
+  $sb->_SQLJoin( ALIAS1 => $sb->{_sql_trattachalias}, FIELD1 => 'TransactionId',
+	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'id');
 
-    $self->SUPER::Limit(
-        ALIAS           => $self->{_sql_transalias},
-        FIELD           => 'ObjectType',
-        VALUE           => 'RT::Ticket',
-        ENTRYAGGREGATOR => 'AND'
-    );
+  # Join Transactions to Tickets
+  $sb->_SQLJoin( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'}, # UGH!
+	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'Ticket');
 
-    $self->_CloseParen;
+  $sb->_CloseParen;
 
 }
 
@@ -793,55 +667,12 @@ sub _WatcherLimit {
 
     $self->_OpenParen;
 
-    # Find out what sort of watcher we're looking for
-    my $fieldname;
-    if ( ref $field ) {
-        $fieldname = $field->[0]->[0];
-    }
-    else {
-        $fieldname = $field;
-    }
-    my $meta = $FIELDS{$fieldname};
-    my $type = ( defined $meta->[1] ? $meta->[1] : undef );
-
-# We only want _one_ clause for all of requestors, cc, admincc
-# It's less flexible than what we used to do, but now it sort of actually works. (no huge cartesian products that hose the db)
-    my $groups = $self->{ 'watcherlimit_' . ('global') . "_groups" } ||=
-      $self->NewAlias('Groups');
-    my $groupmembers =
-      $self->{ 'watcherlimit_' . ('global') . "_groupmembers" } ||=
-      $self->NewAlias('CachedGroupMembers');
-    my $users = $self->{ 'watcherlimit_' . ('global') . "_users" } ||=
-      $self->NewAlias('Users');
-
-# Use regular joins instead of SQL joins since we don't want the joins inside ticketsql or we get a huge cartesian product
-    $self->SUPER::Limit(
-        ALIAS           => $groups,
-        FIELD           => 'Domain',
-        VALUE           => 'RT::Ticket-Role',
-        ENTRYAGGREGATOR => 'AND'
-    );
-    $self->Join(
-        ALIAS1 => $groups,
-        FIELD1 => 'Instance',
-        ALIAS2 => 'main',
-        FIELD2 => 'id'
-    );
-    $self->Join(
-        ALIAS1 => $groups,
-        FIELD1 => 'id',
-        ALIAS2 => $groupmembers,
-        FIELD2 => 'GroupId'
-    );
-    $self->Join(
-        ALIAS1 => $groupmembers,
-        FIELD1 => 'MemberId',
-        ALIAS2 => $users,
-        FIELD2 => 'id'
-    );
+    my $groups       = $self->NewAlias('Groups');
+    my $groupmembers = $self->NewAlias('CachedGroupMembers');
+    my $users        = $self->NewAlias('Users');
 
     # If we're looking for multiple watchers of a given type,
-    # TicketSQL will be handing it to us as an array of clauses in
+    # TicketSQL will be handing it to us as an array of cluases in
     # $field
     if ( ref $field ) {    # gross hack
         $self->_OpenParen;
@@ -865,93 +696,7 @@ sub _WatcherLimit {
             VALUE         => $value,
             OPERATOR      => $op,
             CASESENSITIVE => 0,
-            %rest
-        );
-    }
-
-    $self->_SQLLimit(
-        ALIAS           => $groups,
-        FIELD           => 'Type',
-        VALUE           => $type,
-        ENTRYAGGREGATOR => 'AND'
-      )
-      if ($type);
-
-    $self->_CloseParen;
-}
-
-=head2 _WatcherMembershipLimit
-
-Handle watcher membership limits, i.e. whether the watcher belongs to a
-specific group or not.
-
-Meta Data:
-  1: Field to query on
-
-SELECT DISTINCT main.*
-FROM
-    Tickets main,
-    Groups Groups_1,
-    CachedGroupMembers CachedGroupMembers_2,
-    Users Users_3
-WHERE (
-    (main.EffectiveId = main.id)
-) AND (
-    (main.Status != 'deleted')
-) AND (
-    (main.Type = 'ticket')
-) AND (
-    (
-	(Users_3.EmailAddress = '22')
-	    AND
-	(Groups_1.Domain = 'RT::Ticket-Role')
-	    AND
-	(Groups_1.Type = 'RequestorGroup')
-    )
-) AND
-    Groups_1.Instance = main.id
-AND
-    Groups_1.id = CachedGroupMembers_2.GroupId
-AND
-    CachedGroupMembers_2.MemberId = Users_3.id
-ORDER BY main.id ASC
-LIMIT 25
-
-=cut
-
-sub _WatcherMembershipLimit {
-    my ( $self, $field, $op, $value, @rest ) = @_;
-    my %rest = @rest;
-
-    $self->_OpenParen;
-
-    my $groups       = $self->NewAlias('Groups');
-    my $groupmembers = $self->NewAlias('CachedGroupMembers');
-    my $users        = $self->NewAlias('Users');
-    my $memberships  = $self->NewAlias('CachedGroupMembers');
-
-    if ( ref $field ) {    # gross hack
-        my @bundle = @$field;
-        $self->_OpenParen;
-        for my $chunk (@bundle) {
-            ( $field, $op, $value, @rest ) = @$chunk;
-            $self->_SQLLimit(
-                ALIAS    => $memberships,
-                FIELD    => 'GroupId',
-                VALUE    => $value,
-                OPERATOR => $op,
-                @rest,
-            );
-        }
-        $self->_CloseParen;
-    }
-    else {
-        $self->_SQLLimit(
-            ALIAS    => $memberships,
-            FIELD    => 'GroupId',
-            VALUE    => $value,
-            OPERATOR => $op,
-            @rest,
+            %rest,
         );
     }
 
@@ -963,7 +708,7 @@ sub _WatcherMembershipLimit {
         ENTRYAGGREGATOR => 'AND'
     );
 
-    $self->Join(
+    $self->_SQLJoin(
         ALIAS1 => $groups,
         FIELD1 => 'Instance',
         ALIAS2 => 'main',
@@ -985,107 +730,82 @@ sub _WatcherMembershipLimit {
         );
     }
 
-    $self->Join(
+    $self->_SQLJoin(
         ALIAS1 => $groups,
         FIELD1 => 'id',
         ALIAS2 => $groupmembers,
         FIELD2 => 'GroupId'
     );
 
-    $self->Join(
+    $self->_SQLJoin(
         ALIAS1 => $groupmembers,
         FIELD1 => 'MemberId',
         ALIAS2 => $users,
         FIELD2 => 'id'
     );
 
-    $self->Join(
-        ALIAS1 => $memberships,
-        FIELD1 => 'MemberId',
-        ALIAS2 => $users,
-        FIELD2 => 'id'
-    );
-
     $self->_CloseParen;
 
 }
 
 sub _LinkFieldLimit {
-    my $restriction;
-    my $self;
-    my $LinkAlias;
-    my %args;
-    if ( $restriction->{'TYPE'} ) {
-        $self->SUPER::Limit(
-            ALIAS           => $LinkAlias,
-            ENTRYAGGREGATOR => 'AND',
-            FIELD           => 'Type',
-            OPERATOR        => '=',
-            VALUE           => $restriction->{'TYPE'}
-        );
+  my $restriction;
+  my $self;
+  my $LinkAlias;
+  my %args;
+  if ($restriction->{'TYPE'}) {
+    $self->SUPER::Limit(ALIAS => $LinkAlias,
+			ENTRYAGGREGATOR => 'AND',
+			FIELD =>   'Type',
+			OPERATOR => '=',
+			VALUE =>    $restriction->{'TYPE'} );
+  }
+
+   #If we're trying to limit it to things that are target of
+  if ($restriction->{'TARGET'}) {
+    # If the TARGET is an integer that means that we want to look at
+    # the LocalTarget field. otherwise, we want to look at the
+    # "Target" field
+    my ($matchfield);
+    if ($restriction->{'TARGET'} =~/^(\d+)$/) {
+      $matchfield = "LocalTarget";
+    } else {
+      $matchfield = "Target";
     }
-
-    #If we're trying to limit it to things that are target of
-    if ( $restriction->{'TARGET'} ) {
-
-        # If the TARGET is an integer that means that we want to look at
-        # the LocalTarget field. otherwise, we want to look at the
-        # "Target" field
-        my ($matchfield);
-        if ( $restriction->{'TARGET'} =~ /^(\d+)$/ ) {
-            $matchfield = "LocalTarget";
-        }
-        else {
-            $matchfield = "Target";
-        }
-        $self->SUPER::Limit(
-            ALIAS           => $LinkAlias,
-            ENTRYAGGREGATOR => 'AND',
-            FIELD           => $matchfield,
-            OPERATOR        => '=',
-            VALUE           => $restriction->{'TARGET'}
-        );
-
-        #If we're searching on target, join the base to ticket.id
-        $self->_SQLJoin(
-            ALIAS1 => 'main',
-            FIELD1 => $self->{'primary_key'},
-            ALIAS2 => $LinkAlias,
-            FIELD2 => 'LocalBase'
-        );
+    $self->SUPER::Limit(ALIAS => $LinkAlias,
+			ENTRYAGGREGATOR => 'AND',
+			FIELD =>   $matchfield,
+			OPERATOR => '=',
+			VALUE =>    $restriction->{'TARGET'} );
+    #If we're searching on target, join the base to ticket.id
+    $self->_SQLJoin( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
+		 ALIAS2 => $LinkAlias,
+		 FIELD2 => 'LocalBase');
+  }
+  #If we're trying to limit it to things that are base of
+  elsif ($restriction->{'BASE'}) {
+    # If we're trying to match a numeric link, we want to look at
+    # LocalBase, otherwise we want to look at "Base"
+    my ($matchfield);
+    if ($restriction->{'BASE'} =~/^(\d+)$/) {
+      $matchfield = "LocalBase";
+    } else {
+      $matchfield = "Base";
     }
 
-    #If we're trying to limit it to things that are base of
-    elsif ( $restriction->{'BASE'} ) {
-
-        # If we're trying to match a numeric link, we want to look at
-        # LocalBase, otherwise we want to look at "Base"
-        my ($matchfield);
-        if ( $restriction->{'BASE'} =~ /^(\d+)$/ ) {
-            $matchfield = "LocalBase";
-        }
-        else {
-            $matchfield = "Base";
-        }
-
-        $self->SUPER::Limit(
-            ALIAS           => $LinkAlias,
-            ENTRYAGGREGATOR => 'AND',
-            FIELD           => $matchfield,
-            OPERATOR        => '=',
-            VALUE           => $restriction->{'BASE'}
-        );
-
-        #If we're searching on base, join the target to ticket.id
-        $self->_SQLJoin(
-            ALIAS1 => 'main',
-            FIELD1 => $self->{'primary_key'},
-            ALIAS2 => $LinkAlias,
-            FIELD2 => 'LocalTarget'
-        );
-    }
+    $self->SUPER::Limit(ALIAS => $LinkAlias,
+			ENTRYAGGREGATOR => 'AND',
+			FIELD => $matchfield,
+			OPERATOR => '=',
+			VALUE =>    $restriction->{'BASE'} );
+    #If we're searching on base, join the target to ticket.id
+    $self->_SQLJoin( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
+		 ALIAS2 => $LinkAlias,
+		 FIELD2 => 'LocalTarget')
+  }
 }
 
+
 =head2 KeywordLimit
 
 Limit based on Keywords
@@ -1096,137 +816,97 @@ Meta Data:
 =cut
 
 sub _CustomFieldLimit {
-    my ( $self, $_field, $op, $value, @rest ) = @_;
+  my ($self,$_field,$op,$value,@rest) = @_;
 
-    my %rest  = @rest;
-    my $field = $rest{SUBKEY} || die "No field specified";
+  my %rest = @rest;
+  my $field = $rest{SUBKEY} || die "No field specified";
 
-    # For our sanity, we can only limit on one queue at a time
-    my $queue = 0;
+  # For our sanity, we can only limit on one queue at a time
+  my $queue = 0;
 
-    if ( $field =~ /^(.+?)\.{(.+)}$/ ) {
-        $queue = $1;
-        $field = $2;
-    }
-    $field = $1 if $field =~ /^{(.+)}$/;    # trim { }
 
+  if ($field =~ /^(.+?)\.{(.+)}$/) {
+    $queue =  $1;
+    $field = $2;
+   }
+    $field = $1 if $field =~ /^{(.+)}$/; # trim { }
 
-# If we're trying to find custom fields that don't match something, we
-# want tickets where the custom field has no value at all.  Note that
-# we explicitly don't include the "IS NULL" case, since we would
-# otherwise end up with a redundant clause.
+    my $q = RT::Queue->new($self->CurrentUser);
+    $q->Load($queue) if ($queue);
 
-    my $null_columns_ok;
-    if ( ( $op =~ /^NOT LIKE$/i ) or ( $op eq '!=' ) ) {
-        $null_columns_ok = 1;
+    my $cf;
+    if ($q->id) {
+        $cf = $q->CustomField($field);
+    }
+    else { 
+        $cf = RT::CustomField->new($self->CurrentUser);
+        $cf->LoadByNameAndQueue(Queue => '0', Name => $field);
     }
 
-    my $cfid = 0;
-    if ($queue) {
 
-        my $q = RT::Queue->new( $self->CurrentUser );
-        $q->Load($queue) if ($queue);
 
-        my $cf;
-        if ( $q->id ) {
-            $cf = $q->CustomField($field);
-        }
-        else {
-            $cf = RT::CustomField->new( $self->CurrentUser );
-            $cf->LoadByNameAndQueue( Queue => '0', Name => $field );
-        }
 
-        $cfid = $cf->id;
 
-    }
+  my $cfid = $cf->id;
 
-    my $TicketCFs;
-    my $cfkey = $cfid ? $cfid : "$queue.$field";
+  die "No custom field named $field found\n" unless $cfid;
 
-    # Perform one Join per CustomField
-    if ( $self->{_sql_object_cf_alias}{$cfkey} ) {
-        $TicketCFs = $self->{_sql_object_cf_alias}{$cfkey};
-    }
-    else {
-        if ($cfid) {
-            $TicketCFs = $self->{_sql_object_cf_alias}{$cfkey} = $self->Join(
-                TYPE   => 'left',
-                ALIAS1 => 'main',
-                FIELD1 => 'id',
-                TABLE2 => 'ObjectCustomFieldValues',
-                FIELD2 => 'ObjectId',
-            );
-            $self->SUPER::Limit(
-                LEFTJOIN        => $TicketCFs,
-                FIELD           => 'CustomField',
-                VALUE           => $cfid,
-                ENTRYAGGREGATOR => 'AND'
-            );
-        } else {
-            my $cfalias = $self->Join(
-                TYPE   => 'left',
-                EXPRESSION =>   "'$field'",
-                TABLE2 => 'CustomFields',
-                FIELD2 => 'Name',
-            );
 
-            $TicketCFs = $self->{_sql_object_cf_alias}{$cfkey} = $self->Join(
-                TYPE   => 'left',
-                ALIAS1 => $cfalias,
-                FIELD1 => 'id',
-                TABLE2 => 'ObjectCustomFieldValues',
-                FIELD2 => 'CustomField',
-            );
-            $self->SUPER::Limit(
-                LEFTJOIN => $TicketCFs,
-                FIELD => 'ObjectId',
-                VALUE => 'main.id',
-                QUOTEVALUE => 0,
-                ENTRYAGGREGATOR => 'AND',
-            );
-        }
-        $self->SUPER::Limit(
-            LEFTJOIN => $TicketCFs,
-            FIELD    => 'ObjectType',
-            VALUE    => ref( $self->NewItem )
-            ,    # we want a single item, not a collection
-            ENTRYAGGREGATOR => 'AND'
-        );
-        $self->SUPER::Limit(
-            LEFTJOIN => $TicketCFs,
-            FIELD    => 'Disabled',
-            OPERATOR    => '=',
-            VALUE => '0',
-            ENTRYAGGREGATOR => 'AND');
-    }
 
-    $self->_OpenParen if ($null_columns_ok);
+  my $null_columns_ok;
 
-    $self->_SQLLimit(
-        ALIAS      => $TicketCFs,
-        FIELD      => 'Content',
-        OPERATOR   => $op,
-        VALUE      => $value,
-        QUOTEVALUE => 1,
-        @rest
-    );
+  my $TicketCFs;
+  # Perform one Join per CustomField
+  if ($self->{_sql_keywordalias}{$cfid}) {
+    $TicketCFs = $self->{_sql_keywordalias}{$cfid};
+  } else {
+    $TicketCFs = $self->{_sql_keywordalias}{$cfid} =
+      $self->_SQLJoin( TYPE   => 'left',
+		   ALIAS1 => 'main',
+		   FIELD1 => 'id',
+		   TABLE2 => 'TicketCustomFieldValues',
+		   FIELD2 => 'Ticket' );
+  }
 
-    if ($null_columns_ok) {
-        $self->_SQLLimit(
-            ALIAS           => $TicketCFs,
-            FIELD           => 'Content',
-            OPERATOR        => 'IS',
-            VALUE           => 'NULL',
-            QUOTEVALUE      => 0,
-            ENTRYAGGREGATOR => 'OR',
-        );
-    }
-    $self->_CloseParen if ($null_columns_ok);
+  $self->_OpenParen;
+
+  $self->_SQLLimit( ALIAS      => $TicketCFs,
+		    FIELD      => 'Content',
+		    OPERATOR   => $op,
+		    VALUE      => $value,
+		    QUOTEVALUE => 1,
+		    @rest );
+
+
+   # If we're trying to find custom fields that don't match something, we want tickets
+   # where the custom field has no value at all
+
+  if (   ($op =~ /^IS$/i) || ($op =~ /^NOT LIKE$/i) || ( $op eq '!=' ) ) {
+    $null_columns_ok = 1;
+  }
+    
 
+  if ( $null_columns_ok && $op !~ /IS/i && uc $value ne "NULL") {
+    $self->_SQLLimit( ALIAS           => $TicketCFs,
+		      FIELD           => 'Content',
+		      OPERATOR        => 'IS',
+		      VALUE           => 'NULL',
+		      QUOTEVALUE      => 0,
+		      ENTRYAGGREGATOR => 'OR', );
+  }
 
+  $self->_SQLLimit( LEFTJOIN => $TicketCFs,
+		    FIELD    => 'CustomField',
+		    VALUE    => $cfid,
+		    ENTRYAGGREGATOR => 'OR' );
+
+
+
+  $self->_CloseParen;
 
 }
 
+
 # End Helper Functions
 
 # End of SQL Stuff -------------------------------------------------
@@ -1241,35 +921,33 @@ Takes a paramhash with the fields FIELD, OPERATOR, VALUE and DESCRIPTION
 Generally best called from LimitFoo methods
 
 =cut
-
 sub Limit {
     my $self = shift;
-    my %args = (
-        FIELD       => undef,
-        OPERATOR    => '=',
-        VALUE       => undef,
-        DESCRIPTION => undef,
-        @_
-    );
-    $args{'DESCRIPTION'} = $self->loc( "[_1] [_2] [_3]",
-        $args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'} )
-      if ( !defined $args{'DESCRIPTION'} );
+    my %args = ( FIELD => undef,
+		 OPERATOR => '=',
+		 VALUE => undef,
+		 DESCRIPTION => undef,
+		 @_
+	       );
+    $args{'DESCRIPTION'} = $self->loc(
+	"[_1] [_2] [_3]", $args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'}
+    ) if (!defined $args{'DESCRIPTION'}) ;
 
     my $index = $self->_NextIndex;
 
- #make the TicketRestrictions hash the equivalent of whatever we just passed in;
+    #make the TicketRestrictions hash the equivalent of whatever we just passed in;
 
-    %{ $self->{'TicketRestrictions'}{$index} } = %args;
+    %{$self->{'TicketRestrictions'}{$index}} = %args;
 
     $self->{'RecalcTicketLimits'} = 1;
 
-# If we're looking at the effective id, we don't want to append the other clause
-# which limits us to tickets where id = effective id
-    if ( $args{'FIELD'} eq 'EffectiveId' ) {
+    # If we're looking at the effective id, we don't want to append the other clause
+    # which limits us to tickets where id = effective id
+    if ($args{'FIELD'} eq 'EffectiveId') {
         $self->{'looking_at_effective_id'} = 1;
     }
 
-    if ( $args{'FIELD'} eq 'Type' ) {
+    if ($args{'FIELD'} eq 'Type') {
         $self->{'looking_at_type'} = 1;
     }
 
@@ -1278,6 +956,9 @@ sub Limit {
 
 # }}}
 
+
+
+
 =head2 FreezeLimits
 
 Returns a frozen string suitable for handing back to ThawLimits.
@@ -1285,18 +966,18 @@ Returns a frozen string suitable for handing back to ThawLimits.
 =cut
 
 sub _FreezeThawKeys {
-    'TicketRestrictions', 'restriction_index', 'looking_at_effective_id',
-      'looking_at_type';
+    'TicketRestrictions',
+    'restriction_index',
+    'looking_at_effective_id',
+    'looking_at_type'
 }
 
 # {{{ sub FreezeLimits
 
 sub FreezeLimits {
-    my $self = shift;
-    require Storable;
-    require MIME::Base64;
-    MIME::Base64::base64_encode(
-        Storable::freeze( \@{$self}{ $self->_FreezeThawKeys } ) );
+	my $self = shift;
+	require FreezeThaw;
+	return (FreezeThaw::freeze(@{$self}{$self->_FreezeThawKeys}));
 }
 
 # }}}
@@ -1307,26 +988,25 @@ Take a frozen Limits string generated by FreezeLimits and make this tickets
 object have that set of limits.
 
 =cut
-
 # {{{ sub ThawLimits
 
 sub ThawLimits {
-    my $self = shift;
-    my $in   = shift;
-
-    #if we don't have $in, get outta here.
-    return undef unless ($in);
-
-    $self->{'RecalcTicketLimits'} = 1;
-
-    require Storable;
-    require MIME::Base64;
+	my $self = shift;
+	my $in = shift;
+	
+	#if we don't have $in, get outta here.
+	return undef unless ($in);
 
-    #We don't need to die if the thaw fails.
-    @{$self}{ $self->_FreezeThawKeys } =
-      eval { @{ Storable::thaw( MIME::Base64::base64_decode($in) ) }; };
+    	$self->{'RecalcTicketLimits'} = 1;
 
-    $RT::Logger->error($@) if $@;
+	require FreezeThaw;
+	
+	#We don't need to die if the thaw fails.
+	
+	eval {
+		@{$self}{$self->_FreezeThawKeys} = FreezeThaw::thaw($in);
+	};
+	$RT::Logger->error( $@ ) if $@;
 
 }
 
@@ -1347,18 +1027,16 @@ VALUE is a queue id or Name.
 
 sub LimitQueue {
     my $self = shift;
-    my %args = (
-        VALUE    => undef,
-        OPERATOR => '=',
-        @_
-    );
+    my %args = (VALUE => undef,
+		OPERATOR => '=',
+		@_);
 
     #TODO  VALUE should also take queue names and queue objects
     #TODO FIXME why are we canonicalizing to name, not id, robrt?
-    if ( $args{VALUE} =~ /^\d+$/ ) {
-        my $queue = new RT::Queue( $self->CurrentUser );
-        $queue->Load( $args{'VALUE'} );
-        $args{VALUE} = $queue->Name;
+    if ($args{VALUE} =~ /^\d+$/) {
+      my $queue = new RT::Queue($self->CurrentUser);
+      $queue->Load($args{'VALUE'});
+      $args{VALUE} = $queue->Name;
     }
 
     # What if they pass in an Id?  Check for isNum() and convert to
@@ -1366,16 +1044,15 @@ sub LimitQueue {
 
     #TODO check for a valid queue here
 
-    $self->Limit(
-        FIELD       => 'Queue',
-        VALUE       => $args{VALUE},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION =>
-          join( ' ', $self->loc('Queue'), $args{'OPERATOR'}, $args{VALUE}, ),
-    );
+    $self->Limit (FIELD => 'Queue',
+		  VALUE => $args{VALUE},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Queue'), $args{'OPERATOR'}, $args{VALUE},
+		  ),
+		 );
 
 }
-
 # }}}
 
 # {{{ sub LimitStatus
@@ -1386,27 +1063,19 @@ Takes a paramhash with the fields OPERATOR and VALUE.
 OPERATOR is one of = or !=.
 VALUE is a status.
 
-RT adds Status != 'deleted' until object has
-allow_deleted_search internal property set.
-$tickets->{'allow_deleted_search'} = 1;
-$tickets->LimitStatus( VALUE => 'deleted' );
-
 =cut
 
 sub LimitStatus {
     my $self = shift;
-    my %args = (
-        OPERATOR => '=',
-        @_
-    );
-    $self->Limit(
-        FIELD       => 'Status',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION => join( ' ',
-            $self->loc('Status'), $args{'OPERATOR'},
-            $self->loc( $args{'VALUE'} ) ),
-    );
+    my %args = ( OPERATOR => '=',
+                  @_);
+    $self->Limit (FIELD => 'Status',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Status'), $args{'OPERATOR'}, $self->loc($args{'VALUE'})
+		  ),
+		 );
 }
 
 # }}}
@@ -1448,18 +1117,16 @@ VALUE is a string to search for in the type of the ticket.
 
 sub LimitType {
     my $self = shift;
-    my %args = (
-        OPERATOR => '=',
-        VALUE    => undef,
-        @_
-    );
-    $self->Limit(
-        FIELD       => 'Type',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION =>
-          join( ' ', $self->loc('Type'), $args{'OPERATOR'}, $args{'Limit'}, ),
-    );
+    my %args = (OPERATOR => '=',
+		VALUE => undef,
+		@_);
+    $self->Limit (FIELD => 'Type',
+                  VALUE => $args{'VALUE'},
+                  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Type'), $args{'OPERATOR'}, $args{'Limit'},
+		  ),
+                 );
 }
 
 # }}}
@@ -1481,14 +1148,13 @@ VALUE is a string to search for in the subject of the ticket.
 sub LimitSubject {
     my $self = shift;
     my %args = (@_);
-    $self->Limit(
-        FIELD       => 'Subject',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION => join(
-            ' ', $self->loc('Subject'), $args{'OPERATOR'}, $args{'VALUE'},
-        ),
-    );
+    $self->Limit (FIELD => 'Subject',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Subject'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
 }
 
 # }}}
@@ -1510,18 +1176,16 @@ VALUE is a ticket Id to search for
 
 sub LimitId {
     my $self = shift;
-    my %args = (
-        OPERATOR => '=',
-        @_
-    );
+    my %args = (OPERATOR => '=',
+                @_);
 
-    $self->Limit(
-        FIELD       => 'id',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION =>
-          join( ' ', $self->loc('Id'), $args{'OPERATOR'}, $args{'VALUE'}, ),
-    );
+    $self->Limit (FIELD => 'id',
+                  VALUE => $args{'VALUE'},
+                  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Id'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+                 );
 }
 
 # }}}
@@ -1539,14 +1203,13 @@ VALUE is a value to match the ticket\'s priority against
 sub LimitPriority {
     my $self = shift;
     my %args = (@_);
-    $self->Limit(
-        FIELD       => 'Priority',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION => join( ' ',
-            $self->loc('Priority'),
-            $args{'OPERATOR'}, $args{'VALUE'}, ),
-    );
+    $self->Limit (FIELD => 'Priority',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Priority'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
 }
 
 # }}}
@@ -1565,14 +1228,13 @@ VALUE is a value to match the ticket\'s initial priority against
 sub LimitInitialPriority {
     my $self = shift;
     my %args = (@_);
-    $self->Limit(
-        FIELD       => 'InitialPriority',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION => join( ' ',
-            $self->loc('Initial Priority'), $args{'OPERATOR'},
-            $args{'VALUE'}, ),
-    );
+    $self->Limit (FIELD => 'InitialPriority',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Initial Priority'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
 }
 
 # }}}
@@ -1590,14 +1252,13 @@ VALUE is a value to match the ticket\'s final priority against
 sub LimitFinalPriority {
     my $self = shift;
     my %args = (@_);
-    $self->Limit(
-        FIELD       => 'FinalPriority',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION => join( ' ',
-            $self->loc('Final Priority'),
-            $args{'OPERATOR'}, $args{'VALUE'}, ),
-    );
+    $self->Limit (FIELD => 'FinalPriority',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Final Priority'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
 }
 
 # }}}
@@ -1615,14 +1276,13 @@ VALUE is a value to match the ticket's TimeWorked attribute
 sub LimitTimeWorked {
     my $self = shift;
     my %args = (@_);
-    $self->Limit(
-        FIELD       => 'TimeWorked',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION => join( ' ',
-            $self->loc('Time worked'),
-            $args{'OPERATOR'}, $args{'VALUE'}, ),
-    );
+    $self->Limit (FIELD => 'TimeWorked',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Time worked'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
 }
 
 # }}}
@@ -1640,14 +1300,13 @@ VALUE is a value to match the ticket's TimeLeft attribute
 sub LimitTimeLeft {
     my $self = shift;
     my %args = (@_);
-    $self->Limit(
-        FIELD       => 'TimeLeft',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION => join( ' ',
-            $self->loc('Time left'),
-            $args{'OPERATOR'}, $args{'VALUE'}, ),
-    );
+    $self->Limit (FIELD => 'TimeLeft',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Time left'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
 }
 
 # }}}
@@ -1665,18 +1324,16 @@ OPERATOR is one of =, LIKE, NOT LIKE or !=.
 VALUE is a string to search for in the body of the ticket
 
 =cut
-
 sub LimitContent {
     my $self = shift;
     my %args = (@_);
-    $self->Limit(
-        FIELD       => 'Content',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION => join( ' ',
-            $self->loc('Ticket content'),
-            $args{'OPERATOR'}, $args{'VALUE'}, ),
-    );
+    $self->Limit (FIELD => 'Content',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Ticket content'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
 }
 
 # }}}
@@ -1690,18 +1347,16 @@ OPERATOR is one of =, LIKE, NOT LIKE or !=.
 VALUE is a string to search for in the body of the ticket
 
 =cut
-
 sub LimitFilename {
     my $self = shift;
     my %args = (@_);
-    $self->Limit(
-        FIELD       => 'Filename',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION => join( ' ',
-            $self->loc('Attachment filename'), $args{'OPERATOR'},
-            $args{'VALUE'}, ),
-    );
+    $self->Limit (FIELD => 'Filename',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Attachment filename'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
 }
 
 # }}}
@@ -1718,16 +1373,14 @@ VALUE is a content type to search ticket attachments for
 sub LimitContentType {
     my $self = shift;
     my %args = (@_);
-    $self->Limit(
-        FIELD       => 'ContentType',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION => join( ' ',
-            $self->loc('Ticket content type'), $args{'OPERATOR'},
-            $args{'VALUE'}, ),
-    );
+    $self->Limit (FIELD => 'ContentType',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Ticket content type'), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
 }
-
 # }}}
 
 # }}}
@@ -1746,22 +1399,19 @@ VALUE is a user id.
 
 sub LimitOwner {
     my $self = shift;
-    my %args = (
-        OPERATOR => '=',
-        @_
-    );
-
-    my $owner = new RT::User( $self->CurrentUser );
-    $owner->Load( $args{'VALUE'} );
+    my %args = ( OPERATOR => '=',
+                 @_);
 
+    my $owner = new RT::User($self->CurrentUser);
+    $owner->Load($args{'VALUE'});
     # FIXME: check for a valid $owner
-    $self->Limit(
-        FIELD       => 'Owner',
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        DESCRIPTION =>
-          join( ' ', $self->loc('Owner'), $args{'OPERATOR'}, $owner->Name(), ),
-    );
+    $self->Limit (FIELD => 'Owner',
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc('Owner'), $args{'OPERATOR'}, $owner->Name(),
+		  ),
+		 );
 
 }
 
@@ -1771,6 +1421,7 @@ sub LimitOwner {
 
 # {{{ sub LimitWatcher
 
+
 =head2 LimitWatcher
 
   Takes a paramhash with the fields OPERATOR, TYPE and VALUE.
@@ -1789,46 +1440,44 @@ $t1->Create(Queue => 'general', Subject => "LimitWatchers test", Requestors => \
 
 sub LimitWatcher {
     my $self = shift;
-    my %args = (
-        OPERATOR => '=',
-        VALUE    => undef,
-        TYPE     => undef,
-        @_
-    );
+    my %args = ( OPERATOR => '=',
+		 VALUE => undef,
+		 TYPE => undef,
+		@_);
+
 
     #build us up a description
-    my ( $watcher_type, $desc );
-    if ( $args{'TYPE'} ) {
-        $watcher_type = $args{'TYPE'};
+    my ($watcher_type, $desc);
+    if ($args{'TYPE'}) {
+	$watcher_type = $args{'TYPE'};
     }
     else {
-        $watcher_type = "Watcher";
+	$watcher_type = "Watcher";
     }
 
-    $self->Limit(
-        FIELD       => $watcher_type,
-        VALUE       => $args{'VALUE'},
-        OPERATOR    => $args{'OPERATOR'},
-        TYPE        => $args{'TYPE'},
-        DESCRIPTION => join( ' ',
-            $self->loc($watcher_type),
-            $args{'OPERATOR'}, $args{'VALUE'}, ),
-    );
+    $self->Limit (FIELD => $watcher_type,
+		  VALUE => $args{'VALUE'},
+		  OPERATOR => $args{'OPERATOR'},
+		  TYPE => $args{'TYPE'},
+		  DESCRIPTION => join(
+		   ' ', $self->loc($watcher_type), $args{'OPERATOR'}, $args{'VALUE'},
+		  ),
+		 );
 }
 
+
 sub LimitRequestor {
     my $self = shift;
     my %args = (@_);
-    my ( $package, $filename, $line ) = caller;
-    $RT::Logger->error(
-"Tickets->LimitRequestor is deprecated. please rewrite call at  $package - $filename: $line"
-    );
-    $self->LimitWatcher( TYPE => 'Requestor', @_ );
+  my ($package, $filename, $line) = caller;
+    $RT::Logger->error("Tickets->LimitRequestor is deprecated. please rewrite call at  $package - $filename: $line");
+    $self->LimitWatcher(TYPE => 'Requestor', @_);
 
 }
 
 # }}}
 
+
 # }}}
 
 # }}}
@@ -1852,25 +1501,23 @@ TARGET is the id or URI of the TARGET of the link
 sub LimitLinkedTo {
     my $self = shift;
     my %args = (
-        TICKET => undef,
-        TARGET => undef,
-        TYPE   => undef,
-        @_
-    );
+		TICKET => undef,
+		TARGET => undef,
+		TYPE => undef,
+		 @_);
 
     $self->Limit(
-        FIELD       => 'LinkedTo',
-        BASE        => undef,
-        TARGET      => ( $args{'TARGET'} || $args{'TICKET'} ),
-        TYPE        => $args{'TYPE'},
-        DESCRIPTION => $self->loc(
-            "Tickets [_1] by [_2]",
-            $self->loc( $args{'TYPE'} ),
-            ( $args{'TARGET'} || $args{'TICKET'} )
-        ),
-    );
+		 FIELD => 'LinkedTo',
+		 BASE => undef,
+		 TARGET => ($args{'TARGET'} || $args{'TICKET'}),
+		 TYPE => $args{'TYPE'},
+		 DESCRIPTION => $self->loc(
+		   "Tickets [_1] by [_2]", $self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'})
+		  ),
+		);
 }
 
+
 # }}}
 
 # {{{ LimitLinkedFrom
@@ -1889,71 +1536,62 @@ BASE is the id or URI of the BASE of the link
 
 sub LimitLinkedFrom {
     my $self = shift;
-    my %args = (
-        BASE   => undef,
-        TICKET => undef,
-        TYPE   => undef,
-        @_
-    );
+    my %args = ( BASE => undef,
+		 TICKET => undef,
+		 TYPE => undef,
+		 @_);
 
     # translate RT2 From/To naming to RT3 TicketSQL naming
     my %fromToMap = qw(DependsOn DependentOn
-      MemberOf  HasMember
-      RefersTo  ReferredToBy);
+		       MemberOf  HasMember
+		       RefersTo  ReferredToBy);
 
     my $type = $args{'TYPE'};
-    $type = $fromToMap{$type} if exists( $fromToMap{$type} );
+    $type = $fromToMap{$type} if exists($fromToMap{$type});
 
-    $self->Limit(
-        FIELD       => 'LinkedTo',
-        TARGET      => undef,
-        BASE        => ( $args{'BASE'} || $args{'TICKET'} ),
-        TYPE        => $type,
-        DESCRIPTION => $self->loc(
-            "Tickets [_1] [_2]",
-            $self->loc( $args{'TYPE'} ),
-            ( $args{'BASE'} || $args{'TICKET'} )
-        ),
-    );
+    $self->Limit( FIELD => 'LinkedTo',
+		  TARGET => undef,
+		  BASE => ($args{'BASE'} || $args{'TICKET'}),
+		  TYPE => $type,
+		  DESCRIPTION => $self->loc(
+		   "Tickets [_1] [_2]", $self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'})
+		  ),
+		);
 }
 
+
 # }}}
 
 # {{{ LimitMemberOf
 sub LimitMemberOf {
-    my $self      = shift;
+    my $self = shift;
     my $ticket_id = shift;
-    $self->LimitLinkedTo(
-        TARGET => "$ticket_id",
-        TYPE   => 'MemberOf',
-    );
+    $self->LimitLinkedTo ( TARGET=> "$ticket_id",
+			   TYPE => 'MemberOf',
+			  );
 
 }
-
 # }}}
 
 # {{{ LimitHasMember
 sub LimitHasMember {
-    my $self      = shift;
-    my $ticket_id = shift;
-    $self->LimitLinkedFrom(
-        BASE => "$ticket_id",
-        TYPE => 'HasMember',
-    );
+    my $self = shift;
+    my $ticket_id =shift;
+    $self->LimitLinkedFrom ( BASE => "$ticket_id",
+			     TYPE => 'HasMember',
+			     );
 
 }
-
 # }}}
 
 # {{{ LimitDependsOn
 
 sub LimitDependsOn {
-    my $self      = shift;
+    my $self = shift;
     my $ticket_id = shift;
-    $self->LimitLinkedTo(
-        TARGET => "$ticket_id",
-        TYPE   => 'DependsOn',
-    );
+    $self->LimitLinkedTo ( TARGET => "$ticket_id",
+                           TYPE => 'DependsOn',
+			   );
 
 }
 
@@ -1962,26 +1600,25 @@ sub LimitDependsOn {
 # {{{ LimitDependedOnBy
 
 sub LimitDependedOnBy {
-    my $self      = shift;
+    my $self = shift;
     my $ticket_id = shift;
-    $self->LimitLinkedFrom(
-        BASE => "$ticket_id",
-        TYPE => 'DependentOn',
-    );
+    $self->LimitLinkedFrom (  BASE => "$ticket_id",
+                               TYPE => 'DependentOn',
+			     );
 
 }
 
 # }}}
 
+
 # {{{ LimitRefersTo
 
 sub LimitRefersTo {
-    my $self      = shift;
+    my $self = shift;
     my $ticket_id = shift;
-    $self->LimitLinkedTo(
-        TARGET => "$ticket_id",
-        TYPE   => 'RefersTo',
-    );
+    $self->LimitLinkedTo ( TARGET => "$ticket_id",
+                           TYPE => 'RefersTo',
+			   );
 
 }
 
@@ -1990,12 +1627,11 @@ sub LimitRefersTo {
 # {{{ LimitReferredToBy
 
 sub LimitReferredToBy {
-    my $self      = shift;
+    my $self = shift;
     my $ticket_id = shift;
-    $self->LimitLinkedFrom(
-        BASE => "$ticket_id",
-        TYPE => 'ReferredToBy',
-    );
+    $self->LimitLinkedFrom (  BASE=> "$ticket_id",
+                               TYPE => 'ReferredTo',
+			     );
 
 }
 
@@ -2023,64 +1659,56 @@ the need to pass in a FIELD argument.
 sub LimitDate {
     my $self = shift;
     my %args = (
-        FIELD    => undef,
-        VALUE    => undef,
-        OPERATOR => undef,
+                  FIELD => undef,
+		  VALUE => undef,
+		  OPERATOR => undef,
 
-        @_
-    );
+                  @_);
 
     #Set the description if we didn't get handed it above
-    unless ( $args{'DESCRIPTION'} ) {
-        $args{'DESCRIPTION'} =
-            $args{'FIELD'} . " "
-          . $args{'OPERATOR'} . " "
-          . $args{'VALUE'} . " GMT";
+    unless ($args{'DESCRIPTION'} ) {
+	$args{'DESCRIPTION'} = $args{'FIELD'} . " " .$args{'OPERATOR'}. " ". $args{'VALUE'} . " GMT"
     }
 
-    $self->Limit(%args);
+    $self->Limit (%args);
 
 }
 
 # }}}
 
+
+
+
 sub LimitCreated {
     my $self = shift;
-    $self->LimitDate( FIELD => 'Created', @_ );
+    $self->LimitDate( FIELD => 'Created', @_);
 }
-
 sub LimitDue {
     my $self = shift;
-    $self->LimitDate( FIELD => 'Due', @_ );
+    $self->LimitDate( FIELD => 'Due', @_);
 
 }
-
 sub LimitStarts {
     my $self = shift;
-    $self->LimitDate( FIELD => 'Starts', @_ );
+    $self->LimitDate( FIELD => 'Starts', @_);
 
 }
-
 sub LimitStarted {
     my $self = shift;
-    $self->LimitDate( FIELD => 'Started', @_ );
+    $self->LimitDate( FIELD => 'Started', @_);
 }
-
 sub LimitResolved {
     my $self = shift;
-    $self->LimitDate( FIELD => 'Resolved', @_ );
+    $self->LimitDate( FIELD => 'Resolved', @_);
 }
-
 sub LimitTold {
     my $self = shift;
-    $self->LimitDate( FIELD => 'Told', @_ );
+    $self->LimitDate( FIELD => 'Told', @_);
 }
-
 sub LimitLastUpdated {
     my $self = shift;
-    $self->LimitDate( FIELD => 'LastUpdated', @_ );
+    $self->LimitDate( FIELD => 'LastUpdated', @_);
 }
-
 #
 # {{{ sub LimitTransactionDate
 
@@ -2097,25 +1725,21 @@ VALUE is a date and time in ISO format in GMT
 sub LimitTransactionDate {
     my $self = shift;
     my %args = (
-        FIELD    => 'TransactionDate',
-        VALUE    => undef,
-        OPERATOR => undef,
+                  FIELD => 'TransactionDate',
+		  VALUE => undef,
+		  OPERATOR => undef,
 
-        @_
-    );
+                  @_);
 
     #  <20021217042756.GK28744@pallas.fsck.com>
     #    "Kill It" - Jesse.
 
     #Set the description if we didn't get handed it above
-    unless ( $args{'DESCRIPTION'} ) {
-        $args{'DESCRIPTION'} =
-            $args{'FIELD'} . " "
-          . $args{'OPERATOR'} . " "
-          . $args{'VALUE'} . " GMT";
+    unless ($args{'DESCRIPTION'} ) {
+	$args{'DESCRIPTION'} = $args{'FIELD'} . " " .$args{'OPERATOR'}. " ". $args{'VALUE'} . " GMT"
     }
 
-    $self->Limit(%args);
+    $self->Limit (%args);
 
 }
 
@@ -2132,7 +1756,8 @@ Takes a paramhash of key/value pairs with the following keys:
 
 =over 4
 
-=item CUSTOMFIELD - CustomField name or id.  If a name is passed, an additional parameter QUEUE may also be passed to distinguish the custom field.
+=item CUSTOMFIELD - CustomField name or id.  If a name is passed, an additional
+parameter QUEUE may also be passed to distinguish the custom field.
 
 =item OPERATOR - The usual Limit operators
 
@@ -2144,67 +1769,57 @@ Takes a paramhash of key/value pairs with the following keys:
 
 sub LimitCustomField {
     my $self = shift;
-    my %args = (
-        VALUE       => undef,
-        CUSTOMFIELD => undef,
-        OPERATOR    => '=',
-        DESCRIPTION => undef,
-        FIELD       => 'CustomFieldValue',
-        QUOTEVALUE  => 1,
-        @_
-    );
+    my %args = ( VALUE        => undef,
+                 CUSTOMFIELD   => undef,
+                 OPERATOR      => '=',
+                 DESCRIPTION   => undef,
+                 FIELD         => 'CustomFieldValue',
+                 QUOTEVALUE    => 1,
+                 @_ );
 
     my $CF = RT::CustomField->new( $self->CurrentUser );
-    if ( $args{CUSTOMFIELD} =~ /^\d+$/ ) {
-        $CF->Load( $args{CUSTOMFIELD} );
+    if ( $args{CUSTOMFIELD} =~ /^\d+$/) {
+	$CF->Load( $args{CUSTOMFIELD} );
     }
     else {
-        $CF->LoadByNameAndQueue(
-            Name  => $args{CUSTOMFIELD},
-            Queue => $args{QUEUE}
-        );
-        $args{CUSTOMFIELD} = $CF->Id;
+	$CF->LoadByNameAndQueue( Name => $args{CUSTOMFIELD}, Queue => $args{QUEUE} );
+	$args{CUSTOMFIELD} = $CF->Id;
     }
 
     #If we are looking to compare with a null value.
     if ( $args{'OPERATOR'} =~ /^is$/i ) {
-        $args{'DESCRIPTION'} ||=
-          $self->loc( "Custom field [_1] has no value.", $CF->Name );
+      $args{'DESCRIPTION'} ||= $self->loc("Custom field [_1] has no value.", $CF->Name);
     }
     elsif ( $args{'OPERATOR'} =~ /^is not$/i ) {
-        $args{'DESCRIPTION'} ||=
-          $self->loc( "Custom field [_1] has a value.", $CF->Name );
+      $args{'DESCRIPTION'} ||= $self->loc("Custom field [_1] has a value.", $CF->Name);
     }
 
     # if we're not looking to compare with a null value
     else {
-        $args{'DESCRIPTION'} ||= $self->loc( "Custom field [_1] [_2] [_3]",
-            $CF->Name, $args{OPERATOR}, $args{VALUE} );
+        $args{'DESCRIPTION'} ||= $self->loc("Custom field [_1] [_2] [_3]",  $CF->Name , $args{OPERATOR} , $args{VALUE});
     }
 
     my $q = "";
-    if ( $CF->Queue ) {
-        my $qo = new RT::Queue( $self->CurrentUser );
-        $qo->load( $CF->Queue );
-        $q = $qo->Name;
+    if ($CF->Queue) {
+      my $qo = new RT::Queue( $self->CurrentUser );
+      $qo->load( $CF->Queue );
+      $q = $qo->Name;
     }
 
     my @rest;
     @rest = ( ENTRYAGGREGATOR => 'AND' )
-      if ( $CF->Type eq 'SelectMultiple' );
+      if ($CF->Type eq 'SelectMultiple');
+
+    $self->Limit( VALUE => $args{VALUE},
+		  FIELD => "CF.".( $q
+			     ? $q . ".{" . $CF->Name . "}"
+			     : $CF->Name
+			   ),
+		  OPERATOR => $args{OPERATOR},
+		  CUSTOMFIELD => 1,
+		  @rest,
+		);
 
-    $self->Limit(
-        VALUE => $args{VALUE},
-        FIELD => "CF."
-          . (
-              $q
-            ? $q . ".{" . $CF->Name . "}"
-            : $CF->Name
-          ),
-        OPERATOR    => $args{OPERATOR},
-        CUSTOMFIELD => 1,
-        @rest,
-    );
 
     $self->{'RecalcTicketLimits'} = 1;
 }
@@ -2212,6 +1827,7 @@ sub LimitCustomField {
 # }}}
 # }}}
 
+
 # {{{ sub _NextIndex
 
 =head2 _NextIndex
@@ -2222,9 +1838,8 @@ Keep track of the counter for the array of restrictions
 
 sub _NextIndex {
     my $self = shift;
-    return ( $self->{'restriction_index'}++ );
+    return ($self->{'restriction_index'}++);
 }
-
 # }}}
 
 # }}}
@@ -2232,14 +1847,14 @@ sub _NextIndex {
 # {{{ Core bits to make this a DBIx::SearchBuilder object
 
 # {{{ sub _Init
-sub _Init {
+sub _Init  {
     my $self = shift;
-    $self->{'table'}                   = "Tickets";
-    $self->{'RecalcTicketLimits'}      = 1;
+    $self->{'table'} = "Tickets";
+    $self->{'RecalcTicketLimits'} = 1;
     $self->{'looking_at_effective_id'} = 0;
-    $self->{'looking_at_type'}         = 0;
-    $self->{'restriction_index'}       = 1;
-    $self->{'primary_key'}             = "id";
+    $self->{'looking_at_type'} = 0;
+    $self->{'restriction_index'} =1;
+    $self->{'primary_key'} = "id";
     delete $self->{'items_array'};
     delete $self->{'item_map'};
     delete $self->{'columns_to_display'};
@@ -2248,27 +1863,25 @@ sub _Init {
     $self->_InitSQL;
 
 }
-
 # }}}
 
 # {{{ sub Count
 sub Count {
-    my $self = shift;
-    $self->_ProcessRestrictions() if ( $self->{'RecalcTicketLimits'} == 1 );
-    return ( $self->SUPER::Count() );
+  my $self = shift;
+  $self->_ProcessRestrictions() if ($self->{'RecalcTicketLimits'} == 1 );
+  return($self->SUPER::Count());
 }
-
 # }}}
 
 # {{{ sub CountAll
 sub CountAll {
-    my $self = shift;
-    $self->_ProcessRestrictions() if ( $self->{'RecalcTicketLimits'} == 1 );
-    return ( $self->SUPER::CountAll() );
+  my $self = shift;
+  $self->_ProcessRestrictions() if ($self->{'RecalcTicketLimits'} == 1 );
+  return($self->SUPER::CountAll());
 }
-
 # }}}
 
+
 # {{{ sub ItemsArrayRef
 
 =head2 ItemsArrayRef
@@ -2286,27 +1899,29 @@ sub ItemsArrayRef {
         my $placeholder = $self->_ItemsCounter;
         $self->GotoFirstItem();
         while ( my $item = $self->Next ) {
-            push( @{ $self->{'items_array'} }, $item );
+            push ( @{ $self->{'items_array'} }, $item );
         }
         $self->GotoItem($placeholder);
-        $self->{'items_array'} = $self->ItemsOrderBy( $self->{'items_array'} );
+        $self->{'items_array'} = $self->ItemsOrderBy($self->{'items_array'});
     }
     return ( $self->{'items_array'} );
 }
-
 # }}}
 
 # {{{ sub Next
 sub Next {
-    my $self = shift;
+	my $self = shift;
+ 	
+	$self->_ProcessRestrictions() if ($self->{'RecalcTicketLimits'} == 1 );
 
-    $self->_ProcessRestrictions() if ( $self->{'RecalcTicketLimits'} == 1 );
+	my $Ticket = $self->SUPER::Next();
+	if ((defined($Ticket)) and (ref($Ticket))) {
 
-    my $Ticket = $self->SUPER::Next();
-    if ( ( defined($Ticket) ) and ( ref($Ticket) ) ) {
+    	    #Make sure we _never_ show deleted tickets
+	    #TODO we should be doing this in the where clause.
+	    #but you can't do multiple clauses on the same field just yet :/
 
-	    if ( $Ticket->__Value('Status') eq 'deleted' &&
-			!$self->{'allow_deleted_search'} ) {
+	    if ($Ticket->__Value('Status') eq 'deleted') {
 		return($self->Next());
 	    }
             # Since Ticket could be granted with more rights instead
@@ -2318,33 +1933,17 @@ sub Next {
 		return($Ticket);
 	    }
 
-        if ( $Ticket->__Value('Status') eq 'deleted' ) {
-            return ( $self->Next() );
-        }
-
-        # Since Ticket could be granted with more rights instead
-        # of being revoked, it's ok if queue rights allow
-        # ShowTicket.  It seems need another query, but we have
-        # rights cache in Principal::HasRight.
-        elsif ($Ticket->QueueObj->CurrentUserHasRight('ShowTicket')
-            || $Ticket->CurrentUserHasRight('ShowTicket') )
-        {
-            return ($Ticket);
-        }
-
-        #If the user doesn't have the right to show this ticket
-        else {
-            return ( $self->Next() );
-        }
-    }
-
-    #if there never was any ticket
-    else {
-        return (undef);
-    }
+	    #If the user doesn't have the right to show this ticket
+	    else {	
+		return($self->Next());
+	    }
+	}
+	#if there never was any ticket
+	else {
+		return(undef);
+	}	
 
 }
-
 # }}}
 
 # }}}
@@ -2373,17 +1972,16 @@ is a description of the purpose of that TicketRestriction
 
 =cut
 
-sub DescribeRestrictions {
+sub DescribeRestrictions  {
     my $self = shift;
 
-    my ( $row, %listing );
+    my ($row, %listing);
 
-    foreach $row ( keys %{ $self->{'TicketRestrictions'} } ) {
-        $listing{$row} = $self->{'TicketRestrictions'}{$row}{'DESCRIPTION'};
+    foreach $row (keys %{$self->{'TicketRestrictions'}}) {
+	$listing{$row} = $self->{'TicketRestrictions'}{$row}{'DESCRIPTION'};
     }
     return (%listing);
 }
-
 # }}}
 
 # {{{ sub RestrictionValues
@@ -2396,13 +1994,14 @@ to.
 =cut
 
 sub RestrictionValues {
-    my $self  = shift;
+    my $self = shift;
     my $field = shift;
-    map $self->{'TicketRestrictions'}{$_}{'VALUE'}, grep {
-             $self->{'TicketRestrictions'}{$_}{'FIELD'}    eq $field
-          && $self->{'TicketRestrictions'}{$_}{'OPERATOR'} eq "="
-      }
-      keys %{ $self->{'TicketRestrictions'} };
+    map $self->{'TicketRestrictions'}{$_}{'VALUE'},
+      grep {
+             $self->{'TicketRestrictions'}{$_}{'FIELD'} eq $field
+             && $self->{'TicketRestrictions'}{$_}{'OPERATOR'} eq "="
+           }
+        keys %{$self->{'TicketRestrictions'}};
 }
 
 # }}}
@@ -2419,8 +2018,8 @@ sub ClearRestrictions {
     my $self = shift;
     delete $self->{'TicketRestrictions'};
     $self->{'looking_at_effective_id'} = 0;
-    $self->{'looking_at_type'}         = 0;
-    $self->{'RecalcTicketLimits'}      = 1;
+    $self->{'looking_at_type'} = 0;
+    $self->{'RecalcTicketLimits'} =1;
 }
 
 # }}}
@@ -2434,13 +2033,13 @@ Removes that restriction from the session's limits.
 
 =cut
 
+
 sub DeleteRestriction {
     my $self = shift;
-    my $row  = shift;
+    my $row = shift;
     delete $self->{'TicketRestrictions'}{$row};
 
     $self->{'RecalcTicketLimits'} = 1;
-
     #make the underlying easysearch object forget all its preconceptions
 }
 
@@ -2451,93 +2050,89 @@ sub DeleteRestriction {
 # Convert a set of oldstyle SB Restrictions to Clauses for RQL
 
 sub _RestrictionsToClauses {
-    my $self = shift;
-
-    my $row;
-    my %clause;
-    foreach $row ( keys %{ $self->{'TicketRestrictions'} } ) {
-        my $restriction = $self->{'TicketRestrictions'}{$row};
-
-        #use Data::Dumper;
-        #print Dumper($restriction),"\n";
-
-     # We need to reimplement the subclause aggregation that SearchBuilder does.
-     # Default Subclause is ALIAS.FIELD, and default ALIAS is 'main',
-     # Then SB AND's the different Subclauses together.
-
-        # So, we want to group things into Subclauses, convert them to
-        # SQL, and then join them with the appropriate DefaultEA.
-        # Then join each subclause group with AND.
-
-        my $field = $restriction->{'FIELD'};
-        my $realfield = $field;    # CustomFields fake up a fieldname, so
-                                   # we need to figure that out
-
-        # One special case
-        # Rewrite LinkedTo meta field to the real field
-        if ( $field =~ /LinkedTo/ ) {
-            $realfield = $field = $restriction->{'TYPE'};
-        }
-
-        # Two special case
-        # Handle subkey fields with a different real field
-        if ( $field =~ /^(\w+)\./ ) {
-            $realfield = $1;
-        }
+  my $self = shift;
+
+  my $row;
+  my %clause;
+  foreach $row (keys %{$self->{'TicketRestrictions'}}) {
+    my $restriction = $self->{'TicketRestrictions'}{$row};
+    #use Data::Dumper;
+    #print Dumper($restriction),"\n";
+
+      # We need to reimplement the subclause aggregation that SearchBuilder does.
+      # Default Subclause is ALIAS.FIELD, and default ALIAS is 'main',
+      # Then SB AND's the different Subclauses together.
+
+      # So, we want to group things into Subclauses, convert them to
+      # SQL, and then join them with the appropriate DefaultEA.
+      # Then join each subclause group with AND.
+
+    my $field = $restriction->{'FIELD'};
+    my $realfield = $field;	# CustomFields fake up a fieldname, so
+                                # we need to figure that out
+
+    # One special case
+    # Rewrite LinkedTo meta field to the real field
+    if ($field =~ /LinkedTo/) {
+      $realfield = $field = $restriction->{'TYPE'};
+    }
 
-        die "I don't know about $field yet"
-          unless ( exists $FIELDS{$realfield} or $restriction->{CUSTOMFIELD} );
-
-        my $type = $FIELDS{$realfield}->[0];
-        my $op   = $restriction->{'OPERATOR'};
-
-        my $value = (
-            grep  { defined }
-              map { $restriction->{$_} } qw(VALUE TICKET BASE TARGET)
-        )[0];
-
-        # this performs the moral equivalent of defined or/dor/C<//>,
-        # without the short circuiting.You need to use a 'defined or'
-        # type thing instead of just checking for truth values, because
-        # VALUE could be 0.(i.e. "false")
-
-        # You could also use this, but I find it less aesthetic:
-        # (although it does short circuit)
-        #( defined $restriction->{'VALUE'}? $restriction->{VALUE} :
-        # defined $restriction->{'TICKET'} ?
-        # $restriction->{TICKET} :
-        # defined $restriction->{'BASE'} ?
-        # $restriction->{BASE} :
-        # defined $restriction->{'TARGET'} ?
-        # $restriction->{TARGET} )
-
-        my $ea = $restriction->{ENTRYAGGREGATOR} || $DefaultEA{$type} || "AND";
-        if ( ref $ea ) {
-            die "Invalid operator $op for $field ($type)"
-              unless exists $ea->{$op};
-            $ea = $ea->{$op};
-        }
+    # Two special case
+    # CustomFields have a different real field
+    if ($field =~ /^CF\./) {
+      $realfield = "CF"
+    }
 
-        # Each CustomField should be put into a different Clause so they
-        # are ANDed together.
-        if ( $restriction->{CUSTOMFIELD} ) {
-            $realfield = $field;
-        }
+    die "I don't know about $field yet"
+      unless (exists $FIELDS{$realfield} or $restriction->{CUSTOMFIELD});
+
+    my $type = $FIELDS{$realfield}->[0];
+    my $op   = $restriction->{'OPERATOR'};
+
+    my $value = ( grep { defined }
+		  map { $restriction->{$_} } qw(VALUE TICKET BASE TARGET))[0];
+
+    # this performs the moral equivalent of defined or/dor/C<//>,
+    # without the short circuiting.You need to use a 'defined or'
+    # type thing instead of just checking for truth values, because
+    # VALUE could be 0.(i.e. "false")
+
+    # You could also use this, but I find it less aesthetic:
+    # (although it does short circuit)
+    #( defined $restriction->{'VALUE'}? $restriction->{VALUE} :
+    # defined $restriction->{'TICKET'} ?
+    # $restriction->{TICKET} :
+    # defined $restriction->{'BASE'} ?
+    # $restriction->{BASE} :
+    # defined $restriction->{'TARGET'} ?
+    # $restriction->{TARGET} )
+
+    my $ea = $restriction->{ENTRYAGGREGATOR} || $DefaultEA{$type} || "AND";
+    if ( ref $ea ) {
+      die "Invalid operator $op for $field ($type)"
+	unless exists $ea->{$op};
+      $ea = $ea->{$op};
+    }
 
-        exists $clause{$realfield} or $clause{$realfield} = [];
+    # Each CustomField should be put into a different Clause so they
+    # are ANDed together.
+    if ($restriction->{CUSTOMFIELD}) {
+      $realfield = $field;
+    }
 
-        # Escape Quotes
-        $field =~ s!(['"])!\\$1!g;
-        $value =~ s!(['"])!\\$1!g;
-        my $data = [ $ea, $type, $field, $op, $value ];
+    exists $clause{$realfield} or $clause{$realfield} = [];
+    # Escape Quotes
+    $field =~ s!(['"])!\\$1!g;
+    $value =~ s!(['"])!\\$1!g;
+    my $data = [ $ea, $type, $field, $op, $value ];
 
-        # here is where we store extra data, say if it's a keyword or
-        # something.  (I.e. "TYPE SPECIFIC STUFF")
+    # here is where we store extra data, say if it's a keyword or
+    # something.  (I.e. "TYPE SPECIFIC STUFF")
 
-        #print Dumper($data);
-        push @{ $clause{$realfield} }, $data;
-    }
-    return \%clause;
+    #print Dumper($data);
+    push @{$clause{$realfield}}, $data;
+  }
+  return \%clause;
 }
 
 # }}}
@@ -2553,31 +2148,30 @@ sub _RestrictionsToClauses {
 
 sub _ProcessRestrictions {
     my $self = shift;
-
+    
     #Blow away ticket aliases since we'll need to regenerate them for
     #a new search
     delete $self->{'TicketAliases'};
-    delete $self->{'items_array'};
+    delete $self->{'items_array'};                                                                                                                   
     delete $self->{'item_map'};
     delete $self->{'raw_rows'};
     delete $self->{'rows'};
     delete $self->{'count_all'};
-
-    my $sql = $self->Query;    # Violating the _SQL namespace
-    if ( !$sql || $self->{'RecalcTicketLimits'} ) {
-
-        #  "Restrictions to Clauses Branch\n";
-        my $clauseRef = eval { $self->_RestrictionsToClauses; };
-        if ($@) {
-            $RT::Logger->error( "RestrictionsToClauses: " . $@ );
-            $self->FromSQL("");
-        }
-        else {
-            $sql = $self->ClausesToSQL($clauseRef);
-            $self->FromSQL($sql);
-        }
+ 
+    my $sql = $self->{_sql_query}; # Violating the _SQL namespace
+    if (!$sql||$self->{'RecalcTicketLimits'}) {
+      #  "Restrictions to Clauses Branch\n";
+      my $clauseRef = eval { $self->_RestrictionsToClauses; };
+      if ($@) {
+	$RT::Logger->error( "RestrictionsToClauses: " . $@ );
+	$self->FromSQL("");
+      } else {
+	$sql = $self->ClausesToSQL($clauseRef);
+	$self->FromSQL($sql);
+      }
     }
 
+
     $self->{'RecalcTicketLimits'} = 0;
 
 }
@@ -2592,22 +2186,22 @@ sub _BuildItemMap {
     my $self = shift;
 
     my $items = $self->ItemsArrayRef;
-    my $prev  = 0;
+    my $prev = 0 ;
 
     delete $self->{'item_map'};
-    if ( $items->[0] ) {
+    if ($items->[0]) {
         $self->{'item_map'}->{'first'} = $items->[0]->EffectiveId;
-        while ( my $item = shift @$items ) {
+        while (my $item = shift @$items ) {
             my $id = $item->EffectiveId;
             $self->{'item_map'}->{$id}->{'defined'} = 1;
-            $self->{'item_map'}->{$id}->{prev}      = $prev;
-            $self->{'item_map'}->{$id}->{next}      = $items->[0]->EffectiveId
-              if ( $items->[0] );
+            $self->{'item_map'}->{$id}->{prev}  = $prev;
+            $self->{'item_map'}->{$id}->{next}  = $items->[0]->EffectiveId if ($items->[0]);
             $prev = $id;
         }
         $self->{'item_map'}->{'last'} = $prev;
     }
-}
+} 
+
 
 =head2 ItemMap
 
@@ -2622,14 +2216,15 @@ $ItemMap->{$id}->{next} = the ticket id found after $id
 
 sub ItemMap {
     my $self = shift;
-    $self->_BuildItemMap()
-      unless ( $self->{'items_array'} and $self->{'item_map'} );
-    return ( $self->{'item_map'} );
+    $self->_BuildItemMap() unless ($self->{'items_array'} and $self->{'item_map'});
+    return ($self->{'item_map'});
 }
 
-=cut
 
 
+
+=cut
+
 }
 
 
@@ -2644,30 +2239,12 @@ You don't want to serialize a big tickets object, as the {items} hash will be in
 
 =cut
 
+
 sub PrepForSerialization {
     my $self = shift;
     delete $self->{'items'};
     $self->RedoSearch();
 }
 
-
-=head1 FLAGS
-
-RT::Tickets supports several flags which alter search behavior:
-
-
-allow_deleted_search  (Otherwise never show deleted tickets in search results)
-looking_at_type (otherwise limit to type=ticket)
-
-These flags are set by calling 
-
-$tickets->{'flagname'} = 1;
-
-BUG: There should be an API for this
-
-=cut
-
 1;
 
-
-
diff --git a/rt/lib/RT/Tickets_Overlay_SQL.pm b/rt/lib/RT/Tickets_Overlay_SQL.pm
index 6773917..a873af2 100644
--- a/rt/lib/RT/Tickets_Overlay_SQL.pm
+++ b/rt/lib/RT/Tickets_Overlay_SQL.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,12 +42,12 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-package RT::Tickets;
-
+# }}} END BPS TAGGED BLOCK
 use strict;
 use warnings;
 
+use RT::Tickets;
+
 # Import configuration data from the lexcial scope of __PACKAGE__ (or
 # at least where those two Subroutines are defined.)
 
@@ -73,7 +73,7 @@ sub _InitSQL {
   $self->{'_sql_linkalias'}    = undef;
   $self->{'_sql_transalias'}    = undef;
   $self->{'_sql_trattachalias'} = undef;
-  $self->{'_sql_object_cf_alias'}  = undef;
+  $self->{'_sql_keywordalias'}  = undef;
   $self->{'_sql_depth'}         = 0;
   $self->{'_sql_localdepth'}    = 0;
   $self->{'_sql_query'}         = '';
@@ -149,18 +149,15 @@ use Regexp::Common qw /delimited/;
 use constant VALUE => 1;
 use constant AGGREG => 2;
 use constant OP => 4;
-use constant OPEN_PAREN => 8;
-use constant CLOSE_PAREN => 16;
-use constant KEYWORD => 32;
-my @tokens = qw[VALUE AGGREG OP OPEN_PAREN CLOSE_PAREN KEYWORD];
+use constant PAREN => 8;
+use constant KEYWORD => 16;
+my @tokens = qw[VALUE AGGREG OP PAREN KEYWORD];
 
 my $re_aggreg = qr[(?i:AND|OR)];
-my $re_delim  = qr[$RE{delimited}{-delim=>qq{\'\"}}];
-my $re_value  = qr[$re_delim|\d+|NULL];
-my $re_keyword = qr[$re_delim|(?:\{|\}|\w|\.)+];
+my $re_value  = qr[$RE{delimited}{-delim=>qq{\'\"}}|\d+];
+my $re_keyword = qr[$RE{delimited}{-delim=>qq{\'\"}}|(?:\{|\}|\w|\.)+];
 my $re_op     = qr[=|!=|>=|<=|>|<|(?i:IS NOT)|(?i:IS)|(?i:NOT LIKE)|(?i:LIKE)]; # long to short
-my $re_open_paren  = qr'\(';
-my $re_close_paren  = qr'\)';
+my $re_paren  = qr'\(|\)';
 
 sub _close_bundle
 {
@@ -196,7 +193,7 @@ sub _close_bundle
 
 sub _parser {
   my ($self,$string) = @_;
-  my $want = KEYWORD | OPEN_PAREN;
+  my $want = KEYWORD | PAREN;
   my $last = undef;
 
   my $depth = 0;
@@ -217,19 +214,17 @@ sub _parser {
                       |$re_op
                       |$re_keyword
                       |$re_value
-                      |$re_open_paren
-                      |$re_close_paren
-                     )/iogx ) {
+                      |$re_paren
+                     )/igx ) {
     my $val = $1;
     my $current = 0;
 
     # Highest priority is last
-    $current = OP          if ($want & OP)          && $val =~ /^$re_op$/io;
-    $current = VALUE       if ($want & VALUE)       && $val =~ /^$re_value$/io;
-    $current = KEYWORD     if ($want & KEYWORD)     && $val =~ /^$re_keyword$/io;
-    $current = AGGREG      if ($want & AGGREG)      && $val =~ /^$re_aggreg$/io;
-    $current = OPEN_PAREN  if ($want & OPEN_PAREN)  && $val =~ /^$re_open_paren$/io;
-    $current = CLOSE_PAREN if ($want & CLOSE_PAREN) && $val =~ /^$re_close_paren$/io;
+    $current = OP      if $val =~ /^$re_op$/io;
+    $current = VALUE   if $val =~ /^$re_value$/io;
+    $current = KEYWORD if $val =~ /^$re_keyword$/io && ($want & KEYWORD);
+    $current = AGGREG  if $val =~ /^$re_aggreg$/io;
+    $current = PAREN   if $val =~ /^$re_paren$/io;
 
 
     unless ($current && $want & $current) {
@@ -243,23 +238,24 @@ sub _parser {
     #$RT::Logger->debug("We've just found a '$current' called '$val'");
 
     # Parens are highest priority
-    if ($current & OPEN_PAREN) {
-      $self->_close_bundle(@bundle);  @bundle = ();
-      $depth++;
-      $self->_OpenParen;
+    if ($current & PAREN) {
+      if ($val eq "(") {
+        $self->_close_bundle(@bundle);  @bundle = ();
+        $depth++;
+        $self->_OpenParen;
 
-      $want = KEYWORD | OPEN_PAREN;
-    }
-    elsif ( $current & CLOSE_PAREN ) {
-      $self->_close_bundle(@bundle);  @bundle = ();
-      $depth--;
-      $self->_CloseParen;
+      } else {
+        $self->_close_bundle(@bundle);  @bundle = ();
+        $depth--;
+        $self->_CloseParen;
+      }
 
-      $want = CLOSE_PAREN | AGGREG;
+      $want = KEYWORD | PAREN | AGGREG;
     }
+
     elsif ( $current & AGGREG ) {
       $ea = $val;
-      $want = KEYWORD | OPEN_PAREN;
+      $want = KEYWORD | PAREN;
     }
     elsif ( $current & KEYWORD ) {
       $key = $val;
@@ -274,17 +270,17 @@ sub _parser {
 
       # Remove surrounding quotes from $key, $val
       # (in future, simplify as for($key,$val) { action on $_ })
-      if ($key =~ /$re_delim/o) {
+      if ($key =~ /$RE{delimited}{-delim=>qq{\'\"}}/) {
         substr($key,0,1) = "";
         substr($key,-1,1) = "";
       }
-      if ($val =~ /$re_delim/o) {
+      if ($val =~ /$RE{delimited}{-delim=>qq{\'\"}}/) {
         substr($val,0,1) = "";
         substr($val,-1,1) = "";
       }
       # Unescape escaped characters
-      $key =~ s!\\(.)!$1!g;
-      $val =~ s!\\(.)!$1!g;
+      $key =~ s!\\(.)!$1!g;                                                    
+      $val =~ s!\\(.)!$1!g;     
       #    print "$ea Key=[$key] op=[$op]  val=[$val]\n";
 
 
@@ -340,7 +336,7 @@ sub _parser {
   
       ($ea,$key,$op,$value) = ("","","","");
   
-      $want = CLOSE_PAREN | AGGREG;
+      $want = PAREN | AGGREG;
     } else {
       die "I'm lost";
     }
@@ -351,10 +347,10 @@ sub _parser {
   $self->_close_bundle(@bundle);  @bundle = ();
 
   die "Incomplete query"
-    unless (($want | CLOSE_PAREN) || ($want | KEYWORD));
+    unless (($want | PAREN) || ($want | KEYWORD));
 
   die "Incomplete Query"
-    unless ($last && ($last | CLOSE_PAREN) || ($last || VALUE));
+    unless ($last && ($last | PAREN) || ($last || VALUE));
 
   # This will never happen, because the parser will complain
   die "Mismatched parentheses"
@@ -435,13 +431,14 @@ $query = ("Subject LIKE '$string' OR Content LIKE '$string'");
 
 my ($id, $msg) = $tix->FromSQL($query);
 
-
 ok ($id, $msg);
 
 is ($tix->Count, scalar @ids, "number of returned tickets same as entered");
+
 while (my $tick = $tix->Next) {
     push @expectedids, $tick->Id;
 }
+
 ok (eq_array(\@ids, \@expectedids), "returned expected tickets");
 
 $query = ("id = $ids[0] OR MemberOf = $ids[0]");
@@ -479,7 +476,7 @@ sub FromSQL {
   $self->{_sql_query} = $query;
   eval { $self->_parser( $query ); };
     if ($@) {
-        $RT::Logger->error( "Query error in <<$query>>:\n$@" );
+        $RT::Logger->error( $@ );
         return(0,$@);
     }
   # We only want to look at EffectiveId's (mostly) for these searches.
@@ -508,12 +505,8 @@ sub FromSQL {
     $self->SUPER::Limit( FIELD => 'Type', OPERATOR => '=', VALUE => 'ticket');
   }
 
-  # We don't want deleted tickets unless 'allow_deleted_search' is set
-  unless( $self->{'allow_deleted_search'} ) {
-    $self->SUPER::Limit(FIELD => 'Status',
-                        OPERATOR => '!=',
-                        VALUE => 'deleted');
-  }
+  # We never ever want to show deleted tickets
+  $self->SUPER::Limit(FIELD => 'Status' , OPERATOR => '!=', VALUE => 'deleted');
 
 
   # set SB's dirty flag
diff --git a/rt/lib/RT/Transaction.pm b/rt/lib/RT/Transaction.pm
index cca2281..431d39a 100755
--- a/rt/lib/RT/Transaction.pm
+++ b/rt/lib/RT/Transaction.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -67,6 +67,7 @@ RT::Transaction
 
 package RT::Transaction;
 use RT::Record; 
+use RT::Ticket;
 
 
 use vars qw( @ISA );
@@ -87,16 +88,13 @@ sub _Init {
 
 Create takes a hash of values and creates a row in the database:
 
-  varchar(64) 'ObjectType'.
-  int(11) 'ObjectId'.
+  int(11) 'EffectiveTicket'.
+  int(11) 'Ticket'.
   int(11) 'TimeTaken'.
   varchar(20) 'Type'.
   varchar(40) 'Field'.
   varchar(255) 'OldValue'.
   varchar(255) 'NewValue'.
-  varchar(255) 'ReferenceType'.
-  int(11) 'OldReference'.
-  int(11) 'NewReference'.
   varchar(255) 'Data'.
 
 =cut
@@ -107,30 +105,24 @@ Create takes a hash of values and creates a row in the database:
 sub Create {
     my $self = shift;
     my %args = ( 
-                ObjectType => '',
-                ObjectId => '0',
+                EffectiveTicket => '0',
+                Ticket => '0',
                 TimeTaken => '0',
                 Type => '',
                 Field => '',
                 OldValue => '',
                 NewValue => '',
-                ReferenceType => '',
-                OldReference => '',
-                NewReference => '',
                 Data => '',
 
 		  @_);
     $self->SUPER::Create(
-                         ObjectType => $args{'ObjectType'},
-                         ObjectId => $args{'ObjectId'},
+                         EffectiveTicket => $args{'EffectiveTicket'},
+                         Ticket => $args{'Ticket'},
                          TimeTaken => $args{'TimeTaken'},
                          Type => $args{'Type'},
                          Field => $args{'Field'},
                          OldValue => $args{'OldValue'},
                          NewValue => $args{'NewValue'},
-                         ReferenceType => $args{'ReferenceType'},
-                         OldReference => $args{'OldReference'},
-                         NewReference => $args{'NewReference'},
                          Data => $args{'Data'},
 );
 
@@ -147,42 +139,56 @@ Returns the current value of id.
 =cut
 
 
-=head2 ObjectType
+=head2 EffectiveTicket
 
-Returns the current value of ObjectType. 
-(In the database, ObjectType is stored as varchar(64).)
+Returns the current value of EffectiveTicket. 
+(In the database, EffectiveTicket is stored as int(11).)
 
 
 
-=head2 SetObjectType VALUE
+=head2 SetEffectiveTicket VALUE
 
 
-Set ObjectType to VALUE. 
+Set EffectiveTicket to VALUE. 
 Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, ObjectType will be stored as a varchar(64).)
+(In the database, EffectiveTicket will be stored as a int(11).)
 
 
 =cut
 
 
-=head2 ObjectId
+=head2 Ticket
 
-Returns the current value of ObjectId. 
-(In the database, ObjectId is stored as int(11).)
+Returns the current value of Ticket. 
+(In the database, Ticket is stored as int(11).)
 
 
 
-=head2 SetObjectId VALUE
+=head2 SetTicket VALUE
 
 
-Set ObjectId to VALUE. 
+Set Ticket to VALUE. 
 Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, ObjectId will be stored as a int(11).)
+(In the database, Ticket will be stored as a int(11).)
 
 
 =cut
 
 
+=head2 TicketObj
+
+Returns the Ticket Object which has the id returned by Ticket
+
+
+=cut
+
+sub TicketObj {
+	my $self = shift;
+	my $Ticket =  RT::Ticket->new($self->CurrentUser);
+	$Ticket->Load($self->__Value('Ticket'));
+	return($Ticket);
+}
+
 =head2 TimeTaken
 
 Returns the current value of TimeTaken. 
@@ -273,60 +279,6 @@ Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
 =cut
 
 
-=head2 ReferenceType
-
-Returns the current value of ReferenceType. 
-(In the database, ReferenceType is stored as varchar(255).)
-
-
-
-=head2 SetReferenceType VALUE
-
-
-Set ReferenceType to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, ReferenceType will be stored as a varchar(255).)
-
-
-=cut
-
-
-=head2 OldReference
-
-Returns the current value of OldReference. 
-(In the database, OldReference is stored as int(11).)
-
-
-
-=head2 SetOldReference VALUE
-
-
-Set OldReference to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, OldReference will be stored as a int(11).)
-
-
-=cut
-
-
-=head2 NewReference
-
-Returns the current value of NewReference. 
-(In the database, NewReference is stored as int(11).)
-
-
-
-=head2 SetNewReference VALUE
-
-
-Set NewReference to VALUE. 
-Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, NewReference will be stored as a int(11).)
-
-
-=cut
-
-
 =head2 Data
 
 Returns the current value of Data. 
@@ -368,33 +320,27 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
-        ObjectType => 
-		{read => 1, write => 1, sql_type => 12, length => 64,  is_blob => 0,  is_numeric => 0,  type => 'varchar(64)', default => ''},
-        ObjectId => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, type => 'int(11)', default => ''},
+        EffectiveTicket => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
+        Ticket => 
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         TimeTaken => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, write => 1, type => 'int(11)', default => '0'},
         Type => 
-		{read => 1, write => 1, sql_type => 12, length => 20,  is_blob => 0,  is_numeric => 0,  type => 'varchar(20)', default => ''},
+		{read => 1, write => 1, type => 'varchar(20)', default => ''},
         Field => 
-		{read => 1, write => 1, sql_type => 12, length => 40,  is_blob => 0,  is_numeric => 0,  type => 'varchar(40)', default => ''},
+		{read => 1, write => 1, type => 'varchar(40)', default => ''},
         OldValue => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         NewValue => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
-        ReferenceType => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
-        OldReference => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
-        NewReference => 
-		{read => 1, write => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         Data => 
-		{read => 1, write => 1, sql_type => 12, length => 255,  is_blob => 0,  is_numeric => 0,  type => 'varchar(255)', default => ''},
+		{read => 1, write => 1, type => 'varchar(255)', default => ''},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
@@ -426,7 +372,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Transaction_Overlay.pm b/rt/lib/RT/Transaction_Overlay.pm
index b179084..17e47cb 100644
--- a/rt/lib/RT/Transaction_Overlay.pm
+++ b/rt/lib/RT/Transaction_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Transaction - RT\'s transaction object
@@ -71,9 +70,6 @@ ok(require RT::Transaction);
 
 =cut
 
-
-package RT::Transaction;
-
 use strict;
 no warnings qw(redefine);
 
@@ -88,9 +84,8 @@ use RT::Scrips;
 
 Create a new transaction.
 
-This routine should _never_ be called by anything other than RT::Ticket. 
-It should not be called 
-from client code. Ever. Not ever.  If you do this, we will hunt you down and break your kneecaps.
+This routine should _never_ be called anything other Than RT::Ticket. It should not be called 
+from client code. Ever. Not ever.  If you do this, we will hunt you down. and break your kneecaps.
 Then the unpleasant stuff will start.
 
 TODO: Document what gets passed to this
@@ -102,6 +97,7 @@ sub Create {
     my %args = (
         id             => undef,
         TimeTaken      => 0,
+        Ticket         => 0,
         Type           => 'undefined',
         Data           => '',
         Field          => undef,
@@ -110,36 +106,24 @@ sub Create {
         MIMEObj        => undef,
         ActivateScrips => 1,
         CommitScrips => 1,
-	ObjectType => 'RT::Ticket',
-	ObjectId => 0,
-	ReferenceType => undef,
-        OldReference       => undef,
-        NewReference       => undef,
         @_
     );
 
-    $args{ObjectId} ||= $args{Ticket};
-
     #if we didn't specify a ticket, we need to bail
-    unless ( $args{'ObjectId'} && $args{'ObjectType'}) {
-        return ( 0, $self->loc( "Transaction->Create couldn't, as you didn't specify an object type and id"));
+    unless ( $args{'Ticket'} ) {
+        return ( 0, $self->loc( "Transaction->Create couldn't, as you didn't specify a ticket id"));
     }
 
 
 
     #lets create our transaction
-    my %params = (
+    my %params = (Ticket    => $args{'Ticket'},
         Type      => $args{'Type'},
         Data      => $args{'Data'},
         Field     => $args{'Field'},
         OldValue  => $args{'OldValue'},
         NewValue  => $args{'NewValue'},
-        Created   => $args{'Created'},
-	ObjectType => $args{'ObjectType'},
-	ObjectId => $args{'ObjectId'},
-	ReferenceType => $args{'ReferenceType'},
-	OldReference => $args{'OldReference'},
-	NewReference => $args{'NewReference'},
+        Created   => $args{'Created'}
     );
 
     # Parameters passed in during an import that we probably don't want to touch, otherwise
@@ -153,20 +137,20 @@ sub Create {
 
 
     #Provide a way to turn off scrips if we need to
-        $RT::Logger->debug('About to think about scrips for transaction #' .$self->Id);
-    if ( $args{'ActivateScrips'} and $args{'ObjectType'} eq 'RT::Ticket' ) {
+        $RT::Logger->debug('About to think about scrips for transaction' .$self->Id);            
+    if ( $args{'ActivateScrips'} ) {
        $self->{'scrips'} = RT::Scrips->new($RT::SystemUser);
 
-        $RT::Logger->debug('About to prepare scrips for transaction #' .$self->Id); 
+        $RT::Logger->debug('About to prepare scrips for transaction' .$self->Id);            
 
         $self->{'scrips'}->Prepare(
             Stage       => 'TransactionCreate',
             Type        => $args{'Type'},
-            Ticket      => $args{'ObjectId'},
+            Ticket      => $args{'Ticket'},
             Transaction => $self->id,
         );
         if ($args{'CommitScrips'} ) {
-            $RT::Logger->debug('About to commit scrips for transaction #' .$self->Id);
+            $RT::Logger->debug('About to commit scrips for transaction' .$self->Id);
             $self->{'scrips'}->Commit();
         }
     }
@@ -194,34 +178,10 @@ sub Scrips {
 
 # {{{ sub Delete
 
-=head2 Delete
-
-Delete this transaction. Currently DOES NOT CHECK ACLS
-
-=cut
-
 sub Delete {
     my $self = shift;
-
-
-    $RT::Handle->BeginTransaction();
-
-    my $attachments = $self->Attachments;
-
-    while (my $attachment = $attachments->Next) {
-        my ($id, $msg) = $attachment->Delete();
-        unless ($id) {
-            $RT::Handle->Rollback();
-            return($id, $self->loc("System Error: [_1]", $msg));
-        }
-    }
-    my ($id,$msg) = $self->SUPER::Delete();
-        unless ($id) {
-            $RT::Handle->Rollback();
-            return($id, $self->loc("System Error: [_1]", $msg));
-        }
-    $RT::Handle->Commit();
-    return ($id,$msg);
+    return ( 0,
+        $self->loc('Deleting this object could break referential integrity') );
 }
 
 # }}}
@@ -426,7 +386,7 @@ sub Attachments {
         }
 
         #if they ain't got rights to see, return an empty object
-        elsif ($self->__Value('ObjectType') eq "RT::Ticket") {
+        else {
             unless ( $self->CurrentUserHasRight('ShowTicket') ) {
                 return ( $self->{'attachments'} );
             }
@@ -507,7 +467,7 @@ sub Description {
     }
 
     #if they ain't got rights to see, don't let em
-    elsif ($self->__Value('ObjectType') eq "RT::Ticket") {
+    else {
         unless ( $self->CurrentUserHasRight('ShowTicket') ) {
             return ($self->loc("Permission Denied") );
         }
@@ -533,6 +493,7 @@ Returns a text string which briefly describes this transaction
 sub BriefDescription {
     my $self = shift;
 
+
     #If it's a comment or a comment email record,
     #  we need to be extra special careful
     if ( $self->__Value('Type') =~ /^Comment/ ) {
@@ -542,67 +503,42 @@ sub BriefDescription {
     }
 
     #if they ain't got rights to see, don't let em
-    elsif ( $self->__Value('ObjectType') eq "RT::Ticket" ) {
+    else {
         unless ( $self->CurrentUserHasRight('ShowTicket') ) {
             return ( $self->loc("Permission Denied") );
         }
     }
 
-    my $type = $self->Type;    #cache this, rather than calling it 30 times
+    my $type = $self->Type; #cache this, rather than calling it 30 times
 
-    if ( !defined($type) ) {
+    if ( !defined( $type ) ) {
         return $self->loc("No transaction type specified");
     }
 
-    my $obj_type = $self->FriendlyObjectType;
-
     if ( $type eq 'Create' ) {
-        return ( $self->loc( "[_1] created", $obj_type ) );
+        return ($self->loc("Ticket created"));
     }
     elsif ( $type =~ /Status/ ) {
         if ( $self->Field eq 'Status' ) {
             if ( $self->NewValue eq 'deleted' ) {
-                return ( $self->loc( "[_1] deleted", $obj_type ) );
+                return ($self->loc("Ticket deleted"));
             }
             else {
-                return (
-                    $self->loc(
-                        "Status changed from [_1] to [_2]",
-                        "'" . $self->loc( $self->OldValue ) . "'",
-                        "'" . $self->loc( $self->NewValue ) . "'"
-                    )
-                );
+                return ( $self->loc("Status changed from [_1] to [_2]", $self->loc($self->OldValue), $self->loc($self->NewValue) ));
 
             }
         }
 
         # Generic:
-        my $no_value = $self->loc("(no value)");
-        return (
-            $self->loc(
-                "[_1] changed from [_2] to [_3]",
-                $self->Field,
-                ( $self->OldValue ? "'" . $self->OldValue . "'" : $no_value ),
-                "'" . $self->NewValue . "'"
-            )
-        );
+       my $no_value = $self->loc("(no value)"); 
+        return ( $self->loc( "[_1] changed from [_2] to [_3]", $self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue ));
     }
 
-    if ( my $code = $_BriefDescriptions{$type} ) {
+    if (my $code = $_BriefDescriptions{$type}) {
         return $code->($self);
     }
 
-    return $self->loc(
-        "Default: [_1]/[_2] changed from [_3] to [_4]",
-        $type,
-        $self->Field,
-        (
-            $self->OldValue
-            ? "'" . $self->OldValue . "'"
-            : $self->loc("(no value)")
-        ),
-        "'" . $self->NewValue . "'"
-    );
+    return $self->loc( "Default: [_1]/[_2] changed from [_3] to [_4]", $type, $self->Field, $self->OldValue, $self->NewValue );
 }
 
 %_BriefDescriptions = (
@@ -664,7 +600,7 @@ sub BriefDescription {
         my $self = shift;
         my $Old = RT::User->new( $self->CurrentUser );
         $Old->Load( $self->OldValue );
-        return $self->loc("Stolen from [_1]",  $Old->Name);
+        return $self->loc("Stolen from [_1] ",  $Old->Name);
     },
     Give => sub {
         my $self = shift;
@@ -766,10 +702,7 @@ sub BriefDescription {
     },
     Set => sub {
         my $self = shift;
-        if ( $self->Field eq 'Password' ) {
-            return $self->loc('Password changed');
-        }
-        elsif ( $self->Field eq 'Queue' ) {
+        if ( $self->Field eq 'Queue' ) {
             my $q1 = new RT::Queue( $self->CurrentUser );
             $q1->Load( $self->OldValue );
             my $q2 = new RT::Queue( $self->CurrentUser );
@@ -786,7 +719,7 @@ sub BriefDescription {
             return $self->loc( "[_1] changed from [_2] to [_3]", $self->Field, $t2->AsString, $t1->AsString );
         }
         else {
-            return $self->loc( "[_1] changed from [_2] to [_3]", $self->Field, ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'" );
+            return $self->loc( "[_1] changed from [_2] to [_3]", $self->Field, $self->OldValue, $self->NewValue );
         }
     },
     PurgeTransaction => sub {
@@ -810,7 +743,6 @@ Returns false otherwise
 
 sub IsInbound {
     my $self = shift;
-    $self->ObjectType eq 'RT::Ticket' or return undef;
     return ( $self->TicketObj->IsRequestor( $self->CreatorObj->PrincipalId ) );
 }
 
@@ -818,11 +750,23 @@ sub IsInbound {
 
 # }}}
 
-sub _OverlayAccessible {
+sub _ClassAccessible {
     {
 
-          ObjectType => { public => 1},
-          ObjectId => { public => 1},
+        id => { read => 1, type => 'int(11)', default => '' },
+          EffectiveTicket =>
+          { read => 1, write => 1, type => 'int(11)', default => '' },
+          Ticket =>
+          { read => 1, public => 1, type => 'int(11)', default => '' },
+          TimeTaken => { read => 1, type => 'int(11)',      default => '' },
+          Type      => { read => 1, type => 'varchar(20)',  default => '' },
+          Field     => { read => 1, type => 'varchar(40)',  default => '' },
+          OldValue  => { read => 1, type => 'varchar(255)', default => '' },
+          NewValue  => { read => 1, type => 'varchar(255)', default => '' },
+          Data      => { read => 1, type => 'varchar(100)', default => '' },
+          Creator => { read => 1, auto => 1, type => 'int(11)', default => '' },
+          Created =>
+          { read => 1, auto => 1, type => 'datetime', default => '' },
 
     }
 };
@@ -879,16 +823,9 @@ sub _Value {
         }
 
     }
-    # Make sure the user can see the custom field before showing that it changed
-    elsif ( ( $self->__Value('Type') eq 'CustomField' ) && $self->__Value('Field') ) {
-        my $cf = RT::CustomField->new( $self->CurrentUser );
-        $cf->Load( $self->__Value('Field') );
-        return (undef) unless ( $cf->CurrentUserHasRight('SeeCustomField') );
-    }
-
 
     #if they ain't got rights to see, don't let em
-    elsif ($self->__Value('ObjectType') eq "RT::Ticket") {
+    else {
         unless ( $self->CurrentUserHasRight('ShowTicket') ) {
             return (undef);
         }
@@ -922,150 +859,6 @@ sub CurrentUserHasRight {
 
 # }}}
 
-sub Ticket {
-    my $self = shift;
-    return $self->ObjectId;
-}
-
-sub TicketObj {
-    my $self = shift;
-    return $self->Object;
-}
-
-sub OldValue {
-    my $self = shift;
-    if (my $type = $self->__Value('ReferenceType')) {
-	my $Object = $type->new($self->CurrentUser);
-	$Object->Load($self->__Value('OldReference'));
-	return $Object->Content;
-    }
-    else {
-	return $self->__Value('OldValue');
-    }
-}
-
-sub NewValue {
-    my $self = shift;
-    if (my $type = $self->__Value('ReferenceType')) {
-	my $Object = $type->new($self->CurrentUser);
-	$Object->Load($self->__Value('NewReference'));
-	return $Object->Content;
-    }
-    else {
-	return $self->__Value('NewValue');
-    }
-}
-
-sub Object {
-    my $self  = shift;
-    my $Object = $self->__Value('ObjectType')->new($self->CurrentUser);
-    $Object->Load($self->__Value('ObjectId'));
-    return($Object);
-}
-
-sub FriendlyObjectType {
-    my $self = shift;
-    my $type = $self->ObjectType or return undef;
-    $type =~ s/^RT:://;
-    return $self->loc($type);
-}
-
-=head2 UpdateCustomFields
-    
-    Takes a hash of 
-
-    CustomField-<<Id>> => Value
-        or 
-
-    Object-RT::Transaction-CustomField-<<Id>> => Value parameters to update
-    this transaction's custom fields
-
-=cut
-
-sub UpdateCustomFields {
-    my $self = shift;
-    my %args = (@_);
-
-    # This method used to have an API that took a hash of a single
-    # value "ARGSRef", which was a reference to a hash of arguments.
-    # This was insane. The next few lines of code preserve that API
-    # while giving us something saner.
-       
-
-    # TODO: 3.6: DEPRECATE OLD API
-
-    my $args; 
-
-    if ($args{'ARGSRef'}) { 
-        $args = $args{ARGSRef};
-    } else {
-        $args = \%args;
-    }
-
-    foreach my $arg ( keys %$args ) {
-        next
-          unless ( $arg =~
-            /^(?:Object-RT::Transaction--)?CustomField-(\d+)/ );
-	next if $arg =~ /-Magic$/;
-        my $cfid   = $1;
-        my $values = $args->{$arg};
-        foreach
-          my $value ( UNIVERSAL::isa( $values, 'ARRAY' ) ? @$values : $values )
-        {
-            next unless length($value);
-            $self->_AddCustomFieldValue(
-                Field             => $cfid,
-                Value             => $value,
-                RecordTransaction => 0,
-            );
-        }
-    }
-}
-
-
-
-=head2 CustomFieldValues
-
- Do name => id mapping (if needed) before falling back to RT::Record's CustomFieldValues
-
- See L<RT::Record>
-
-=cut
-
-sub CustomFieldValues {
-    my $self  = shift;
-    my $field = shift;
-
-    if ( UNIVERSAL::can( $self->Object, 'QueueObj' ) ) {
-
-        unless ( $field =~ /^\d+$/o ) {
-            my $CFs = RT::CustomFields->new( $self->CurrentUser );
-             $CFs->Limit( FIELD => 'Name', VALUE => $field);
-            $CFs->LimitToLookupType($self->CustomFieldLookupType);
-            $CFs->LimitToGlobalOrObjectId($self->Object->QueueObj->id);
-            $field = $CFs->First->id if $CFs->First;
-        }
-    }
-    return $self->SUPER::CustomFieldValues($field);
-}
-
-# }}}
-
-# {{{ sub CustomFieldLookupType
-
-=head2 CustomFieldLookupType
-
-Returns the RT::Transaction lookup type, which can 
-be passed to RT::CustomField->Create() via the 'LookupType' hash key.
-
-=cut
-
-# }}}
-
-sub CustomFieldLookupType {
-    "RT::Queue-RT::Ticket-RT::Transaction";
-}
-
 # Transactions don't change. by adding this cache congif directiove, we don't lose pathalogically on long tickets.
 sub _CacheConfig {
   {
diff --git a/rt/lib/RT/Transactions.pm b/rt/lib/RT/Transactions.pm
index 351b14c..1e8a97b 100755
--- a/rt/lib/RT/Transactions.pm
+++ b/rt/lib/RT/Transactions.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Transactions_Overlay.pm b/rt/lib/RT/Transactions_Overlay.pm
index fe51575..62a0727 100644
--- a/rt/lib/RT/Transactions_Overlay.pm
+++ b/rt/lib/RT/Transactions_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Transactions - a collection of RT Transaction objects
@@ -66,9 +65,6 @@ ok (require RT::Transactions);
 
 =cut
 
-
-package RT::Transactions;
-
 use strict;
 no warnings qw(redefine);
 
@@ -89,72 +85,6 @@ sub _Init   {
 }
 # }}}
 
-=head2 Limit
-
-A wrapper around SUPER::Limit to catch migration issues
-
-=cut
-
-sub Limit {
-	my $self = shift;
-	my %args = (@_);
-
-	if ($args{'FIELD'} eq 'Ticket') {
-		Carp::cluck("Historical code calling RT::Transactions::Limit with a 'Ticket'.  This deprecated API will be deleted in 3.6");
-		$self->SUPER::Limit(FIELD => 'ObjectType', OPERATOR => '=', VALUE =>'RT::Ticket');
-		$args{'FIELD'} = 'ObjectId';
-		$self->SUPER::Limit(%args);
-
-	} else {
-
-		$self->SUPER::Limit(%args);
-	}
-
-
-}
-
-
-
-=head2 LimitToTicket TICKETID 
-
-Find only transactions for the ticket whose id is TICKETID.
-
-This includes tickets merged into TICKETID.
-
-Repeated calls to this method will intelligently limit down to that set of tickets, joined with an OR
-
-
-=cut
-
-
-sub LimitToTicket {
-    my $self = shift;
-    my $tid  = shift;
-
-    unless ( $self->{'tickets_table'} ) {
-        $self->{'tickets_table'} ||= $self->NewAlias('Tickets');
-        $self->Join(
-            ALIAS1 => 'main',
-            FIELD1 => 'ObjectId',
-            ALIAS2 => $self->{'tickets_table'},
-            FIELD2 => 'id'
-        );
-        $self->Limit(
-            FIELD => 'ObjectType',
-            VALUE => 'RT::Ticket',
-        );
-    }
-    $self->Limit(
-        ALIAS           => $self->{tickets_table},
-        FIELD           => 'EffectiveId',
-        OPERATOR        => '=',
-        ENTRYAGGREGATOR => 'OR',
-        VALUE           => $tid,
-    );
-
-}
-
-
 # {{{ sub Next
 sub Next {
     my $self = shift;
diff --git a/rt/lib/RT/URI.pm b/rt/lib/RT/URI.pm
index fdbe63b..b047044 100644
--- a/rt/lib/RT/URI.pm
+++ b/rt/lib/RT/URI.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::URI;;
 
 use strict;
diff --git a/rt/lib/RT/URI/base.pm b/rt/lib/RT/URI/base.pm
index 56bfef3..e50f640 100644
--- a/rt/lib/RT/URI/base.pm
+++ b/rt/lib/RT/URI/base.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::URI::base;
 
 use strict;
diff --git a/rt/lib/RT/URI/freeside.pm b/rt/lib/RT/URI/freeside.pm
index ff1d38d..ebd24ad 100644
--- a/rt/lib/RT/URI/freeside.pm
+++ b/rt/lib/RT/URI/freeside.pm
@@ -28,170 +28,143 @@ package RT::URI::freeside;
 
 use RT::URI::base;
 use strict;
-use vars qw(@ISA $IntegrationType $URL);
+use vars qw(@ISA);
+
 @ISA = qw/RT::URI::base/;
 
 
 =head1 NAME
 
-RT::URI::freeside
+RT::URI::base
 
 =head1 DESCRIPTION
 
 URI handler for freeside URIs.  See http://www.sisd.com/freeside/ for
 more information on freeside.
 
-
-=head1 Public subroutines
-
-=over 4
-
-=item FreesideGetConfig CONFKEY
-
-Subroutine that returns the freeside's configuration value(s) for CONFKEY
-as a scalar or list.
-
-=cut
-
-sub FreesideGetConfig { return undef; }
-
-
-=item FreesideURL
-
-Returns the URL for freeside's web interface.
-
-=cut
-
-sub FreesideURL { return $URL; }
-
-
-=item FreesideVersion
-
-Returns a string describing the freeside version being used.
-
-=cut
-
-sub FreesideVersion { return undef; }
-
-
-=item smart_search
-
-A wrapper for the FS::cust_main::smart_search subroutine.
-
-=cut
-
-sub smart_search { return undef; }
-
-
-=item small_custview
-
-A wrapper for the FS::CGI::small_custview subroutine.
-
-=cut
-
-sub small_custview { return 'Freeside integration error!</A>'; }
-
-
-=back
-
-=head1 Private methods
-
-=over 4
-
-=item _FreesideGetRecord
-
-Method returns a hashref of the freeside record referenced in the URI.
-Must be called after ParseURI.
-
 =cut
 
-sub _FreesideGetRecord { return undef; }
 
-
-=item _FreesideURIPrefix
-
-Method that returns the URI prefix for freeside URIs.
-
-=cut
-
-sub _FreesideURIPrefix {
+sub FreesideURIPrefix {
 
   my $self = shift;
   return($self->Scheme . '://freeside');
 
 }
 
-=item _FreesideURILabel
-
-Method that returns a short string describing the customer referenced
-in the URI.
-
-=cut
-
-sub _FreesideURILabel {
+sub FreesideURILabel {
 
   my $self = shift;
 
-  $RT::Logger->debug("Called _FreesideURILabel()");
-
-  return unless (exists($self->{'fstable'}) and
-                 exists($self->{'fspkey'}));
+  return(undef) unless (exists($self->{'fstable'}) and
+                        exists($self->{'fspkey'}));
 
   my $label;
   my ($table, $pkey) = ($self->{'fstable'}, $self->{'fspkey'});
 
-  if ($table ne 'cust_main') {
-    warn "FS::${table} not currently supported";
-    return;
-  }
+  eval {
+    use FS::UID qw(dbh);
+    use FS::Record qw(qsearchs qsearch dbdef);
+    eval "use FS::$table;";
+    use FS::cust_svc;
+
+    my $dbdef = dbdef or die "No dbdef";
+    my $pkeyfield = $dbdef->table($table)->primary_key
+      or die "No primary key for table $table";
+
+    my $rec = qsearchs($table, { $pkeyfield => $pkey })
+      or die "Record with $pkeyfield == $pkey does not exist in table $table";
+
+    if ($table =~ /^svc_/) {
+      if ($rec->can('cust_svc')) {
+        my $cust_svc = $rec->cust_svc or die '$rec->cust_svc failed';
+        my ($svc, $tag, $svcdb) = $cust_svc->label;
+        $label = "Freeside service ${svc}: ${tag}";
+      }
+    } elsif ($table eq 'cust_main') {
+      #my ($last, $first, $company) = map { $rec->getfield($_) }
+      #                                   qw(last first company);
+      #$label = "Freeside customer ${last}, ${first}";
+      #$label .= ($company ne '') ? " with ${company}" : '';
+      $label = "$pkey: ". $rec->name;
+    } else {
+      $label = "Freeside ${table}, ${pkeyfield} == ${pkey}";
+    }
 
-  my $rec = $self->_FreesideGetRecord();
+    #... other cases
 
-  if (ref($rec) eq 'HASH' and $table eq 'cust_main') {
-    my $name = $rec->{'last'} . ', ' . $rec->{'first'};
-    $name = $rec->{'company'} . " ($name)" if $rec->{'company'};
-    $label = "$pkey: $name";
-  } else {
-    $label = "$pkey: $table";
-  }
+  };
 
   if ($label and !$@) {
     return($label);
   } else {
-    return;
+    return(undef);
   }
+      
 
 }
 
-=item _FreesideURILabelLong
-
-Method that returns a longer string describing the customer referenced
-in the URI.
-
-=cut
-
-sub _FreesideURILabelLong {
+sub FreesideURILabelLong {
 
   my $self = shift;
 
-  return $self->_FreesideURILabel();
+  return(undef) unless (exists($self->{'fstable'}) and
+                        exists($self->{'fspkey'}));
 
-}
+  my $label;
+  my ($table, $pkey) = ($self->{'fstable'}, $self->{'fspkey'});
 
-=back
+  eval {
+    use FS::UID qw(dbh);
+    use FS::Record qw(qsearchs qsearch dbdef);
+    eval "use FS::$table;";
+    use FS::cust_svc;
+
+    my $dbdef = dbdef or die "No dbdef";
+    my $pkeyfield = $dbdef->table($table)->primary_key
+      or die "No primary key for table $table";
+
+    my $rec = qsearchs($table, { $pkeyfield => $pkey })
+      or die "Record with $pkeyfield == $pkey does not exist in table $table";
+
+    if ($table =~ /^svc_/) {
+      #if ($rec->can('cust_svc')) {
+      #  my $cust_svc = $rec->cust_svc or die '$rec->cust_svc failed';
+      #  my ($svc, $tag, $svcdb) = $cust_svc->label;
+      #  $label = "Freeside service ${svc}: ${tag}";
+      #}
+      $label = '';
+    } elsif ($table eq 'cust_main') {
+      use FS::CGI qw(small_custview);
+      $label = small_custview( $rec,
+                               scalar(FS::Conf->new->config('countrydefault')),
+                               1 #nobalance
+                             );
+    } else {
+      #$label = "Freeside ${table}, ${pkeyfield} == ${pkey}";
+      $label = '';
+    }
 
-=head1 Public methods
+    #... other cases
 
-=over 4
+  };
 
-=cut
+  if ($label and !$@) {
+    return($label);
+  } else {
+    warn $@;
+    return(undef);
+  }
+      
+
+}
 
 sub ParseURI { 
     my $self = shift;
     my $uri = shift;
     my ($table, $pkey);
 
-    my $uriprefix = $self->_FreesideURIPrefix;
+    my $uriprefix = $self->FreesideURIPrefix;
     if ($uri =~ /^$uriprefix\/(\w+)\/(\d+)$/) {
       $table = $1;
       $pkey = $2;
@@ -204,13 +177,22 @@ sub ParseURI {
     $self->{'fstable'} = $table;
     $self->{'fspkey'} = $pkey;
 
+    my $p;
 
-    my $url = $self->FreesideURL();
+    eval {
+      use FS::UID qw(dbh);
+      use FS::CGI qw(popurl);
 
-    if ($url ne '') {
-      $self->{'href'} = "${url}/view/${table}.cgi?${pkey}";
-    } else {
+      if (dbh) {
+	$p = popurl(3);
+      }
+
+    };
+
+    if ($@ or (!$p)) {
       $self->{'href'} = $self->{'uri'};
+    } else {
+      $self->{'href'} = "${p}view/${table}.cgi?${pkey}";
     }
 
     $self->{'uri'};
@@ -233,7 +215,7 @@ sub IsLocal {
     return undef;
 }
 
-=item AsString
+=head2 AsString
 
 Return a "pretty" string representing the URI object.
 
@@ -247,14 +229,14 @@ This is meant to be used like this:
 sub AsString {
     my $self = shift;
     my $prettystring;
-    if ($prettystring = $self->_FreesideURILabel) {
+    if ($prettystring = $self->FreesideURILabel) {
       return $prettystring;
     } else {
       return $self->URI;
     }
 }
 
-=item AsStringLong
+=head2 AsStringLong
 
 Return a longer (HTML) string representing the URI object.
 
@@ -263,23 +245,16 @@ Return a longer (HTML) string representing the URI object.
 sub AsStringLong {
     my $self = shift;
     my $prettystring;
-    if ($prettystring = $self->_FreesideURILabelLong || $self->_FreesideURILabel){
+    if ($prettystring = $self->FreesideURILabelLong || $self->FreesideURILabel){
       return $prettystring;
     } else {
       return $self->URI;
     }
 }
 
-$IntegrationType ||= 'Internal';
-eval "require RT::URI::freeside::${RT::URI::freeside::IntegrationType}";
-warn $@ if $@;
-if ($@ &&
-    $@ !~ qr(^Can't locate RT/URI/freeside/${RT::URI::freeside::IntegrationType}.pm)) {
-  die $@;
-};
-
-=back
-
-=cut
+eval "require RT::URI::base_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI/base_Vendor.pm});
+eval "require RT::URI::base_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI/base_Local.pm});
 
 1;
diff --git a/rt/lib/RT/URI/freeside/Internal.pm b/rt/lib/RT/URI/freeside/Internal.pm
deleted file mode 100644
index 9ca0630..0000000
--- a/rt/lib/RT/URI/freeside/Internal.pm
+++ /dev/null
@@ -1,138 +0,0 @@
-# BEGIN LICENSE BLOCK
-# 
-# Copyright (c) 2004 Kristian Hoffmann <khoff@fire2wire.com>
-# Based on the original RT::URI::base and RT::URI::fsck_com_rt.
-# 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
-# 
-# (Except where explictly superceded by other copyright notices)
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
-# 
-# 
-# END LICENSE BLOCK
-#
-use strict;
-no warnings qw(redefine);
-
-#use vars qw($conf);
-
-use FS;
-use FS::UID qw(dbh);
-use FS::CGI qw(popurl small_custview);
-use FS::Conf;
-use FS::Record qw(qsearchs qsearch dbdef);
-use FS::cust_main;
-use FS::cust_svc;
-
-=head1 NAME
-
-RT::URI::freeside::Internal
-
-=head1 DESCRIPTION
-
-Overlay for the RT::URI::freeside URI handler implementing the Internal integration type.
-
-See L<RT::URI::freeside> for public/private interface documentation.
-
-=cut
-
-
-
-sub _FreesideGetRecord {
-
-  my $self = shift;
-  my ($table, $pkey) = ($self->{'fstable'}, $self->{'fspkey'});
-
-  $RT::Logger->debug("Called _FreesideGetRecord()");
-
-  #eval "use FS::$table;";
-
-  my $dbdef = dbdef;
-  unless ($dbdef) {
-    $RT::Logger->error("Using Internal freeside integration type, ".
-                       "but it doesn't look like we're running under ".
-                       "freeside's Mason handler.");
-    return;
-  }
-
-  my $pkeyfield = $dbdef->table($table)->primary_key;
-  unless ($pkeyfield) {
-    $RT::Logger->error("No primary key for freeside table '$table'");
-    return;
-  }
-
-  my $fsrec = qsearchs($table, { $pkeyfield => $pkey });
-  unless ($fsrec) {
-    $RT::Logger->error("Record with '$pkeyfield' == '$pkey' does " .
-                       "not exist in table $table");
-    return;
-  }
-
-  return { $fsrec->hash, '_object' => $fsrec };
-
-}
-
-sub FreesideVersion {
-
-  return $FS::VERSION;
-
-}
-
-sub FreesideGetConfig {
-
-  #$conf = new FS::Conf unless ref($conf);
-  my $conf = new FS::Conf;
-
-  return scalar($conf->config(@_));
-
-}
-
-sub smart_search { #Subroutine
-
-  return map { { $_->hash } } &FS::cust_main::smart_search(@_);
-
-}
-
-sub small_custview {
-
-  return &FS::CGI::small_custview(@_);
-
-}
-
-sub _FreesideURILabelLong {
-
-  my $self = shift;
-
-  my $table = $self->{'fstable'};
-
-  if ( $table eq 'cust_main' ) {
-
-    my $rec = $self->_FreesideGetRecord();
-    return small_custview( $rec->{'_object'},
-                           scalar(FS::Conf->new->config('countrydefault')),
-                           1 #nobalance
-                         );
-
-  } else {
-
-    return $self->_FreesideURILabel();
-
-  }
-
-}
-
-1;
diff --git a/rt/lib/RT/URI/freeside/XMLRPC.pm b/rt/lib/RT/URI/freeside/XMLRPC.pm
deleted file mode 100644
index a8a731f..0000000
--- a/rt/lib/RT/URI/freeside/XMLRPC.pm
+++ /dev/null
@@ -1,122 +0,0 @@
-# BEGIN LICENSE BLOCK
-# 
-# Copyright (c) 2004 Kristian Hoffmann <khoff@fire2wire.com>
-# Based on the original RT::URI::base and RT::URI::fsck_com_rt.
-# 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
-# 
-# (Except where explictly superceded by other copyright notices)
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
-# 
-# 
-# END LICENSE BLOCK
-
-use strict;
-no warnings qw(redefine);
-
-use vars qw($XMLRPC_URL $_FS_VERSION);
-
-use Frontier::Client;
-
-=head1 NAME
-
-RT::URI::freeside::XMLRPC
-
-=head1 DESCRIPTION
-
-Overlay for the RT::URI::freeside URI handler implementing the XMLRPC integration type.
-
-See L<RT::URI::freeside> for public/private interface documentation.
-
-=cut
-
-
-sub _XMLRPCRequest { #Subroutine
-
-  my $method = shift;
-  my @args = @_;
-
-  my $result;
-  eval {
-    my $server = new Frontier::Client ( url => $XMLRPC_URL );
-    $result = $server->call($method, @args);
-  };
-
-  if (not $@ and ref($result) eq 'ARRAY') {
-    return (scalar(@$result) == 1) ? @$result[0] : @$result;
-  } else {
-    $RT::Logger->debug("Freeside XMLRPC: " . $result || $@);
-    return ();
-  }
-
-}
-
-sub _FreesideGetRecord {
-
-  my $self = shift;
-  my ($table, $pkey) = ($self->{'fstable'}, $self->{'fspkey'});
-  my $record;
-
-  $RT::Logger->debug("Called XMLRPC::_FreesideGetRecord()");
-
-  #FIXME: Need a better way to get primary keys.
-  # Maybe create a method for it and cache them like version?
-  my %table_pkeys = (
-    cust_main => 'custnum',
-  );
-    
-  my $method = 'Record.qsearchs';
-  my @args = ($table, { $table_pkeys{$table} => $pkey });
-  my ($record) = &_XMLRPCRequest($method, @args);
-
-  return $record;
-
-}
-
-
-sub FreesideGetConfig {
-
-  return _XMLRPCRequest('Conf.config', @_);
-
-}
-
-
-sub FreesideVersion {
-
-  return $_FS_VERSION if ($_FS_VERSION =~ /^\d+\.\d+\.\d+/);
-
-  $RT::Logger->debug("Requesting freeside version...");
-  ($_FS_VERSION) = &_XMLRPCRequest('version');
-  $RT::Logger->debug("Cached freeside version: ${_FS_VERSION}");
- 
-  return $_FS_VERSION;
-
-}
-
-sub smart_search { #Subroutine
-
-  return _XMLRPCRequest('cust_main.smart_search', @_);
-
-}
-
-sub small_custview {
-
-  return _XMLRPCRequest('CGI.small_custview', @_);
-
-}
-
-1;
diff --git a/rt/lib/RT/URI/fsck_com_rt.pm b/rt/lib/RT/URI/fsck_com_rt.pm
index ba98b1d..cfe77cd 100644
--- a/rt/lib/RT/URI/fsck_com_rt.pm
+++ b/rt/lib/RT/URI/fsck_com_rt.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 package RT::URI::fsck_com_rt;
 
 use RT::Ticket;
@@ -75,7 +75,7 @@ ok (UNIVERSAL::isa($uri,RT::URI::fsck_com_rt), "It's an RT::URI::fsck_com_rt");
 ok ($uri->isa('RT::URI::base'), "It's an RT::URI::base");
 ok ($uri->isa('RT::Base'), "It's an RT::Base");
 
-is ($uri->LocalURIPrefix , 'fsck.com-rt://'.$RT::Organization);
+is ($uri->LocalURIPrefix , 'fsck.com-rt://example.com');
 
 =end testing
 
diff --git a/rt/lib/RT/URI/t.pm b/rt/lib/RT/URI/t.pm
deleted file mode 100644
index 2f95b2d..0000000
--- a/rt/lib/RT/URI/t.pm
+++ /dev/null
@@ -1,83 +0,0 @@
-# BEGIN LICENSE BLOCK
-# 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
-# 
-# (Except where explictly superceded by other copyright notices)
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
-# 
-# 
-# END LICENSE BLOCK
-package RT::URI::t;
-
-use RT::Ticket;
-use RT::URI::base;
-
-use strict;
-use vars qw(@ISA);
-@ISA = qw/RT::URI::fsck_com_rt/;
-
-my $scheme = "t";
-
-=head2 ParseURI URI
-
-When handed an t: URI, figures out if it is an RT ticket.  This is an
-alternate short form of specifying a full ticket URI.
-
-=begin testing
-
-use_ok("RT::URI::t");
-my $uri = RT::URI::t->new($RT::SystemUser);
-ok(ref($uri), "URI object exists");
-
-my $uristr = "t:1";
-$uri->ParseURI($uristr);
-is(ref($uri->Object), "RT::Ticket", "Object loaded is a ticket");
-is($uri->Object->Id, 1, "Object loaded has correct ID");
-is($uri->URI, 'fsck.com-rt://'.$RT::Organization.'/ticket/1',
-   "URI object has correct URI string");
-
-=end testing
-
-=cut
-
-sub ParseURI { 
-    my $self = shift;
-    my $uri = shift;
-
-    # "t:<articlenum>"
-    # Pass this off to fsck_com_rt, which is equipped to deal with
-    # tickets after stripping off the t: prefix.
-
-    if ($uri =~ /^$scheme:(\d+)/) {
-	return $self->SUPER::ParseURI($1);
-    } else {
-	$self->{'uri'} = $uri;
-	return undef;
-    }
-}
-
-=head2 Scheme
-
-Return the URI scheme 
-
-=cut
-
-sub Scheme {
-  return $scheme;
-}
-
-1;
diff --git a/rt/lib/RT/User.pm b/rt/lib/RT/User.pm
index 18edfd4..10e7e84 100755
--- a/rt/lib/RT/User.pm
+++ b/rt/lib/RT/User.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -764,73 +764,73 @@ sub _CoreAccessible {
     {
      
         id =>
-		{read => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => ''},
+		{read => 1, type => 'int(11)', default => ''},
         Name => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         Password => 
-		{read => 1, write => 1, sql_type => 12, length => 40,  is_blob => 0,  is_numeric => 0,  type => 'varchar(40)', default => ''},
+		{read => 1, write => 1, type => 'varchar(40)', default => ''},
         Comments => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'blob', default => ''},
+		{read => 1, write => 1, type => 'blob', default => ''},
         Signature => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'blob', default => ''},
+		{read => 1, write => 1, type => 'blob', default => ''},
         EmailAddress => 
-		{read => 1, write => 1, sql_type => 12, length => 120,  is_blob => 0,  is_numeric => 0,  type => 'varchar(120)', default => ''},
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
         FreeformContactInfo => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'blob', default => ''},
+		{read => 1, write => 1, type => 'blob', default => ''},
         Organization => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         RealName => 
-		{read => 1, write => 1, sql_type => 12, length => 120,  is_blob => 0,  is_numeric => 0,  type => 'varchar(120)', default => ''},
+		{read => 1, write => 1, type => 'varchar(120)', default => ''},
         NickName => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         Lang => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         EmailEncoding => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         WebEncoding => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         ExternalContactInfoId => 
-		{read => 1, write => 1, sql_type => 12, length => 100,  is_blob => 0,  is_numeric => 0,  type => 'varchar(100)', default => ''},
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
         ContactInfoSystem => 
-		{read => 1, write => 1, sql_type => 12, length => 30,  is_blob => 0,  is_numeric => 0,  type => 'varchar(30)', default => ''},
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
         ExternalAuthId => 
-		{read => 1, write => 1, sql_type => 12, length => 100,  is_blob => 0,  is_numeric => 0,  type => 'varchar(100)', default => ''},
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
         AuthSystem => 
-		{read => 1, write => 1, sql_type => 12, length => 30,  is_blob => 0,  is_numeric => 0,  type => 'varchar(30)', default => ''},
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
         Gecos => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         HomePhone => 
-		{read => 1, write => 1, sql_type => 12, length => 30,  is_blob => 0,  is_numeric => 0,  type => 'varchar(30)', default => ''},
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
         WorkPhone => 
-		{read => 1, write => 1, sql_type => 12, length => 30,  is_blob => 0,  is_numeric => 0,  type => 'varchar(30)', default => ''},
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
         MobilePhone => 
-		{read => 1, write => 1, sql_type => 12, length => 30,  is_blob => 0,  is_numeric => 0,  type => 'varchar(30)', default => ''},
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
         PagerPhone => 
-		{read => 1, write => 1, sql_type => 12, length => 30,  is_blob => 0,  is_numeric => 0,  type => 'varchar(30)', default => ''},
+		{read => 1, write => 1, type => 'varchar(30)', default => ''},
         Address1 => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         Address2 => 
-		{read => 1, write => 1, sql_type => 12, length => 200,  is_blob => 0,  is_numeric => 0,  type => 'varchar(200)', default => ''},
+		{read => 1, write => 1, type => 'varchar(200)', default => ''},
         City => 
-		{read => 1, write => 1, sql_type => 12, length => 100,  is_blob => 0,  is_numeric => 0,  type => 'varchar(100)', default => ''},
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
         State => 
-		{read => 1, write => 1, sql_type => 12, length => 100,  is_blob => 0,  is_numeric => 0,  type => 'varchar(100)', default => ''},
+		{read => 1, write => 1, type => 'varchar(100)', default => ''},
         Zip => 
-		{read => 1, write => 1, sql_type => 12, length => 16,  is_blob => 0,  is_numeric => 0,  type => 'varchar(16)', default => ''},
+		{read => 1, write => 1, type => 'varchar(16)', default => ''},
         Country => 
-		{read => 1, write => 1, sql_type => 12, length => 50,  is_blob => 0,  is_numeric => 0,  type => 'varchar(50)', default => ''},
+		{read => 1, write => 1, type => 'varchar(50)', default => ''},
         Timezone => 
-		{read => 1, write => 1, sql_type => 12, length => 50,  is_blob => 0,  is_numeric => 0,  type => 'varchar(50)', default => ''},
+		{read => 1, write => 1, type => 'varchar(50)', default => ''},
         PGPKey => 
-		{read => 1, write => 1, sql_type => -4, length => 0,  is_blob => 1,  is_numeric => 0,  type => 'text', default => ''},
+		{read => 1, write => 1, type => 'text', default => ''},
         Creator => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         Created => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
         LastUpdatedBy => 
-		{read => 1, auto => 1, sql_type => 4, length => 11,  is_blob => 0,  is_numeric => 1,  type => 'int(11)', default => '0'},
+		{read => 1, auto => 1, type => 'int(11)', default => '0'},
         LastUpdated => 
-		{read => 1, auto => 1, sql_type => 11, length => 0,  is_blob => 0,  is_numeric => 0,  type => 'datetime', default => ''},
+		{read => 1, auto => 1, type => 'datetime', default => ''},
 
  }
 };
@@ -862,7 +862,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/User_Overlay.pm b/rt/lib/RT/User_Overlay.pm
index 27ddd4c..c4ef340 100644
--- a/rt/lib/RT/User_Overlay.pm
+++ b/rt/lib/RT/User_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::User - RT User object
@@ -66,9 +65,6 @@ ok(require RT::User);
 
 =cut
 
-
-package RT::User;
-
 use strict;
 no warnings qw(redefine);
 
@@ -79,7 +75,7 @@ use vars qw(%_USERS_KEY_CACHE);
 use Digest::MD5;
 use RT::Principals;
 use RT::ACE;
-use RT::Interface::Email;
+use RT::EmailParser;
 
 
 # {{{ sub _Accessible 
@@ -122,41 +118,41 @@ sub _OverlayAccessible {
 
 my $u1 = RT::User->new($RT::SystemUser);
 is(ref($u1), 'RT::User');
-my ($id, $msg) = $u1->Create(Name => 'CreateTest1'.$$, EmailAddress => $$.'create-test-1@example.com');
+my ($id, $msg) = $u1->Create(Name => 'CreateTest1', EmailAddress => 'create-test-1@example.com');
 ok ($id, "Creating user CreateTest1 - " . $msg );
 
 # Make sure we can't create a second user with the same name
 my $u2 = RT::User->new($RT::SystemUser);
-($id, $msg) = $u2->Create(Name => 'CreateTest1'.$$, EmailAddress => $$.'create-test-2@example.com');
+($id, $msg) = $u2->Create(Name => 'CreateTest1', EmailAddress => 'create-test-2@example.com');
 ok (!$id, $msg);
 
 
 # Make sure we can't create a second user with the same EmailAddress address
 my $u3 = RT::User->new($RT::SystemUser);
-($id, $msg) = $u3->Create(Name => 'CreateTest2'.$$, EmailAddress => $$.'create-test-1@example.com');
+($id, $msg) = $u3->Create(Name => 'CreateTest2', EmailAddress => 'create-test-1@example.com');
 ok (!$id, $msg);
 
 # Make sure we can create a user with no EmailAddress address
 my $u4 = RT::User->new($RT::SystemUser);
-($id, $msg) = $u4->Create(Name => 'CreateTest3'.$$);
+($id, $msg) = $u4->Create(Name => 'CreateTest3');
 ok ($id, $msg);
 
 # make sure we can create a second user with no EmailAddress address
 my $u5 = RT::User->new($RT::SystemUser);
-($id, $msg) = $u5->Create(Name => 'CreateTest4'.$$);
+($id, $msg) = $u5->Create(Name => 'CreateTest4');
 ok ($id, $msg);
 
 # make sure we can create a user with a blank EmailAddress address
 my $u6 = RT::User->new($RT::SystemUser);
-($id, $msg) = $u6->Create(Name => 'CreateTest6'.$$, EmailAddress => '');
+($id, $msg) = $u6->Create(Name => 'CreateTest6', EmailAddress => '');
 ok ($id, $msg);
 # make sure we can create a second user with a blankEmailAddress address
 my $u7 = RT::User->new($RT::SystemUser);
-($id, $msg) = $u7->Create(Name => 'CreateTest7'.$$, EmailAddress => '');
+($id, $msg) = $u7->Create(Name => 'CreateTest7', EmailAddress => '');
 ok ($id, $msg);
 
 # Can we change the email address away from from "";
-($id,$msg) = $u7->SetEmailAddress('foo@bar'.$$);
+($id,$msg) = $u7->SetEmailAddress('foo@bar');
 ok ($id, $msg);
 # can we change the address back to "";  
 ($id,$msg) = $u7->SetEmailAddress('');
@@ -175,13 +171,9 @@ sub Create {
         Privileged => 0,
         Disabled => 0,
         EmailAddress => '',
-        _RecordTransaction => 1,
         @_    # get the real argumentlist
     );
 
-    # remove the value so it does not cripple SUPER::Create
-    my $record_transaction = delete $args{'_RecordTransaction'};
-
     #Check the ACL
     unless ( $self->CurrentUser->HasRight(Right => 'AdminUsers', Object => $RT::System) ) {
         return ( 0, $self->loc('No permission to create users') );
@@ -212,7 +204,7 @@ sub Create {
         $args{'Password'} = '*NO-PASSWORD*';
     }
     elsif ( length( $args{'Password'} ) < $RT::MinimumPasswordLength ) {
-        return ( 0, $self->loc("Password needs to be at least [_1] characters long",$RT::MinimumPasswordLength) );
+        return ( 0, $self->loc("Password too short") );
     }
 
     else {
@@ -322,12 +314,7 @@ sub Create {
     }
 
 
-    if ( $record_transaction ) {
-	$self->_NewTransaction( Type => "Create" );
-    }
-
     $RT::Handle->Commit;
-
     return ( $id, $self->loc('User created') );
 }
 
@@ -586,15 +573,12 @@ sub LoadOrCreateByEmail {
         my ($val, $message);
 
 	my ( $Address, $Name ) =
-	RT::Interface::Email::ParseAddressFromHeader($email);
+		RT::EmailParser::ParseAddressFromHeader('', $email);
 	$email = $Address;
 
         $self->LoadByEmail($email);
         $message = $self->loc('User loaded');
         unless ($self->Id) {
-		$self->Load($email);
-	}
-	unless($self->Id) {
             ( $val, $message ) = $self->Create(
                 Name => $email,
                 EmailAddress => $email,
@@ -665,13 +649,11 @@ sub ValidateEmailAddress {
 
 
 
-=head2 CanonicalizeEmailAddress ADDRESS
+=item CanonicalizeEmailAddress ADDRESS
 
-CanonicalizeEmailAddress converts email addresses into canonical form.
-it takes one email address in and returns the proper canonical
-form. You can dump whatever your proper local config is in here.  Note
-that it may be called as a static method; in this case, $self may be
-undef.
+# CanonicalizeEmailAddress converts email addresses into canonical form.
+# it takes one email address in and returns the proper canonical
+# form. You can dump whatever your proper local config is in here
 
 =cut
 
@@ -694,14 +676,14 @@ sub CanonicalizeEmailAddress {
 
 
 
-=head2 CanonicalizeUserInfo HASH of ARGS
+=item CanonicalizeUserInfo HASH of ARGS
 
-CanonicalizeUserInfo can convert all User->Create options.
-it takes a hashref of all the params sent to User->Create and
-returns that same hash, by default nothing is done.
+# CanonicalizeUserInfo can convert all User->Create options.
+# it takes a hashref of all the params sent to User->Create and
+# returns that same hash, by default nothing is done.
 
-This function is intended to allow users to have their info looked up via
-an outside source and modified upon creation.
+# This function is intended to allow users to have their info looked up via
+# an outside source and modified upon creation.
 
 =cut
 
@@ -736,11 +718,7 @@ sub SetRandomPassword {
         return ( 0, $self->loc("Permission Denied") );
     }
 
-
-    my $min = ( $RT::MinimumPasswordLength > 6 ?  $RT::MinimumPasswordLength : 6);
-    my $max = ( $RT::MinimumPasswordLength > 8 ?  $RT::MinimumPasswordLength : 8);
-
-    my $pass = $self->GenerateRandomPassword( $min, $max) ;
+    my $pass = $self->GenerateRandomPassword( 6, 8 );
 
     # If we have "notify user on 
 
@@ -786,7 +764,7 @@ sub ResetPassword {
         $template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
     }
     else {
-        $template->LoadGlobalTemplate('RT_PasswordChange_NonPrivileged');
+        $template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
     }
 
     unless ( $template->Id ) {
@@ -1028,33 +1006,25 @@ sub SetPassword {
     my $password = shift;
 
     unless ( $self->CurrentUserCanModify('Password') ) {
-        return ( 0, $self->loc('Password: Permission Denied') );
+        return ( 0, $self->loc('Permission Denied') );
     }
 
     if ( !$password ) {
         return ( 0, $self->loc("No password set") );
     }
     elsif ( length($password) < $RT::MinimumPasswordLength ) {
-        return ( 0, $self->loc("Password needs to be at least [_1] characters long", $RT::MinimumPasswordLength) );
+        return ( 0, $self->loc("Password too short") );
     }
     else {
-        my $new = !$self->HasPassword;
         $password = $self->_GeneratePassword($password);
-        my ( $val, $msg ) = $self->SUPER::SetPassword($password);
-        if ($val) {
-            return ( 1, $self->loc("Password set") ) if $new;
-            return ( 1, $self->loc("Password changed") );
-        }
-        else {
-            return ( $val, $msg );
-        }
+        return ( $self->SUPER::SetPassword( $password));
     }
 
 }
 
 =head2 _GeneratePassword PASSWORD
 
-returns an MD5 hash of the password passed in, in hexadecimal encoding.
+returns an MD5 hash of the password passed in, in base64 encoding.
 
 =cut
 
@@ -1064,54 +1034,12 @@ sub _GeneratePassword {
 
     my $md5 = Digest::MD5->new();
     $md5->add($password);
-    return ($md5->hexdigest);
-
-}
-
-=head2 _GeneratePasswordBase64 PASSWORD
-
-returns an MD5 hash of the password passed in, in base64 encoding
-(obsoleted now).
-
-=cut
-
-sub _GeneratePasswordBase64 {
-    my $self = shift;
-    my $password = shift;
-
-    my $md5 = Digest::MD5->new();
-    $md5->add($password);
     return ($md5->b64digest);
 
 }
 
 # }}}
 
-                                                                                
-=head2 HasPassword
-                                                                                
-Returns true if the user has a valid password, otherwise returns false.         
-                                                                               
-=cut
-
-
-sub HasPassword {
-    my $self = shift;
-    if (   ( $self->__Value('Password') eq '' )
-        || ( $self->__Value('Password') eq undef ) )
-    {
-
-        return (undef);
-    }
-    if ( $self->__Value('Password') eq '*NO-PASSWORD*' ) {
-        return undef;
-    }
-
-    return 1;
-
-}
-
-
 # {{{ sub IsPassword 
 
 =head2 IsPassword
@@ -1138,7 +1066,8 @@ sub IsPassword {
         return (undef);
     }
 
-    unless ($self->HasPassword) {
+    if ( ($self->__Value('Password') eq '') || 
+         ($self->__Value('Password') eq undef) )  {
         return(undef);
      }
 
@@ -1148,12 +1077,9 @@ sub IsPassword {
     }
 
     #  if it's a historical password we say ok.
-    if ($self->__Value('Password') eq crypt($value, $self->__Value('Password'))
-        or $self->_GeneratePasswordBase64($value) eq $self->__Value('Password'))
-    {
-        # ...but upgrade the legacy password inplace.
-        $self->SUPER::SetPassword( $self->_GeneratePassword($value) );
-        return(1);
+
+    if ( $self->__Value('Password') eq crypt( $value, $self->__Value('Password') ) ) {
+        return (1);
     }
 
     # no password check has succeeded. get out
@@ -1205,7 +1131,7 @@ The response is cached. PrincipalObj should never ever change.
 ok(my $u = RT::User->new($RT::SystemUser));
 ok($u->Load(1), "Loaded the first user");
 ok($u->PrincipalObj->ObjectId == 1, "user 1 is the first principal");
-is($u->PrincipalObj->PrincipalType, 'User' , "Principal 1 is a user, not a group");
+ok($u->PrincipalObj->PrincipalType eq 'User' , "Principal 1 is a user, not a group");
 
 =end testing
 
@@ -1294,29 +1220,9 @@ sub HasGroupRight {
 
 # }}}
 
-# {{{ sub OwnGroups 
-
-=head2 OwnGroups
-
-Returns a group collection object containing the groups of which this
-user is a member.
-
-=cut
-
-sub OwnGroups {
-    my $self = shift;
-    my $groups = RT::Groups->new($self->CurrentUser);
-    $groups->LimitToUserDefinedGroups;
-    $groups->WithMember(PrincipalId => $self->Id, 
-			Recursively => 1);
-    return $groups;
-}
-
-# }}}
-
 # {{{ sub Rights testing
 
-=head1 Rights testing
+=head2 Rights testing
 
 
 =begin testing
@@ -1331,7 +1237,7 @@ ok($rootq->Id, "Loaded the first queue");
 ok ($rootq->CurrentUser->HasRight(Right=> 'CreateTicket', Object => $rootq), "Root can create tickets");
 
 my $new_user = RT::User->new($RT::SystemUser);
-my ($id, $msg) = $new_user->Create(Name => 'ACLTest'.$$);
+my ($id, $msg) = $new_user->Create(Name => 'ACLTest');
 
 ok ($id, "Created a new user for acl test $msg");
 
@@ -1362,7 +1268,7 @@ ok($tickid, "Created ticket: $tickid");
 ok (!$new_user->HasRight( Object => $new_tick, Right => 'ModifyTicket'), "User can't modify the ticket without group membership");
 # Create a new group
 my $group = RT::Group->new($RT::SystemUser);
-$group->CreateUserDefinedGroup(Name => 'ACLTest'.$$);
+$group->CreateUserDefinedGroup(Name => 'ACLTest');
 ok($group->Id, "Created a new group Ok");
 # Grant a group the right to modify tickets in a queue
 ok(my ($gv,$gm) = $group->PrincipalObj->GrantRight( Object => $q, Right => 'ModifyTicket'),"Granted the group the right to modify tickets");
@@ -1389,7 +1295,7 @@ ok($q_as_system->Id, "Loaded the first queue");
 my $new_tick2 = RT::Ticket->new($RT::SystemUser);
 my ($tick2id, $tickmsg) = $new_tick2->Create(Subject=> 'ACL Test 2', Queue =>$q_as_system->Id);
 ok($tick2id, "Created ticket: $tick2id");
-is($new_tick2->QueueObj->id, $q_as_system->Id, "Created a new ticket in queue 1");
+ok($new_tick2->QueueObj->id eq $q_as_system->Id, "Created a new ticket in queue 1");
 
 
 # make sure that the user can't do this without subgroup membership
@@ -1397,7 +1303,7 @@ ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User
 
 # Create a subgroup
 my $subgroup = RT::Group->new($RT::SystemUser);
-$subgroup->CreateUserDefinedGroup(Name => 'Subgrouptest',$$);
+$subgroup->CreateUserDefinedGroup(Name => 'Subgrouptest');
 ok($subgroup->Id, "Created a new group ".$subgroup->Id."Ok");
 #Add the subgroup as a subgroup of the group
 my ($said, $samsg) =  $group->AddMember($subgroup->PrincipalId);
@@ -1412,8 +1318,8 @@ ok ($new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User c
 #  {{{ Deal with making sure that members of subgroups of a disabled group don't have rights
 
 my ($id, $msg);
-($id, $msg) =  $group->SetDisabled(1);
-ok ($id,$msg);
+ ($id, $msg) =  $group->SetDisabled(1);
+ ok ($id,$msg);
 ok (!$new_user->HasRight( Object => $new_tick2, Right => 'ModifyTicket'), "User can't modify the ticket when the group ".$group->Id. " is disabled");
  ($id, $msg) =  $group->SetDisabled(0);
 ok($id,$msg);
@@ -1558,7 +1464,7 @@ ok($rqv, "Revoked the right successfully - $rqm");
 
 # {{{ sub HasRight
 
-=head2 HasRight
+=head2 sub HasRight
 
 Shim around PrincipalObj->HasRight. See RT::Principal
 
@@ -1617,8 +1523,8 @@ sub CurrentUserCanModify {
 
 =head2 CurrentUserHasRight
   
-Takes a single argument. returns 1 if $Self->CurrentUser
-has the requested right. returns undef otherwise
+  Takes a single argument. returns 1 if $Self->CurrentUser
+  has the requested right. returns undef otherwise
 
 =cut
 
@@ -1631,77 +1537,6 @@ sub CurrentUserHasRight {
 
 # }}}
 
-# {{{ sub _CleanupInvalidDelegations
-
-=head2 _CleanupInvalidDelegations { InsideTransaction => undef }
-
-Revokes all ACE entries delegated by this user which are inconsistent
-with their current delegation rights.  Does not perform permission
-checks.  Should only ever be called from inside the RT library.
-
-If called from inside a transaction, specify a true value for the
-InsideTransaction parameter.
-
-Returns a true value if the deletion succeeded; returns a false value
-and logs an internal error if the deletion fails (should not happen).
-
-=cut
-
-# XXX Currently there is a _CleanupInvalidDelegations method in both
-# RT::User and RT::Group.  If the recursive cleanup call for groups is
-# ever unrolled and merged, this code will probably want to be
-# factored out into RT::Principal.
-
-sub _CleanupInvalidDelegations {
-    my $self = shift;
-    my %args = ( InsideTransaction => undef,
-		  @_ );
-
-    unless ( $self->Id ) {
-	$RT::Logger->warning("User not loaded.");
-	return (undef);
-    }
-
-    my $in_trans = $args{InsideTransaction};
-
-    return(1) if ($self->HasRight(Right => 'DelegateRights',
-				  Object => $RT::System));
-
-    # Look up all delegation rights currently posessed by this user.
-    my $deleg_acl = RT::ACL->new($RT::SystemUser);
-    $deleg_acl->LimitToPrincipal(Type => 'User',
-				 Id => $self->PrincipalId,
-				 IncludeGroupMembership => 1);
-    $deleg_acl->Limit( FIELD => 'RightName',
-		       OPERATOR => '=',
-		       VALUE => 'DelegateRights' );
-    my @allowed_deleg_objects = map {$_->Object()}
-	@{$deleg_acl->ItemsArrayRef()};
-
-    # Look up all rights delegated by this principal which are
-    # inconsistent with the allowed delegation objects.
-    my $acl_to_del = RT::ACL->new($RT::SystemUser);
-    $acl_to_del->DelegatedBy(Id => $self->Id);
-    foreach (@allowed_deleg_objects) {
-	$acl_to_del->LimitNotObject($_);
-    }
-
-    # Delete all disallowed delegations
-    while ( my $ace = $acl_to_del->Next() ) {
-	my $ret = $ace->_Delete(InsideTransaction => 1);
-	unless ($ret) {
-	    $RT::Handle->Rollback() unless $in_trans;
-	    $RT::Logger->warning("Couldn't delete delegated ACL entry ".$ace->Id);
-	    return (undef);
-	}
-    }
-
-    $RT::Handle->Commit() unless $in_trans;
-    return (1);
-}
-
-# }}}
-
 # {{{ sub _Set
 
 sub _Set {
@@ -1710,8 +1545,6 @@ sub _Set {
     my %args = (
         Field => undef,
         Value => undef,
-	TransactionType   => 'Set',
-	RecordTransaction => 1,
         @_
     );
 
@@ -1725,29 +1558,13 @@ sub _Set {
         return ( 0, $self->loc("Permission Denied") );
     }
 
-    my $Old = $self->SUPER::_Value("$args{'Field'}");
-    
-    my ($ret, $msg) = $self->SUPER::_Set( Field => $args{'Field'},
-					  Value => $args{'Value'} );
-    
-    #If we can't actually set the field to the value, don't record
-    # a transaction. instead, get out of here.
-    if ( $ret == 0 ) { return ( 0, $msg ); }
-
-    if ( $args{'RecordTransaction'} == 1 ) {
+    #Set the new value
+    my ( $ret, $msg ) = $self->SUPER::_Set(
+        Field => $args{'Field'},
+        Value => $args{'Value'}
+    );
 
-        my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
-                                               Type => $args{'TransactionType'},
-                                               Field     => $args{'Field'},
-                                               NewValue  => $args{'Value'},
-                                               OldValue  => $Old,
-                                               TimeTaken => $args{'TimeTaken'},
-        );
-        return ( $Trans, scalar $TransObj->BriefDescription );
-    }
-    else {
-        return ( $ret, $msg );
-    }
+    return ( $ret, $msg );
 }
 
 # }}}
@@ -1797,14 +1614,6 @@ sub _Value {
 
 # }}}
 
-sub BasicColumns {
-    (
-	[ Name => 'User Id' ],
-	[ EmailAddress => 'Email' ],
-	[ RealName => 'Name' ],
-	[ Organization => 'Organization' ],
-    );
-}
 
 1;
 
diff --git a/rt/lib/RT/Users.pm b/rt/lib/RT/Users.pm
index abe471f..95aec3b 100755
--- a/rt/lib/RT/Users.pm
+++ b/rt/lib/RT/Users.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Autogenerated by DBIx::SearchBuilder factory (by <jesse@bestpractical.com>)
 # WARNING: THIS FILE IS AUTOGENERATED. ALL CHANGES TO THIS FILE WILL BE LOST.  
 # 
@@ -123,7 +123,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/lib/RT/Users_Overlay.pm b/rt/lib/RT/Users_Overlay.pm
index 4bb9f8f..49e4a99 100644
--- a/rt/lib/RT/Users_Overlay.pm
+++ b/rt/lib/RT/Users_Overlay.pm
@@ -1,8 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,8 +42,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
   RT::Users - Collection of RT::User objects
@@ -66,9 +65,6 @@ ok(require RT::Users);
 
 =cut
 
-
-package RT::Users;
-
 use strict;
 no warnings qw(redefine);
 
@@ -223,7 +219,7 @@ sub LimitToPrivileged {
 
 # {{{ WhoHaveRight
 
-=head2 WhoHaveRight { Right => 'name', Object => $rt_object , IncludeSuperusers => undef, IncludeSubgroupMembers => undef, IncludeSystemRights => undef, EquivObjects => [ ] }
+=head2 WhoHaveRight { Right => 'name', Object => $rt_object , IncludeSuperusers => undef, IncludeSubgroupMembers => undef, IncludeSystemRights => undef }
 
 =begin testing
 
@@ -232,59 +228,6 @@ $users->WhoHaveRight(Object =>$RT::System, Right =>'SuperUser');
 ok($users->Count == 1, "There is one privileged superuser - Found ". $users->Count );
 # TODO: this wants more testing
 
-my $RTxUser = RT::User->new($RT::SystemUser);
-($id, $msg) = $RTxUser->Create( Name => 'RTxUser', Comments => "RTx extension user", Privileged => 1);
-ok ($id,$msg);
-
-my $group = RT::Group->new($RT::SystemUser);
-$group->LoadACLEquivalenceGroup($RTxUser->PrincipalObj);
-
-my $RTxSysObj = {};
-bless $RTxSysObj, 'RTx::System';
-*RTx::System::Id = sub { 1; };
-*RTx::System::id = *RTx::System::Id;
-my $ace = RT::Record->new($RT::SystemUser);
-$ace->Table('ACL');
-$ace->_BuildTableAttributes unless ($_TABLE_ATTR->{ref($self)});
-($id, $msg) = $ace->Create( PrincipalId => $group->id, PrincipalType => 'Group', RightName => 'RTxUserRight', ObjectType => 'RTx::System', ObjectId  => 1 );
-ok ($id, "ACL for RTxSysObj created");
-
-my $RTxObj = {};
-bless $RTxObj, 'RTx::System::Record';
-*RTx::System::Record::Id = sub { 4; };
-*RTx::System::Record::id = *RTx::System::Record::Id;
-
-$users = RT::Users->new($RT::SystemUser);
-$users->WhoHaveRight(Right => 'RTxUserRight', Object => $RTxSysObj);
-is($users->Count, 1, "RTxUserRight found for RTxSysObj");
-
-$users = RT::Users->new($RT::SystemUser);
-$users->WhoHaveRight(Right => 'RTxUserRight', Object => $RTxObj);
-is($users->Count, 0, "RTxUserRight not found for RTxObj");
-
-$users = RT::Users->new($RT::SystemUser);
-$users->WhoHaveRight(Right => 'RTxUserRight', Object => $RTxObj, EquivObjects => [ $RTxSysObj ]);
-is($users->Count, 1, "RTxUserRight found for RTxObj using EquivObjects");
-
-$ace = RT::Record->new($RT::SystemUser);
-$ace->Table('ACL');
-$ace->_BuildTableAttributes unless ($_TABLE_ATTR->{ref($self)});
-($id, $msg) = $ace->Create( PrincipalId => $group->id, PrincipalType => 'Group', RightName => 'RTxUserRight', ObjectType => 'RTx::System::Record', ObjectId => 5 );
-ok ($id, "ACL for RTxObj created");
-
-my $RTxObj2 = {};
-bless $RTxObj2, 'RTx::System::Record';
-*RTx::System::Record::Id = sub { 5; };
-*RTx::System::Record::id = sub { 5; };
-
-$users = RT::Users->new($RT::SystemUser);
-$users->WhoHaveRight(Right => 'RTxUserRight', Object => $RTxObj2);
-is($users->Count, 1, "RTxUserRight found for RTxObj2");
-
-$users = RT::Users->new($RT::SystemUser);
-$users->WhoHaveRight(Right => 'RTxUserRight', Object => $RTxObj2, EquivObjects => [ $RTxSysObj ]);
-is($users->Count, 1, "RTxUserRight found for RTxObj2");
-
 
 =end testing
 
@@ -293,7 +236,6 @@ find all users who the right Right for this group, either individually
 or as members of groups
 
 
-If passed a queue object, with no id, it will find users who have that right for _any_ queue
 
 
 
@@ -301,125 +243,38 @@ If passed a queue object, with no id, it will find users who have that right for
 
 sub WhoHaveRight {
     my $self = shift;
-    my %args = (
-        Right                  => undef,
-        Object                 => undef,
-        IncludeSystemRights    => undef,
-        IncludeSuperusers      => undef,
-        IncludeSubgroupMembers => 1,
-        EquivObjects           => [ ],
-        @_
-    );
-
-    if ( defined $args{'ObjectType'} || defined $args{'ObjectId'} ) {
-        $RT::Logger->crit( "$self WhoHaveRight called with the Obsolete ObjectId/ObjectType API");
-        return (undef);
-    }
-    
-
-    # Find only members of groups that have the right.
-
-    my $acl       = $self->NewAlias('ACL');
-    my $groups    = $self->NewAlias('Groups');
-    my $userprinc = $self->{'princalias'};
-
-# The cachedgroupmembers table is used for unrolling group memberships to allow fast lookups
-# if we bind to CachedGroupMembers, we'll find all members of groups recursively.
-# if we don't we'll find only 'direct' members of the group in question
-    my $cgm;
-
-    if ( $args{'IncludeSubgroupMembers'} ) {
-        $cgm = $self->NewAlias('CachedGroupMembers');
-    }
-    else {
-        $cgm = $self->NewAlias('GroupMembers');
-    }
+    my %args = ( Right                  => undef,
+                 Object =>              => undef,
+                 IncludeSystemRights    => undef,
+                 IncludeSuperusers      => undef,
+                 IncludeSubgroupMembers => 1,
+                 @_ );
 
-#Tie the users we're returning ($userprinc) to the groups that have rights granted to them ($groupprinc)
-    $self->Join(
-        ALIAS1 => $cgm,
-        FIELD1 => 'MemberId',
-        ALIAS2 => $userprinc,
-        FIELD2 => 'id'
-    );
-
-    $self->Join(
-        ALIAS1 => $groups,
-        FIELD1 => 'id',
-        ALIAS2 => $cgm,
-        FIELD2 => 'GroupId'
-    );
-
-# {{{ Find only rows where the right granted is the one we're looking up or _possibly_ superuser
-    $self->Limit(
-        ALIAS    => $acl,
-        FIELD    => 'RightName',
-        OPERATOR => ( $args{Right} ? '=' : 'IS NOT' ),
-        VALUE => $args{Right} || 'NULL',
-        ENTRYAGGREGATOR => 'OR'
-    );
-
-    if ( $args{'IncludeSuperusers'} and $args{'Right'} ) {
-        $self->Limit(
-            ALIAS           => $acl,
-            FIELD           => 'RightName',
-            OPERATOR        => '=',
-            VALUE           => 'SuperUser',
-            ENTRYAGGREGATOR => 'OR'
-        );
+    if (defined $args{'ObjectType'} || defined $args{'ObjectId'}) {
+        $RT::Logger->crit("$self WhoHaveRight called with the Obsolete ObjectId/ObjectType API");
+        return(undef);
     }
-
-    # }}}
-
-    my ( $or_check_ticket_roles, $or_check_roles );
-    my $which_object = "$acl.ObjectType = 'RT::System'";
-
-    if ( defined $args{'Object'} ) {
-        if ( ref( $args{'Object'} ) eq 'RT::Ticket' ) {
-            $or_check_ticket_roles = " OR ( $groups.Domain = 'RT::Ticket-Role' AND $groups.Instance = " . $args{'Object'}->Id . ") ";
-
-# If we're looking at ticket rights, we also want to look at the associated queue rights.
-# this is a little bit hacky, but basically, now that we've done the ticket roles magic,
-# we load the queue object and ask all the rest of our questions about the queue.
-            $args{'Object'} = $args{'Object'}->QueueObj;
+        my @privgroups;
+        my $Groups = RT::Groups->new($RT::SystemUser);
+        $Groups->WithRight(Right=> $args{'Right'},
+                     Object => $args{'Object'},
+                     IncludeSystemRights => $args{'IncludeSystemRights'},
+                     IncludeSuperusers => $args{'IncludeSuperusers'});
+        while (my $Group = $Groups->Next()) {
+                push @privgroups, $Group->Id();
         }
 
-        # TODO XXX This really wants some refactoring
-        if ( ref( $args{'Object'} ) eq 'RT::Queue' ) {
-            $or_check_roles = " OR ( ( ($groups.Domain = 'RT::Queue-Role' ";
-            $or_check_roles .= "AND $groups.Instance = " . $args{'Object'}->id if ( $args{'Object'}->id );
-            $or_check_roles .= ") $or_check_ticket_roles ) " . " AND $groups.Type = $acl.PrincipalType) ";
-        }
-        if ( $args{'IncludeSystemRights'} ) {
-            $which_object .= ' OR ';
-        }
-        else {
-            $which_object = '';
-        }
-        foreach my $obj ( @{ $args{'EquivObjects'} } ) {
-            $which_object .= "($acl.ObjectType = '" . ref( $obj ) . "' AND $acl.ObjectId = " . $obj->id . ") OR ";
-        }
-        $which_object .= " ($acl.ObjectType = '" . ref( $args{'Object'} ) . "'";
-        if ( $args{'Object'}->id ) {
-            $which_object .= " AND $acl.ObjectId = " . $args{'Object'}->id;
-        }
 
-        $which_object .=  ") ";
+    if (@privgroups) {
+        $self->WhoBelongToGroups(Groups => \@privgroups,
+                                 IncludeSubgroupMembers => $args{'IncludeSubgroupMembers'});
+    }
+    else {
+	# We don't have any group that matches -- make it impossible.
+	$self->Limit( FIELD => 'Id', VALUE => 'IS', OPERATOR => 'NULL' );
     }
-    $self->_AddSubClause( "WhichObject", "($which_object)" );
-    $self->_AddSubClause(
-        "WhichGroup",
-            qq{ ( (    $acl.PrincipalId = $groups.id AND $acl.PrincipalType = 'Group' 
-                AND (   $groups.Domain = 'SystemInternal' OR $groups.Domain = 'UserDefined' OR $groups.Domain = 'ACLEquivalence')) 
-                $or_check_roles) }
-    );
-    # only include regular RT users
-    $self->LimitToEnabled;
-
-    # no system user
-    $self->Limit( ALIAS => $userprinc, FIELD => 'id', OPERATOR => '!=', VALUE => $RT::SystemUser->id);
-
 }
+
 # }}}
 
 # {{{ WhoBelongToGroups 
@@ -452,14 +307,20 @@ sub WhoBelongToGroups {
         $cgm = $self->NewAlias('GroupMembers');
     }
 
-    #Tie the users we're returning ($userprinc) to the groups that have rights granted to them ($groupprinc)
+    # {{{ Tie the users we're returning ($userprinc) to the groups that have rights granted to them ($groupprinc)
     $self->Join( ALIAS1 => $cgm, FIELD1 => 'MemberId',
                  ALIAS2 => $userprinc, FIELD2 => 'id' );
+    # }}} 
 
+ #   my $and_check_groups = "($cgm.GroupId = NULL";
     foreach my $groupid (@{$args{'Groups'}}) {
         $self->Limit(ALIAS => $cgm, FIELD => 'GroupId', VALUE => $groupid, QUOTEVALUE => 0, ENTRYAGGREGATOR=> 'OR')
 
+        #$and_check_groups .= " OR $cgm.GroupId = $groupid";
     }
+    #$and_check_groups .= ")";
+
+    #$self->_AddSubClause("WhichGroup", $and_check_groups);
 }
 # }}}
 
diff --git a/rt/lib/t/00smoke.t b/rt/lib/t/00smoke.t
index 9e9bf4a..4f36bb3 100644
--- a/rt/lib/t/00smoke.t
+++ b/rt/lib/t/00smoke.t
@@ -2,12 +2,13 @@
 
 use Test::More qw(no_plan);
 
+use lib "/opt/rt3/lib";
 use RT;
 ok(RT::LoadConfig);
 ok(RT::Init, "Basic initialization and DB connectivity");
 
 use File::Find;
-File::Find::find({wanted => \&wanted}, 'lib/');
+File::Find::find({wanted => \&wanted}, '.');
 sub wanted { /^*\.pm\z/s && ok(require $_, "Requiring '$_'"); }
 
 
diff --git a/rt/lib/t/00smoke.t.in b/rt/lib/t/00smoke.t.in
new file mode 100644
index 0000000..288dd4a
--- /dev/null
+++ b/rt/lib/t/00smoke.t.in
@@ -0,0 +1,14 @@
+#!@PERL@
+
+use Test::More qw(no_plan);
+
+use lib "@RT_LIB_PATH@";
+use RT;
+ok(RT::LoadConfig);
+ok(RT::Init, "Basic initialization and DB connectivity");
+
+use File::Find;
+File::Find::find({wanted => \&wanted}, 'lib/');
+sub wanted { /^*\.pm\z/s && ok(require $_, "Requiring '$_'"); }
+
+
diff --git a/rt/lib/t/01harness.t.in b/rt/lib/t/01harness.t.in
new file mode 100644
index 0000000..d132330
--- /dev/null
+++ b/rt/lib/t/01harness.t.in
@@ -0,0 +1,12 @@
+#!@PERL@
+
+use Test::More qw(no_plan);
+
+use lib "@RT_LIB_PATH@";
+use RT;
+ok(RT::LoadConfig);
+ok(RT::Init, "Basic initialization and DB connectivity");
+
+my $test = shift @ARGV;
+require $test;
+
diff --git a/rt/lib/t/setup_regression.t b/rt/lib/t/02regression.t.in
index 36f809b..c2e3277 100644
--- a/rt/lib/t/setup_regression.t
+++ b/rt/lib/t/02regression.t.in
@@ -1,7 +1,8 @@
-#!/usr/bin/perl
+#!@PERL@
 
 use Test::More qw(no_plan);
 
+use lib "@RT_LIB_PATH@";
 use RT;
 ok(RT::LoadConfig);
 ok(RT::Init, "Basic initialization and DB connectivity");
@@ -32,3 +33,15 @@ is($q2->CorrespondAddress, 'correspond@a');
 is($q2->CommentAddress, 'comment@a');
 
 
+use File::Find;
+File::Find::find({wanted => \&wanted_autogen,	
+	preprocess => sub {return sort @_}}, 'lib/t/autogen');
+sub wanted_autogen { /^autogen.*\.t\z/s && require $_; }
+
+File::Find::find({wanted => \&wanted_regression,
+	preprocess => sub {return sort @_}}, 'lib/t/regression');
+sub wanted_regression { /^*\.t\z/s && require $_; }
+
+require "@RT_LIB_PATH@/t/03web.pl";
+require "@RT_LIB_PATH@/t/04_send_email.pl";
+require "@RT_LIB_PATH@/t/05cronsupport.pl";
diff --git a/rt/lib/t/regression/02basic_web.t b/rt/lib/t/03web.pl.in
index d3376d0..25c26e7 100644
--- a/rt/lib/t/regression/02basic_web.t
+++ b/rt/lib/t/03web.pl.in
@@ -1,7 +1,6 @@
-#!/usr/bin/perl
+#!@PERL@
 
 use strict;
-use Test::More tests => 17;
 use WWW::Mechanize;
 use HTTP::Request::Common;
 use HTTP::Cookies;
@@ -15,11 +14,9 @@ my $agent = WWW::Mechanize->new();
 
 $agent->cookie_jar($cookie_jar);
 
-use RT;
-RT::LoadConfig;
 
 # get the top page
-my $url = $RT::WebURL;
+my $url = "http://localhost".$RT::WebPath."/";
 $agent->get($url);
 
 is ($agent->{'status'}, 200, "Loaded a page");
@@ -48,10 +45,12 @@ $agent->form(3);
 # Start with a string containing characters in latin1
 my $string = "I18N Web Testing æøå";
 Encode::from_to($string, 'iso-8859-1', 'utf8');
-$agent->field('Subject' => "Ticket with utf8 body");
+$agent->field('Subject' => "Foo");
 $agent->field('Content' => $string);
-ok($agent->submit(), "Created new ticket with $string as Content");
+ok($agent->submit(), "Created new ticket with $string");
+
 ok( $agent->{'content'} =~ qr{$string} , "Found the content");
+
 $agent->get($url."Ticket/Create.html?Queue=1");
 is ($agent->{'status'}, 200, "Loaded Create.html");
 $agent->form(3);
@@ -59,8 +58,8 @@ $agent->form(3);
 my $string = "I18N Web Testing æøå";
 Encode::from_to($string, 'iso-8859-1', 'utf8');
 $agent->field('Subject' => $string);
-$agent->field('Content' => "Ticket with utf8 subject");
-ok($agent->submit(), "Created new ticket with $string as Subject");
+$agent->field('Content' => "BAR");
+ok($agent->submit(), "Created new ticket with $string");
 
 ok( $agent->{'content'} =~ qr{$string} , "Found the content");
 
@@ -146,5 +145,26 @@ is ($query, "Subject LIKE 'aaa' AND Subject LIKE 'bbb'");
 
 # }}}
 
+use File::Find;
+find ( \&wanted , 'html/');
+
+sub wanted {
+        -f  && /\.html$/ && $_ !~ /Logout.html$/  && test_get($File::Find::name);
+}       
+
+sub test_get {
+        my $file = shift;
+
+
+        $file =~ s#^html/##; 
+        ok ($agent->get("$url/$file", "GET $url/$file"));
+        is ($agent->{'status'}, 200, "Loaded $file");
+#        ok( $agent->{'content'} =~ /Logout/i, "Found a logout link on $file ");
+        ok( $agent->{'content'} !~ /Not logged in/i, "Still logged in for  $file");
+        ok( $agent->{'content'} !~ /System error/i, "Didn't get a Mason compilation error on $file");
+        
+}
+
+# }}}
 
 1;
diff --git a/rt/lib/t/regression/04send_email.t b/rt/lib/t/04_send_email.pl.in
index 09e6e6f..39ab0d2 100644
--- a/rt/lib/t/regression/04send_email.t
+++ b/rt/lib/t/04_send_email.pl.in
@@ -1,10 +1,6 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 
 use strict;
-use Test::More tests => 137;
-use RT;
-RT::LoadConfig();
-RT::Init;
 use RT::EmailParser;
 use RT::Tickets;
 use RT::Action::SendEmail;
@@ -40,7 +36,7 @@ my $parser = RT::EmailParser->new();
 
 
 # Let's test to make sure a multipart/report is processed correctly
-my $content =  `cat $RT::BasePath/lib/t/data/multipart-report` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/multipart-report` || die "couldn't find new content";
 # be as much like the mail gateway as possible.
 use RT::Interface::Email;
                                   
@@ -49,8 +45,7 @@ my %args =        (message => $content, queue => 1, action => 'correspond');
 my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
-my $tick= $tickets->First();
-isa_ok($tick, "RT::Ticket", "got a ticket object");
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 
 ok ($tick->Transactions->First->Content =~ /The original message was received/, "It's the bounce");
@@ -75,12 +70,12 @@ Foob!');
 use Data::Dumper;
 
 my $ticket = RT::Ticket->new($RT::SystemUser);
-my  ($id,  undef, $msg ) = $ticket->Create(Requestor => ['root@localhost'], Queue => 'general', Subject => 'I18NTest', MIMEObj => $parser->Entity);
+my ($id,  $tid, $msg ) = $ticket->Create(Requestor => ['root@localhost'], Queue => 'general', Subject => 'I18NTest', MIMEObj => $parser->Entity);
 ok ($id,$msg);
-$tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
- $tick = $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 ok ($tick->Subject eq 'I18NTest', "failed to create the new ticket from an unprivileged account");
 
@@ -96,7 +91,7 @@ is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
 # create an iso 8859-1 ticket
 @scrips_fired = ();
 
-$content =  `cat $RT::BasePath/lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
 
 
 
@@ -106,12 +101,12 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 use RT::Interface::Email;
                            
- %args =        (message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
  RT::Interface::Email::Gateway(\%args);
- $tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
- $tick = $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 
 ok ($tick->Transactions->First->Content =~ /H\x{e5}vard/, "It's signed by havard. yay");
@@ -127,7 +122,7 @@ is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
 # If we correspond, does it do the right thing to the outbound messages?
 
 $parser->ParseMIMEEntityFromScalar($content);
-  ($id, $msg) = $tick->Comment(MIMEObj => $parser->Entity);
+my ($id, $msg) = $tick->Comment(MIMEObj => $parser->Entity);
 ok ($id, $msg);
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -144,16 +139,16 @@ $RT::EmailOutputEncoding = 'iso-8859-1';
 # create an iso 8859-1 ticket
 @scrips_fired = ();
 
- $content =  `cat $RT::BasePath/lib/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/new-ticket-from-iso-8859-1` || die "couldn't find new content";
 # be as much like the mail gateway as possible.
 use RT::Interface::Email;
                                   
- %args =        (message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
  RT::Interface::Email::Gateway(\%args);
-$tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
- $tick = $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 
 ok ($tick->Transactions->First->Content =~ /H\x{e5}vard/, "It's signed by havard. yay");
@@ -170,7 +165,7 @@ is ($#scrips_fired, 1, "Fired 2 scrips on ticket creation");
 # If we correspond, does it do the right thing to the outbound messages?
 
 $parser->ParseMIMEEntityFromScalar($content);
- ($id, $msg) = $tick->Comment(MIMEObj => $parser->Entity);
+my ($id, $msg) = $tick->Comment(MIMEObj => $parser->Entity);
 ok ($id, $msg);
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -238,7 +233,7 @@ sub iso8859_redef_sendmessage {
 
 # {{{ test a multipart alternative containing a text-html part with an umlaut
 
- $content =  `cat $RT::BasePath/lib/t/data/multipart-alternative-with-umlaut` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/multipart-alternative-with-umlaut` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -246,12 +241,12 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &umlauts_redef_sendmessage;
 
- %args =        (message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
  RT::Interface::Email::Gateway(\%args);
- $tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
- $tick = $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 
 ok ($tick->Transactions->First->Content =~ /causes Error/, "We recorded the content right as text-plain");
@@ -266,7 +261,7 @@ sub umlauts_redef_sendmessage {
 
 # {{{ test a text-html message with an umlaut
 
- $content =  `cat $RT::BasePath/lib/t/data/text-html-with-umlaut` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/text-html-with-umlaut` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -274,12 +269,12 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &text_html_umlauts_redef_sendmessage;
 
- %args =        (message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
  RT::Interface::Email::Gateway(\%args);
- $tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
- $tick = $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 
 ok ($tick->Transactions->First->Attachments->First->Content =~ /causes Error/, "We recorded the content as containing 'causes error'");
@@ -304,7 +299,7 @@ sub text_html_umlauts_redef_sendmessage {
 
 # {{{ test a text-html message with russian characters
 
- $content =  `cat $RT::BasePath/lib/t/data/text-html-in-russian` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/text-html-in-russian` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -312,12 +307,12 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &text_html_russian_redef_sendmessage;
 
- %args =        (message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
  RT::Interface::Email::Gateway(\%args);
- $tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
- $tick = $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 
 ok ($tick->Transactions->First->Attachments->First->ContentType =~ /text\/html/, "We recorded the content right as text-html");
@@ -347,19 +342,19 @@ sub text_html_russian_redef_sendmessage {
 
 unshift (@RT::EmailInputEncodings, 'koi8-r');
 $RT::EmailOutputEncoding = 'koi8-r';
-$content =  `cat $RT::BasePath/lib/t/data/russian-subject-no-content-type` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/russian-subject-no-content-type` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
 
 # be as much like the mail gateway as possible.
 &text_plain_russian_redef_sendmessage;
- %args =        (message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
  RT::Interface::Email::Gateway(\%args);
- $tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
-$tick= $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 
 ok ($tick->Transactions->First->Attachments->First->ContentType =~ /text\/plain/, "We recorded the content type right");
@@ -386,7 +381,7 @@ $RT::EmailOutputEncoding = 'utf-8';
 
 # {{{ test a message containing a nested RFC 822 message
 
- $content =  `cat $RT::BasePath/lib/t/data/nested-rfc-822` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/nested-rfc-822` || die "couldn't find new content";
 ok ($content, "Loaded nested-rfc-822 to test");
 
 $parser->ParseMIMEEntityFromScalar($content);
@@ -394,12 +389,12 @@ $parser->ParseMIMEEntityFromScalar($content);
 
 # be as much like the mail gateway as possible.
 &text_plain_nested_redef_sendmessage;
- %args =        (message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
  RT::Interface::Email::Gateway(\%args);
- $tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
-$tick= $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 is ($tick->Subject, "[Jonas Liljegren] Re: [Para] Niv\x{e5}er?");
 ok ($tick->Transactions->First->Attachments->First->ContentType =~ /multipart\/mixed/, "We recorded the content type right");
@@ -425,7 +420,7 @@ sub text_plain_nested_redef_sendmessage {
 
 # {{{ test a multipart alternative containing a uuencoded mesage generated by lotus notes
 
- $content =  `cat $RT::BasePath/lib/t/data/notes-uuencoded` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/notes-uuencoded` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -433,12 +428,12 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &notes_redef_sendmessage;
 
- %args =        (message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
  RT::Interface::Email::Gateway(\%args);
-$tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
-$tick= $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 
 ok ($tick->Transactions->First->Content =~ /from Lotus Notes/, "We recorded the content right");
@@ -453,7 +448,7 @@ sub notes_redef_sendmessage {
 
 # {{{ test a multipart that crashes the file-based mime-parser works
 
- $content =  `cat $RT::BasePath/lib/t/data/crashes-file-based-parser` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/crashes-file-based-parser` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
@@ -461,12 +456,12 @@ $parser->ParseMIMEEntityFromScalar($content);
 # be as much like the mail gateway as possible.
 &crashes_redef_sendmessage;
 
- %args =        (message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
  RT::Interface::Email::Gateway(\%args);
- $tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
-$tick= $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 
 ok ($tick->Transactions->First->Content =~ /FYI/, "We recorded the content right");
@@ -483,18 +478,18 @@ sub crashes_redef_sendmessage {
 
 # {{{ test a multi-line RT-Send-CC header
 
- $content =  `cat $RT::BasePath/lib/t/data/rt-send-cc` || die "couldn't find new content";
+my $content =  `cat @RT_LIB_PATH@/t/data/rt-send-cc` || die "couldn't find new content";
 
 $parser->ParseMIMEEntityFromScalar($content);
 
 
 
- %args =        (message => $content, queue => 1, action => 'correspond');
+my %args =        (message => $content, queue => 1, action => 'correspond');
  RT::Interface::Email::Gateway(\%args);
- $tickets = RT::Tickets->new($RT::SystemUser);
+my $tickets = RT::Tickets->new($RT::SystemUser);
 $tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
 $tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
-$tick= $tickets->First();
+my $tick = $tickets->First();
 ok ($tick->Id, "found ticket ".$tick->Id);
 
 my $cc = $tick->Transactions->First->Attachments->First->GetHeader('RT-Send-Cc');
diff --git a/rt/lib/t/regression/05cronsupport.t b/rt/lib/t/05cronsupport.pl.in
index 8e5bd75..a6b3d74 100644
--- a/rt/lib/t/regression/05cronsupport.t
+++ b/rt/lib/t/05cronsupport.pl.in
@@ -1,11 +1,6 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 
 use strict;
-use Test::More qw/no_plan/;
-
-use RT;
-RT::LoadConfig();
-RT::Init();
 
 ### Set up some testing data.  Test the testing data because why not?
 
@@ -87,5 +82,3 @@ ok($correspond_act->Commit(), "Correspondence committed");
 my ($trans, $desc, $transaction) = $ticket2->Comment(MIMEObj => $template_obj->MIMEObj);
 my $bogus_action = RT::Action::RecordComment->new(TicketObj => $ticket1, TemplateObj => $template_obj, TransactionObj => $transaction, CurrentUser => $CurrentUser);
 ok(!$bogus_action->Prepare(), "Comment aborted to prevent loop");
-
-1;
diff --git a/rt/lib/t/create_data.pl b/rt/lib/t/create_data.pl
deleted file mode 100644
index 35226ea..0000000
--- a/rt/lib/t/create_data.pl
+++ /dev/null
@@ -1,136 +0,0 @@
-#!@PERL@ -w
-use strict;
-
-use Test::More qw/no_plan/;
-use Text::Lorem;
-use RT;
-RT::LoadConfig;
-RT::Init;
-
-#### Generate some number of RT accounts.  Come up with random
-#### usernames if requested, otherwise use provided ones.  Take
-#### $subdomain argument so that we can generate customer accounts,
-#### etc.  Group memberships should also be provided.
-
-=head2 create_users
-
-=over 4
-
-This subroutine creates a number of RT users, if they don't already
-exist, and places them in the specified group.  It also creates the
-group if it needs to.  Returns a ref to a list containing the user
-objects.
-
-If a list of names is specified, users with those names are created.
-Otherwise, it will make names up, checking to be sure that a user with
-the random name does not yet exist.  Each user will have an email
-address in "example.com".
-
-Takes a hash of the following arguments:
-number => How many users to create.  Default is 1.
-names => A ref to a list of usernames to use.  Optional.
-subdomain => The subdomain of example.com which should be used for
-    email addresses.
-group => The name of the group these users should belong to.  Creates
-    the group if it does not yet exist.
-privileged => Whether the users should be able to be granted rights.
-    Default is 1.
-attributes => a ref to a list of hashrefs containing the arguments for 
-    any unsupported attribute we should add to the user (for example, a 
-    user saved search.)
-
-=back
-
-=cut
-
-sub create_users {
-    my %ARGS = (number => 1,
-		subdomain => undef,
-		privileged => 1,
-		@_);
-    my $lorem = Text::Lorem->new();
-    my @users_returned;
-
-    my @usernames;
-    my $anon;
-    if ($ARGS{'users'}) {
-	@usernames = @{$ARGS{'users'}};
-	$anon = 0;
-    } else {
-	@usernames = split(/\s+/, $lorem->words($ARGS{'number'}));
-	$anon = 1;
-    }
-
-    my $domain = 'example.com';
-    $domain = $ARGS{'subdomain'} . ".$domain" if $ARGS{'subdomain'};
-
-    foreach my $user (@usernames) {
-	my $user_obj = RT::User->new($RT::SystemUser);
-	$user_obj->Load($user);
-	if ($user_obj->Id() && !$anon) {
-	    # Use this user; assume we know what we're doing.  Don't
-	    # modify it, other than adding it to any group specified.
-	    push(@users_returned, $user_obj);
-	} elsif ($user_obj->Id()) {
-	    # Oops.  Get a different username and stick it on the back
-	    # of the list.
-	    append(@users, $lorem->words(1));
-	} else {
-	    $user_obj->Create(Name => $user,
-			      Password => $user."pass",
-			      EmailAddress => $user.'@'.$domain,
-			      RealName => "$user ipsum",
-			      Privileged => $ARGS{'privileged'},
-			      );
-	    push(@users_returned, $user_obj);
-	}
-    }
-
-    # Now we have our list of users.  Did we have groups to add them
-    # to?
-
-    if ($ARGS{'groups'}) {
-	my @groups = @{$ARGS{'groups'}};
-	foreach my $group (@groups) {
-	    my $group_obj = RT::Group->new();
-	    $group_obj->LoadUserDefinedGroup($group);
-	    unless ($group_obj->Id()) {
-		# Create it.
-		$group_obj->CreateUserDefinedGroup(
-				Name => $group,
-				Description => "lorem defined group $group",
-						   );
-	    }
-	    foreach (@users_returned) {
-		$group_obj->AddMember($_->Id);
-	    }
-	}
-    }
-
-    # Do we have attributes to apply to the users?
-    if ($ARGS{'attributes'}) {
-	foreach my $attrib (@{$ARGS{'attributes'}}) {
-	    my %attr_args = %{$attrib};
-	    foreach (@users_returned) {
-		$_->AddAttribute(%attr_args);
-	    }
-	}
-    }
-
-    # Return our list of users.
-    return \@users_returned;
-}
-
-#### Generate any RT groups.  These ought to be named, by function.
-#### The group names should be given either as part of user creation,
-#### or as a name with a number of subgroups which should be members.
-
-
-#### Generate some queues.  Users/groups who have permissions on
-#### queues need to be specified on this point.  Permissions can be
-#### specified by role, e.g. "client" or "staffmember" or "admin" for
-#### each queue.  If the queue should have anything special like a
-#### custom field, say so here.
-
-
-#### Generate some tickets and transactions.
diff --git a/rt/etc/upgrade/3.3.0/content b/rt/lib/t/regression/00placeholder
index 0afc604..0afc604 100644
--- a/rt/etc/upgrade/3.3.0/content
+++ b/rt/lib/t/regression/00placeholder
diff --git a/rt/lib/t/regression/01ticket_link_searching.t b/rt/lib/t/regression/01ticket_link_searching.t
deleted file mode 100644
index 6d10221..0000000
--- a/rt/lib/t/regression/01ticket_link_searching.t
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/usr/bin/perl -w
-
-use Test::More tests => 25;
-use strict;
-use RT;
-
-# Load the config file
-RT::LoadConfig();
-
-#Connect to the database and get RT::SystemUser and RT::Nobody loaded
-RT::Init();
-
-#Get the current user all loaded
-my $CurrentUser = $RT::SystemUser;
-
-my $queue = new RT::Queue($CurrentUser);
-$queue->Load('General') || Abort(loc("Queue could not be loaded."));
-
-my $child_ticket = new RT::Ticket( $CurrentUser );
-
-my ( $childid ) = $child_ticket->Create
-    ( Subject => 'test child',
-      Queue => $queue->Id);
-
-ok($childid != 0);
-
-my $parent_ticket = new RT::Ticket( $CurrentUser );
-
-my ( $parentid ) = $parent_ticket->Create
-    ( Subject => 'test parent',
-      Children => [$childid],
-      Queue => $queue->Id);
-
-ok($parentid != 0, "We created a parent ticket");
-
-my $Collection = RT::Tickets->new($CurrentUser);
-$Collection->LimitMemberOf ($parentid);
-
-ok ($Collection->First);
-is ($Collection->First->id, $childid, "We found the collection of all children of $parentid with Limit");
-is($Collection->Count,1, "We found only one result");
-
-$Collection = RT::Tickets->new($CurrentUser);
-$Collection->FromSQL( "MemberOf =  $parentid");
-is ($Collection->First->id, $childid, "We found the collection of all children of $parentid with TicketSQL");
-is($Collection->Count,1, "We found only one result");
-
-
-
-
-
-$Collection = RT::Tickets->new($CurrentUser);
-$Collection->LimitHasMember ($childid);
-
-ok ($Collection->First);
-is ($Collection->First->id, $parentid, "We found the collection of all parents of $childid with Limit");
-is($Collection->Count,1, "We found only one result");
-
-
-
-$Collection = RT::Tickets->new($CurrentUser);
-$Collection->FromSQL("HasMember = $childid");
-
-ok ($Collection->First);
-is ($Collection->First->id, $parentid, "We found the collection of all parents of $childid with TicketSQL");
-is($Collection->Count,1, "We found only one result");
-
-
-
-# Now we find a collection of all the tickets which have no members. they should have no children.
-$Collection = RT::Tickets->new($CurrentUser);
-$Collection->LimitHasMember('');
-# must contain child; must not contain parent
-my %has;
-while (my $t = $Collection->Next) {
-    ++$has{$t->id};
-}
-ok ($has{$childid} , "The collection has our child - $childid");
-ok( !$has{$parentid}, "The collection doesn't have our parent - $parentid");
-
-
-
-
-# Now we find a collection of all the tickets which are not members of anything. they should have no parents.
-$Collection = RT::Tickets->new($CurrentUser);
-$Collection->LimitMemberOf('');
-# must contain parent; must not contain child
-%has = ();
-while (my $t = $Collection->Next) {
-    ++$has{$t->id};
-}
-ok ($has{$parentid} , "The collection has our parent - $parentid");
-ok( !$has{$childid}, "The collection doesn't have our child - $childid");
-
-
-#  Do it all over with TicketSQL
-#
-
-
-
-# Now we find a collection of all the tickets which have no members. they should have no children.
-$Collection = RT::Tickets->new($CurrentUser);
-$Collection->FromSQL ("HasMember IS NULL");
-# must contain parent; must not contain child
- %has = ();
-while (my $t = $Collection->Next) {
-    ++$has{$t->id};
-}
-ok (!$has{$parentid} , "The collection doesn't have our parent - $parentid");
-ok( $has{$childid}, "The collection has our child - $childid");
-
-
-# Now we find a collection of all the tickets which have no members. they should have no children.
-# Alternate syntax
-$Collection = RT::Tickets->new($CurrentUser);
-$Collection->FromSQL ("HasMember = ''");
-# must contain parent; must not contain child
- %has = ();
-while (my $t = $Collection->Next) {
-    ++$has{$t->id};
-}
-ok (!$has{$parentid} , "The collection doesn't have our parent - $parentid");
-ok( $has{$childid}, "The collection has our child - $childid");
-
-
-
-# Now we find a collection of all the tickets which are not members of anything. they should have no parents.
-$Collection = RT::Tickets->new($CurrentUser);
-$Collection->FromSQL("MemberOf IS NULL");
-# must not  contain parent; must contain parent
-%has = ();
-while (my $t = $Collection->Next) {
-    ++$has{$t->id};
-}
-ok ($has{$parentid} , "The collection has our parent - $parentid");
-ok(!$has{$childid}, "The collection doesn't have our child - $childid");
-
-
-# Now we find a collection of all the tickets which are not members of anything. they should have no parents.
-$Collection = RT::Tickets->new($CurrentUser);
-$Collection->FromSQL("MemberOf = ''");
-# must not  contain parent; must contain parent
-%has = ();
-while (my $t = $Collection->Next) {
-    ++$has{$t->id};
-}
-ok ($has{$parentid} , "The collection has our parent - $parentid");
-ok(!$has{$childid}, "The collection doesn't have our child - $childid");
-
-
-
-
-1;
-
-
diff --git a/rt/lib/t/regression/03web_compiliation_errors.t b/rt/lib/t/regression/03web_compiliation_errors.t
deleted file mode 100644
index f2e62c9..0000000
--- a/rt/lib/t/regression/03web_compiliation_errors.t
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use Test::More qw/no_plan/;
-use WWW::Mechanize;
-use HTTP::Request::Common;
-use HTTP::Cookies;
-use LWP;
-use Encode;
-
-my $cookie_jar = HTTP::Cookies->new;
-my $agent = WWW::Mechanize->new();
-
-# give the agent a place to stash the cookies
-
-$agent->cookie_jar($cookie_jar);
-
-use RT;
-RT::LoadConfig;
-
-# get the top page
-my $url = $RT::WebURL;
-$agent->get($url);
-
-is ($agent->{'status'}, 200, "Loaded a page");
-
-
-# {{{ test a login
-
-# follow the link marked "Login"
-
-ok($agent->{form}->find_input('user'));
-
-ok($agent->{form}->find_input('pass'));
-ok ($agent->{'content'} =~ /username:/i);
-$agent->field( 'user' => 'root' );
-$agent->field( 'pass' => 'password' );
-# the field isn't named, so we have to click link 0
-$agent->click(0);
-is($agent->{'status'}, 200, "Fetched the page ok");
-ok( $agent->{'content'} =~ /Logout/i, "Found a logout link");
-
-
-use File::Find;
-find ( \&wanted , 'html/');
-
-sub wanted {
-        -f  && /\.html$/ && $_ !~ /Logout.html$/  && test_get($File::Find::name);
-}       
-
-sub test_get {
-        my $file = shift;
-
-
-        $file =~ s#^html/##; 
-        ok ($agent->get("$url/$file", "GET $url/$file"));
-        is ($agent->{'status'}, 200, "Loaded $file");
-#        ok( $agent->{'content'} =~ /Logout/i, "Found a logout link on $file ");
-        ok( $agent->{'content'} !~ /Not logged in/i, "Still logged in for  $file");
-        ok( $agent->{'content'} !~ /System error/i, "Didn't get a Mason compilation error on $file");
-        
-}
-
-# }}}
-
-1;
diff --git a/rt/lib/t/regression/06mailgateway.t b/rt/lib/t/regression/06mailgateway.t
deleted file mode 100644
index 8486aea..0000000
--- a/rt/lib/t/regression/06mailgateway.t
+++ /dev/null
@@ -1,504 +0,0 @@
-#!/usr/bin/perl -w
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-
-=head1 NAME
-
-rt-mailgate - Mail interface to RT3.
-
-=cut
-
-use strict;
-use Test::More tests => 57;
-use RT;
-RT::LoadConfig();
-RT::Init();
-use RT::I18N;
-# Make sure that when we call the mailgate wrong, it tempfails
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url http://this.test.for.non-connection.is.expected.to.generate.an.error"), "Opened the mailgate - The error below is expected - $@");
-print MAIL <<EOF;
-From: root\@localhost
-To: rt\@example.com
-Subject: This is a test of new ticket creation
-
-Foob!
-EOF
-close (MAIL);
-
-# Check the return value
-is ( $? >> 8, 75, "The error message above is expected The mail gateway exited with a failure. yay");
-
-
-# {{{ Test new ticket creation by root who is privileged and superuser
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action correspond"), "Opened the mailgate - $@");
-print MAIL <<EOF;
-From: root\@localhost
-To: rt\@example.com
-Subject: This is a test of new ticket creation
-
-Blah!
-Foob!
-EOF
-close (MAIL);
-
-#Check the return value
-is ($? >> 8, 0, "The mail gateway exited normally. yay");
-
-use RT::Tickets;
-my $tickets = RT::Tickets->new($RT::SystemUser);
-$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
-$tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
-my $tick = $tickets->First();
-ok (UNIVERSAL::isa($tick,'RT::Ticket'));
-ok ($tick->Id, "found ticket ".$tick->Id);
-ok ($tick->Subject eq 'This is a test of new ticket creation', "Created the ticket");
-
-# }}}
-
-
-# {{{This is a test of new ticket creation as an unknown user
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action correspond"), "Opened the mailgate - $@");
-print MAIL <<EOF;
-From: doesnotexist\@example.com
-To: rt\@example.com
-Subject: This is a test of new ticket creation as an unknown user
-
-Blah!
-Foob!
-EOF
-close (MAIL);
-#Check the return value
-is ($? >> 8, 0, "The mail gateway exited normally. yay");
-
-$tickets = RT::Tickets->new($RT::SystemUser);
-$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
-$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
-$tick = $tickets->First();
-ok ($tick->Id, "found ticket ".$tick->Id);
-ok ($tick->Subject ne 'This is a test of new ticket creation as an unknown user', "failed to create the new ticket from an unprivileged account");
-my $u = RT::User->new($RT::SystemUser);
-$u->Load('doesnotexist@example.com');
-ok( $u->Id == 0, " user does not exist and was not created by failed ticket submission");
-
-
-# }}}
-
-# {{{ now everybody can create tickets.  can a random unkown user create tickets?
-
-my $g = RT::Group->new($RT::SystemUser);
-$g->LoadSystemInternalGroup('Everyone');
-ok( $g->Id, "Found 'everybody'");
-
-my ($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
-ok ($val, "Granted everybody the right to create tickets - $msg");
-
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action correspond"), "Opened the mailgate - $@");
-print MAIL <<EOF;
-From: doesnotexist\@example.com
-To: rt\@example.com
-Subject: This is a test of new ticket creation as an unknown user
-
-Blah!
-Foob!
-EOF
-close (MAIL);
-#Check the return value
-is ($? >> 8, 0, "The mail gateway exited normally. yay");
-
-
-$tickets = RT::Tickets->new($RT::SystemUser);
-$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
-$tickets->Limit(FIELD => 'id' ,OPERATOR => '>', VALUE => '0');
-$tick = $tickets->First();
-ok ($tick->Id, "found ticket ".$tick->Id);
-ok ($tick->Subject eq 'This is a test of new ticket creation as an unknown user', "failed to create the new ticket from an unprivileged account");
- $u = RT::User->new($RT::SystemUser);
-$u->Load('doesnotexist@example.com');
-ok( $u->Id != 0, " user does not exist and was created by ticket submission");
-
-# }}}
-
-
-# {{{  can another random reply to a ticket without being granted privs? answer should be no.
-
-
-#($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
-#ok ($val, "Granted everybody the right to create tickets - $msg");
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action correspond"), "Opened the mailgate - $@");
-print MAIL <<EOF;
-From: doesnotexist-2\@example.com
-To: rt\@example.com
-Subject: [example.com #@{[$tick->Id]}] This is a test of a reply as an unknown user
-
-Blah!  (Should not work.)
-Foob!
-EOF
-close (MAIL);
-#Check the return value
-is ($? >> 8, 0, "The mail gateway exited normally. yay");
-
-$u = RT::User->new($RT::SystemUser);
-$u->Load('doesnotexist-2@example.com');
-ok( $u->Id == 0, " user does not exist and was not created by ticket correspondence submission");
-# }}}
-
-
-# {{{  can another random reply to a ticket after being granted privs? answer should be yes
-
-
-($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'ReplyToTicket');
-ok ($val, "Granted everybody the right to reply to  tickets - $msg");
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action correspond"), "Opened the mailgate - $@");
-print MAIL <<EOF;
-From: doesnotexist-2\@example.com
-To: rt\@example.com
-Subject: [example.com #@{[$tick->Id]}] This is a test of a reply as an unknown user
-
-Blah!
-Foob!
-EOF
-close (MAIL);
-#Check the return value
-is ($? >> 8, 0, "The mail gateway exited normally. yay");
-
-
-$u = RT::User->new($RT::SystemUser);
-$u->Load('doesnotexist-2@example.com');
-ok( $u->Id != 0, " user exists and was created by ticket correspondence submission");
-
-# }}}
-
-# {{{  can another random comment on a ticket without being granted privs? answer should be no.
-
-
-#($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CreateTicket');
-#ok ($val, "Granted everybody the right to create tickets - $msg");
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action comment"), "Opened the mailgate - $@");
-print MAIL <<EOF;
-From: doesnotexist-3\@example.com
-To: rt\@example.com
-Subject: [example.com #@{[$tick->Id]}] This is a test of a comment as an unknown user
-
-Blah!  (Should not work.)
-Foob!
-EOF
-close (MAIL);
-
-#Check the return value
-is ($? >> 8, 0, "The mail gateway exited normally. yay");
-
-$u = RT::User->new($RT::SystemUser);
-$u->Load('doesnotexist-3@example.com');
-ok( $u->Id == 0, " user does not exist and was not created by ticket comment submission");
-
-# }}}
-# {{{  can another random reply to a ticket after being granted privs? answer should be yes
-
-
-($val,$msg) = $g->PrincipalObj->GrantRight(Right => 'CommentOnTicket');
-ok ($val, "Granted everybody the right to reply to  tickets - $msg");
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action comment"), "Opened the mailgate - $@");
-print MAIL <<EOF;
-From: doesnotexist-3\@example.com
-To: rt\@example.com
-Subject: [example.com #@{[$tick->Id]}] This is a test of a comment as an unknown user
-
-Blah!
-Foob!
-EOF
-close (MAIL);
-
-#Check the return value
-is ($? >> 8, 0, "The mail gateway exited normally. yay");
-
-$u = RT::User->new($RT::SystemUser);
-$u->Load('doesnotexist-3@example.com');
-ok( $u->Id != 0, " user exists and was created by ticket comment submission");
-
-# }}}
-
-# {{{ Testing preservation of binary attachments
-
-# Get a binary blob (Best Practical logo) 
-
-# Create a mime entity with an attachment
-
-use MIME::Entity;
-my $entity = MIME::Entity->build( From => 'root@localhost',
-                                 To => 'rt@localhost',
-                                Subject => 'binary attachment test',
-                                Data => ['This is a test of a binary attachment']);
-
-# currently in lib/t/autogen
-
-my $LOGO_FILE = $RT::MasonComponentRoot.'/NoAuth/images/bplogo.gif';
-
-$entity->attach(Path => $LOGO_FILE,
-                Type => 'image/gif',
-                Encoding => 'base64');
-
-# Create a ticket with a binary attachment
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action correspond"), "Opened the mailgate - $@");
-
-$entity->print(\*MAIL);
-
-close (MAIL);
-
-#Check the return value
-is ($? >> 8, 0, "The mail gateway exited normally. yay");
-
-$tickets = RT::Tickets->new($RT::SystemUser);
-$tickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
-$tickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
- $tick = $tickets->First();
-ok (UNIVERSAL::isa($tick,'RT::Ticket'));
-ok ($tick->Id, "found ticket ".$tick->Id);
-ok ($tick->Subject eq 'binary attachment test', "Created the ticket - ".$tick->Id);
-
-my $file = `cat $LOGO_FILE`;
-ok ($file, "Read in the logo image");
-
-
-        use Digest::MD5;
-warn "for the raw file the content is ".Digest::MD5::md5_base64($file);
-
-
-
-# Verify that the binary attachment is valid in the database
-my $attachments = RT::Attachments->new($RT::SystemUser);
-$attachments->Limit(FIELD => 'ContentType', VALUE => 'image/gif');
-ok ($attachments->Count == 1, 'Found only one gif in the database');
-my $attachment = $attachments->First;
-ok($attachment->Id);
-my $acontent = $attachment->Content;
-
-        warn "coming from the  database, the content is ".Digest::MD5::md5_base64($acontent);
-
-is( $acontent, $file, 'The attachment isn\'t screwed up in the database.');
-# Log in as root
-use Getopt::Long;
-use LWP::UserAgent;
-
-
-# Grab the binary attachment via the web ui
-my $ua      = LWP::UserAgent->new();
-
-my $full_url = "$RT::WebURL/Ticket/Attachment/".$attachment->TransactionId."/".$attachment->id."/bplogo.gif?&user=root&pass=password";
-my $r = $ua->get( $full_url);
-
-
-# Verify that the downloaded attachment is the same as what we uploaded.
-is($file, $r->content, 'The attachment isn\'t screwed up in download');
-
-
-
-# }}}
-
-# {{{ Simple I18N testing
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action correspond"), "Opened the mailgate - $@");
-                                                                         
-print MAIL <<EOF;
-From: root\@localhost
-To: rtemail\@example.com
-Subject: This is a test of I18N ticket creation
-Content-Type: text/plain; charset="utf-8"
-
-2 accented lines
-\303\242\303\252\303\256\303\264\303\273
-\303\241\303\251\303\255\303\263\303\272
-bye
-EOF
-close (MAIL);
-
-#Check the return value
-is ($? >> 8, 0, "The mail gateway exited normally. yay");
-
-my $unitickets = RT::Tickets->new($RT::SystemUser);
-$unitickets->OrderBy(FIELD => 'id', ORDER => 'DESC');
-$unitickets->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
-my $unitick = $unitickets->First();
-ok (UNIVERSAL::isa($unitick,'RT::Ticket'));
-ok ($unitick->Id, "found ticket ".$unitick->Id);
-ok ($unitick->Subject eq 'This is a test of I18N ticket creation', "Created the ticket - ". $unitick->Subject);
-
-
-
-my $unistring = "\303\241\303\251\303\255\303\263\303\272";
-Encode::_utf8_on($unistring);
-is ($unitick->Transactions->First->Content, $unitick->Transactions->First->Attachments->First->Content, "Content is ". $unitick->Transactions->First->Attachments->First->Content);
-ok($unitick->Transactions->First->Attachments->First->Content =~ /$unistring/i, $unitick->Id." appears to be unicode ". $unitick->Transactions->First->Attachments->First->Id);
-# supposedly I18N fails on the second message sent in.
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action correspond"), "Opened the mailgate - $@");
-                                                                         
-print MAIL <<EOF;
-From: root\@localhost
-To: rtemail\@example.com
-Subject: This is a test of I18N ticket creation
-Content-Type: text/plain; charset="utf-8"
-
-2 accented lines
-\303\242\303\252\303\256\303\264\303\273
-\303\241\303\251\303\255\303\263\303\272
-bye
-EOF
-close (MAIL);
-
-#Check the return value
-is ($? >> 8, 0, "The mail gateway exited normally. yay");
-
-my $tickets2 = RT::Tickets->new($RT::SystemUser);
-$tickets2->OrderBy(FIELD => 'id', ORDER => 'DESC');
-$tickets2->Limit(FIELD => 'id', OPERATOR => '>', VALUE => '0');
-my $tick2 = $tickets2->First();
-ok (UNIVERSAL::isa($tick2,'RT::Ticket'));
-ok ($tick2->Id, "found ticket ".$tick2->Id);
-ok ($tick2->Subject eq 'This is a test of I18N ticket creation', "Created the ticket");
-
-
-
-$unistring = "\303\241\303\251\303\255\303\263\303\272";
-Encode::_utf8_on($unistring);
-
-ok ($tick2->Transactions->First->Content =~ $unistring, "It appears to be unicode - ".$tick2->Transactions->First->Content);
-
-# }}}
-
-
-($val,$msg) = $g->PrincipalObj->RevokeRight(Right => 'CreateTicket');
-ok ($val, $msg);
-
-=for later
-
-TODO: {
-
-# {{{ Check take and resolve actions
-
-# create ticket that is owned by nobody
-use RT::Ticket;
-$tick = RT::Ticket->new($RT::SystemUser);
-my ($id) = $tick->Create( Queue => 'general', Subject => 'test');
-ok( $id, 'new ticket created' );
-is( $tick->Owner, $RT::Nobody->Id, 'owner of the new ticket is nobody' );
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action take"), "Opened the mailgate - $@");
-print MAIL <<EOF;
-From: root\@localhost
-Subject: [example.com \#$id] test
-
-EOF
-close (MAIL);
-is ($? >> 8, 0, "The mail gateway exited normally");
-
-$tick = RT::Ticket->new($RT::SystemUser);
-$tick->Load( $id );
-is( $tick->Id, $id, 'load correct ticket');
-is( $tick->OwnerObj->EmailAddress, 'root@localhost', 'successfuly take ticket via email');
-
-# check that there is no text transactions writen
-is( $tick->Transactions->Count, 2, 'no superfluous transactions');
-
-my $status = '';
-($status, $msg) = $tick->SetOwner( $RT::Nobody->Id, 'Force' );
-ok( $status, 'successfuly changed owner: '. ($msg||'') );
-is( $tick->Owner, $RT::Nobody->Id, 'set owner back to nobody');
-
-
-
-    local $TODO = "Advanced mailgate actions require an unsafe configuration";
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action take-correspond"), "Opened the mailgate - $@");
-print MAIL <<EOF;
-From: root\@localhost
-Subject: [example.com \#$id] correspondence
-
-test
-EOF
-close (MAIL);
-is ($? >> 8, 0, "The mail gateway exited normally");
-
-$tick = RT::Ticket->new($RT::SystemUser);
-$tick->Load( $id );
-is( $tick->Id, $id, 'load correct ticket');
-is( $tick->OwnerObj->EmailAddress, 'root@localhost', 'successfuly take ticket via email');
-my $txns = $tick->Transactions;
-$txns->Limit( FIELD => 'Type', VALUE => 'Correspond');
-is( $txns->Last->Subject, "[example.com \#$id] correspondence", 'successfuly add correspond within take via email' );
-# +1 because of auto open
-is( $tick->Transactions->Count, 6, 'no superfluous transactions');
-
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $RT::WebURL --queue general --action resolve"), "Opened the mailgate - $@");
-print MAIL <<EOF;
-From: root\@localhost
-Subject: [example.com \#$id] test
-
-EOF
-close (MAIL);
-is ($? >> 8, 0, "The mail gateway exited normally");
-
-DBIx::SearchBuilder::Record::Cachable->FlushCache;
-
-$tick = RT::Ticket->new($RT::SystemUser);
-$tick->Load( $id );
-is( $tick->Id, $id, 'load correct ticket');
-is( $tick->Status, 'resolved', 'successfuly resolved ticket via email');
-is( $tick->Transactions->Count, 7, 'no superfluous transactions');
-
-};
-
-=cut
-
-# }}}
-
-1;
diff --git a/rt/lib/t/regression/07acl.t b/rt/lib/t/regression/07acl.t
deleted file mode 100644
index bb1ccdc..0000000
--- a/rt/lib/t/regression/07acl.t
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/perl -w
-
-use WWW::Mechanize;
-use HTTP::Cookies;
-
-use Test::More qw/no_plan/;
-use RT;
-RT::LoadConfig();
-RT::Init();
-
-# Create a user with basically no rights, to start.
-my $user_obj = RT::User->new($RT::SystemUser);
-my ($ret, $msg) = $user_obj->LoadOrCreateByEmail('customer-'.$$.'@example.com');
-ok($ret, 'ACL test user creation');
-$user_obj->SetName('customer-'.$$);
-$user_obj->SetPrivileged(1);
-($ret, $msg) = $user_obj->SetPassword('customer');
-ok($ret, "ACL test password set. $msg");
-
-# Now test the web interface, making sure objects come and go as
-# required.
-
-my $cookie_jar = HTTP::Cookies->new;
-my $agent = WWW::Mechanize->new();
-
-# give the agent a place to stash the cookies
-
-$agent->cookie_jar($cookie_jar);
-
-
-# get the top page
-my $url = $RT::WebURL;
-$agent->get($url);
-
-is ($agent->{'status'}, 200, "Loaded a page - $RT::WebURL");
-# {{{ test a login
-
-# follow the link marked "Login"
-
-ok($agent->{form}->find_input('user'));
-
-ok($agent->{form}->find_input('pass'));
-ok ($agent->{'content'} =~ /username:/i);
-$agent->field( 'user' => 'customer-'.$$ );
-$agent->field( 'pass' => 'customer' );
-# the field isn't named, so we have to click link 0
-$agent->click(0);
-is($agent->{'status'}, 200, "Fetched the page ok");
-ok($agent->{'content'} =~ /Logout/i, "Found a logout link");
-
-# Test for absence of Configure and Preferences tabs.
-ok(!$agent->find_link( url => '/Admin/',
-		       text => 'Configuration'), "No config tab" );
-ok(!$agent->find_link( url => '/User/Prefs.html',
-		       text => 'Preferences'), "No prefs pane" );
-
-# Now test for their presence, one at a time.  Sleep for a bit after
-# ACL changes, thanks to the 10s ACL cache.
-$user_obj->PrincipalObj->GrantRight(Right => 'ShowConfigTab');
-$agent->reload();
-ok($agent->{'content'} =~ /Logout/i, "Reloaded page successfully");
-ok($agent->find_link( url => '/Admin/',
-		       text => 'Configuration'), "Found config tab" );
-$user_obj->PrincipalObj->RevokeRight(Right => 'ShowConfigTab');
-$user_obj->PrincipalObj->GrantRight(Right => 'ModifySelf');
-$agent->reload();
-ok($agent->{'content'} =~ /Logout/i, "Reloaded page successfully");
-ok($agent->find_link( url => '/User/Prefs.html',
-		       text => 'Preferences'), "Found prefs pane" );
-$user_obj->PrincipalObj->RevokeRight(Right => 'ModifySelf');
-
-# Good.  Now load the search page and test Load/Save Search.
-$agent->follow_link( url => '/Search/Build.html',
-		     text => 'Tickets');
-is($agent->{'status'}, 200, "Fetched search builder page");
-ok($agent->{'content'} !~ /Load saved search/i, "No search loading box");
-ok($agent->{'content'} !~ /Saved searches/i, "No saved searches box");
-
-$user_obj->PrincipalObj->GrantRight(Right => 'LoadSavedSearch');
-$agent->reload();
-ok($agent->{'content'} =~ /Load saved search/i, "Search loading box exists");
-ok($agent->{'content'} !~ /input\s+type=.submit.\s+name=.Save./i, 
-   "Still no saved searches box");
-
-$user_obj->PrincipalObj->GrantRight(Right => 'CreateSavedSearch');
-$agent->reload();
-ok($agent->{'content'} =~ /Load saved search/i, 
-   "Search loading box still exists");
-ok($agent->{'content'} =~ /input\s+type=.submit.\s+name=.Save./i, 
-   "Saved searches box exists");
-
-# Create a group, and a queue, so we can test limited user visibility
-# via SelectOwner.
-
-my $queue_obj = RT::Queue->new($RT::SystemUser);
-($ret, $msg) = $queue_obj->Create(Name => 'CustomerQueue', 
-				  Description => 'queue for SelectOwner testing');
-ok($ret, "SelectOwner test queue creation. $msg");
-my $group_obj = RT::Group->new($RT::SystemUser);
-($ret, $msg) = $group_obj->CreateUserDefinedGroup(Name => 'CustomerGroup',
-			      Description => 'group for SelectOwner testing');
-ok($ret, "SelectOwner test group creation. $msg");
-
-# Add our customer to the customer group, and give it queue rights.
-($ret, $msg) = $group_obj->AddMember($user_obj->PrincipalObj->Id());
-ok($ret, "Added customer to its group. $msg");
-$group_obj->PrincipalObj->GrantRight(Right => 'OwnTicket',
-				     Object => $queue_obj);
-$group_obj->PrincipalObj->GrantRight(Right => 'SeeQueue',
-				     Object => $queue_obj);
-
-# Now.  When we look at the search page we should be able to see
-# ourself in the list of possible owners.
-
-$agent->reload();
-ok($agent->form_name('BuildQuery'), "Yep, form is still there");
-my $input = $agent->current_form->find_input('ValueOfActor');
-ok(grep(/customer-$$/, $input->value_names()), "Found self in the actor listing");
-
-1;
diff --git a/rt/lib/t/regression/07rights.t b/rt/lib/t/regression/07rights.t
deleted file mode 100644
index 4764b49..0000000
--- a/rt/lib/t/regression/07rights.t
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/perl -w
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-
-use Test::More tests => 14;
-use RT;
-RT::LoadConfig();
-RT::Init();
-use RT::I18N;
-use strict;
-no warnings 'once';
-
-use RT::Queue;
-use RT::ACE;
-use RT::User;
-use RT::Group;
-use RT::Ticket;
-
-
-# clear all global right
-my $acl = RT::ACL->new($RT::SystemUser);
-$acl->Limit( FIELD => 'RightName', OPERATOR => '!=', VALUE => 'SuperUser' );
-$acl->LimitToObject( $RT::System );
-while( my $ace = $acl->Next ) {
-	$ace->Delete;
-}
-
-# create new queue to be shure we don't mess with rights
-my $queue = RT::Queue->new($RT::SystemUser);
-my ($queue_id) = $queue->Create( Name => 'rights');
-ok( $queue_id, 'queue created for rights tests' );
-
-# new privileged user to check rights
-my $user = RT::User->new( $RT::SystemUser );
-my ($user_id) = $user->Create( Name => 'rights',
-			   EmailAddress => 'rights@localhost',
-			   Privileged => 1,
-			   Password => 'qwe123',
-			 );
-ok( !$user->HasRight( Right => 'OwnTicket', Object => $queue ), "user can't own ticket" );
-ok( !$user->HasRight( Right => 'ReplyToTicket', Object => $queue ), "user can't reply to ticket" );
-
-my $group = RT::Group->new( $RT::SystemUser );
-ok( $group->LoadQueueRoleGroup( Queue => $queue_id, Type=> 'Owner' ), "load queue owners role group" );
-my $ace = RT::ACE->new( $RT::SystemUser );
-my ($ace_id, $msg) = $group->PrincipalObj->GrantRight( Right => 'ReplyToTicket', Object => $queue );
-ok( $ace_id, "Granted queue owners role group with ReplyToTicket right: $msg" );
-ok( $group->PrincipalObj->HasRight( Right => 'ReplyToTicket', Object => $queue ), "role group can reply to ticket" );
-ok( !$user->HasRight( Right => 'ReplyToTicket', Object => $queue ), "user can't reply to ticket" );
-
-# new ticket
-my $ticket = RT::Ticket->new($RT::SystemUser);
-my ($ticket_id) = $ticket->Create( Queue => $queue_id, Subject => 'test');
-ok( $ticket_id, 'new ticket created' );
-is( $ticket->Owner, $RT::Nobody->Id, 'owner of the new ticket is nobody' );
-
-my $status;
-($status, $msg) = $user->PrincipalObj->GrantRight( Object => $queue, Right => 'OwnTicket' );
-ok( $status, "successfuly granted right: $msg" );
-ok( $user->HasRight( Right => 'OwnTicket', Object => $queue ), "user can own ticket" );
-
-($status, $msg) = $ticket->SetOwner( $user_id );
-ok( $status, "successfuly set owner: $msg" );
-is( $ticket->Owner, $user_id, "set correct owner" );
-
-ok( $user->HasRight( Right => 'ReplyToTicket', Object => $ticket ), "user is owner and can reply to ticket" );
-
diff --git a/rt/lib/t/regression/08web_cf_access.t b/rt/lib/t/regression/08web_cf_access.t
deleted file mode 100644
index 012d733..0000000
--- a/rt/lib/t/regression/08web_cf_access.t
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-use Test::More tests => 15;
-use RT;
-RT::LoadConfig;
-RT::Init;
-use Test::WWW::Mechanize;
-
-$RT::WebURL ||= 0; # avoid stupid warning
-my $BaseURL = $RT::WebURL;
-use constant ImageFile => $RT::MasonComponentRoot .'/NoAuth/images/bplogo.gif';
-use constant ImageFileContent => do {
-    local $/;
-    open my $fh, '<', ImageFile or die $!;
-    binmode($fh);
-    scalar <$fh>;
-};
-
-my $m = Test::WWW::Mechanize->new;
-isa_ok($m, 'Test::WWW::Mechanize');
-
-$m->get( $BaseURL."?user=root;pass=password" );
-$m->content_like(qr/Logout/, 'we did log in');
-$m->follow_link( text => 'Configuration' );
-$m->title_is(q/RT Administration/, 'admin screen');
-$m->follow_link( text => 'Custom Fields' );
-$m->title_is(q/Select a Custom Field/, 'admin-cf screen');
-$m->follow_link( text => 'New custom field' );
-$m->submit_form(
-    form_name => "ModifyCustomField",
-    fields => {
-        TypeComposite => 'Image-0',
-        LookupType => 'RT::Queue-RT::Ticket',
-        Name => 'img',
-        Description => 'img',
-    },
-);
-$m->title_is(q/Created CustomField img/, 'admin-cf created');
-$m->follow_link( text => 'Queues' );
-$m->title_is(q/Admin queues/, 'admin-queues screen');
-$m->follow_link( text => 'General' );
-$m->title_is(q/Editing Configuration for queue General/, 'admin-queue: general');
-$m->follow_link( text => 'Ticket Custom Fields' );
-
-$m->title_is(q/Edit Custom Fields for General/, 'admin-queue: general tcf');
-$m->form_name('EditCustomFields');
-
-# Sort by numeric IDs in names
-my @names = map  { $_->[1] }
-            sort { $a->[0] <=> $b->[0] }
-            map  { /Object-1-CF-(\d+)/ ? [ $1 => $_ ] : () }
-            map  $_->name, $m->current_form->inputs;
-my $tcf = pop(@names);
-$m->field( $tcf => 1 );         # Associate the new CF with this queue
-$m->field( $_ => undef ) for @names;    # ...and not any other. ;-)
-$m->submit;
-
-$m->content_like( qr/Object created/, 'TCF added to the queue' );
-
-$m->submit_form(
-    form_name => "CreateTicketInQueue",
-    fields => { Queue => 'General' },
-);
-
-$m->content_like(qr/Upload multiple images/, 'has a upload image field');
-
-$tcf =~ /(\d+)$/ or die "Hey this is impossible dude";
-my $upload_field = "Object-RT::Ticket--CustomField-$1-Upload";
-
-$m->submit_form(
-    form_name => "TicketCreate",
-    fields => {
-        $upload_field => ImageFile,
-        Subject => 'testing img cf creation',
-    },
-);
-
-$m->content_like(qr/Ticket \d+ created/, "a ticket is created succesfully");
-
-my $id = $1 if $m->content =~ /Ticket (\d+) created/;
-
-$m->title_like(qr/testing img cf creation/, "its title is the Subject");
-
-$m->follow_link( text => 'bplogo.gif' );
-$m->content_is(ImageFileContent, "it links to the uploaded image");
-
-$m->get( $BaseURL );
-
-$m->follow_link( text => 'Tickets' );
-$m->follow_link( text => 'New Query' );
-
-$m->title_is(q/Query Builder/, 'Query building');
-$m->submit_form(
-    form_name => "BuildQuery",
-    fields => {
-        idOp => '=',
-        ValueOfid => $id,
-        ValueOfQueue => 'General',
-    },
-    button => 'AddClause',
-);
-
-$m->form_name('BuildQuery');
-
-my $col = ($m->current_form->find_input('SelectDisplayColumns'))[-1];
-$col->value( ($col->possible_values)[-1] );
-
-$m->click('AddCol');
-
-$m->form_name('BuildQuery');
-$m->click('DoSearch');
-
-$m->follow_link( text_regex => qr/bplogo\.gif/ );
-$m->content_is(ImageFileContent, "it links to the uploaded image");
-
-__END__
-[FC] Bulk Update does not have custom fields.
diff --git a/rt/lib/t/regression/09record_cf_api.t b/rt/lib/t/regression/09record_cf_api.t
deleted file mode 100644
index 1428a28..0000000
--- a/rt/lib/t/regression/09record_cf_api.t
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings FATAL => 'all';
-use Test::More tests => 131;
-
-use RT;
-RT::LoadConfig();
-RT::Init();
-
-# Before we get going, ditch all object_cfs; this will remove 
-# all custom fields systemwide;
-my $object_cfs = RT::ObjectCustomFields->new($RT::SystemUser);
-$object_cfs->UnLimit();
-while (my $ocf = $object_cfs->Next) {
-	$ocf->Delete();
-}
-
-
-my $queue = RT::Queue->new( $RT::SystemUser );
-$queue->Create( Name => 'RecordCustomFields-'.$$ );
-ok ($queue->id, "Created the queue");
-
-my $ticket = RT::Ticket->new( $RT::SystemUser );
-$ticket->Create(
-	Queue => $queue->Id,
-	Requestor => 'root@localhost',
-	Subject => 'RecordCustomFields1',
-);
-
-my $cfs = $ticket->CustomFields;
-is( $cfs->Count, 0 );
-
-# Check that record has no any CF values yet {{{
-my $cfvs = $ticket->CustomFieldValues;
-is( $cfvs->Count, 0 );
-is( $ticket->FirstCustomFieldValue, undef );
-
-my $local_cf1 = RT::CustomField->new( $RT::SystemUser );
-$local_cf1->Create( Name => 'RecordCustomFields1-'.$$, Type => 'SelectSingle', Queue => $queue->id );
-$local_cf1->AddValue( Name => 'RecordCustomFieldValues11' );
-$local_cf1->AddValue( Name => 'RecordCustomFieldValues12' );
-
-my $local_cf2 = RT::CustomField->new( $RT::SystemUser );
-$local_cf2->Create( Name => 'RecordCustomFields2-'.$$, Type => 'SelectSingle', Queue => $queue->id );
-$local_cf2->AddValue( Name => 'RecordCustomFieldValues21' );
-$local_cf2->AddValue( Name => 'RecordCustomFieldValues22' );
-
-my $global_cf3 = RT::CustomField->new( $RT::SystemUser );
-$global_cf3->Create( Name => 'RecordCustomFields3-'.$$, Type => 'SelectSingle', Queue => 0 );
-$global_cf3->AddValue( Name => 'RecordCustomFieldValues31' );
-$global_cf3->AddValue( Name => 'RecordCustomFieldValues32' );
-
-
-my @custom_fields = ($local_cf1, $local_cf2, $global_cf3);
-
-
-$cfs = $ticket->CustomFields;
-is( $cfs->Count, 3 );
-
-# Check that record has no any CF values yet {{{
-$cfvs = $ticket->CustomFieldValues;
-is( $cfvs->Count, 0 );
-is( $ticket->FirstCustomFieldValue, undef );
-
-# CF with ID -1 shouldnt exist at all
-$cfvs = $ticket->CustomFieldValues( -1 );
-is( $cfvs->Count, 0 );
-is( $ticket->FirstCustomFieldValue( -1 ), undef );
-
-$cfvs = $ticket->CustomFieldValues( 'SomeUnexpedCustomFieldName' );
-is( $cfvs->Count, 0 );
-is( $ticket->FirstCustomFieldValue( 'SomeUnexpedCustomFieldName' ), undef );
-
-for (@custom_fields) {
-	$cfvs = $ticket->CustomFieldValues( $_->id );
-	is( $cfvs->Count, 0 );
-
-	$cfvs = $ticket->CustomFieldValues( $_->Name );
-	is( $cfvs->Count, 0 );
-	is( $ticket->FirstCustomFieldValue( $_->id ), undef );
-	is( $ticket->FirstCustomFieldValue( $_->Name ), undef );
-}
-# }}}
-
-# try to add field value with fields that do not exist {{{
-my ($status, $msg) = $ticket->AddCustomFieldValue( Field => -1 , Value => 'foo' );
-ok(!$status, "shouldn't add value" );
-($status, $msg) = $ticket->AddCustomFieldValue( Field => 'SomeUnexpedCustomFieldName' , Value => 'foo' );
-ok(!$status, "shouldn't add value" );
-# }}}
-
-# {{{
-SKIP: {
-
-	skip "TODO: We want fields that are not allowed to set unexpected values", 10;
-	for (@custom_fields) {
-		($status, $msg) = $ticket->AddCustomFieldValue( Field => $_ , Value => 'SomeUnexpectedCFValue' );
-		ok( !$status, 'value doesn\'t exist');
-	
-		($status, $msg) = $ticket->AddCustomFieldValue( Field => $_->id , Value => 'SomeUnexpectedCFValue' );
-		ok( !$status, 'value doesn\'t exist');
-	
-		($status, $msg) = $ticket->AddCustomFieldValue( Field => $_->Name , Value => 'SomeUnexpectedCFValue' );
-		ok( !$status, 'value doesn\'t exist');
-	}
-	
-	# Let check that we did not add value to be sure
-	# using only FirstCustomFieldValue sub because
-	# we checked other variants allready
-	for (@custom_fields) {
-		is( $ticket->FirstCustomFieldValue( $_->id ), undef );
-	}
-	
-}
-# Add some values to our custom fields
-for (@custom_fields) {
-	# this should be tested elsewhere
-	$_->AddValue( Name => 'Foo' );
-	$_->AddValue( Name => 'Bar' );
-}
-
-my $test_add_delete_cycle = sub {
-	my $cb = shift;
-	for (@custom_fields) {
-		($status, $msg) = $ticket->AddCustomFieldValue( Field => $cb->($_) , Value => 'Foo' );
-		ok( $status, "message: $msg");
-	}
-	
-	# does it exist?
-	$cfvs = $ticket->CustomFieldValues;
-	is( $cfvs->Count, 3, "We found all three custom fields on our ticket" );
-	for (@custom_fields) {
-		$cfvs = $ticket->CustomFieldValues( $_->id );
-		is( $cfvs->Count, 1 , "we found one custom field when searching by id");
-	
-		$cfvs = $ticket->CustomFieldValues( $_->Name );
-		is( $cfvs->Count, 1 , " We found one custom field when searching by name for " . $_->Name);
-		is( $ticket->FirstCustomFieldValue( $_->id ), 'Foo' , "first value by id is foo");
-		is( $ticket->FirstCustomFieldValue( $_->Name ), 'Foo' , "first value by name is foo");
-	}
-	# because our CFs are SingleValue then new value addition should override
-	for (@custom_fields) {
-		($status, $msg) = $ticket->AddCustomFieldValue( Field => $_ , Value => 'Bar' );
-		ok( $status, "message: $msg");
-	}
-	$cfvs = $ticket->CustomFieldValues;
-	is( $cfvs->Count, 3 );
-	for (@custom_fields) {
-		$cfvs = $ticket->CustomFieldValues( $_->id );
-		is( $cfvs->Count, 1 );
-	
-		$cfvs = $ticket->CustomFieldValues( $_->Name );
-		is( $cfvs->Count, 1 );
-		is( $ticket->FirstCustomFieldValue( $_->id ), 'Bar' );
-		is( $ticket->FirstCustomFieldValue( $_->Name ), 'Bar' );
-	}
-	# delete it
-	for (@custom_fields ) { 
-		($status, $msg) = $ticket->DeleteCustomFieldValue( Field => $_ , Value => 'Bar' );
-		ok( $status, "Deleted a custom field value 'Bar' for field ".$_->id.": $msg");
-	}
-	$cfvs = $ticket->CustomFieldValues;
-	is( $cfvs->Count, 0, "The ticket (".$ticket->id.") no longer has any custom field values"  );
-	for (@custom_fields) {
-		$cfvs = $ticket->CustomFieldValues( $_->id );
-		is( $cfvs->Count, 0,  $ticket->id." has no values for cf  ".$_->id );
-	
-		$cfvs = $ticket->CustomFieldValues( $_->Name );
-		is( $cfvs->Count, 0 , $ticket->id." has no values for cf  '".$_->Name. "'" );
-		is( $ticket->FirstCustomFieldValue( $_->id ), undef , "There is no first custom field value when loading by id" );
-		is( $ticket->FirstCustomFieldValue( $_->Name ), undef, "There is no first custom field value when loading by Name" );
-	}
-};
-
-# lets test cycle via CF id
-$test_add_delete_cycle->( sub { return $_[0]->id } );
-# lets test cycle via CF object reference
-$test_add_delete_cycle->( sub { return $_[0] } );
-
-#SKIP: {
-#	skip "TODO: should we add CF values to objects via CF Name?", 48;
-# names are not unique
-	# lets test cycle via CF Name
-#	$test_add_delete_cycle->( sub { return $_[0]->Name } );
-#}
-
-
diff --git a/rt/lib/t/regression/10merge.t b/rt/lib/t/regression/10merge.t
deleted file mode 100644
index 8bca952..0000000
--- a/rt/lib/t/regression/10merge.t
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/perl 
-
-use warnings;
-use strict;
-
-
-#
-# This test script validates that when merging two tickets, the comments from both tickets
-# are integrated into the new ticket
-
-use Test::More tests => 13;
-use RT;
-RT::LoadConfig;
-RT::Init;
-
-use_ok('RT::Ticket');
-use_ok('RT::Queue');
-
-my $queue = RT::Queue->new($RT::SystemUser);
-my ($id,$msg) = $queue->Create(Name => 'MergeTest-'.rand(25));
-ok ($id,$msg);
-
-my $t1 = RT::Ticket->new($RT::SystemUser);
-my ($tid,$transid, $t1msg) =$t1->Create ( Queue => $queue->Name, Subject => 'Merge test. orig');
-ok ($tid, $t1msg);
-($id, $msg) = $t1->Comment(Content => 'This is a Comment on the original');
-ok($id,$msg);
-
-my $txns = $t1->Transactions;
-my $Comments = 0;
-while (my $txn = $txns->Next) {
-$Comments++ if ($txn->Type eq 'Comment');
-}
-is($Comments,1, "our first ticket has only one Comment");
-
-my $t2 = RT::Ticket->new($RT::SystemUser);
-my ($t2id,$t2transid, $t2msg) =$t2->Create ( Queue => $queue->Name, Subject => 'Merge test. duplicate');
-ok ($t2id, $t2msg);
-
-
-
-($id, $msg) = $t2->Comment(Content => 'This is a commet on the duplicate');
-ok($id,$msg);
-
-
-$txns = $t2->Transactions;
- $Comments = 0;
-while (my $txn = $txns->Next) {
-    $Comments++ if ($txn->Type eq 'Comment');
-}
-is($Comments,1, "our second ticket has only one Comment");
-
-($id, $msg) = $t1->Comment(Content => 'This is a second  Comment on the original');
-ok($id,$msg);
-
-$txns = $t1->Transactions;
-$Comments = 0;
-while (my $txn = $txns->Next) {
-    $Comments++ if ($txn->Type eq 'Comment');
-}
-is($Comments,2, "our first ticket now has two Comments");
-
-($id,$msg) = $t2->MergeInto($t1->id);
-
-ok($id,$msg);
-$txns = $t1->Transactions;
-$Comments = 0;
-while (my $txn = $txns->Next) {
-    $Comments++ if ($txn->Type eq 'Comment');
-}
-is($Comments,3, "our first ticket now has three Comments - we merged safely");
-
diff --git a/rt/lib/t/regression/11-template-insert.t b/rt/lib/t/regression/11-template-insert.t
deleted file mode 100644
index 8681ce6..0000000
--- a/rt/lib/t/regression/11-template-insert.t
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/perl
-
-use warnings;
-use strict;
-
-use Test::More tests => 7;
-
-use RT;
-RT::LoadConfig();
-RT::Init;
-
-
-# This tiny little test script triggers an interaction bug between DBD::Oracle 1.16, SB 1.15 and RT 3.4
-
-use_ok('RT::Template');
-my $template = RT::Template->new($RT::SystemUser);
-
-isa_ok($template, 'RT::Template');
-my ($val,$msg) = $template->Create(Queue => 1,
-                  Name => 'InsertTest',
-                  Content => 'This is template content');
-ok($val,$msg);
-is($template->Name, 'InsertTest');
-is($template->Content, 'This is template content', "We created the object right");
-($val, $msg) = $template->SetContent( 'This is new template content');
-ok($val,$msg);
-is($template->Content, 'This is new template content', "We managed to _Set_ the content");
diff --git a/rt/lib/t/regression/12-search.t b/rt/lib/t/regression/12-search.t
deleted file mode 100644
index 9cc4aa4..0000000
--- a/rt/lib/t/regression/12-search.t
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/opt/perl/bin/perl -w
-
-# tests relating to searching. Especially around custom fields, and
-# corner cases.
-
-use strict;
-use warnings;
-
-use Test::More tests => 35;
-use_ok('RT');
-RT::LoadConfig();
-RT::Init();
-
-# setup the queue
-
-my $q = RT::Queue->new($RT::SystemUser);
-my $queue = 'SearchTests-'.$$;
-$q->Create(Name => $queue);
-ok ($q->id, "Created the queue");
-
-
-# and setup the CFs
-# we believe the Type shouldn't matter.
-
-my $cf = RT::CustomField->new($RT::SystemUser);
-$cf->Create(Name => 'SearchTest', Type => 'Freeform', MaxValues => 0, Queue => $q->id);
-ok($cf->id, "Created the SearchTest CF");
-my $cflabel = "CustomField-".$cf->id;
-
-my $cf2 = RT::CustomField->new($RT::SystemUser);
-$cf2->Create(Name => 'SearchTest2', Type => 'Freeform', MaxValues => 0, Queue => $q->id);
-ok($cf2->id, "Created the SearchTest2 CF");
-my $cflabel2 = "CustomField-".$cf2->id;
-
-my $cf3 = RT::CustomField->new($RT::SystemUser);
-$cf3->Create(Name => 'SearchTest3', Type => 'Freeform', MaxValues => 0, Queue => $q->id);
-ok($cf3->id, "Created the SearchTest3 CF");
-my $cflabel3 = "CustomField-".$cf3->id;
-
-
-# setup some tickets
-# we'll need a small pile of them, to test various combinations and nulls.
-# there's probably a way to think harder and do this with fewer
-
-
-my $t1 = RT::Ticket->new($RT::SystemUser);
-my ( $id, undef $msg ) = $t1->Create(
-    Queue      => $q->id,
-    Subject    => 'SearchTest1',
-    Requestor  => ['search1@example.com'],
-    $cflabel   => 'foo1',
-    $cflabel2  => 'bar1',
-    $cflabel3  => 'qux1',
-);
-ok( $id, $msg );
-
-
-my $t2 = RT::Ticket->new($RT::SystemUser);
-( $id, undef, $msg ) = $t2->Create(
-    Queue      => $q->id,
-    Subject    => 'SearchTest2',
-    Requestor  => ['search2@example.com'],
-#    $cflabel   => 'foo2',
-    $cflabel2  => 'bar2',
-    $cflabel3  => 'qux2',
-);
-ok( $id, $msg );
-
-my $t3 = RT::Ticket->new($RT::SystemUser);
-( $id, undef, $msg ) = $t3->Create(
-    Queue      => $q->id,
-    Subject    => 'SearchTest3',
-    Requestor  => ['search3@example.com'],
-    $cflabel   => 'foo3',
-#    $cflabel2  => 'bar3',
-    $cflabel3  => 'qux3',
-);
-ok( $id, $msg );
-
-my $t4 = RT::Ticket->new($RT::SystemUser);
-( $id, undef, $msg ) = $t4->Create(
-    Queue      => $q->id,
-    Subject    => 'SearchTest4',
-    Requestor  => ['search4@example.com'],
-    $cflabel   => 'foo4',
-    $cflabel2  => 'bar4',
-#    $cflabel3  => 'qux4',
-);
-ok( $id, $msg );
-
-my $t5 = RT::Ticket->new($RT::SystemUser);
-( $id, undef, $msg ) = $t5->Create(
-    Queue      => $q->id,
-#    Subject    => 'SearchTest5',
-    Requestor  => ['search5@example.com'],
-    $cflabel   => 'foo5',
-    $cflabel2  => 'bar5',
-    $cflabel3  => 'qux5',
-);
-ok( $id, $msg );
-
-my $t6 = RT::Ticket->new($RT::SystemUser);
-( $id, undef, $msg ) = $t6->Create(
-    Queue      => $q->id,
-    Subject    => 'SearchTest6',
-#    Requestor  => ['search6@example.com'],
-    $cflabel   => 'foo6',
-    $cflabel2  => 'bar6',
-    $cflabel3  => 'qux6',
-);
-ok( $id, $msg );
-
-my $t7 = RT::Ticket->new($RT::SystemUser);
-( $id, undef, $msg ) = $t7->Create(
-    Queue      => $q->id,
-    Subject    => 'SearchTest7',
-    Requestor  => ['search7@example.com'],
-#    $cflabel   => 'foo7',
-#    $cflabel2  => 'bar7',
-    $cflabel3  => 'qux7',
-);
-ok( $id, $msg );
-
-# we have tickets. start searching
-my $tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue'");
-is($tix->Count, 7, "found all the tickets");
-
-
-# very simple searches. both CF and normal
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND CF.SearchTest = 'foo1'");
-is($tix->Count, 1, "matched identical subject");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND CF.SearchTest LIKE 'foo1'");
-is($tix->Count, 1, "matched LIKE subject");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND CF.SearchTest = 'foo'");
-is($tix->Count, 0, "IS a regexp match");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND CF.SearchTest LIKE 'foo'");
-is($tix->Count, 5, "matched LIKE subject");
-
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND CF.SearchTest IS NULL");
-    
-    is($tix->Count, 2, "IS null CF");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND Requestors LIKE 'search1'");
-is($tix->Count, 1, "LIKE requestor");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND Requestors = 'search1\@example.com'");
-is($tix->Count, 1, "IS requestor");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND Requestors LIKE 'search'");
-is($tix->Count, 6, "LIKE requestor");
-
-TODO: {
-    
-    local $TODO = "Can't search for 'no requestor"; 
-    $tix = RT::Tickets->new($RT::SystemUser);
-    $tix->FromSQL("Queue = '$queue' AND Requestors IS NULL");
-    is($tix->Count, 1, "Search for no requestor");
-
-};
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND Subject = 'SearchTest1'");
-is($tix->Count, 1, "IS subject");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND Subject LIKE 'SearchTest1'");
-is($tix->Count, 1, "LIKE subject");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND Subject = ''");
-is($tix->Count, 1, "found one ticket");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND Subject LIKE 'SearchTest'");
-is($tix->Count, 6, "found two ticket");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND Subject LIKE 'qwerty'");
-is($tix->Count, 0, "found zero ticket");
-
-
-
-
-# various combinations
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("CF.SearchTest LIKE 'foo' AND CF.SearchTest2 LIKE 'bar1'");
-is($tix->Count, 1, "LIKE cf and LIKE cf");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("CF.SearchTest = 'foo1' AND CF.SearchTest2 = 'bar1'");
-is($tix->Count, 1, "is cf and is cf");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("CF.SearchTest = 'foo' AND CF.SearchTest2 LIKE 'bar1'");
-is($tix->Count, 0, "is cf and like cf");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("CF.SearchTest LIKE 'foo' AND CF.SearchTest2 LIKE 'bar' AND CF.SearchTest3 LIKE 'qux'");
-is($tix->Count, 3, "like cf and like cf and like cf");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("CF.SearchTest LIKE 'foo' AND CF.SearchTest2 LIKE 'bar' AND CF.SearchTest3 LIKE 'qux6'");
-is($tix->Count, 1, "like cf and like cf and is cf");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("CF.SearchTest LIKE 'foo' AND Subject LIKE 'SearchTest'");
-is($tix->Count, 4, "like cf and like subject");
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("CF.SearchTest IS NULL AND CF.SearchTest2 = 'bar2'");
-    
-    is($tix->Count, 1, "null cf and is cf");
-
-
-$tix = RT::Tickets->new($RT::SystemUser);
-$tix->FromSQL("Queue = '$queue' AND CF.SearchTest IS NULL AND CF.SearchTest2 IS NULL");
-
-        is($tix->Count, 1, "null cf and null cf"); 
-
-
diff --git a/rt/lib/t/regression/13-attribute-tests.t b/rt/lib/t/regression/13-attribute-tests.t
deleted file mode 100644
index 945bbcf..0000000
--- a/rt/lib/t/regression/13-attribute-tests.t
+++ /dev/null
@@ -1,67 +0,0 @@
-
-use Test::More tests => 24;
-use RT;
-RT::LoadConfig();
-RT::Init();
-
-
-my $runid = rand(200);
-
-my $attribute = "squelch-$runid";
-
-ok(require RT::Attributes);
-
-my $user = RT::User->new($RT::SystemUser);
-ok (UNIVERSAL::isa($user, 'RT::User'));
-my ($id,$msg)  = $user->Create(Name => 'attrtest-'.$runid);
-ok ($id, $msg);
-ok($user->id, "Created a test user");
-
-ok(1, $user->Attributes->BuildSelectQuery);
-my $attr = $user->Attributes;
-
-ok(1, $attr->BuildSelectQuery);
-
-
-ok (UNIVERSAL::isa($attr,'RT::Attributes'), 'got the attributes object');
-
-($id, $msg) =  $user->AddAttribute(Name => 'TestAttr', Content => 'The attribute has content'); 
-ok ($id, $msg);
-is ($attr->Count,1, " One attr after adidng a first one");
-($id, $msg) = $attr->DeleteEntry(Name => $runid);
-ok(!$id, "Deleted non-existant entry  - $msg");
-is ($attr->Count,1, "1 attr after deleting an empty attr");
-
-my @names = $attr->Names;
-is ("@names", "TestAttr");
-
-
-($id, $msg) = $user->AddAttribute(Name => $runid, Content => "First");
-
-is ($attr->Count,2, " Two attrs after adding an attribute named $runid");
-($id, $msg) = $user->AddAttribute(Name => $runid, Content => "Second");
-ok($id, $msg);
-
-is ($attr->Count,3, " Three attrs after adding a secondvalue to $runid");
-($id, $msg) = $attr->DeleteEntry(Name => $runid, Content => "First");
-ok($id, $msg);
-is ($attr->Count,2);
-
-#$attr->_DoSearch();
-($id, $msg) = $attr->DeleteEntry(Name => $runid, Content => "Second");
-ok($id, $msg);
-is ($attr->Count,1);
-
-#$attr->_DoSearch();
-ok(1, $attr->BuildSelectQuery);
-($id, $msg) = $attr->DeleteEntry(Name => "moose");
-ok(!$id, "Deleted non-existant entry - $msg");
-is ($attr->Count,1);
-
-ok(1, $attr->BuildSelectQuery);
-@names = $attr->Names;
-is("@names", "TestAttr");
-
-
-
-1;
diff --git a/rt/lib/t/regression/14merge.t b/rt/lib/t/regression/14merge.t
deleted file mode 100644
index c916251..0000000
--- a/rt/lib/t/regression/14merge.t
+++ /dev/null
@@ -1,31 +0,0 @@
-
-use Test::More  tests => '6';
-use RT;
-RT::LoadConfig();
-RT::Init();
-
-# when you try to merge duplicate links on postgres, eveyrything goes to hell due to referential integrity constraints.
-
-
-my $t = RT::Ticket->new($RT::SystemUser);
-$t->Create(Subject => 'Main', Queue => 'general');
-
-ok ($t->id);
-my $t2 = RT::Ticket->new($RT::SystemUser);
-$t2->Create(Subject => 'Second', Queue => 'general');
-ok ($t2->id);
-
-my $t3 = RT::Ticket->new($RT::SystemUser);
-$t3->Create(Subject => 'Third', Queue => 'general');
-
-ok ($t3->id);
-
-my ($id,$val);
-($id,$val) = $t->AddLink(Type => 'DependsOn', Target => $t3->id);
-ok($id,$val);
-($id,$val) = $t2->AddLink(Type => 'DependsOn', Target => $t3->id);
-ok($id,$val);
-
-
-($id,$val) = $t->MergeInto($t2->id);
-ok($id,$val);
diff --git a/rt/lib/t/regression/15cf_single_values_are_single.t b/rt/lib/t/regression/15cf_single_values_are_single.t
deleted file mode 100644
index dcfa2e5..0000000
--- a/rt/lib/t/regression/15cf_single_values_are_single.t
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-use Test::More tests => 8;
-
-use RT;
-RT::LoadConfig();
-RT::Init();
-
-
-my $q = RT::Queue->new($RT::SystemUser);
-my ($id,$msg) =$q->Create(Name => "CF-Single-".$$);
-ok($id,$msg);
-
-my $cf = RT::CustomField->new($RT::SystemUser);
-($id,$msg) = $cf->Create(Name => 'Single-'.$$, Type => 'Select', MaxValues => '1', Queue => $q->id);
-ok($id,$msg);
-
-
-($id,$msg) =$cf->AddValue(Name => 'First');
-ok($id,$msg);
-
-($id,$msg) =$cf->AddValue(Name => 'Second');
-ok($id,$msg);
-
-
-my $t = RT::Ticket->new($RT::SystemUser);
-($id,undef,$msg) = $t->Create(Queue => $q->id,
-          Subject => 'CF Test');
-
-ok($id,$msg);
-is($t->CustomFieldValues($cf->id)->Count, 0, "No values yet");
-$t->AddCustomFieldValue(Field => $cf->id, Value => 'First');
-is($t->CustomFieldValues($cf->id)->Count, 1, "One now");
-
-$t->AddCustomFieldValue(Field => $cf->id, Value => 'Second');
-is($t->CustomFieldValues($cf->id)->Count, 1, "Still one");
-
-1;
diff --git a/rt/lib/t/regression/16-transaction_cf_tests.t b/rt/lib/t/regression/16-transaction_cf_tests.t
deleted file mode 100644
index 9e1e86c..0000000
--- a/rt/lib/t/regression/16-transaction_cf_tests.t
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/perl
-
-use warnings;
-use strict;
-use Data::Dumper;
-use Test::More qw/no_plan/;
-
-use_ok('RT');
-use_ok('RT::Transactions');
-RT::LoadConfig();
-RT::Init();
-
-my $q = RT::Queue->new($RT::SystemUser);
-my ($id,$msg) = $q->Create( Name => 'TxnCFTest'.$$);
-ok($id,$msg);
-
-my $cf = RT::CustomField->new($RT::SystemUser);
-($id,$msg) = $cf->Create(Name => 'Txnfreeform-'.$$, Type => 'Freeform', MaxValues => '0', LookupType => RT::Transaction->CustomFieldLookupType );
-
-ok($id,$msg);
-
-($id,$msg) = $cf->AddToObject($q);
-
-ok($id,$msg);
-
-
-my $ticket = RT::Ticket->new($RT::SystemUser);
-
-my $transid;
-($id,$transid, $msg) = $ticket->Create(Queue => $q->id,
-                Subject => 'TxnCF test',
-            );
-ok($id,$msg);
-
-my $trans = RT::Transaction->new($RT::SystemUser);
-$trans->Load($transid);
-
-is($trans->ObjectId,$id);
-is ($trans->ObjectType, 'RT::Ticket');
-is ($trans->Type, 'Create');
-my $txncfs = $trans->CustomFields;
-is ($txncfs->Count, 1, "We have one custom field");
-my $txn_cf = $txncfs->First;
-is ($txn_cf->id, $cf->id, "It's the right custom field");
-my $values = $trans->CustomFieldValues($txn_cf->id);
-is ($values->Count, 0, "It has no values");
-
-# Old API
-my %cf_updates = ( 'CustomField-'.$cf->id => 'Testing');
-$trans->UpdateCustomFields( ARGSRef => \%cf_updates);
-
- $values = $trans->CustomFieldValues($txn_cf->id);
-is ($values->Count, 1, "It has one value");
-
-# New API
-
-$trans->UpdateCustomFields( 'CustomField-'.$cf->id => 'Test two');
- $values = $trans->CustomFieldValues($txn_cf->id);
-is ($values->Count, 2, "it has two values");
-
-# TODO ok(0, "Should updating custom field values remove old values?");
diff --git a/rt/lib/t/regression/17multiple_deleg_revocation.t b/rt/lib/t/regression/17multiple_deleg_revocation.t
deleted file mode 100644
index 1ed0404..0000000
--- a/rt/lib/t/regression/17multiple_deleg_revocation.t
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/perl -w
-
-use Test::More qw(no_plan);
-
-use RT;
-
-ok( RT::LoadConfig, "Locating config files" );
-ok( RT::Init,       "Basic initialization and DB connectivity" );
-
-my ($u1, $g1, $pg1, $pg2, $ace, @groups, @users, @principals);
-@groups = (\$g1, \$pg1, \$pg2);
-@users = (\$u1);
-@principals = (@groups, @users);
-
-my($ret, $msg);
-
-$u1 = RT::User->new($RT::SystemUser);
-( $ret, $msg ) = $u1->LoadOrCreateByEmail('delegtest1@example.com');
-ok( $ret, "Load / Create test user 1: $msg" );
-$u1->SetPrivileged(1);
-
-$g1 = RT::Group->new($RT::SystemUser);
-( $ret, $msg) = $g1->LoadUserDefinedGroup('dg1');
-unless ($ret) {
-    ( $ret, $msg ) = $g1->CreateUserDefinedGroup( Name => 'dg1' );
-}
-$pg1 = RT::Group->new($RT::SystemUser);
-( $ret, $msg ) = $pg1->LoadPersonalGroup( Name => 'dpg1',
-					  User => $u1->PrincipalId );
-unless ($ret) {
-    ( $ret, $msg ) = $pg1->CreatePersonalGroup( Name => 'dpg1',
-						PrincipalId => $u1->PrincipalId );
-}
-ok( $ret, "Load / Create test personal group 1: $msg" );
-$pg2 = RT::Group->new($RT::SystemUser);
-( $ret, $msg ) = $pg2->LoadPersonalGroup( Name => 'dpg2',
-					  User => $u1->PrincipalId );
-unless ($ret) {
-    ( $ret, $msg ) = $pg2->CreatePersonalGroup( Name => 'dpg2',
-						PrincipalId => $u1->PrincipalId );
-}
-ok( $ret, "Load / Create test personal group 2: $msg" );
-
-clear_acls_and_groups();
-
-( $ret, $msg ) = $u1->PrincipalObj->GrantRight( Right => 'DelegateRights' );
-ok( $ret, "Grant DelegateRights to u1: $msg" );
-( $ret, $msg ) = $g1->PrincipalObj->GrantRight( Right => 'ShowConfigTab' );
-ok( $ret, "Grant ShowConfigTab to g1: $msg" );
-( $ret, $msg ) = $g1->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g1: $msg" );
-
-$ace = RT::ACE->new($u1);
-( $ret, $msg ) = $ace->LoadByValues(
-    RightName     => 'ShowConfigTab',
-    Object        => $RT::System,
-    PrincipalType => 'Group',
-    PrincipalId   => $g1->PrincipalId
-);
-ok( $ret, "Look up ACE to be delegated: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate ShowConfigTab to pg1: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg2->PrincipalId );
-ok( $ret, "Delegate ShowConfigTab to pg2: $msg" );
-
-ok(( $pg1->PrincipalObj->HasRight( Right  => 'ShowConfigTab',
-				   Object => $RT::System ) and
-     $pg2->PrincipalObj->HasRight( Right  => 'ShowConfigTab',
-				   Object => $RT::System )),
-   "Test personal groups have ShowConfigTab right after delegation" );
-
-( $ret, $msg ) = $g1->DeleteMember( $u1->PrincipalId );
-ok( $ret, "Delete test user 1 from g1: $msg" );
-
-ok( not( $pg1->PrincipalObj->HasRight( Right  => 'ShowConfigTab',
-				       Object => $RT::System )),
-    "Test personal group 1 lacks ShowConfigTab after user removed from g1" );
-ok( not( $pg2->PrincipalObj->HasRight( Right  => 'ShowConfigTab',
-				       Object => $RT::System )),
-    "Test personal group 2 lacks ShowConfigTab after user removed from g1" );
-
-( $ret, $msg ) = $g1->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g1: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate ShowConfigTab to pg1: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg2->PrincipalId );
-ok( $ret, "Delegate ShowConfigTab to pg2: $msg" );
-
-ok(( $pg1->PrincipalObj->HasRight( Right  => 'ShowConfigTab',
-				   Object => $RT::System ) and
-     $pg2->PrincipalObj->HasRight( Right  => 'ShowConfigTab',
-				   Object => $RT::System )),
-   "Test personal groups have ShowConfigTab right after delegation" );
-
-( $ret, $msg ) = $g1->PrincipalObj->RevokeRight( Right => 'ShowConfigTab' );
-ok( $ret, "Revoke ShowConfigTab from g1: $msg" );
-
-ok( not( $pg1->PrincipalObj->HasRight( Right  => 'ShowConfigTab',
-				       Object => $RT::System )),
-    "Test personal group 1 lacks ShowConfigTab after user removed from g1" );
-ok( not( $pg2->PrincipalObj->HasRight( Right  => 'ShowConfigTab',
-				       Object => $RT::System )),
-    "Test personal group 2 lacks ShowConfigTab after user removed from g1" );
-
-
-
-#######
-
-sub clear_acls_and_groups {
-    # Revoke all rights granted to our cast
-    my $acl = RT::ACL->new($RT::SystemUser);
-    foreach (@principals) {
-	$acl->LimitToPrincipal(Type => $$_->PrincipalObj->PrincipalType,
-			       Id => $$_->PrincipalObj->Id);
-    }
-    while (my $ace = $acl->Next()) {
-	$ace->Delete();
-    }
-
-    # Remove all group memberships
-    my $members = RT::GroupMembers->new($RT::SystemUser);
-    foreach (@groups) {
-	$members->LimitToMembersOfGroup( $$_->PrincipalId );
-    }
-    while (my $member = $members->Next()) {
-	$member->Delete();
-    }
-
-    $acl->RedoSearch();
-    ok( $acl->Count() == 0,
-       "All principals have no rights after clearing ACLs" );
-    $members->RedoSearch();
-    ok( $members->Count() == 0,
-       "All groups have no members after clearing groups" );
-}
diff --git a/rt/lib/t/regression/18stale_delegations_cleanup.t b/rt/lib/t/regression/18stale_delegations_cleanup.t
deleted file mode 100644
index 84e666e..0000000
--- a/rt/lib/t/regression/18stale_delegations_cleanup.t
+++ /dev/null
@@ -1,458 +0,0 @@
-#!/usr/bin/perl -w
-
-# Regression test suite for http://rt3.fsck.com/Ticket/Display.html?id=6184
-# and related corner cases related to cleanup of delegated ACEs when
-# the delegator loses the right to delegate.  This causes complexities
-# due to the fact that multiple ACEs can grant different delegation
-# rights to a principal, and because DelegateRights and SuperUser can
-# themselves be delegated.
-
-# The case where the "parent" delegated ACE is removed is handled in
-# the embedded regression tests in lib/RT/ACE_Overlay.pm .
-
-use Test::More qw(no_plan);
-
-use RT;
-
-ok( RT::LoadConfig, "Locating config files" );
-ok( RT::Init,       "Basic initialization and DB connectivity" );
-
-my ($u1, $u2, $g1, $g2, $g3, $pg1, $pg2, $ace, @groups, @users, @principals);
-@groups = (\$g1, \$g2, \$g3, \$pg1, \$pg2);
-@users = (\$u1, \$u2);
-@principals = (@groups, @users);
-
-my($ret, $msg);
-
-$u1 = RT::User->new($RT::SystemUser);
-( $ret, $msg ) = $u1->LoadOrCreateByEmail('delegtest1@example.com');
-ok( $ret, "Load / Create test user 1: $msg" );
-$u1->SetPrivileged(1);
-$u2 = RT::User->new($RT::SystemUser);
-( $ret, $msg ) = $u2->LoadOrCreateByEmail('delegtest2@example.com');
-ok( $ret, "Load / Create test user 2: $msg" );
-$u2->SetPrivileged(1);
-$g1 = RT::Group->new($RT::SystemUser);
-( $ret, $msg) = $g1->LoadUserDefinedGroup('dg1');
-unless ($ret) {
-    ( $ret, $msg ) = $g1->CreateUserDefinedGroup( Name => 'dg1' );
-}
-ok( $ret, "Load / Create test group 1: $msg" );
-$g2 = RT::Group->new($RT::SystemUser);
-( $ret, $msg) = $g2->LoadUserDefinedGroup('dg2');
-unless ($ret) {
-    ( $ret, $msg ) = $g2->CreateUserDefinedGroup( Name => 'dg2' );
-}
-ok( $ret, "Load / Create test group 2: $msg" );
-$g3 = RT::Group->new($RT::SystemUser);
-( $ret, $msg) = $g3->LoadUserDefinedGroup('dg3');
-unless ($ret) {
-    ( $ret, $msg ) = $g3->CreateUserDefinedGroup( Name => 'dg3' );
-}
-ok( $ret, "Load / Create test group 3: $msg" );
-$pg1 = RT::Group->new($RT::SystemUser);
-( $ret, $msg ) = $pg1->LoadPersonalGroup( Name => 'dpg1',
-					  User => $u1->PrincipalId );
-unless ($ret) {
-    ( $ret, $msg ) = $pg1->CreatePersonalGroup( Name => 'dpg1',
-						PrincipalId => $u1->PrincipalId );
-}
-ok( $ret, "Load / Create test personal group 1: $msg" );
-$pg2 = RT::Group->new($RT::SystemUser);
-( $ret, $msg ) = $pg2->LoadPersonalGroup( Name => 'dpg2',
-					  User => $u2->PrincipalId );
-unless ($ret) {
-    ( $ret, $msg ) = $pg2->CreatePersonalGroup( Name => 'dpg2',
-						PrincipalId => $u2->PrincipalId );
-}
-ok( $ret, "Load / Create test personal group 2: $msg" );
-
-
-
-# Basic case: u has global DelegateRights through g1 and ShowConfigTab
-# through g2; then u is removed from g1.
-
-clear_acls_and_groups();
-
-( $ret, $msg ) = $g1->PrincipalObj->GrantRight( Right => 'DelegateRights' );
-ok( $ret, "Grant DelegateRights to g1: $msg" );
-( $ret, $msg ) = $g2->PrincipalObj->GrantRight( Right => 'ShowConfigTab' );
-ok( $ret, "Grant ShowConfigTab to g2: $msg" );
-( $ret, $msg ) = $g1->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g1: $msg" );
-ok(
-    $u1->PrincipalObj->HasRight(
-        Right  => 'DelegateRights',
-        Object => $RT::System
-    ),
-    "test user 1 has DelegateRights after joining g1"
-);
-( $ret, $msg ) = $g2->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g2: $msg" );
-ok(
-    $u1->PrincipalObj->HasRight(
-        Right  => 'ShowConfigTab',
-        Object => $RT::System
-    ),
-    "test user 1 has ShowConfigTab after joining g2"
-);
-
-$ace = RT::ACE->new($u1);
-( $ret, $msg ) = $ace->LoadByValues(
-    RightName     => 'ShowConfigTab',
-    Object        => $RT::System,
-    PrincipalType => 'Group',
-    PrincipalId   => $g2->PrincipalId
-);
-ok( $ret, "Look up ACE to be delegated: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate ShowConfigTab to pg1: $msg" );
-ok(
-    $pg1->PrincipalObj->HasRight(
-        Right  => 'ShowConfigTab',
-        Object => $RT::System
-    ),
-    "Test personal group 1 has ShowConfigTab right after delegation"
-);
-
-( $ret, $msg ) = $g1->DeleteMember( $u1->PrincipalId );
-ok( $ret, "Delete test user 1 from g1: $msg" );
-ok(
-    not(
-        $pg1->PrincipalObj->HasRight(
-            Right  => 'ShowConfigTab',
-            Object => $RT::System
-        )
-    ),
-    "Test personal group 1 lacks ShowConfigTab right after user removed from g1"
-);
-
-# Basic case: u has global DelegateRights through g1 and ShowConfigTab
-# through g2; then DelegateRights revoked from g1.
-
-( $ret, $msg ) = $g1->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g1: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate ShowConfigTab to pg1: $msg" );
-( $ret, $msg ) = $g1->PrincipalObj->RevokeRight( Right => 'DelegateRights' );
-ok( $ret, "Revoke DelegateRights from g1: $msg" );
-ok(
-    not(
-        $pg1->PrincipalObj->HasRight(
-            Right  => 'ShowConfigTab',
-            Object => $RT::System
-        )
-    ),
-    "Test personal group 1 lacks ShowConfigTab right after DelegateRights revoked from g1"
-);
-
-
-
-# Corner case - restricted delegation: u has DelegateRights on pg1
-# through g1 and AdminGroup on pg1 through g2; then DelegateRights
-# revoked from g1.
-
-clear_acls_and_groups();
-
-( $ret, $msg ) = $g1->PrincipalObj->GrantRight( Right => 'DelegateRights',
-					        Object => $pg1);
-ok( $ret, "Grant DelegateRights on pg1 to g1: $msg" );
-( $ret, $msg ) = $g2->PrincipalObj->GrantRight( Right => 'AdminGroup',
-					        Object => $pg1);
-ok( $ret, "Grant AdminGroup on pg1 to g2: $msg" );
-( $ret, $msg ) = $g1->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g1: $msg" );
-( $ret, $msg ) = $g2->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g2: $msg" );
-ok( $u1->PrincipalObj->HasRight(
-        Right  => 'DelegateRights',
-        Object => $pg1 ),
-    "test user 1 has DelegateRights on pg1 after joining g1" );
-ok( not( $u1->PrincipalObj->HasRight(
-            Right  => 'DelegateRights',
-            Object => $RT::System )),
-    "Test personal group 1 lacks global DelegateRights after joining g1" );
-$ace = RT::ACE->new($u1);
-( $ret, $msg ) = $ace->LoadByValues(
-    RightName     => 'AdminGroup',
-    Object        => $pg1,
-    PrincipalType => 'Group',
-    PrincipalId   => $g2->PrincipalId
-);
-ok( $ret, "Look up ACE to be delegated: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate AdminGroup on pg1 to pg1: $msg" );
-ok( $pg1->PrincipalObj->HasRight(
-        Right  => 'AdminGroup',
-        Object => $pg1 ),
-    "Test personal group 1 has AdminGroup right on pg1 after delegation" );
-( $ret, $msg ) = $g1->PrincipalObj->RevokeRight ( Right => 'DelegateRights',
-						  Object => $pg1 );
-ok( $ret, "Revoke DelegateRights on pg1 from g1: $msg" );
-ok( not( $pg1->PrincipalObj->HasRight(
-            Right  => 'AdminGroup',
-            Object => $pg1 )),
-    "Test personal group 1 lacks AdminGroup right on pg1 after DelegateRights revoked from g1" );
-( $ret, $msg ) = $g1->PrincipalObj->GrantRight( Right => 'DelegateRights',
-					        Object => $pg1);
-
-# Corner case - restricted delegation: u has DelegateRights on pg1
-# through g1 and AdminGroup on pg1 through g2; then u removed from g1.
-
-ok( $ret, "Grant DelegateRights on pg1 to g1: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate AdminGroup on pg1 to pg1: $msg" );
-ok( $pg1->PrincipalObj->HasRight(
-        Right  => 'AdminGroup',
-        Object => $pg1 ),
-    "Test personal group 1 has AdminGroup right on pg1 after delegation" );
-( $ret, $msg ) = $g1->DeleteMember( $u1->PrincipalId );
-ok( $ret, "Delete test user 1 from g1: $msg" );
-ok( not( $pg1->PrincipalObj->HasRight(
-            Right  => 'AdminGroup',
-            Object => $pg1 )),
-    "Test personal group 1 lacks AdminGroup right on pg1 after user removed from g1" );
-
-clear_acls_and_groups();
-
-
-
-# Corner case - multiple delegation rights: u has global
-# DelegateRights directly and DelegateRights on pg1 through g1, and
-# AdminGroup on pg1 through g2; then u removed from g1 (delegation
-# should remain); then DelegateRights revoked from u (delegation
-# should not remain).
-
-( $ret, $msg ) = $g1->PrincipalObj->GrantRight( Right => 'DelegateRights',
-					        Object => $pg1);
-ok( $ret, "Grant DelegateRights on pg1 to g1: $msg" );
-( $ret, $msg ) = $g2->PrincipalObj->GrantRight( Right => 'AdminGroup',
-					        Object => $pg1);
-ok( $ret, "Grant AdminGroup on pg1 to g2: $msg" );
-( $ret, $msg ) = $u1->PrincipalObj->GrantRight( Right => 'DelegateRights',
-					       Object => $RT::System);
-ok( $ret, "Grant DelegateRights to user: $msg" );
-( $ret, $msg ) = $g1->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g1: $msg" );
-( $ret, $msg ) = $g2->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g2: $msg" );
-$ace = RT::ACE->new($u1);
-( $ret, $msg ) = $ace->LoadByValues(
-    RightName     => 'AdminGroup',
-    Object        => $pg1,
-    PrincipalType => 'Group',
-    PrincipalId   => $g2->PrincipalId
-);
-ok( $ret, "Look up ACE to be delegated: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate AdminGroup on pg1 to pg1: $msg" );
-( $ret, $msg ) = $g1->DeleteMember( $u1->PrincipalId );
-ok( $ret, "Delete test user 1 from g1: $msg" );
-ok( $pg1->PrincipalObj->HasRight(Right  => 'AdminGroup',
-				Object => $pg1),
-    "Test personal group 1 retains AdminGroup right on pg1 after user removed from g1" );
-( $ret, $msg ) = $u1->PrincipalObj->RevokeRight( Right => 'DelegateRights',
-						Object => $RT::System );
-ok( not ($pg1->PrincipalObj->HasRight(Right  => 'AdminGroup',
-				     Object => $pg1)),
-    "Test personal group 1 lacks AdminGroup right on pg1 after DelegateRights revoked");
-
-# Corner case - multiple delegation rights and selectivity: u has
-# DelegateRights globally and on g2 directly and DelegateRights on pg1
-# through g1, and AdminGroup on pg1 through g2; then global
-# DelegateRights revoked from u (delegation should remain),
-# DelegateRights on g2 revoked from u (delegation should remain), and
-# u removed from g1 (delegation should not remain).
-
-( $ret, $msg ) = $g1->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g1: $msg" );
-( $ret, $msg ) = $u1->PrincipalObj->GrantRight( Right => 'DelegateRights',
-					       Object => $RT::System);
-ok( $ret, "Grant DelegateRights to user: $msg" );
-( $ret, $msg ) = $u1->PrincipalObj->GrantRight( Right => 'DelegateRights',
-					       Object => $g2);
-ok( $ret, "Grant DelegateRights on g2 to user: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate AdminGroup on pg1 to pg1: $msg" );
-( $ret, $msg ) = $u1->PrincipalObj->RevokeRight( Right => 'DelegateRights',
-						Object => $RT::System );
-ok( $pg1->PrincipalObj->HasRight(Right  => 'AdminGroup',
-				Object => $pg1),
-    "Test personal group 1 retains AdminGroup right on pg1 after global DelegateRights revoked" );
-( $ret, $msg ) = $u1->PrincipalObj->RevokeRight( Right => 'DelegateRights',
-						Object => $g2 );
-ok( $pg1->PrincipalObj->HasRight(Right  => 'AdminGroup',
-				Object => $pg1),
-    "Test personal group 1 retains AdminGroup right on pg1 after DelegateRights on g2 revoked" );
-( $ret, $msg ) = $g1->DeleteMember( $u1->PrincipalId );
-ok( $ret, "Delete test user 1 from g1: $msg" );
-ok( not ($pg1->PrincipalObj->HasRight(Right  => 'AdminGroup',
-				     Object => $pg1)),
-    "Test personal group 1 lacks AdminGroup right on pg1 after user removed from g1");
-
-
-
-# Corner case - indirect delegation rights: u has DelegateRights
-# through g1 via g3, and ShowConfigTab via g2; then g3 removed from
-# g1.
-
-clear_acls_and_groups();
-
-( $ret, $msg ) = $g1->PrincipalObj->GrantRight( Right => 'DelegateRights' );
-ok( $ret, "Grant DelegateRights to g1: $msg" );
-( $ret, $msg ) = $g2->PrincipalObj->GrantRight( Right => 'ShowConfigTab' );
-ok( $ret, "Grant ShowConfigTab to g2: $msg" );
-( $ret, $msg ) = $g1->AddMember( $g3->PrincipalId );
-ok( $ret, "Add g3 to g1: $msg" );
-( $ret, $msg ) = $g3->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g3: $msg" );
-( $ret, $msg ) = $g2->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g2: $msg" );
-
-$ace = RT::ACE->new($u1);
-( $ret, $msg ) = $ace->LoadByValues(
-    RightName     => 'ShowConfigTab',
-    Object        => $RT::System,
-    PrincipalType => 'Group',
-    PrincipalId   => $g2->PrincipalId
-);
-ok( $ret, "Look up ACE to be delegated: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate ShowConfigTab to pg1: $msg" );
-
-( $ret, $msg ) = $g1->DeleteMember( $g3->PrincipalId );
-ok( $ret, "Delete g3 from g1: $msg" );
-ok( not ($pg1->PrincipalObj->HasRight(Right  => 'ShowConfigTab',
-				     Object => $RT::System)),
-	 "Test personal group 1 lacks ShowConfigTab right after g3 removed from g1");
-
-# Corner case - indirect delegation rights: u has DelegateRights
-# through g1 via g3, and ShowConfigTab via g2; then DelegateRights
-# revoked from g1.
-
-( $ret, $msg ) = $g1->AddMember( $g3->PrincipalId );
-ok( $ret, "Add g3 to g1: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate ShowConfigTab to pg1: $msg" );
-( $ret, $msg ) = $g1->PrincipalObj->RevokeRight ( Right => 'DelegateRights' );
-ok( $ret, "Revoke DelegateRights from g1: $msg" );
-
-ok( not ($pg1->PrincipalObj->HasRight(Right  => 'ShowConfigTab',
-				     Object => $RT::System)),
-	 "Test personal group 1 lacks ShowConfigTab right after DelegateRights revoked from g1");
-
-
-
-# Corner case - delegation of DelegateRights: u1 has DelegateRights
-# via g1 and delegates DelegateRights to pg1; u2 has DelegateRights
-# via pg1 and ShowConfigTab via g2; then u1 removed from g1.
-
-clear_acls_and_groups();
-
-( $ret, $msg ) = $g1->PrincipalObj->GrantRight( Right => 'DelegateRights' );
-ok( $ret, "Grant DelegateRights to g1: $msg" );
-( $ret, $msg ) = $g2->PrincipalObj->GrantRight( Right => 'ShowConfigTab' );
-ok( $ret, "Grant ShowConfigTab to g2: $msg" );
-( $ret, $msg ) = $g1->AddMember( $u1->PrincipalId );
-ok( $ret, "Add test user 1 to g1: $msg" );
-$ace = RT::ACE->new($u1);
-( $ret, $msg ) = $ace->LoadByValues(
-    RightName     => 'DelegateRights',
-    Object        => $RT::System,
-    PrincipalType => 'Group',
-    PrincipalId   => $g1->PrincipalId
-);
-ok( $ret, "Look up ACE to be delegated: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate DelegateRights to pg1: $msg" );
-
-( $ret, $msg ) = $pg1->AddMember( $u2->PrincipalId );
-ok( $ret, "Add test user 2 to pg1: $msg" );
-( $ret, $msg ) = $g2->AddMember( $u2->PrincipalId );
-ok( $ret, "Add test user 2 to g2: $msg" );
-$ace = RT::ACE->new($u2);
-( $ret, $msg ) = $ace->LoadByValues(
-    RightName     => 'ShowConfigTab',
-    Object        => $RT::System,
-    PrincipalType => 'Group',
-    PrincipalId   => $g2->PrincipalId
-);
-ok( $ret, "Look up ACE to be delegated: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg2->PrincipalId );
-ok( $ret, "Delegate ShowConfigTab to pg2: $msg" );
-
-ok( $pg2->PrincipalObj->HasRight(Right  => 'ShowConfigTab',
-				 Object => $RT::System),
-    "Test personal group 2 has ShowConfigTab right after delegation");
-( $ret, $msg ) = $g1->DeleteMember( $u1->PrincipalId );
-ok( $ret, "Delete u1 from g1: $msg" );
-ok( not ($pg2->PrincipalObj->HasRight(Right  => 'ShowConfigTab',
-				      Object => $RT::System)),
-	 "Test personal group 2 lacks ShowConfigTab right after u1 removed from g1");
-
-# Corner case - delegation of DelegateRights: u1 has DelegateRights
-# via g1 and delegates DelegateRights to pg1; u2 has DelegateRights
-# via pg1 and ShowConfigTab via g2; then DelegateRights revoked from
-# g1.
-
-( $ret, $msg ) = $g1->AddMember( $u1->PrincipalId );
-ok( $ret, "Add u1 to g1: $msg" );
-$ace = RT::ACE->new($u1);
-( $ret, $msg ) = $ace->LoadByValues(
-    RightName     => 'DelegateRights',
-    Object        => $RT::System,
-    PrincipalType => 'Group',
-    PrincipalId   => $g1->PrincipalId
-);
-ok( $ret, "Look up ACE to be delegated: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg1->PrincipalId );
-ok( $ret, "Delegate DelegateRights to pg1: $msg" );
-$ace = RT::ACE->new($u2);
-( $ret, $msg ) = $ace->LoadByValues(
-    RightName     => 'ShowConfigTab',
-    Object        => $RT::System,
-    PrincipalType => 'Group',
-    PrincipalId   => $g2->PrincipalId
-);
-ok( $ret, "Look up ACE to be delegated: $msg" );
-( $ret, $msg ) = $ace->Delegate( PrincipalId => $pg2->PrincipalId );
-ok( $ret, "Delegate ShowConfigTab to pg2: $msg" );
-
-( $ret, $msg ) = $g1->PrincipalObj->RevokeRight ( Right => 'DelegateRights' );
-ok( $ret, "Revoke DelegateRights from g1: $msg" );
-ok( not ($pg2->PrincipalObj->HasRight(Right  => 'ShowConfigTab',
-				      Object => $RT::System)),
-	 "Test personal group 2 lacks ShowConfigTab right after DelegateRights revoked from g1");
-
-
-
-
-#######
-
-sub clear_acls_and_groups {
-    # Revoke all rights granted to our cast
-    my $acl = RT::ACL->new($RT::SystemUser);
-    foreach (@principals) {
-	$acl->LimitToPrincipal(Type => $$_->PrincipalObj->PrincipalType,
-			       Id => $$_->PrincipalObj->Id);
-    }
-    while (my $ace = $acl->Next()) {
-	$ace->Delete();
-    }
-
-    # Remove all group memberships
-    my $members = RT::GroupMembers->new($RT::SystemUser);
-    foreach (@groups) {
-	$members->LimitToMembersOfGroup( $$_->PrincipalId );
-    }
-    while (my $member = $members->Next()) {
-	$member->Delete();
-    }
-
-    $acl->RedoSearch();
-    ok( $acl->Count() == 0,
-       "All principals have no rights after clearing ACLs" );
-    $members->RedoSearch();
-    ok( $members->Count() == 0,
-       "All groups have no members after clearing groups" );
-}
diff --git a/rt/lib/t/regression/19-rtname.t b/rt/lib/t/regression/19-rtname.t
deleted file mode 100644
index b654df2..0000000
--- a/rt/lib/t/regression/19-rtname.t
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-use Test::More qw/no_plan/;
-
-use_ok("RT");
-
-RT::LoadConfig();
-RT::Init();
-
-use RT::Interface::Email;
-
-# normal use case, regexp set to rtname
-$RT::rtname = "site";
-$RT::EmailSubjectTagRegex = qr/$RT::rtname/ ;
-$RT::rtname = undef;
-is(RT::Interface::Email::ParseTicketId("[site #123] test"), 123);
-is(RT::Interface::Email::ParseTicketId("[othersite #123] test"), undef);
-
-# oops usecase, where the regexp is scragged
-$RT::rtname = "site";
-$RT::EmailSubjectTagRegex = undef;
-is(RT::Interface::Email::ParseTicketId("[site #123] test"), 123);
-is(RT::Interface::Email::ParseTicketId("[othersite #123] test"), undef);
-
-# set to a simple regexp. NOTE: we no longer match "site"
-$RT::rtname = "site";
-$RT::EmailSubjectTagRegex = qr/newsite/;
-is(RT::Interface::Email::ParseTicketId("[site #123] test"), undef);
-is(RT::Interface::Email::ParseTicketId("[newsite #123] test"), 123);
-
-# set to a more complex regexp
-$RT::rtname = "site";
-$RT::EmailSubjectTagRegex = qr/newsite||site/;
-is(RT::Interface::Email::ParseTicketId("[site #123] test"), 123);
-is(RT::Interface::Email::ParseTicketId("[newsite #123] test"), 123);
-is(RT::Interface::Email::ParseTicketId("[othersite #123] test"), undef);
-
diff --git a/rt/lib/t/regression/20savedsearch.t b/rt/lib/t/regression/20savedsearch.t
deleted file mode 100644
index f4439f9..0000000
--- a/rt/lib/t/regression/20savedsearch.t
+++ /dev/null
@@ -1,180 +0,0 @@
-use RT;
-use Test::More tests => 26;
-use RT::User;
-use RT::Group;
-use RT::Ticket;
-use RT::Queue;
-
-use_ok(RT::SavedSearch);
-use_ok(RT::SavedSearches);
-
-RT::LoadConfig();
-RT::Init();
-
-# Set up some infrastructure.  These calls are tested elsewhere.
-
-my $searchuser = RT::User->new($RT::SystemUser);
-my ($ret, $msg) = $searchuser->Create(Name => 'searchuser'.$$,
-		    Privileged => 1,
-		    EmailAddress => "searchuser\@p$$.example.com",
-		    RealName => 'Search user');
-ok($ret, "created searchuser: $msg");
-$searchuser->PrincipalObj->GrantRight(Right => 'LoadSavedSearch');
-$searchuser->PrincipalObj->GrantRight(Right => 'CreateSavedSearch');
-$searchuser->PrincipalObj->GrantRight(Right => 'ModifySelf');
-
-# This is the group whose searches searchuser should be able to see.
-my $ingroup = RT::Group->new($RT::SystemUser);
-$ingroup->CreateUserDefinedGroup(Name => 'searchgroup1'.$$);
-$ingroup->AddMember($searchuser->Id);
-$searchuser->PrincipalObj->GrantRight(Right => 'EditSavedSearches',
-				      Object => $ingroup);
-$searchuser->PrincipalObj->GrantRight(Right => 'ShowSavedSearches',
-				      Object => $ingroup);
-
-# This is the group whose searches searchuser should not be able to see.
-my $outgroup = RT::Group->new($RT::SystemUser);
-$outgroup->CreateUserDefinedGroup(Name => 'searchgroup2'.$$);
-$outgroup->AddMember($RT::SystemUser->Id);
-
-my $queue = RT::Queue->new($RT::SystemUser);
-$queue->Create(Name => 'SearchQueue'.$$);
-$searchuser->PrincipalObj->GrantRight(Right => 'SeeQueue', Object => $queue);
-$searchuser->PrincipalObj->GrantRight(Right => 'ShowTicket', Object => $queue);
-$searchuser->PrincipalObj->GrantRight(Right => 'OwnTicket', Object => $queue);
-
-
-my $ticket = RT::Ticket->new($RT::SystemUser);
-$ticket->Create(Queue => $queue->Id,
-		Requestor => [ $searchuser->Name ],
-		Owner => $searchuser,
-		Subject => 'saved search test');
-
-
-# Now start the search madness.
-my $curruser = RT::CurrentUser->new($searchuser);
-my $format = '\'   <b><a href="/Ticket/Display.html?id=__id__">__id__</a></b>/TITLE:#\',
-\'<b><a href="/Ticket/Display.html?id=__id__">__Subject__</a></b>/TITLE:Subject\',
-\'__Status__\',
-\'__QueueName__\',
-\'__OwnerName__\',
-\'__Priority__\',
-\'__NEWLINE__\',
-\'\',
-\'<small>__Requestors__</small>\',
-\'<small>__CreatedRelative__</small>\',
-\'<small>__ToldRelative__</small>\',
-\'<small>__LastUpdatedRelative__</small>\',
-\'<small>__TimeLeft__</small>\'';
-
-my ($ret, $msg);
-my $mysearch = RT::SavedSearch->new($curruser);
-($ret, $msg) = $mysearch->Save(Privacy => 'RT::User-' . $searchuser->Id,
-			       Type => 'Ticket',
-			       Name => 'owned by me',
-			       SearchParams => {'Format' => $format,
-						'Query' => "Owner = '" 
-						    . $searchuser->Name 
-						    . "'"});
-ok($ret, "mysearch was created");
-
-
-my $groupsearch = RT::SavedSearch->new($curruser);
-($ret, $msg) = $groupsearch->Save(Privacy => 'RT::Group-' . $ingroup->Id,
-				  Type => 'Ticket',
-				  Name => 'search queue',
-				  SearchParams => {'Format' => $format,
-						   'Query' => "Queue = '"
-						       . $queue->Name . "'"});
-ok($ret, "groupsearch was created");
-
-my $othersearch = RT::SavedSearch->new($curruser);
-($ret, $msg) = $othersearch->Save(Privacy => 'RT::Group-' . $outgroup->Id,
-				  Type => 'Ticket',
-				  Name => 'searchuser requested',
-				  SearchParams => {'Format' => $format,
-						   'Query' => 
-						       "Requestor.Name LIKE 'search'"});
-ok(!$ret, "othersearch NOT created");
-like($msg, qr/Failed to load object for/, "...for the right reason");
-
-$othersearch = RT::SavedSearch->new($RT::SystemUser);
-($ret, $msg) = $othersearch->Save(Privacy => 'RT::Group-' . $outgroup->Id,
-				  Type => 'Ticket',
-				  Name => 'searchuser requested',
-				  SearchParams => {'Format' => $format,
-						   'Query' => 
-						       "Requestor.Name LIKE 'search'"});
-ok($ret, "othersearch created by systemuser");
-
-# Now try to load some searches.
-
-# This should work.
-my $loadedsearch1 = RT::SavedSearch->new($curruser);
-$loadedsearch1->Load('RT::User-'.$curruser->Id, $mysearch->Id);
-is($loadedsearch1->Id, $mysearch->Id, "Loaded mysearch");
-like($loadedsearch1->GetParameter('Query'), qr/Owner/, 
-     "Retrieved query of mysearch");
-# Check through the other accessor methods.
-is($loadedsearch1->Privacy, 'RT::User-' . $curruser->Id,
-   "Privacy of mysearch correct");
-is($loadedsearch1->Name, 'owned by me', "Name of mysearch correct");
-is($loadedsearch1->Type, 'Ticket', "Type of mysearch correct");
-
-# See if it can be used to search for tickets.
-my $tickets = RT::Tickets->new($curruser);
-$tickets->FromSQL($loadedsearch1->GetParameter('Query'));
-is($tickets->Count, 1, "Found a ticket");
-
-# This should fail -- wrong object.
-# my $loadedsearch2 = RT::SavedSearch->new($curruser);
-# $loadedsearch2->Load('RT::User-'.$curruser->Id, $groupsearch->Id);
-# isnt($loadedsearch2->Id, $othersearch->Id, "Didn't load groupsearch as mine");
-# ...but this should succeed.
-my $loadedsearch3 = RT::SavedSearch->new($curruser);
-$loadedsearch3->Load('RT::Group-'.$ingroup->Id, $groupsearch->Id);
-is($loadedsearch3->Id, $groupsearch->Id, "Loaded groupsearch");
-like($loadedsearch3->GetParameter('Query'), qr/Queue/,
-     "Retrieved query of groupsearch");
-# Can it get tickets?
-$tickets = RT::Tickets->new($curruser);
-$tickets->FromSQL($loadedsearch3->GetParameter('Query'));
-is($tickets->Count, 1, "Found a ticket");
-
-# This should fail -- no permission.
-my $loadedsearch4 = RT::SavedSearch->new($curruser);
-$loadedsearch4->Load($othersearch->Privacy, $othersearch->Id);
-isnt($loadedsearch4->Id, $othersearch->Id, "Did not load othersearch");
-
-# Try to update an existing search.
-$loadedsearch1->Update(	SearchParams => {'Format' => $format,
-			'Query' => "Queue = '" . $queue->Name . "'" } );
-like($loadedsearch1->GetParameter('Query'), qr/Queue/,
-     "Updated mysearch parameter");
-is($loadedsearch1->Type, 'Ticket', "mysearch is still for tickets");
-is($loadedsearch1->Privacy, 'RT::User-'.$curruser->Id,
-   "mysearch still belongs to searchuser");
-like($mysearch->GetParameter('Query'), qr/Queue/, "other mysearch object updated");
-
-
-## Right ho.  Test the pseudo-collection object.
-
-my $genericsearch = RT::SavedSearch->new($curruser);
-$genericsearch->Save(Name => 'generic search',
-		     Type => 'all',
-		     SearchParams => {'Query' => "Queue = 'General'"});
-
-my $ticketsearches = RT::SavedSearches->new($curruser);
-$ticketsearches->LimitToPrivacy('RT::User-'.$curruser->Id, 'Ticket');
-is($ticketsearches->Count, 1, "Found searchuser's ticket searches");
-
-my $allsearches = RT::SavedSearches->new($curruser);
-$allsearches->LimitToPrivacy('RT::User-'.$curruser->Id);
-is($allsearches->Count, 2, "Found all searchuser's searches");
-
-# Delete a search.
-($ret, $msg) = $genericsearch->Delete;
-ok($ret, "Deleted genericsearch");
-$allsearches->LimitToPrivacy('RT::User-'.$curruser->Id);
-is($allsearches->Count, 1, "Found all searchuser's searches after deletion");
-
diff --git a/rt/lib/t/regression/21query-builder.t b/rt/lib/t/regression/21query-builder.t
deleted file mode 100644
index be04599..0000000
--- a/rt/lib/t/regression/21query-builder.t
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use Test::More tests => 31;
-use Test::WWW::Mechanize;
-use HTTP::Request::Common;
-use HTTP::Cookies;
-use LWP;
-use Encode;
-
-my $cookie_jar = HTTP::Cookies->new;
-my $agent = Test::WWW::Mechanize->new();
-
-# give the agent a place to stash the cookies
-
-$agent->cookie_jar($cookie_jar);
-
-use RT;
-RT::LoadConfig;
-
-# get the top page
-my $url = $RT::WebURL;
-$agent->get($url);
-
-is ($agent->{'status'}, 200, "Loaded a page");
-
-
-# {{{ test a login
-
-# follow the link marked "Login"
-
-ok($agent->{form}->find_input('user'));
-
-ok($agent->{form}->find_input('pass'));
-ok ($agent->{'content'} =~ /username:/i);
-$agent->field( 'user' => 'root' );
-$agent->field( 'pass' => 'password' );
-# the field isn't named, so we have to click link 0
-$agent->click(0);
-is($agent->{'status'}, 200, "Fetched the page ok");
-ok( $agent->{'content'} =~ /Logout/i, "Found a logout link");
-
-# }}}
-
-# {{{ Query Builder tests
-
-my $response = $agent->get($url."Search/Build.html");
-ok( $response->is_success, "Fetched " . $url."Search/Build.html" );
-
-# Adding items
-
-# set the first value
-ok($agent->form_name('BuildQuery'), "found the form once");
-$agent->field("ActorField", "Owner");
-$agent->field("ActorOp", "=");
-$agent->field("ValueOfActor", "Nobody");
-$agent->submit();
-
-# set the next value
-ok($agent->form_name('BuildQuery'), "found the form again");
-$agent->field("QueueOp", "!=");
-$agent->field("ValueOfQueue", "Regression");
-$agent->submit();
-
-ok($agent->form_name('BuildQuery'), "found the form a third time");
-
-sub getQueryFromForm {
-    # This pulls out the "hidden input" query from the page
-    my $q = $agent->current_form->find_input("Query")->value;
-    $q =~ s/^\s+//g;
-    $q =~ s/\s+$//g;
-    $q =~ s/\s+/ /g;
-    return $q;
-}
-
-is (getQueryFromForm, "Owner = 'Nobody' AND Queue != 'Regression'");
-
-# We're going to delete the owner
-
-$agent->select("clauses", ["0"] );
-
-$agent->click("DeleteClause");
-
-ok($agent->form_name('BuildQuery'), "found the form a fourth time");
-
-is (getQueryFromForm, "Queue != 'Regression'");
-
-$agent->field("AndOr", "OR");
-
-$agent->select("idOp", ">");
-
-$agent->field("ValueOfid" => "1234");
-
-$agent->click("AddClause");
-
-ok($agent->form_name('BuildQuery'), "found the form again");
-TODO: {
-  local $TODO = "query builder incorrectly quotes numbers";
-  is(getQueryFromForm, "Queue != 'Regression' OR id > 1234", "added something as OR, and number not quoted");
-}
-
-sub selectedClauses {
-    my @clauses = grep { defined } map { $_->value } $agent->current_form->find_input("clauses");
-    return [ @clauses ];
-}
-
-
-is_deeply(selectedClauses, ["1"], 'the id that we just entered is still selected');
-
-# Move the second one up a level
-$agent->click("Up"); 
-
-ok($agent->form_name('BuildQuery'), "found the form again");
-is(getQueryFromForm, "id > 1234 OR Queue != 'Regression'", "moved up one");
-
-is_deeply(selectedClauses, ["0"], 'the one we moved up is selected');
-
-$agent->click("Right");
-
-ok($agent->form_name('BuildQuery'), "found the form again");
-is(getQueryFromForm, "Queue != 'Regression' OR ( id > 1234 )", "moved over to the right (and down)");
-is_deeply(selectedClauses, ["2"], 'the one we moved right is selected');
-
-$agent->select("clauses", ["1"]);
-
-$agent->click("Up");
-
-ok($agent->form_name('BuildQuery'), "found the form again");
-TODO: {
-  local $TODO = "query builder incorrectly changes OR to AND";
-  is(getQueryFromForm, "( id > 1234 ) OR Queue != 'Regression'", "moved up");
-}
-
-$agent->select("clauses", ["0"]); # this is a null clause
-
-$agent->click("Up");
-
-ok($agent->form_name('BuildQuery'), "found the form again");
-
-$agent->content_like(qr/error: can\S+t move up/, "i shouldn't have been able to hit up");
-
-$agent->click("Left");
-
-ok($agent->form_name('BuildQuery'), "found the form again");
-
-$agent->content_like(qr/error: can\S+t move left/, "i shouldn't have been able to hit left");
-
-$agent->select("clauses", ["1"]);
-$agent->select("ValueOfStatus" => "stalled");
-
-$agent->submit;
-ok($agent->form_name('BuildQuery'), "found the form again");
-is_deeply(selectedClauses, ["2"], 'the one we added is selected');
-TODO: {
-  local $TODO = "query builder incorrectly changes OR to AND";
-  is(getQueryFromForm, "( id > 1234 AND Status = 'stalled' ) OR Queue != 'Regression'", "added new one");
-}
-
-
-
-# - new items go one level down
-# - add items at currently selected level
-# - if nothing is selected, add at end, one level down
-#
-# move left
-# - error if nothing selected
-# - same item should be selected after move
-# - can't move left if you're at the top level
-#
-# move right
-# - error if nothing selected
-# - same item should be selected after move
-# - can always move right (no max depth...should there be?)
-#
-# move up
-# - error if nothing selected
-# - same item should be selected after move
-# - can't move up if you're first in the list
-#
-# move down
-# - error if nothing selected
-# - same item should be selected after move
-# - can't move down if you're last in the list
-#
-# toggle
-# - error if nothing selected
-# - change all aggregators in the grouping
-# - don't change any others
-#
-# delete
-# - error if nothing selected
-# - delete currently selected item
-# - delete all children of a grouping
-# - if delete leaves a node with no children, delete that, too
-# - what should be selected?
-#
-# Clear
-# - clears entire query
-# - clears it from the session, too
-
-# }}}
-
-
-1;
diff --git a/rt/lib/t/regression/22search_tix_by_txn.t b/rt/lib/t/regression/22search_tix_by_txn.t
deleted file mode 100644
index 54dad98..0000000
--- a/rt/lib/t/regression/22search_tix_by_txn.t
+++ /dev/null
@@ -1,32 +0,0 @@
-#use Test::More tests => 26;
-use Test::More qw/no_plan/;
-
-use RT;
-RT::LoadConfig();
-RT::Init();
-
-my $SUBJECT = "Search test - ".$$;
-
-use_ok('RT::Tickets');
-my $tix = RT::Tickets->new($RT::SystemUser);
-can_ok($tix, 'FromSQL');
-$tix->FromSQL('Updated = "2005-08-05" AND Subject = "$SUBJECT"');
-
-ok(! $tix->Count, "Searching for tickets updated on a random date finds nothing" . $tix->Count);
-
-my $ticket = RT::Ticket->new($RT::SystemUser);
-$ticket->Create(Queue => 'General', Subject => $SUBJECT);
-ok ($ticket->id, "We created a ticket");
-my ($id, $txnid, $txnobj) =  $ticket->Comment( Content => 'A comment that happend on 2004-01-01');
-
-isa_ok($txnobj, 'RT::Transaction');
-
-ok($txnobj->CreatedObj->ISO);
-my ( $sid,$smsg) = $txnobj->__Set(Field => 'Created', Value => '2005-08-05 20:00:56');
-ok($sid,$smsg);
-is($txnobj->Created,'2005-08-05 20:00:56');
-is($txnobj->CreatedObj->ISO,'2005-08-05 20:00:56');
-
-$tix->FromSQL(qq{Updated = "2005-08-05" AND Subject = "$SUBJECT"});
-is( $tix->Count, 1);
-1;
diff --git a/rt/m4/rt_layout.m4 b/rt/m4/rt_layout.m4
index c92a108..393b321 100644
--- a/rt/m4/rt_layout.m4
+++ b/rt/m4/rt_layout.m4
@@ -21,15 +21,14 @@ AC_DEFUN([RT_LAYOUT],[
 		pldconf=./config.pld
 		$PERL  -0777 -p -e "\$layout = '$2';"  -e '
 		s/.*<Layout\s+$layout>//gims; 
-		s/<\/Layout>.*//s; 
-		s/^#.*$//gm;
+		s/\<\/Layout\>.*//s; 
+		s/^#.*$//m;
 		s/^\s+//gim;
 		s/\s+$/\n/gim;
 		s/\+$/\/rt3/gim;
 		# m4 will not let us just use $1, we need @S|@1
-#		s/^((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
-		# uh, should be [:=], but m4 apparently substitutes something...
-		s/^(.*?)\s*(?::|=)\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
+		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
+		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
 		 ' < $1 > $pldconf
 
 		if test -s $pldconf; then
diff --git a/rt/sbin/extract-message-catalog b/rt/sbin/extract-message-catalog
index 3552afb..c5d4d89 100644
--- a/rt/sbin/extract-message-catalog
+++ b/rt/sbin/extract-message-catalog
@@ -1,9 +1,9 @@
 #!/usr/bin/perl -w 
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 # Portions Copyright 2002 Autrijus Tang <autrijus@autrijus.org>
 
 use strict;
@@ -98,7 +98,7 @@ sub extract_strings_from_code {
 
     local $/;
     return if ( -d $_ );
-    return if ( $File::Find::dir =~ 'lib/blib|lib/t/autogen|var|m4|local|\.svn' );
+    return if ( $File::Find::dir =~ 'lib/blib|lib/t/autogen|var|m4|local' );
     return if ( /\.po$|\.bak$|~|,D|,B$|extract-message-catalog$/ );
     return if ( /^[\.#]/ );
     return if ( -f "$_.in" );
@@ -195,7 +195,6 @@ sub update {
     while (@lines) {
         my $msghdr = "";
         $msghdr .= shift @lines while ( $lines[0] && $lines[0] !~ /^msgid/ );
-        
         my $msgid  = shift @lines;
         my $msgstr = "";
         $msgstr .= shift @lines while ( $lines[0] && $lines[0] =~ /^(msgstr|")/ );
@@ -204,8 +203,8 @@ sub update {
 
         chomp $msgid;
         chomp $msgstr;
-        $msgid  =~ s/^msgid "(.*)"\s*?$/$1/ms    or warn "$msgid in $file";
-        $msgstr =~ s/^msgstr "(.*)"\s*?$/$1/ms or warn "$msgstr  in $file";
+        $msgid  =~ s/^msgid "(.*)"$/$1/    or warn $msgid;
+        $msgstr =~ s/^msgstr "(.*)"$/$1/ms or warn $msgstr;
 
         $Lexicon{$msgid} = $msgstr;
         $Header{$msgid}  = $msghdr;
@@ -230,10 +229,6 @@ sub update {
 
         my %seen;
         $out .= $Header{$_} if exists $Header{$_};
-
-
-
-        next if (!$f && $_ && !$Lexicon{$_});
         if ( $f && $f !~ /^\s+$/ ) {
 
             $out .= "#: $f\n";
diff --git a/rt/sbin/extract_pod_tests b/rt/sbin/extract_pod_tests
index 4d9d7bd..3987e90 100644
--- a/rt/sbin/extract_pod_tests
+++ b/rt/sbin/extract_pod_tests
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 use strict;
 use vars qw($VERSION);
 $VERSION = '0.06';
@@ -121,14 +121,7 @@ else {
 }
 
 
-print $outfh <<EOF;
 
-use Test::More qw/no_plan/;
-use RT;
-RT::LoadConfig();
-RT::Init();
-
-EOF
 foreach my $test (@tests, @examples) {
     print $outfh "$test\n";
 }
diff --git a/rt/sbin/factory b/rt/sbin/factory
index 743d8b9..882e4a8 100644
--- a/rt/sbin/factory
+++ b/rt/sbin/factory
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w
-# BEGIN BPS TAGGED BLOCK {{{
+#!/usr/bin/perl
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,8 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
-use strict;
+# }}} END BPS TAGGED BLOCK
 use DBI;
 
 my $database  = shift;
@@ -60,17 +59,11 @@ my $password = '';
 
 
 my $LicenseBlock = << '.';
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
+# BEGIN BPS TAGGED BLOCK
 # 
-# (Except where explicitly superseded by other copyright notices)
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 # 
-# 
-# LICENSE:
+# (Except where explictly superceded by other copyright notices)
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -82,29 +75,14 @@ my $LicenseBlock = << '.';
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
 # 
 # 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
+# END BPS TAGGED BLOCK
+
 .
 
 my $Attribution = << '.';
@@ -148,7 +126,6 @@ foreach my $table (@tables) {
 $tablemap{'CreatedBy'} = 'User';
 $tablemap{'UpdatedBy'} = 'User';
 
-my %typemap;
 $typemap{'id'}            = 'ro';
 $typemap{'Creator'}       = 'auto';
 $typemap{'Created'}       = 'auto';
@@ -185,27 +162,7 @@ foreach my $table (@tables) {
     my $ClassAccessible = "";
     my $FieldsPod       = "";
     my $CreatePod       = "";
-    my $RecordInit      = "";
     my %fields;
-
-
-    my $introspection = $dbh->prepare("SELECT * from $table where id is null");
-    $introspection->execute();
-    my @names =@{ $introspection->{'NAME'}};
-    my @types = @{$introspection->{'TYPE'}};
-    my @is_blob = @{$introspection->{'mysql_is_blob'}};
-    my @is_num = @{$introspection->{'mysql_is_num'}};
-
-    my %blobness = ();
-    my %sqltypes = ();
-    my %numeric = ();
-    foreach my $name (@names) {
-        $sqltypes{$name} = shift @types;
-        $blobness{$name} = (shift @is_blob || "0");
-        $numeric{$name} = (shift @is_num || "0");
-    }
-
-
     my $sth = $dbh->prepare("DESCRIBE $table");
     $sth->execute;
 
@@ -213,16 +170,10 @@ foreach my $table (@tables) {
         my $field   = $row->{'Field'};
         my $type    = $row->{'Type'};
         my $default = $row->{'Default'};
-        my $length = 0;
-        if ($type =~ /^(?:.*?)\((\d+)\)$/) {
-                $length = $1; 
-        }
         $fields{$field} = 1;
 
         #generate the 'accessible' datastructure
 
-        no warnings 'uninitialized';
-
         if ( $typemap{$field} eq 'auto' ) {
             $ClassAccessible .= "        $field => 
 		{read => 1, auto => 1,";
@@ -236,7 +187,7 @@ foreach my $table (@tables) {
 		{read => 1, write => 1,";
 
         }
-        $ClassAccessible .= " sql_type => $sqltypes{$field}, length => $length,  is_blob => $blobness{$field},  is_numeric => $numeric{$field}, ";
+
         $ClassAccessible .= " type => '$type', default => '$default'},\n";
 
         #generate pod for the accessible fields
@@ -248,7 +199,7 @@ Returns the current value of $field.
 
 ";
 
-        unless ( exists $typemap{$field} && ( $typemap{$field} eq 'auto' || $typemap{$field} eq 'ro' )) {
+        unless ( $typemap{$field} eq 'auto' || $typemap{$field} eq 'ro' ) {
             $FieldsPod .= "
 
 =head2 Set$field VALUE
@@ -303,7 +254,7 @@ sub ${field}Obj {
 
     }
 
-    my $Create = "
+    $Create = "
 sub Create {
     my \$self = shift;
     my \%args = ( 
@@ -355,15 +306,10 @@ sub _Init {
 
         $CollectionClass .= "
 
-  # By default, order by SortOrder
-  \$self->OrderByCols(
-	 { ALIAS => 'main',
-	   FIELD => 'SortOrder',
-	   ORDER => 'ASC' },
-	 { ALIAS => 'main',
-	   FIELD => 'id',
-	   ORDER => 'ASC' },
-     );
+  # By default, order by name
+  \$self->OrderBy( ALIAS => 'main',
+                  FIELD => 'SortOrder',
+                  ORDER => 'ASC');
 ";
     }
     $CollectionClass .= "
@@ -451,7 +397,7 @@ $ClassAccessible
 
     open( COL, ">$CollectionClassPath" );
     print COL $CollectionClass;
-    close(COL);
+    close($COL);
 
 }
 
@@ -492,7 +438,7 @@ _Vendor is for 3rd-party vendor add-ons, while _Local is for site-local customiz
 
 These overlay files can contain new subs or subs to replace existing subs in this module.
 
-Each of these files should begin with the line 
+If you'll be working with perl 5.6.0 or greater, each of these files should begin with the line 
 
    no warnings qw(redefine);
 
diff --git a/rt/sbin/license_tag b/rt/sbin/license_tag
index 906d349..cd1a971 100644
--- a/rt/sbin/license_tag
+++ b/rt/sbin/license_tag
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 
 
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -45,12 +45,12 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 my $LICENSE  = <<'EOL';
 
 COPYRIGHT:
  
-This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
                                          <jesse@bestpractical.com>
 
 (Except where explicitly superseded by other copyright notices)
@@ -116,16 +116,16 @@ sub tag_mason {
 
 
         print "$pm - ";
-        if ($file =~ /^%# BEGIN BPS TAGGED BLOCK {{{/ms) {
+        if ($file =~ /^%# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^%# BEGIN BPS TAGGED BLOCK {{{(.*?)%# END BPS TAGGED BLOCK }}}/%# BEGIN BPS TAGGED BLOCK {{{\n$pmlic%# END BPS TAGGED BLOCK }}}/ms;
+             $file =~ s/^%# {{{ BEGIN BPS TAGGED BLOCK(.*?)%# }}} END BPS TAGGED BLOCK/%# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic%# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
-             $file ="%# BEGIN BPS TAGGED BLOCK {{{\n$pmlic%# END BPS TAGGED BLOCK }}}\n". $file;
+             $file ="%# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic%# }}} END BPS TAGGED BLOCK\n". $file;
         }
-        $file =~ s/%# END BPS TAGGED BLOCK }}}(\n+)/%# END BPS TAGGED BLOCK }}}\n/mg;
+        $file =~ s/%# }}} END BPS TAGGED BLOCK(\n+)/%# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
         
@@ -148,16 +148,16 @@ sub tag_makefile {
 
 
         print "$pm - ";
-        if ($file =~ /^# BEGIN BPS TAGGED BLOCK {{{/ms) {
+        if ($file =~ /^# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^# BEGIN BPS TAGGED BLOCK {{{(.*?)# END BPS TAGGED BLOCK }}}/# BEGIN BPS TAGGED BLOCK {{{\n$pmlic# END BPS TAGGED BLOCK }}}/ms;
+             $file =~ s/^# {{{ BEGIN BPS TAGGED BLOCK(.*?)# }}} END BPS TAGGED BLOCK/# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
-             $file ="# BEGIN BPS TAGGED BLOCK {{{\n$pmlic# END BPS TAGGED BLOCK }}}\n". $file;
+             $file ="# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK\n". $file;
         }
-        $file =~ s/# END BPS TAGGED BLOCK }}}(\n+)/# END BPS TAGGED BLOCK }}}\n/mg;
+        $file =~ s/# }}} END BPS TAGGED BLOCK(\n+)/# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
         
@@ -181,16 +181,16 @@ sub tag_pm {
 
 
         print "$pm - ";
-        if ($file =~ /^# BEGIN BPS TAGGED BLOCK {{{/ms) {
+        if ($file =~ /^# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^# BEGIN BPS TAGGED BLOCK {{{(.*?)# END BPS TAGGED BLOCK }}}/# BEGIN BPS TAGGED BLOCK {{{\n$pmlic# END BPS TAGGED BLOCK }}}/ms;
+             $file =~ s/^# {{{ BEGIN BPS TAGGED BLOCK(.*?)# }}} END BPS TAGGED BLOCK/# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
-             $file ="# BEGIN BPS TAGGED BLOCK {{{\n$pmlic# END BPS TAGGED BLOCK }}}\n". $file;
+             $file ="# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK\n". $file;
         }
-        $file =~ s/# END BPS TAGGED BLOCK }}}(\n+)/# END BPS TAGGED BLOCK }}}\n/mg;
+        $file =~ s/# }}} END BPS TAGGED BLOCK(\n+)/# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
         
@@ -213,21 +213,21 @@ sub tag_script {
         $pmlic =~ s/^/# /msg;
 
         print "$pm - ";
-        if ($file =~ /^# BEGIN BPS TAGGED BLOCK {{{/ms) {
+        if ($file =~ /^# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^# BEGIN BPS TAGGED BLOCK {{{(.*?)# END BPS TAGGED BLOCK }}}/# BEGIN BPS TAGGED BLOCK {{{\n$pmlic# END BPS TAGGED BLOCK }}}/ms;
+             $file =~ s/^# {{{ BEGIN BPS TAGGED BLOCK(.*?)# }}} END BPS TAGGED BLOCK/# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
                 if ($file =~ /^(#!.*?)\n/) {
 
-            my  $lic ="# BEGIN BPS TAGGED BLOCK {{{\n$pmlic# END BPS TAGGED BLOCK }}}\n";
+            my  $lic ="# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK\n";
                 $file =~ s/^(#!.*?)\n/$1\n$lic/; 
 
                 } 
         }
-        $file =~ s/# END BPS TAGGED BLOCK }}}(\n+)/# END BPS TAGGED BLOCK }}}\n/mg;
+        $file =~ s/# }}} END BPS TAGGED BLOCK(\n+)/# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
 
diff --git a/rt/sbin/regression_harness b/rt/sbin/regression_harness
index d98e462..c107796 100644
--- a/rt/sbin/regression_harness
+++ b/rt/sbin/regression_harness
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 open (FH,"make regression|");
 
 my $skip_frontmatter = 1;
diff --git a/rt/sbin/rt-dump-database.in b/rt/sbin/rt-dump-database.in
deleted file mode 100755
index bcc7bb7..0000000
--- a/rt/sbin/rt-dump-database.in
+++ /dev/null
@@ -1,168 +0,0 @@
-#!@PERL@ -w
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-use strict;
-use lib "@RT_LIB_PATH@";
-use RT;
-use XML::Simple;
-
-RT::LoadConfig();
-RT::Init();
-
-my $LocalOnly = @ARGV ? shift(@ARGV) : 1;
-
-my %RV;
-my %Ignore = (
-    All => [qw(
-	id Created Creator LastUpdated LastUpdatedBy
-    )],
-    Templates => [qw(
-	TranslationOf
-    )],
-);
-
-my $SystemUserId = $RT::SystemUser->Id;
-my @classes = qw(
-    Users Groups Queues ScripActions ScripConditions
-    Templates Scrips ACL CustomFields
-);
-foreach my $class (@classes) {
-    require "RT/$class.pm";
-    my $objects = "RT::$class"->new($RT::SystemUser);
-    $objects->{find_disabled_rows} = 1;
-    $objects->UnLimit;
-
-    if ($class eq 'CustomFields') {
-        $objects->OrderByCols(
-            { FIELD => 'LookupType' },
-            { FIELD => 'SortOrder' },
-            { FIELD => 'Id' },
-        );
-    }
-    else {
-        $objects->OrderBy( FIELD => 'Id' );
-    }
-
-    if ($LocalOnly) {
-        next if $class eq 'ACL'; # XXX - would go into infinite loop - XXX
-	$objects->Limit( FIELD => 'LastUpdatedBy', OPERATOR => '!=', VALUE => $SystemUserId )
-	    unless $class eq 'Groups';
-	$objects->Limit( FIELD => 'Id', OPERATOR => '!=', VALUE => $SystemUserId )
-	    if $class eq 'Users';
-	$objects->Limit( FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined' )
-	    if $class eq 'Groups';
-    }
-
-    my %fields;
-    while (my $obj = $objects->Next) {
-	next if $obj->can('LastUpdatedBy') and $obj->LastUpdatedBy == $SystemUserId;
-
-	if (!%fields) {
-	    %fields = map { $_ => 1 } keys %{$obj->_ClassAccessible};
-	    delete @fields{
-		@{$Ignore{$class}||=[]},
-		@{$Ignore{All}||=[]},
-	    };
-	}
-
-	my $rv;
-	# next if $obj-> # skip default names
-	foreach my $field (sort keys %fields) {
-	    my $value = $obj->__Value($field);
-	    $rv->{$field} = $value if length($value);
-	}
-	delete $rv->{Disabled} unless $rv->{Disabled};
-
-	foreach my $record (map { /ACL/ ? 'ACE' : substr($_, 0, -1) } @classes) {
-	    foreach my $key (map "$record$_", ('', 'Id')) {
-		next unless exists $rv->{$key};
-		my $id = $rv->{$key} or next;
-		my $obj = "RT::$record"->new($RT::SystemUser);
-		$obj->LoadByCols( Id => $id ) or next;
-		$rv->{$key} = $obj->__Value('Name') || 0;
-	    }
-	}
-
-	if ($class eq 'Users' and defined $obj->Privileged) {
-	    $rv->{Privileged} = int($obj->Privileged);
-	}
-	elsif ($class eq 'CustomFields') {
-	    my $values = $obj->Values;
-	    while (my $value = $values->Next) {
-		push @{$rv->{Values}}, {
-		    map { ($_ => $value->__Value($_)) } qw(
-			Name Description SortOrder
-		    ),
-		};
-	    }
-	}
-
-	if (eval { require RT::Attributes; 1 }) {
-	    my $attributes = $obj->Attributes;
-	    while (my $attribute = $attributes->Next) {
-		my $content = $attribute->Content;
-		$rv->{Attributes}{$attribute->Name} = $content if length($content);
-	    }
-	}
-
-	push @{$RV{$class}}, $rv;
-    }
-}
-
-print(<< ".");
-no strict; use XML::Simple; *_ = XMLin(do { local \$/; readline(DATA) }, ForceArray => [qw(
- @classes Values
-)], NoAttr => 1, SuppressEmpty => ''); *\$_ = (\$_{\$_} || []) for keys \%_; 1; # vim: ft=xml
-__DATA__
-.
-
-print XMLout(
-    { map { ($_ => ($RV{$_} || [])) } @classes },
-    RootName => 'InitialData',
-    NoAttr => 1,
-    SuppressEmpty => '',
-    XMLDecl => '<?xml version="1.0" encoding="UTF-8"?>',
-);
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index 49feba8..9d8fd2e 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -1,9 +1,9 @@
 #!@PERL@ -w
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 use strict;
 use vars qw($PROMPT $VERSION $Handle $Nobody $SystemUser $item);
 use vars
@@ -199,7 +199,6 @@ sub insert_schema {
 
 	local $SIG{__WARN__} = sub {};
 	my $is_local = 0; # local/etc/schema needs to be nonfatal. 
-        $dbh->begin_work or die $dbh->errstr;
         foreach my $statement (@schema) {
 	    if ($statement =~ /^\s*;$/) { $is_local = 1; next; }
             print STDERR "SQL: $statement\n" if defined $args{'debug'};
@@ -208,13 +207,12 @@ sub insert_schema {
                 die "Problem with statement:\n $statement\n" . $sth->errstr;
             }
         }
-        $dbh->commit or die $dbh->errstr;
 
     }
     else {
         die "Couldn't find schema file for " . $RT::DatabaseType . "\n";
     }
-    print "Done setting up database schema.\n";
+    print "schema sucessfully inserted\n";
 
 }
 
@@ -222,6 +220,7 @@ sub insert_schema {
 
 # {{{ sub drop_db
 sub drop_db {
+    return if ( $RT::DatabaseType eq 'SQLite' );
     if ( $RT::DatabaseType eq 'Oracle' ) {
         print <<END;
 
@@ -245,10 +244,6 @@ END
 
     print "Dropping $RT::DatabaseType database $RT::DatabaseName.\n";
 
-    if ( $RT::DatabaseType eq 'SQLite' ) {
-	unlink $RT::DatabaseName or warn $!;
-	return;
-    }
     $dbh->do("Drop DATABASE $RT::DatabaseName") or warn $DBI::errstr;
 }
 
@@ -281,19 +276,20 @@ sub create_db {
 # }}}
 
 sub get_dba_password {
-    print "In order to create or update your RT database,";
+    print
+"In order to create a new database and grant RT access to that database,\n";
     print "this script needs to connect to your "
       . $RT::DatabaseType
       . " instance on "
       . $RT::DatabaseHost . " as "
       . $args{'dba'} . ".\n";
-    print "Please specify that user's database password below. If the user has no database\n";
+    print
+"Please specify that user's database password below. If the user has no database\n";
     print "password, just press return.\n\n";
     print "Password: ";
     ReadMode('noecho');
     my $password = ReadLine(0);
     ReadMode('normal');
-    print "\n";
     return ($password);
 }
 
@@ -320,15 +316,15 @@ sub insert_acl {
     }
     elsif ( $RT::DatabaseType =~ /^mysql$/i ) {
         do $base_path . "/acl.mysql"
-          || die "Couldn't find ACLS for mysql in $base_path\n" . $@;
+          || die "Couldn't find ACLS for mysql in " . $RT::EtcPath . "\n" . $@;
     }
     elsif ( $RT::DatabaseType =~ /^Sybase$/i ) {
         do $base_path . "/acl.Sybase"
-          || die "Couldn't find ACLS for Sybase in $base_path\n" . $@;
+          || die "Couldn't find ACLS for Sybase in " . $RT::EtcPath . "\n" . $@;
     }
     elsif ( $RT::DatabaseType =~ /^informix$/i ) {
         do $base_path . "/acl.Informix"
-          || die "Couldn't find ACLS for Informix in $base_path\n" . $@;
+          || die "Couldn't find ACLS for Informix in " . $RT::EtcPath . "\n" . $@;
     }
     elsif ( $RT::DatabaseType =~ /^SQLite$/i ) {
         return;
@@ -345,7 +341,6 @@ sub insert_acl {
             die "Problem with statement:\n $statement\n" . $sth->errstr;
         }
     }
-    print "Done setting up database ACLs.\n";
 }
 
 # }}}
@@ -410,8 +405,7 @@ sub insert_initial_data {
         RealName => 'The RT System itself',
         Comments =>
 'Do not delete or modify this user. It is integral to RT\'s internal database structures',
-        Creator => '1',
-        LastUpdatedBy => '1' );
+        Creator => '1' );
 
     unless ($val) {
         print "$msg\n";
@@ -445,7 +439,6 @@ sub insert_data {
                              ObjectType    => 'RT::System',
                              ObjectId      => '1' );
 
-        print "done.\n";
     }
 
     # Slurp in stuff to insert from the datafile. Possible things to go in here:-
@@ -619,7 +612,7 @@ sub insert_data {
         print "done.\n";
     }
     $RT::Handle->Disconnect() unless ($RT::DatabaseType eq 'SQLite');
-    print "Done setting up database content.\n";
+
 }
 
 =head2 ACLEquivGroupId
diff --git a/rt/sbin/rt-test-dependencies.in b/rt/sbin/rt-test-dependencies.in
index f79e4e5..6eed513 100644
--- a/rt/sbin/rt-test-dependencies.in
+++ b/rt/sbin/rt-test-dependencies.in
@@ -1,9 +1,9 @@
 #!@PERL@
-# BEGIN BPS TAGGED BLOCK {{{
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -43,7 +43,7 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# END BPS TAGGED BLOCK }}}
+# }}} END BPS TAGGED BLOCK
 #
 # This is just a basic script that checks to make sure that all
 # the modules needed by RT before you can install it.
@@ -52,68 +52,36 @@
 use strict;
 no warnings qw(numeric redefine);
 use Getopt::Long;
+use CPAN;
 my %args;
 my %deps;
-GetOptions(
-    \%args,                               'v|verbose',
-    'install',                            'with-MYSQL',
-    'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE',
-    'with-ORACLE',                        'with-FASTCGI',
-    'with-SPEEDYCGI',                     'with-MODPERL1',
-    'with-MODPERL2',                      'with-DEV',
-    'download=s',
-    'repository=s'
-);
-
-unless (keys %args) {
+GetOptions(\%args, 'v|verbose', 'install', 'with-MYSQL', 'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE', 'with-ORACLE', 'with-FASTCGI', 'with-SPEEDYCGI', 'with-MODPERL1', 'with-MODPERL2' ,'with-DEV', 'download=s');
+
+if (!keys %args) {
     help();
     exit(0);
 }
+if ($args{'with-MODPERL2'}) {
+    warn_modperl2();
+}
 
-# Set up defaults
 $args{'with-MASON'} = 1;
 $args{'with-CORE'} = 1;
 $args{'with-DEV'} =1; 
 $args{'with-CLI'} =1; 
 $args{'with-MAILGATE'} =1; 
-{
-  my $section;
-  my %always_show_sections = (
-    perl => 1,
-    users => 1,
-  );
-
-  sub section {
-    my $s = shift;
-    $section = $s;
-    print "$s:\n";
-  }
-
-  my $any_missing = 0;
-  sub found {
-    my $msg = shift;
-    my $test = shift;
-    my $extra = shift;
-  
-    $any_missing = 1 unless $test;
-    if ($args{'v'} or not $test or $always_show_sections{$section}) {
-      print "\t$msg...";
-      print $test ? "found" : "MISSING";
-      print "\n";
-    }
-    
-    print "\t\t$extra\n" if defined $extra;
-  }
 
-  sub conclude {
-    if ($any_missing) {
-      print "\nSOMETHING WAS MISSING!\n";
-    } else {
-      print "\nEverything was found.\n";
-    }
-  }
+sub warn_modperl2 {
+    print <<'.';
+        NOTE: mod_perl 2.0 isn't quite ready for prime_time just yet;
+        Best Practical Solutions strongly recommends that sites use
+        Apache 1.3 or FastCGI. If you MUST use mod_perl 2.0 (or 1.99),
+        please read the mailing list archives before asking for help.
+.
+    sleep 5;
 }
 
+
 sub help {
 
     print <<'.';
@@ -153,7 +121,7 @@ Digest::MD5 2.27
 DBI 1.37
 Test::Inline
 Class::ReturnValue 0.40
-DBIx::SearchBuilder 1.26
+DBIx::SearchBuilder 1.01
 Text::Template
 File::Spec 0.8
 HTML::Entities 
@@ -168,7 +136,6 @@ Mail::Mailer 1.57
 Net::SMTP
 Text::Wrapper 
 Time::ParseDate
-Time::HiRes 
 File::Temp
 Term::ReadKey
 Text::Autoformat
@@ -176,8 +143,6 @@ Text::Quoted 1.3
 Tree::Simple 1.04
 Scalar::Util
 Module::Versions::Report
-Cache::Simple::TimedExpiry
-XML::Simple
 .
 
 $deps{'MASON'} = [ _( << '.') ];
@@ -192,10 +157,7 @@ Digest::MD5 2.27
 CGI::Cookie 1.20
 Storable 2.08
 Apache::Session 1.53
-XML::RSS 1.05
-HTTP::Server::Simple 0.07
-HTTP::Server::Simple::Mason 0.09
-Text::WikiFormat
+XML::RSS
 .
 
 $deps{'MAILGATE'} = [ _( << '.') ];
@@ -211,13 +173,12 @@ Getopt::Long 2.24
 
 $deps{'DEV'} = [ _( << '.') ];
 Regexp::Common
+Time::HiRes 
 Test::Inline 
 Apache::Test
 HTML::Form
 HTML::TokeParser
 WWW::Mechanize
-Test::WWW::Mechanize
-Module::Refresh 0.03
 .
 
 $deps{'FASTCGI'} = [ _( << '.') ];
@@ -241,7 +202,6 @@ Apache::DBI 0.92
 $deps{'MODPERL2'} = [ _( << '.') ];
 CGI 2.92
 Apache::DBI
-HTML::Mason 1.31
 .
 
 $deps{'MYSQL'} = [ _( << '.') ];
@@ -251,7 +211,7 @@ $deps{'ORACLE'} = [ _( << '.') ];
 DBD::Oracle
 .
 $deps{'POSTGRESQL'} = [ _( << '.') ];
-DBD::Pg 1.41
+DBD::Pg
 .
 
 $deps{'SQLITE'} = [ _( << '.') ];
@@ -260,19 +220,74 @@ DBD::SQLite
 
 if ($args{'download'}) {
 
-    download_mods();
+    my %modules;
+
+    foreach my $key (keys %deps) {
+        my @deps = (@{$deps{$key}});
+        while (@deps) {
+            my $mod = shift @deps;
+            my $ver = shift @deps;
+            next if ($mod =~ /^(DBD-|Apache-Request)/);
+            $modules{$mod} = $ver;
+        }
+    }
+    my @mods = keys %modules;
+    CPAN::get();
+    my $moddir = $args{'download'};
+    foreach my $mod (@mods) {
+        $CPAN::Config->{'build_dir'} = $moddir;
+        CPAN::get($mod);
+    }
+
+    opendir(DIR, $moddir);
+    while ( my $dir = readdir(DIR)) {
+        print "Dir is $dir\n";
+        next if ( $dir =~ /^\.\.?$/);
+
+        if ($dir =~ /^(.*)-(.*?)$/) {
+            print "$1  --  $2\n";
+            `svn_load_dirs.pl file:///Users/jesse/mod-repo $1 $moddir/$dir`;
+            `rm -rf $moddir/$dir`;
+
+        }
+
+    }
+    closedir(DIR);
+    exit;
 }
 
 
-check_perl_version();
+print "perl:\n";
+print "\t5.8.3";
+eval {require 5.008003};
+if ($@) {
+    print "...MISSING.\n";
+    eval {require 5.008000};
+    if ($@) {
+        print "\nRT is known to be non-functional on versions of perl older than 5.8.3.\nPlease upgrade to 5.8.3 or newer\n\n";
+        die;
+    } 
 
-check_users();
+    eval {require 5.008003};
+    if ($@) {
+        print "\nRT is known to be non-functional on versions of perl older than 5.8.3.\nPlease upgrade to 5.8.3 or newer\n\n";
+    }
+} else {
+    print "...found\n" if $args{'v'};
+}
 
+print "users:\n";
+print "\trt group (@RTGROUP@)...",      (defined getgrnam("@RTGROUP@")    ? "found" : "MISSING"), "\n";
+print "\tbin owner (@BIN_OWNER@)...",   (defined getpwnam("@BIN_OWNER@")  ? "found" : "MISSING"), "\n";
+print "\tlibs owner (@LIBS_OWNER@)...", (defined getpwnam("@LIBS_OWNER@") ? "found" : "MISSING"), "\n";
+print "\tlibs group (@LIBS_GROUP@)...", (defined getgrnam("@LIBS_GROUP@") ? "found" : "MISSING"), "\n";
+print "\tweb owner (@WEB_USER@)...",    (defined getpwnam("@WEB_USER@")   ? "found" : "MISSING"), "\n";
+print "\tweb group (@WEB_GROUP@)...",   (defined getgrnam("@WEB_GROUP@")  ? "found" : "MISSING"), "\n";
 
 foreach my $type (keys %args) {
     next unless ($type =~ /^with-(.*?)$/);
     my $type = $1;
-    section("$type dependencies");
+    print "$type dependencies:\n";
     my @deps = (@{$deps{$type}});
     while (@deps) {
         my $module = shift @deps;
@@ -285,8 +300,6 @@ foreach my $type (keys %args) {
     }
 }
 
-conclude();
-
 sub test_dep {
     my $module = shift;
     my $version = shift;
@@ -295,83 +308,46 @@ sub test_dep {
     if ($@) {
         my $error = $@;
         $error =~ s/\n(.*)$//s;
-        undef $error unless $error =~ /this is only/;
-        found("$module $version", 0, $error);
+        print "\t$module $version";
+        print "...MISSING\n";
+        print "\t\t$error\n" if $error =~ /this is only/;
 
         return undef;
     } else {
-        found("$module $version", 1);
+        print "\t$module $version...found\n" if $args{'v'};
         return 1;
     }
 }
 
 sub resolve_dep {
     my $module = shift;
-    system( qq[@PERL@ -MCPAN -e'install("$module")'] );
+    use CPAN;
+    CPAN::Shell->install($module);		
 }
 
-sub download_mods {
-    my %modules;
-    use CPAN;
-    
-    foreach my $key (keys %deps) {
-        my @deps = (@{$deps{$key}});
-        while (@deps) {
-            my $mod = shift @deps;
-            my $ver = shift @deps;
-            next if ($mod =~ /^(DBD-|Apache-Request)/);
-            $modules{$mod} = $ver;
-        }
-    }
-    my @mods = keys %modules;
-    CPAN::get();
-    my $moddir = $args{'download'};
-    foreach my $mod (@mods) {
-        $CPAN::Config->{'build_dir'} = $moddir;
-        CPAN::get($mod);
-    }
 
-    opendir(DIR, $moddir);
-    while ( my $dir = readdir(DIR)) {
-        print "Dir is $dir\n";
-        next if ( $dir =~ /^\.\.?$/);
+sub print_help {
+    print << "EOF";
 
-        # Skip things we've previously tagged
-        my $out = `svn ls $args{'repository'}/tags/$dir`;
-        next if ($out);
+$0 FLAG DBTYPE
 
-        if ($dir =~ /^(.*)-(.*?)$/) {
-            `svn_load_dirs -no_user_input -t tags/$dir -v $args{'repository'} dists/$1 $moddir/$dir`;
-            `rm -rf $moddir/$dir`;
 
-        }
+$0 is a tool for RT that will tell you if you've got all
+the modules RT depends on properly installed.
 
-    }
-    closedir(DIR);
-    exit;
-}
+Flags: (only one flag is valid for a given run)
 
-sub check_perl_version {
-  section("perl");
-  eval {require 5.008003};
-  if ($@) {
-    found("5.8.3", 0, "RT is known to be non-functional on versions of perl older than 5.8.3. Please upgrade to 5.8.3 or newer.");
-    die;
-  } else {
-    found("5.8.3", 1);
-  }
-}
+-quiet will check to see if we've got everything we need
+	and will exit with a return code of (1) if we don't.
 
-sub check_users {
-  section("users");
-  found("rt group (@RTGROUP@)",      defined getgrnam("@RTGROUP@"));
-  found("bin owner (@BIN_OWNER@)",   defined getpwnam("@BIN_OWNER@"));
-  found("libs owner (@LIBS_OWNER@)", defined getpwnam("@LIBS_OWNER@"));
-  found("libs group (@LIBS_GROUP@)", defined getgrnam("@LIBS_GROUP@"));
-  found("web owner (@WEB_USER@)",    defined getpwnam("@WEB_USER@"));
-  found("web group (@WEB_GROUP@)",   defined getgrnam("@WEB_GROUP@"));
-}
+-warn will tell you what isn't properly installed
+
+-fix will use CPANPLUS.pm or CPAN.pm to magically make everything better
 
+DBTYPE is one of:
+	oracle, pg, mysql
 
+EOF
 
-1;
+    exit(0);
+}